AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Reland "[offthread] Add a write lock to the string table"

Browse Source 
This is a reland of 6af09b1b02

Relanding without changes after fixing the root cause in
https://crrev.com/c/2315987

Original change's description:
> [offthread] Add a write lock to the string table
>
> Adds an initial implementation of a concurrency support for the string
> table, allowing it to be read without holding a lock, and written to
> while holding a lock.
>
> This is an initial prototype of _roughly_ how the concurrency would
> work; there are still a few holes (e.g. around deserialization). This
> is predominantly to assess the main-thread runtime impact of the more
> complex string table access.
>
> Bug: v8:10729
> Change-Id: I5c6c35e6fca309efd6ee79804c16972aae1ab3ab
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2306804
> Reviewed-by: Toon Verwaest <verwaest@chromium.org>
> Reviewed-by: Igor Sheludko <ishell@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Commit-Queue: Leszek Swirski <leszeks@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#68985}

Tbr: verwaest@chromium.org,ishell@chromium.org,ulan@chromium.org
Bug: v8:10729
Change-Id: I9ce8882cfbdd40fbe1c7478e171c0785bf2e64d6
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2315989
Commit-Queue: Leszek Swirski <leszeks@chromium.org>
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Igor Sheludko <ishell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#69025}
This commit is contained in:
Leszek Swirski 2020-07-21 17:09:04 +02:00 committed by Commit Bot
parent 185389fae3
commit 9458d625d2
7 changed files with 199 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/execution/isolate.h
View File

@ -16,6 +16,7 @@
#include "include/v8-internal.h"
#include "include/v8.h"
#include "src/base/macros.h"
#include "src/base/platform/mutex.h"
#include "src/builtins/builtins.h"
#include "src/common/globals.h"
#include "src/debug/interface-types.h"
@ -613,6 +614,9 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
return &transition_array_access_;
}
// Mutex for accessing the string table.
base::Mutex* string_table_mutex() { return &string_table_mutex_; }
Address get_address_from_id(IsolateAddressId id);
// Access to top context (where the current function object was created).
@ -1654,6 +1658,7 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
std::shared_ptr<Counters> async_counters_;
base::RecursiveMutex break_access_;
base::SharedMutex transition_array_access_;
base::Mutex string_table_mutex_;
Logger* logger_ = nullptr;
StubCache* load_stub_cache_ = nullptr;
StubCache* store_stub_cache_ = nullptr;

3
src/objects/hash-table-inl.h
View File

@ -157,11 +157,10 @@ InternalIndex HashTable<Derived, Shape>::FindEntry(const LocalIsolate* isolate,
Object element = KeyAt(isolate, entry);
// Empty entry. Uses raw unchecked accessors because it is called by the
// string table during bootstrapping.
if (element == undefined) break;
if (element == undefined) return InternalIndex::NotFound();
if (Shape::kMatchNeedsHoleCheck && element == the_hole) continue;
if (Shape::IsMatch(key, element)) return entry;
}
return InternalIndex::NotFound();
}
// static

6
src/objects/hash-table.h
View File

