Commit 71736859 authored by Daniel Bevenius's avatar Daniel Bevenius Committed by Commit Bot

[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: 's avatarUlan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#69876}
parent a29b44e5
...@@ -183,7 +183,12 @@ AllocationResult Heap::AllocateRaw(int size_in_bytes, AllocationType type, ...@@ -183,7 +183,12 @@ AllocationResult Heap::AllocateRaw(int size_in_bytes, AllocationType type,
IncrementObjectCounters(); IncrementObjectCounters();
#endif #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; HeapObject object;
AllocationResult allocation; AllocationResult allocation;
...@@ -216,10 +221,10 @@ AllocationResult Heap::AllocateRaw(int size_in_bytes, AllocationType type, ...@@ -216,10 +221,10 @@ AllocationResult Heap::AllocateRaw(int size_in_bytes, AllocationType type,
allocation = old_space_->AllocateRaw(size_in_bytes, alignment, origin); allocation = old_space_->AllocateRaw(size_in_bytes, alignment, origin);
} }
} else if (AllocationType::kCode == type) { } else if (AllocationType::kCode == type) {
if (size_in_bytes <= code_space()->AreaSize() && !large_object) { if (large_object) {
allocation = code_space_->AllocateRawUnaligned(size_in_bytes);
} else {
allocation = code_lo_space_->AllocateRaw(size_in_bytes); allocation = code_lo_space_->AllocateRaw(size_in_bytes);
} else {
allocation = code_space_->AllocateRawUnaligned(size_in_bytes);
} }
} else if (AllocationType::kMap == type) { } else if (AllocationType::kMap == type) {
allocation = map_space_->AllocateRawUnaligned(size_in_bytes); allocation = map_space_->AllocateRawUnaligned(size_in_bytes);
......
...@@ -1441,8 +1441,10 @@ class Heap { ...@@ -1441,8 +1441,10 @@ class Heap {
// Heap object allocation tracking. ========================================== // Heap object allocation tracking. ==========================================
// =========================================================================== // ===========================================================================
void AddHeapObjectAllocationTracker(HeapObjectAllocationTracker* tracker); V8_EXPORT_PRIVATE void AddHeapObjectAllocationTracker(
void RemoveHeapObjectAllocationTracker(HeapObjectAllocationTracker* tracker); HeapObjectAllocationTracker* tracker);
V8_EXPORT_PRIVATE void RemoveHeapObjectAllocationTracker(
HeapObjectAllocationTracker* tracker);
bool has_heap_object_allocation_tracker() const { bool has_heap_object_allocation_tracker() const {
return !allocation_trackers_.empty(); return !allocation_trackers_.empty();
} }
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
// Tests that should have access to private methods of {v8::internal::Heap}. // Tests that should have access to private methods of {v8::internal::Heap}.
// Those tests need to be defined using HEAP_TEST(Name) { ... }. // Those tests need to be defined using HEAP_TEST(Name) { ... }.
#define HEAP_TEST_METHODS(V) \ #define HEAP_TEST_METHODS(V) \
V(CodeLargeObjectSpace) \
V(CompactionFullAbortedPage) \ V(CompactionFullAbortedPage) \
V(CompactionPartiallyAbortedPage) \ V(CompactionPartiallyAbortedPage) \
V(CompactionPartiallyAbortedPageIntraAbortedPointers) \ V(CompactionPartiallyAbortedPageIntraAbortedPointers) \
......
...@@ -7196,6 +7196,39 @@ TEST(Regress10698) { ...@@ -7196,6 +7196,39 @@ TEST(Regress10698) {
filler.set_map_after_allocation(*factory->one_pointer_filler_map()); filler.set_map_after_allocation(*factory->one_pointer_filler_map());
} }
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::kCodeAligned);
CHECK(allocation.ToAddress() == allocation_tracker.address());
heap->CreateFillerObjectAt(allocation.ToAddress(), size_in_bytes,
ClearRecordedSlots::kNo);
heap->RemoveHeapObjectAllocationTracker(&allocation_tracker);
}
} // namespace heap } // namespace heap
} // namespace internal } // namespace internal
} // namespace v8 } // namespace v8
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment