Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Heap allows us to take free pages. 

The API is kinda weird and will probably be reworked in near future
but this will work for now :)
This commit is contained in:
Bananymous 2023-04-18 10:16:09 +03:00
parent 295a27f16a
commit 96ac072166
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/include/kernel/Memory/Heap.h
View File

@ -22,9 +22,11 @@ namespace Kernel::Memory
paddr_t reserve_page(); paddr_t reserve_page();
void release_page(paddr_t); void release_page(paddr_t);
paddr_t usable_start() const { return m_start + m_list_pages * PAGE_SIZE; } paddr_t start() const { return m_start; }
paddr_t usable_end() const { return m_start + m_total_pages * PAGE_SIZE; } paddr_t end() const { return m_start + m_size; }
uint64_t usable_pages() const { return m_reservable_pages; } bool contains(paddr_t addr) const { return m_start <= addr && addr < m_start + m_size; }
size_t usable_memory() const { return m_reservable_pages * PAGE_SIZE; }
private: private:
struct node struct node
@ -57,6 +59,9 @@ namespace Kernel::Memory
static void initialize(); static void initialize();
static Heap& get(); static Heap& get();
paddr_t take_mapped_page(uint8_t);
void return_mapped_page(paddr_t);
private: private:
Heap() = default; Heap() = default;
void initialize_impl(); void initialize_impl();

32
kernel/kernel/Memory/Heap.cpp
View File

@ -141,7 +141,7 @@ namespace Kernel::Memory
if (mmmt->type == 1) if (mmmt->type == 1)
{ {
PhysicalRange range(mmmt->base_addr, mmmt->length); PhysicalRange range(mmmt->base_addr, mmmt->length);
if (range.usable_pages() > 0) if (range.usable_memory() > 0)
MUST(m_physical_ranges.push_back(range)); MUST(m_physical_ranges.push_back(range));
} }
@ -151,11 +151,37 @@ namespace Kernel::Memory
size_t total = 0; size_t total = 0;
for (auto& range : m_physical_ranges) for (auto& range : m_physical_ranges)
{ {
size_t bytes = range.usable_pages() * PAGE_SIZE; size_t bytes = range.usable_memory();
dprintln("RAM {8H}->{8H}, {} pages ({}.{} MB)", range.usable_start(), range.usable_end(), range.usable_pages(), bytes / (1 << 20), bytes % (1 << 20) * 1000 / (1 << 20)); dprintln("RAM {8H}->{8H} ({}.{} MB)", range.start(), range.end(), bytes / (1 << 20), bytes % (1 << 20) * 1000 / (1 << 20));
total += bytes; total += bytes;
} }
dprintln("Total RAM {}.{} MB", total / (1 << 20), total % (1 << 20) * 1000 / (1 << 20)); dprintln("Total RAM {}.{} MB", total / (1 << 20), total % (1 << 20) * 1000 / (1 << 20));
} }
paddr_t Heap::take_mapped_page(uint8_t flags)
{
for (auto& range : m_physical_ranges)
{
if (paddr_t page = range.reserve_page(); page != PhysicalRange::invalid)
{
MMU::get().allocate_page(page, flags);
return page;
}
}
ASSERT_NOT_REACHED();
}
void Heap::return_mapped_page(paddr_t addr)
{
for (auto& range : m_physical_ranges)
{
if (range.contains(addr))
{
MMU::get().unallocate_page(addr);
return;
}
}
ASSERT_NOT_REACHED();
}
} }