mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-25 05:55:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Kernel: Make committed physical page allocation return NonnullRefPtr

Browse source 
Since we're taking from the committed set of pages, there should never
be a reason for this call to fail.

Also add a Badge to disallow taking committed pages from anywhere but
the Region class.
This commit is contained in:
Andreas Kling 2021-07-22 13:51:40 +02:00
parent d79d768010
commit 0642f8f2c6
Notes: sideshowbarker 2024-07-18 22:57:59 +09:00
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Kernel/VM/AnonymousVMObject.cpp
View file

@ -362,7 +362,7 @@ size_t AnonymousVMObject::mark_committed_pages_for_nonvolatile_range(VolatilePag
return pages_updated; return pages_updated;
} }
RefPtr<PhysicalPage> AnonymousVMObject::allocate_committed_page(size_t page_index) NonnullRefPtr<PhysicalPage> AnonymousVMObject::allocate_committed_page(Badge<Region>, size_t page_index)
{ {
{ {
ScopedSpinLock lock(m_lock); ScopedSpinLock lock(m_lock);

2
Kernel/VM/AnonymousVMObject.h
View file

@ -26,7 +26,7 @@ public:
static RefPtr<AnonymousVMObject> try_create_with_physical_pages(Span<NonnullRefPtr<PhysicalPage>>); static RefPtr<AnonymousVMObject> try_create_with_physical_pages(Span<NonnullRefPtr<PhysicalPage>>);
virtual RefPtr<VMObject> try_clone() override; virtual RefPtr<VMObject> try_clone() override;
RefPtr<PhysicalPage> allocate_committed_page(size_t); [[nodiscard]] NonnullRefPtr<PhysicalPage> allocate_committed_page(Badge<Region>, size_t);
PageFaultResponse handle_cow_fault(size_t, VirtualAddress); PageFaultResponse handle_cow_fault(size_t, VirtualAddress);
size_t cow_pages() const; size_t cow_pages() const;
bool should_cow(size_t page_index, bool) const; bool should_cow(size_t page_index, bool) const;

6
Kernel/VM/Region.cpp
View file

@ -426,7 +426,8 @@ PageFaultResponse Region::handle_fault(const PageFault& fault, ScopedSpinLock<Re
auto& page_slot = physical_page_slot(page_index_in_region); auto& page_slot = physical_page_slot(page_index_in_region);
if (page_slot->is_lazy_committed_page()) { if (page_slot->is_lazy_committed_page()) {
auto page_index_in_vmobject = translate_to_vmobject_page(page_index_in_region); auto page_index_in_vmobject = translate_to_vmobject_page(page_index_in_region);
page_slot = static_cast<AnonymousVMObject&>(*m_vmobject).allocate_committed_page(page_index_in_vmobject); VERIFY(m_vmobject->is_anonymous());
page_slot = static_cast<AnonymousVMObject&>(*m_vmobject).allocate_committed_page({}, page_index_in_vmobject);
remap_vmobject_page(page_index_in_vmobject); remap_vmobject_page(page_index_in_vmobject);
return PageFaultResponse::Continue; return PageFaultResponse::Continue;
} }
@ -495,7 +496,8 @@ PageFaultResponse Region::handle_zero_fault(size_t page_index_in_region, ScopedS
current_thread->did_zero_fault(); current_thread->did_zero_fault();
if (page_slot->is_lazy_committed_page()) { if (page_slot->is_lazy_committed_page()) {
page_slot = static_cast<AnonymousVMObject&>(*m_vmobject).allocate_committed_page(page_index_in_vmobject); VERIFY(m_vmobject->is_anonymous());
page_slot = static_cast<AnonymousVMObject&>(*m_vmobject).allocate_committed_page({}, page_index_in_vmobject);
dbgln_if(PAGE_FAULT_DEBUG, " >> ALLOCATED COMMITTED {}", page_slot->paddr()); dbgln_if(PAGE_FAULT_DEBUG, " >> ALLOCATED COMMITTED {}", page_slot->paddr());
} else { } else {
page_slot = MM.allocate_user_physical_page(MemoryManager::ShouldZeroFill::Yes); page_slot = MM.allocate_user_physical_page(MemoryManager::ShouldZeroFill::Yes);