apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

MemoryManager: add get_page_at and get_pages_at functions to map any physical memory at a fixed virtual address (inverse of get_mapping and get_mappings)

Browse Source
This commit is contained in:
apio 2022-10-01 12:12:50 +02:00
parent 867d312177
commit e769cb45a7
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/include/memory/MemoryManager.h
View File

@ -20,6 +20,9 @@ namespace MemoryManager
void* get_page(int flags = MAP_READ_WRITE); void* get_page(int flags = MAP_READ_WRITE);
void* get_pages(uint64_t count, int flags = MAP_READ_WRITE); void* get_pages(uint64_t count, int flags = MAP_READ_WRITE);
void* get_page_at(uint64_t addr, int flags = MAP_READ_WRITE);
void* get_pages_at(uint64_t addr, uint64_t count, int flags = MAP_READ_WRITE);
void release_page(void* page); void release_page(void* page);
void release_pages(void* pages, uint64_t count); void release_pages(void* pages, uint64_t count);
} }

40
kernel/src/memory/MemoryManager.cpp
View File

@ -90,14 +90,6 @@ void MemoryManager::release_mapping(void* mapping)
void* MemoryManager::get_page(int flags) void* MemoryManager::get_page(int flags)
{ {
void* physicalAddress = PMM::request_page();
if (PMM_DID_FAIL(physicalAddress))
{
#ifdef MM_DEBUG
kwarnln("OOM while allocating one page of memory. this is not good...");
#endif
return 0;
}
uint64_t virtualAddress = KernelHeap::request_virtual_page(); uint64_t virtualAddress = KernelHeap::request_virtual_page();
if (!virtualAddress) if (!virtualAddress)
{ {
@ -106,8 +98,21 @@ void* MemoryManager::get_page(int flags)
#endif #endif
return 0; return 0;
} }
kernelVMM.map(virtualAddress, (uint64_t)physicalAddress, flags); return get_page_at(virtualAddress, flags);
return (void*)virtualAddress; }
void* MemoryManager::get_page_at(uint64_t addr, int flags)
{
void* physicalAddress = PMM::request_page();
if (PMM_DID_FAIL(physicalAddress))
{
#ifdef MM_DEBUG
kwarnln("OOM while allocating one page of memory. this is not good...");
#endif
return 0;
}
kernelVMM.map(addr, (uint64_t)physicalAddress, flags);
return (void*)addr;
} }
void MemoryManager::release_page(void* page) void MemoryManager::release_page(void* page)
@ -134,6 +139,16 @@ void* MemoryManager::get_pages(uint64_t count, int flags)
return 0; // Out of virtual address in the kernel heap range (-128M to -64M). This should be difficult to return 0; // Out of virtual address in the kernel heap range (-128M to -64M). This should be difficult to
// achieve... // achieve...
} }
return get_pages_at(virtualAddress, count, flags);
}
void* MemoryManager::get_pages_at(uint64_t addr, uint64_t count, int flags)
{
if (!count) return 0;
if (count == 1) return get_page_at(addr, flags);
#ifdef MM_DEBUG
kdbgln("allocating several pages (%ld), at address %ld", count, addr);
#endif
for (uint64_t i = 0; i < count; i++) for (uint64_t i = 0; i < count; i++)
{ {
void* physicalAddress = PMM::request_page(); void* physicalAddress = PMM::request_page();
@ -144,15 +159,14 @@ void* MemoryManager::get_pages(uint64_t count, int flags)
#ifdef MM_DEBUG #ifdef MM_DEBUG
kwarnln("OOM while allocating page %ld of memory. this might be recoverable..."); kwarnln("OOM while allocating page %ld of memory. this might be recoverable...");
#endif #endif
release_pages((void*)virtualAddress, i); // release the pages we have already mapped
return 0; return 0;
} }
kernelVMM.map(virtualAddress + (i * 4096), (uint64_t)physicalAddress, flags); kernelVMM.map(addr + (i * 4096), (uint64_t)physicalAddress, flags);
#ifdef MM_DEBUG #ifdef MM_DEBUG
kdbgln("allocating virtual %lx, physical %lx", virtualAddress + (i * 4096), (uint64_t)physicalAddress); kdbgln("allocating virtual %lx, physical %lx", virtualAddress + (i * 4096), (uint64_t)physicalAddress);
#endif #endif
} }
return (void*)virtualAddress; return (void*)addr;
} }
void MemoryManager::release_pages(void* pages, uint64_t count) void MemoryManager::release_pages(void* pages, uint64_t count)