diff options
Diffstat (limited to 'deps/v8/src/heap/cppgc/page-memory.cc')
| -rw-r--r-- | deps/v8/src/heap/cppgc/page-memory.cc | 118 |
1 files changed, 74 insertions, 44 deletions
diff --git a/deps/v8/src/heap/cppgc/page-memory.cc b/deps/v8/src/heap/cppgc/page-memory.cc index 49b44aff91..ed76f903e8 100644 --- a/deps/v8/src/heap/cppgc/page-memory.cc +++ b/deps/v8/src/heap/cppgc/page-memory.cc @@ -6,17 +6,21 @@ #include "src/base/macros.h" #include "src/base/sanitizer/asan.h" +#include "src/heap/cppgc/platform.h" namespace cppgc { namespace internal { namespace { -void Unprotect(PageAllocator* allocator, const PageMemory& page_memory) { +void Unprotect(PageAllocator& allocator, FatalOutOfMemoryHandler& oom_handler, + const PageMemory& page_memory) { if (SupportsCommittingGuardPages(allocator)) { - CHECK(allocator->SetPermissions(page_memory.writeable_region().base(), - page_memory.writeable_region().size(), - PageAllocator::Permission::kReadWrite)); + if (!allocator.SetPermissions(page_memory.writeable_region().base(), + page_memory.writeable_region().size(), + PageAllocator::Permission::kReadWrite)) { + oom_handler("Oilpan: Unprotecting memory."); + } } else { // No protection in case the allocator cannot commit at the required // granularity. Only protect if the allocator supports committing at that @@ -24,53 +28,66 @@ void Unprotect(PageAllocator* allocator, const PageMemory& page_memory) { // // The allocator needs to support committing the overall range. CHECK_EQ(0u, - page_memory.overall_region().size() % allocator->CommitPageSize()); - CHECK(allocator->SetPermissions(page_memory.overall_region().base(), - page_memory.overall_region().size(), - PageAllocator::Permission::kReadWrite)); + page_memory.overall_region().size() % allocator.CommitPageSize()); + if (!allocator.SetPermissions(page_memory.overall_region().base(), + page_memory.overall_region().size(), + PageAllocator::Permission::kReadWrite)) { + oom_handler("Oilpan: Unprotecting memory."); + } } } -void Protect(PageAllocator* allocator, const PageMemory& page_memory) { +void Protect(PageAllocator& allocator, FatalOutOfMemoryHandler& oom_handler, + const PageMemory& page_memory) { if (SupportsCommittingGuardPages(allocator)) { // Swap the same region, providing the OS with a chance for fast lookup and // change. - CHECK(allocator->SetPermissions(page_memory.writeable_region().base(), - page_memory.writeable_region().size(), - PageAllocator::Permission::kNoAccess)); + if (!allocator.SetPermissions(page_memory.writeable_region().base(), + page_memory.writeable_region().size(), + PageAllocator::Permission::kNoAccess)) { + oom_handler("Oilpan: Protecting memory."); + } } else { // See Unprotect(). CHECK_EQ(0u, - page_memory.overall_region().size() % allocator->CommitPageSize()); - CHECK(allocator->SetPermissions(page_memory.overall_region().base(), - page_memory.overall_region().size(), - PageAllocator::Permission::kNoAccess)); + page_memory.overall_region().size() % allocator.CommitPageSize()); + if (!allocator.SetPermissions(page_memory.overall_region().base(), + page_memory.overall_region().size(), + PageAllocator::Permission::kNoAccess)) { + oom_handler("Oilpan: Protecting memory."); + } } } -MemoryRegion ReserveMemoryRegion(PageAllocator* allocator, +MemoryRegion ReserveMemoryRegion(PageAllocator& allocator, + FatalOutOfMemoryHandler& oom_handler, size_t allocation_size) { void* region_memory = - allocator->AllocatePages(nullptr, allocation_size, kPageSize, - PageAllocator::Permission::kNoAccess); + allocator.AllocatePages(nullptr, allocation_size, kPageSize, + PageAllocator::Permission::kNoAccess); + if (!region_memory) { + oom_handler("Oilpan: Reserving memory."); + } const MemoryRegion reserved_region(static_cast<Address>(region_memory), allocation_size); DCHECK_EQ(reserved_region.base() + allocation_size, reserved_region.end()); return reserved_region; } -void FreeMemoryRegion(PageAllocator* allocator, +void FreeMemoryRegion(PageAllocator& allocator, const MemoryRegion& reserved_region) { // Make sure pages returned to OS are unpoisoned. ASAN_UNPOISON_MEMORY_REGION(reserved_region.base(), reserved_region.size()); - allocator->FreePages(reserved_region.base(), reserved_region.size()); + allocator.FreePages(reserved_region.base(), reserved_region.size()); } } // namespace -PageMemoryRegion::PageMemoryRegion(PageAllocator* allocator, +PageMemoryRegion::PageMemoryRegion(PageAllocator& allocator, + FatalOutOfMemoryHandler& oom_handler, MemoryRegion reserved_region, bool is_large) : allocator_(allocator), + oom_handler_(oom_handler), reserved_region_(reserved_region), is_large_(is_large) {} @@ -81,12 +98,14 @@ PageMemoryRegion::~PageMemoryRegion() { // static constexpr size_t NormalPageMemoryRegion::kNumPageRegions; -NormalPageMemoryRegion::NormalPageMemoryRegion(PageAllocator* allocator) - : PageMemoryRegion(allocator, - ReserveMemoryRegion( - allocator, RoundUp(kPageSize * kNumPageRegions, - allocator->AllocatePageSize())), - false) { +NormalPageMemoryRegion::NormalPageMemoryRegion( + PageAllocator& allocator, FatalOutOfMemoryHandler& oom_handler) + : PageMemoryRegion( + allocator, oom_handler, + ReserveMemoryRegion(allocator, oom_handler, + RoundUp(kPageSize * kNumPageRegions, + allocator.AllocatePageSize())), + false) { #ifdef DEBUG for (size_t i = 0; i < kNumPageRegions; ++i) { DCHECK_EQ(false, page_memories_in_use_[i]); @@ -99,33 +118,35 @@ NormalPageMemoryRegion::~NormalPageMemoryRegion() = default; void NormalPageMemoryRegion::Allocate(Address writeable_base) { const size_t index = GetIndex(writeable_base); ChangeUsed(index, true); - Unprotect(allocator_, GetPageMemory(index)); + Unprotect(allocator_, oom_handler_, GetPageMemory(index)); } void NormalPageMemoryRegion::Free(Address writeable_base) { const size_t index = GetIndex(writeable_base); ChangeUsed(index, false); - Protect(allocator_, GetPageMemory(index)); + Protect(allocator_, oom_handler_, GetPageMemory(index)); } void NormalPageMemoryRegion::UnprotectForTesting() { for (size_t i = 0; i < kNumPageRegions; ++i) { - Unprotect(allocator_, GetPageMemory(i)); + Unprotect(allocator_, oom_handler_, GetPageMemory(i)); } } -LargePageMemoryRegion::LargePageMemoryRegion(PageAllocator* allocator, - size_t length) - : PageMemoryRegion(allocator, - ReserveMemoryRegion( - allocator, RoundUp(length + 2 * kGuardPageSize, - allocator->AllocatePageSize())), - true) {} +LargePageMemoryRegion::LargePageMemoryRegion( + PageAllocator& allocator, FatalOutOfMemoryHandler& oom_handler, + size_t length) + : PageMemoryRegion( + allocator, oom_handler, + ReserveMemoryRegion(allocator, oom_handler, + RoundUp(length + 2 * kGuardPageSize, + allocator.AllocatePageSize())), + true) {} LargePageMemoryRegion::~LargePageMemoryRegion() = default; void LargePageMemoryRegion::UnprotectForTesting() { - Unprotect(allocator_, GetPageMemory()); + Unprotect(allocator_, oom_handler_, GetPageMemory()); } PageMemoryRegionTree::PageMemoryRegionTree() = default; @@ -165,27 +186,33 @@ std::pair<NormalPageMemoryRegion*, Address> NormalPageMemoryPool::Take( return pair; } -PageBackend::PageBackend(PageAllocator* allocator) : allocator_(allocator) {} +PageBackend::PageBackend(PageAllocator& allocator, + FatalOutOfMemoryHandler& oom_handler) + : allocator_(allocator), oom_handler_(oom_handler) {} PageBackend::~PageBackend() = default; Address PageBackend::AllocateNormalPageMemory(size_t bucket) { + v8::base::MutexGuard guard(&mutex_); std::pair<NormalPageMemoryRegion*, Address> result = page_pool_.Take(bucket); if (!result.first) { - auto pmr = std::make_unique<NormalPageMemoryRegion>(allocator_); + auto pmr = + std::make_unique<NormalPageMemoryRegion>(allocator_, oom_handler_); for (size_t i = 0; i < NormalPageMemoryRegion::kNumPageRegions; ++i) { page_pool_.Add(bucket, pmr.get(), pmr->GetPageMemory(i).writeable_region().base()); } page_memory_region_tree_.Add(pmr.get()); normal_page_memory_regions_.push_back(std::move(pmr)); - return AllocateNormalPageMemory(bucket); + result = page_pool_.Take(bucket); + DCHECK(result.first); } result.first->Allocate(result.second); return result.second; } void PageBackend::FreeNormalPageMemory(size_t bucket, Address writeable_base) { + v8::base::MutexGuard guard(&mutex_); auto* pmr = static_cast<NormalPageMemoryRegion*>( page_memory_region_tree_.Lookup(writeable_base)); pmr->Free(writeable_base); @@ -193,15 +220,18 @@ void PageBackend::FreeNormalPageMemory(size_t bucket, Address writeable_base) { } Address PageBackend::AllocateLargePageMemory(size_t size) { - auto pmr = std::make_unique<LargePageMemoryRegion>(allocator_, size); + v8::base::MutexGuard guard(&mutex_); + auto pmr = + std::make_unique<LargePageMemoryRegion>(allocator_, oom_handler_, size); const PageMemory pm = pmr->GetPageMemory(); - Unprotect(allocator_, pm); + Unprotect(allocator_, oom_handler_, pm); page_memory_region_tree_.Add(pmr.get()); large_page_memory_regions_.insert(std::make_pair(pmr.get(), std::move(pmr))); return pm.writeable_region().base(); } void PageBackend::FreeLargePageMemory(Address writeable_base) { + v8::base::MutexGuard guard(&mutex_); PageMemoryRegion* pmr = page_memory_region_tree_.Lookup(writeable_base); page_memory_region_tree_.Remove(pmr); auto size = large_page_memory_regions_.erase(pmr); |