Skip to content

Commit

Permalink
deps: V8: cherry-pick 71736859756b2bd0444bdb0a87a
Browse files Browse the repository at this point in the history
Original commit message:

    [heap] Add large_object_threshold to AllocateRaw

    This commit adds a check in Heap::AllocateRaw when setting the
    large_object variable, when the AllocationType is of type kCode, to
    take into account the size of the CodeSpace's area size.

    The motivation for this change is that without this check it is
    possible that size_in_bytes is less than 128, and hence not considered
    a large object, but it might be larger than the available space
    in code_space->AreaSize(), which will cause the object to be created
    in the CodeLargeObjectSpace. This will later cause a segmentation fault
    when calling the following chain of functions:

       if (!large_object) {
          MemoryChunk::FromHeapObject(heap_object)
              ->GetCodeObjectRegistry()
              ->RegisterNewlyAllocatedCodeObject(heap_object.address());
       }

    We (Red Hat) ran into this issue when running Node.js v12.16.1 in
    combination with yarn on aarch64 (this was the only architecture that
    this happed on).

    Bug: v8:10808
    Change-Id: I0c396b0eb64bc4cc91d9a3be521254f3130eac7b
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2390665
    Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
    Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#69876}

Refs: v8/v8@7173685
PR-URL: #35205
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
danbev authored and addaleax committed Sep 23, 2020
1 parent 26ede7f commit 57564eb
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 7 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.40',
'v8_embedder_string': '-node.41',

##### V8 defaults for Node.js #####

Expand Down
14 changes: 10 additions & 4 deletions deps/v8/src/heap/heap-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,13 @@ AllocationResult Heap::AllocateRaw(int size_in_bytes, AllocationType type,
IncrementObjectCounters();
#endif

bool large_object = size_in_bytes > kMaxRegularHeapObjectSize;
size_t large_object_threshold =
AllocationType::kCode == type
? std::min(kMaxRegularHeapObjectSize, code_space()->AreaSize())
: kMaxRegularHeapObjectSize;
bool large_object =
static_cast<size_t>(size_in_bytes) > large_object_threshold;


HeapObject object;
AllocationResult allocation;
Expand Down Expand Up @@ -200,10 +206,10 @@ AllocationResult Heap::AllocateRaw(int size_in_bytes, AllocationType type,
allocation = old_space_->AllocateRaw(size_in_bytes, alignment, origin);
}
} else if (AllocationType::kCode == type) {
if (size_in_bytes <= code_space()->AreaSize() && !large_object) {
allocation = code_space_->AllocateRawUnaligned(size_in_bytes);
} else {
if (large_object) {
allocation = code_lo_space_->AllocateRaw(size_in_bytes);
} else {
allocation = code_space_->AllocateRawUnaligned(size_in_bytes);
}
} else if (AllocationType::kMap == type) {
allocation = map_space_->AllocateRawUnaligned(size_in_bytes);
Expand Down
6 changes: 4 additions & 2 deletions deps/v8/src/heap/heap.h
Original file line number Diff line number Diff line change
Expand Up @@ -1262,8 +1262,10 @@ class Heap {
// Heap object allocation tracking. ==========================================
// ===========================================================================

void AddHeapObjectAllocationTracker(HeapObjectAllocationTracker* tracker);
void RemoveHeapObjectAllocationTracker(HeapObjectAllocationTracker* tracker);
V8_EXPORT_PRIVATE void AddHeapObjectAllocationTracker(
HeapObjectAllocationTracker* tracker);
V8_EXPORT_PRIVATE void RemoveHeapObjectAllocationTracker(
HeapObjectAllocationTracker* tracker);
bool has_heap_object_allocation_tracker() const {
return !allocation_trackers_.empty();
}
Expand Down
1 change: 1 addition & 0 deletions deps/v8/test/cctest/heap/heap-tester.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// Tests that should have access to private methods of {v8::internal::Heap}.
// Those tests need to be defined using HEAP_TEST(Name) { ... }.
#define HEAP_TEST_METHODS(V) \
V(CodeLargeObjectSpace) \
V(CompactionFullAbortedPage) \
V(CompactionPartiallyAbortedPage) \
V(CompactionPartiallyAbortedPageIntraAbortedPointers) \
Expand Down
32 changes: 32 additions & 0 deletions deps/v8/test/cctest/heap/test-heap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6754,6 +6754,38 @@ TEST(CodeObjectRegistry) {
CHECK(MemoryChunk::FromAddress(code2_address)->Contains(code2_address));
}

class TestAllocationTracker : public HeapObjectAllocationTracker {
public:
explicit TestAllocationTracker(int expected_size) : expected_size_(expected_size) {}

void AllocationEvent(Address addr, int size) {
CHECK(expected_size_ == size);
address_ = addr;
}

Address address() { return address_; }

private:
int expected_size_;
Address address_;
};

HEAP_TEST(CodeLargeObjectSpace) {
Heap* heap = CcTest::heap();
int size_in_bytes = kMaxRegularHeapObjectSize + kSystemPointerSize;
TestAllocationTracker allocation_tracker{size_in_bytes};
heap->AddHeapObjectAllocationTracker(&allocation_tracker);

AllocationResult allocation = heap->AllocateRaw(
size_in_bytes, AllocationType::kCode, AllocationOrigin::kGeneratedCode,
AllocationAlignment::kWordAligned);

CHECK(allocation.ToObjectChecked().address() == allocation_tracker.address());
heap->CreateFillerObjectAt(allocation.ToObjectChecked().address(),
size_in_bytes, ClearRecordedSlots::kNo);
heap->RemoveHeapObjectAllocationTracker(&allocation_tracker);
}

} // namespace heap
} // namespace internal
} // namespace v8
Expand Down

0 comments on commit 57564eb

Please sign in to comment.