RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:57:36 +00:00
Code Issues Activity Actions

Kernel: Propagate failure to commit VM regions in more places

Browse source 
Ultimately we should not panic just because we can't fully commit a VM
region (by populating it with physical pages.)

This patch handles some of the situations where commit() can fail.
This commit is contained in:
Andreas Kling 2020-05-08 21:47:08 +02:00
parent 25db315b29
commit 042b1f6814
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Kernel/Process.cpp
View file

@ -193,23 +193,23 @@ Region& Process::allocate_split_region(const Region& source_region, const Range&
return region; return region;
} }
Region* Process::allocate_region(const Range& range, const String& name, int prot, bool commit) Region* Process::allocate_region(const Range& range, const String& name, int prot, bool should_commit)
{ {
ASSERT(range.is_valid()); ASSERT(range.is_valid());
auto vmobject = AnonymousVMObject::create_with_size(range.size()); auto vmobject = AnonymousVMObject::create_with_size(range.size());
auto& region = add_region(Region::create_user_accessible(range, vmobject, 0, name, prot_to_region_access_flags(prot))); auto region = Region::create_user_accessible(range, vmobject, 0, name, prot_to_region_access_flags(prot));
region.map(page_directory()); region->map(page_directory());
if (commit) if (should_commit && !region->commit())
region.commit(); return nullptr;
return &region; return &add_region(move(region));
} }
Region* Process::allocate_region(VirtualAddress vaddr, size_t size, const String& name, int prot, bool commit) Region* Process::allocate_region(VirtualAddress vaddr, size_t size, const String& name, int prot, bool should_commit)
{ {
auto range = allocate_range(vaddr, size); auto range = allocate_range(vaddr, size);
if (!range.is_valid()) if (!range.is_valid())
return nullptr; return nullptr;
return allocate_region(range, name, prot, commit); return allocate_region(range, name, prot, should_commit);
} }
Region* Process::allocate_region_with_vmobject(const Range& range, NonnullRefPtr<VMObject> vmobject, size_t offset_in_vmobject, const String& name, int prot) Region* Process::allocate_region_with_vmobject(const Range& range, NonnullRefPtr<VMObject> vmobject, size_t offset_in_vmobject, const String& name, int prot)

4
Kernel/Process.h
View file

@ -374,9 +374,9 @@ public:
bool is_superuser() const { return m_euid == 0; } bool is_superuser() const { return m_euid == 0; }
Region* allocate_region_with_vmobject(VirtualAddress, size_t, NonnullRefPtr<VMObject>, size_t offset_in_vmobject, const String& name, int prot); Region* allocate_region_with_vmobject(VirtualAddress, size_t, NonnullRefPtr<VMObject>, size_t offset_in_vmobject, const String& name, int prot);
Region* allocate_region(VirtualAddress, size_t, const String& name, int prot = PROT_READ | PROT_WRITE, bool commit = true); Region* allocate_region(VirtualAddress, size_t, const String& name, int prot = PROT_READ | PROT_WRITE, bool should_commit = true);
Region* allocate_region_with_vmobject(const Range&, NonnullRefPtr<VMObject>, size_t offset_in_vmobject, const String& name, int prot); Region* allocate_region_with_vmobject(const Range&, NonnullRefPtr<VMObject>, size_t offset_in_vmobject, const String& name, int prot);
Region* allocate_region(const Range&, const String& name, int prot = PROT_READ | PROT_WRITE, bool commit = true); Region* allocate_region(const Range&, const String& name, int prot = PROT_READ | PROT_WRITE, bool should_commit = true);
bool deallocate_region(Region& region); bool deallocate_region(Region& region);
Region& allocate_split_region(const Region& source_region, const Range&, size_t offset_in_vmobject); Region& allocate_split_region(const Region& source_region, const Range&, size_t offset_in_vmobject);

4
Kernel/VM/MemoryManager.cpp
View file

@ -358,8 +358,8 @@ OwnPtr<Region> MemoryManager::allocate_kernel_region(size_t size, const StringVi
auto region = allocate_kernel_region_with_vmobject(range, vmobject, name, access, user_accessible, cacheable); auto region = allocate_kernel_region_with_vmobject(range, vmobject, name, access, user_accessible, cacheable);
if (!region) if (!region)
return nullptr; return nullptr;
if (should_commit) if (should_commit && !region->commit())
region->commit(); return nullptr;
return region; return region;
} }