RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 21:58:10 +00:00
Code Issues Activity Actions

Kernel: Break region_from_vaddr() into {user,kernel}_region_from_vaddr

Browse source 
Sometimes you're only interested in either user OR kernel regions but
not both. Let's break this into two functions so the caller can choose
what he's interested in.
This commit is contained in:
Andreas Kling 2019-08-06 10:31:20 +02:00
parent e27e1b3fb2
commit 8d07bce12a
2 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Kernel/VM/MemoryManager.cpp
View file

@ -255,42 +255,43 @@ void MemoryManager::initialize()
s_the = new MemoryManager; s_the = new MemoryManager;
} }
Region* MemoryManager::kernel_region_from_vaddr(VirtualAddress vaddr)
{
ASSERT(vaddr.get() >= 0xc0000000);
for (auto& region : MM.m_kernel_regions) {
if (region->contains(vaddr))
return region;
}
return nullptr;
}
Region* MemoryManager::user_region_from_vaddr(Process& process, VirtualAddress vaddr)
{
// FIXME: Use a binary search tree (maybe red/black?) or some other more appropriate data structure!
for (auto& region : process.m_regions) {
if (region.contains(vaddr))
return &region;
}
dbg() << process << " Couldn't find user region for " << vaddr;
return nullptr;
}
Region* MemoryManager::region_from_vaddr(Process& process, VirtualAddress vaddr) Region* MemoryManager::region_from_vaddr(Process& process, VirtualAddress vaddr)
{ {
ASSERT_INTERRUPTS_DISABLED(); ASSERT_INTERRUPTS_DISABLED();
if (vaddr.get() >= 0xc0000000) { if (vaddr.get() >= 0xc0000000)
for (auto& region : MM.m_kernel_regions) { return kernel_region_from_vaddr(vaddr);
if (region->contains(vaddr))
return region;
}
}
// FIXME: Use a binary search tree (maybe red/black?) or some other more appropriate data structure! return user_region_from_vaddr(process, vaddr);
for (auto& region : process.m_regions) {
if (region.contains(vaddr))
return &region;
}
dbgprintf("%s(%u) Couldn't find region for L%x (CR3=%x)\n", process.name().characters(), process.pid(), vaddr.get(), process.page_directory().cr3());
return nullptr;
} }
const Region* MemoryManager::region_from_vaddr(const Process& process, VirtualAddress vaddr) const Region* MemoryManager::region_from_vaddr(const Process& process, VirtualAddress vaddr)
{ {
if (vaddr.get() >= 0xc0000000) { if (vaddr.get() >= 0xc0000000)
for (auto& region : MM.m_kernel_regions) { return kernel_region_from_vaddr(vaddr);
if (region->contains(vaddr))
return region;
}
}
// FIXME: Use a binary search tree (maybe red/black?) or some other more appropriate data structure! return user_region_from_vaddr(const_cast<Process&>(process), vaddr);
for (auto& region : process.m_regions) {
if (region.contains(vaddr))
return &region;
}
dbgprintf("%s(%u) Couldn't find region for L%x (CR3=%x)\n", process.name().characters(), process.pid(), vaddr.get(), process.page_directory().cr3());
return nullptr;
} }
bool MemoryManager::zero_page(Region& region, unsigned page_index_in_region) bool MemoryManager::zero_page(Region& region, unsigned page_index_in_region)

3
Kernel/VM/MemoryManager.h
View file

@ -105,6 +105,9 @@ private:
static Region* region_from_vaddr(Process&, VirtualAddress); static Region* region_from_vaddr(Process&, VirtualAddress);
static const Region* region_from_vaddr(const Process&, VirtualAddress); static const Region* region_from_vaddr(const Process&, VirtualAddress);
static Region* user_region_from_vaddr(Process&, VirtualAddress);
static Region* kernel_region_from_vaddr(VirtualAddress);
bool copy_on_write(Region&, unsigned page_index_in_region); bool copy_on_write(Region&, unsigned page_index_in_region);
bool page_in_from_inode(Region&, unsigned page_index_in_region); bool page_in_from_inode(Region&, unsigned page_index_in_region);
bool zero_page(Region& region, unsigned page_index_in_region); bool zero_page(Region& region, unsigned page_index_in_region);