@ -223,6 +223,12 @@ class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) HashTable
uint32_t hash);
InternalIndex FindInsertionEntry(Isolate* isolate, uint32_t hash);
// Find either the entry with the given key, or the entry at which to insert
// an element with the given key.
InternalIndex FindEntryOrInsertionEntry(const Isolate* isolate,
ReadOnlyRoots roots, Key key,
uint32_t hash);
// Computes the capacity a table with the given capacity would need to have
// room for the given number of elements, also allowing it to shrink.
static int ComputeCapacityWithShrink(int current_capacity,

221
src/objects/objects.cc
View File

@ -5908,8 +5908,37 @@ InternalIndex HashTable<Derived, Shape>::FindInsertionEntry(Isolate* isolate,
return FindInsertionEntry(isolate, ReadOnlyRoots(isolate), hash);
}
template <typename Derived, typename Shape>
InternalIndex HashTable<Derived, Shape>::FindEntryOrInsertionEntry(
const Isolate* isolate, ReadOnlyRoots roots, Key key, uint32_t hash) {
uint32_t capacity = Capacity();
InternalIndex insertion_entry = InternalIndex::NotFound();
uint32_t count = 1;
// EnsureCapacity will guarantee the hash table is never full.
Object undefined = roots.undefined_value();
Object the_hole = roots.the_hole_value();
for (InternalIndex entry = FirstProbe(hash, capacity);;
entry = NextProbe(entry, count++, capacity)) {
Object element = KeyAt(isolate, entry);
if (element == undefined) {
// Empty entry, it's out insertion entry if there was no previous Hole.
if (insertion_entry.is_not_found()) return entry;
return insertion_entry;
}
if (element == the_hole) {
// Holes are potential insertion candidates, but we continue the search
// in case we find the actual matching entry.
if (insertion_entry.is_not_found()) insertion_entry = entry;
continue;
}
if (Shape::IsMatch(key, element)) return entry;
}
}
void StringTable::EnsureCapacityForDeserialization(Isolate* isolate,
int expected) {
// TODO(crbug.com/v8/10729): Add concurrent string table support.
Handle<StringTable> table = isolate->factory()->string_table();
// We need a key instance for the virtual hash function.
table = EnsureCapacity(isolate, table, expected);
@ -5954,49 +5983,153 @@ Handle<String> StringTable::LookupString(Isolate* isolate,
// static
template <typename StringTableKey>
Handle<String> StringTable::LookupKey(Isolate* isolate, StringTableKey* key) {
Handle<StringTable> table = isolate->factory()->string_table();
InternalIndex entry = table->FindEntry(isolate, key);
// String table lookups are allowed to be concurrent, assuming that:
//
// - The Heap access is allowed to be concurrent (using LocalHeap or
// similar),
// - All writes to the string table are guarded by the Isolate string table
// mutex,
// - Resizes of the string table first copies the old contents to the new
// table, and only then sets the new string table pointer to the new
// table,
// - Only GCs can remove elements from the string table.
//
// These assumptions allow us to make the following statement:
//
// "Reads are allowed when not holding the lock, as long as false negatives
// (misses) are ok. We will never get a false positive (hit of an entry no
// longer in the table)"
//
// This is because we _know_ that if we find an entry in the string table, any
// entry will also be in all reallocations of that tables. This is required
// for strong consistency of internalized string equality implying reference
// equality.
//
// We therefore try to optimistically read from the string table without
// taking the lock (both here and in the NoAllocate version of the lookup),
// and on a miss we take the lock and try to write the entry, with a second
// read lookup in case the non-locked read missed a write.
//
// One complication is allocation -- we don't want to allocate while holding
// the string table lock. This applies to both allocation of new strings, and
// re-allocation of the string table on resize. So, we optimistically allocate
// (without copying values) outside the lock, and potentially discard the
// allocation if another write also did an allocation. This assumes that
// writes are rarer than reads.
// String already in table.
if (entry.is_found()) {
return handle(String::cast(table->KeyAt(entry)), isolate);
ReadOnlyRoots roots(isolate);
// Take the explicit slot to the string table, so that we can read/write it
// with acquire/release semantics.
FullObjectSlot string_table_slot =
isolate->roots_table().slot(RootIndex::kStringTable);
Handle<String> new_string;
while (true) {
// Load the string table slot, creating a new Handle for the table to cache
// the current slot value in case another thread updates it.
Handle<StringTable> table =
handle(StringTable::cast(string_table_slot.Acquire_Load()), isolate);
// First try to find the string in the table. This is safe to do even if the
// table is now reallocated; we won't find a stale entry in the old table
// because the new table won't delete it's corresponding entry until the
// string is dead, in which case it will die in this table too and worst
// case we'll have a false miss.
InternalIndex entry = table->FindEntry(isolate, roots, key, key->hash());
if (entry.is_found()) {
return handle(String::cast(table->KeyAt(isolate, entry)), isolate);
}
// No entry found, so adding new string.
// Allocate the string before the first insertion attempt, reuse this
// allocated value on insertion retries. If another thread concurrently
// allocates the same string, the insert will fail, the lookup above will
// succeed, and this string will be discarded.
if (new_string.is_null()) new_string = key->AsHandle(isolate);
// Grow or shrink table if needed. We first try to shrink the table, if it
// is sufficiently empty; otherwise we make sure to grow it so that it has
// enough space.
int current_capacity = table->Capacity();
int current_nof = table->NumberOfElements();
int capacity_after_shrinking =
ComputeCapacityWithCautiousShrink(current_capacity, current_nof + 1);
int new_capacity = -1;
if (capacity_after_shrinking < current_capacity) {
DCHECK(HasSufficientCapacityToAdd(capacity_after_shrinking, current_nof,
0, 1));
new_capacity = capacity_after_shrinking;
} else if (!HasSufficientCapacityToAdd(current_capacity, current_nof,
table->NumberOfDeletedElements(),
1)) {
new_capacity = ComputeCapacity(current_nof + 1);
}
// Maybe re-allocate the table outside of the lock, delay copying the
// contents until the lock is held.
MaybeHandle<StringTable> maybe_new_table;
if (new_capacity != -1) {
bool pretenure = (new_capacity > kMinCapacityForPretenure) &&
!Heap::InYoungGeneration(*table);
maybe_new_table = HashTable::New(
isolate, new_capacity,
pretenure ? AllocationType::kOld : AllocationType::kYoung,
USE_CUSTOM_MINIMUM_CAPACITY);
}
{
base::MutexGuard table_write_guard(isolate->string_table_mutex());
// Reload the table, now as a Handle, in case someone else changed it.
Handle<StringTable> reloaded_table = isolate->factory()->string_table();
// Someone else updated the table slot, they probably resized so we should
// invalidate our new table if there is one.
if (*reloaded_table != *table) {
table = reloaded_table;
maybe_new_table = kNullMaybeHandle;
} else {
// Copy the old table if necessary -- this is in the lock so that we
// don’t miss any writes to the old table (which is guaranteed to).
Handle<StringTable> new_table;
if (maybe_new_table.ToHandle(&new_table)) {
// Make sure the new table is still large enough, in case the old
// table was mutated.
if (!HasSufficientCapacityToAdd(new_table->Capacity(), 0, 0,
table->NumberOfElements() + 1)) {
continue;
}
table->Rehash(isolate, *new_table);
string_table_slot.Release_Store(*new_table);
table = new_table;
}
}
if (!table->HasSufficientCapacityToAdd(1)) {
// The table is too small to insert our entry, which means someone else
// added new entries since we last checked. Loop around again to retry
// the lookup (and possibly resize).
continue;
}
InternalIndex entry =
table->FindEntryOrInsertionEntry(isolate, roots, key, key->hash());
// Check one last time if the key is present in the table, in case it was
// added after the check
Object element = table->KeyAt(isolate, entry);
if (IsKey(roots, element)) {
return handle(String::cast(element), isolate);
}
// Add the new string and return it.
table->set(EntryToIndex(entry), *new_string);
table->ElementAdded();
return new_string;
}
}
// No entry found, so adding new string.
// Grow or shrink table if needed. We first try to shrink the table, if it
// is sufficiently empty; otherwise we make sure to grow it so that it has
// enough space.
int current_capacity = table->Capacity();
int current_nof = table->NumberOfElements();
int capacity_after_shrinking =
ComputeCapacityWithCautiousShrink(current_capacity, current_nof + 1);
int new_capacity = -1;
if (capacity_after_shrinking < current_capacity) {
DCHECK(HasSufficientCapacityToAdd(capacity_after_shrinking, current_nof, 0,
1));
new_capacity = capacity_after_shrinking;
} else if (!HasSufficientCapacityToAdd(current_capacity, current_nof,
table->NumberOfDeletedElements(), 1)) {
new_capacity = ComputeCapacity(current_nof + 1);
}
// Maybe re-allocate the table.
if (new_capacity != -1) {
bool pretenure = (new_capacity > kMinCapacityForPretenure) &&
!Heap::InYoungGeneration(*table);
Handle<StringTable> new_table = HashTable::New(
isolate, new_capacity,
pretenure ? AllocationType::kOld : AllocationType::kYoung,
USE_CUSTOM_MINIMUM_CAPACITY);
table->Rehash(isolate, *new_table);
isolate->heap()->SetRootStringTable(*new_table);
table = new_table;
}
DCHECK(table->HasSufficientCapacityToAdd(1));
return AddKeyNoResize(isolate, table, key);
}
template Handle<String> StringTable::LookupKey(Isolate* isolate,
@ -6047,7 +6180,11 @@ template <typename Char>
Address LookupString(Isolate* isolate, String string, String source,
size_t start) {
DisallowHeapAllocation no_gc;
StringTable table = isolate->heap()->string_table();
// Take the explicit slot to the string table, so that we can read it with
// acquire/release semantics.
FullObjectSlot string_table_slot =
isolate->roots_table().slot(RootIndex::kStringTable);
StringTable table = StringTable::cast(string_table_slot.Acquire_Load());
uint64_t seed = HashSeed(isolate);
int length = string.length();

6
src/roots/roots.h
View File

@ -436,6 +436,12 @@ class RootsTable {
return roots_[index];
}
FullObjectSlot slot(RootIndex root_index) {
size_t index = static_cast<size_t>(root_index);
DCHECK_LT(index, kEntriesCount);
return FullObjectSlot(&roots_[index]);
}
static const char* name(RootIndex root_index) {
size_t index = static_cast<size_t>(root_index);
DCHECK_LT(index, kEntriesCount);

1
src/snapshot/deserializer.cc
View File

@ -240,6 +240,7 @@ HeapObject Deserializer::PostProcessNewObject(HeapObject obj,
if (string.IsInternalizedString()) {
// Off-thread internalized strings are canonicalized during off-thread
// isolate publish, so we don't have to canonicalize them here.
// TODO(crbug.com/v8/10729): Add concurrent string table support.
if (local_isolate().is_off_thread()) return string;
// Canonicalize the internalized string. If it already exists in the

1
src/snapshot/object-deserializer.cc
View File

@ -79,6 +79,7 @@ MaybeHandle<HeapObject> ObjectDeserializer::Deserialize(
void ObjectDeserializer::CommitPostProcessedObjects() {
if (is_main_thread()) {
// TODO(crbug.com/v8/10729): Add concurrent string table support.
CHECK_LE(new_internalized_strings().size(), kMaxInt);
StringTable::EnsureCapacityForDeserialization(
isolate(), static_cast<int>(new_internalized_strings().size()));