Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

Kernel: namespace and function renames 

MMU moved to namespace kernel
Kernel::Memory::Heap moved to just Kernel
MMU::map_{page,range} renamed to identity_map_{page,range}

Add MMU::get_page_flags
This commit is contained in:
Bananymous 2023-04-28 14:45:09 +03:00
parent e48acbb03b
commit f139fc2229
12 changed files with 473 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
kernel/arch/i386/MMU.cpp
View File

@ -9,7 +9,10 @@
// bits 31-12 set
#define PAGE_MASK 0xfffff000
#define PAGE_SIZE 0x00001000
#define FLAGS_MASK 0x00000fff
namespace Kernel
{
static MMU* s_instance = nullptr;
@ -159,21 +162,21 @@ void MMU::map_page_at(paddr_t paddr, vaddr_t vaddr, uint8_t flags)
page_table[pte] = paddr | flags;
}
void MMU::map_page(uintptr_t address, uint8_t flags)
void MMU::identity_map_page(paddr_t address, uint8_t flags)
{
address &= PAGE_MASK;
map_page_at(address, address, flags);
}
void MMU::map_range(uintptr_t address, ptrdiff_t size, uint8_t flags)
void MMU::identity_map_range(paddr_t address, ptrdiff_t size, uint8_t flags)
{
uintptr_t s_page = address & PAGE_MASK;
uintptr_t e_page = (address + size - 1) & PAGE_MASK;
for (uintptr_t page = s_page; page <= e_page; page += PAGE_SIZE)
map_page(page, flags);
paddr_t s_page = address & PAGE_MASK;
paddr_t e_page = (address + size - 1) & PAGE_MASK;
for (paddr_t page = s_page; page <= e_page; page += PAGE_SIZE)
identity_map_page(page, flags);
}
void MMU::unmap_page(uintptr_t address)
void MMU::unmap_page(vaddr_t address)
{
#if MMU_DEBUG_PRINT
dprintln("UnAllocatePage(0x{8H})", address & PAGE_MASK);
@ -196,10 +199,30 @@ void MMU::unmap_page(uintptr_t address)
// TODO: Unallocate the page table if this was the only allocated page
}
void MMU::unmap_range(uintptr_t address, ptrdiff_t size)
void MMU::unmap_range(vaddr_t address, ptrdiff_t size)
{
uintptr_t s_page = address & PAGE_MASK;
uintptr_t e_page = (address + size - 1) & PAGE_MASK;
for (uintptr_t page = s_page; page <= e_page; page += PAGE_SIZE)
unmap_page(page);
}
uint8_t MMU::get_page_flags(vaddr_t address) const
{
uint32_t pdpte = (address & 0xC0000000) >> 30;
uint32_t pde = (address & 0x3FE00000) >> 21;
uint32_t pte = (address & 0x001FF000) >> 12;
uint64_t* page_directory = (uint64_t*)(m_highest_paging_struct[pdpte] & PAGE_MASK);
if (!(page_directory[pde] & Flags::Present))
return 0;
uint64_t* page_table = (uint64_t*)(page_directory[pde] & PAGE_MASK);
if (!(page_table[pte] & Flags::Present))
return 0;
return page_table[pte] & FLAGS_MASK;
}
}

74
kernel/arch/x86_64/MMU.cpp
View File

@ -2,8 +2,8 @@
#include <kernel/Memory/kmalloc.h>
#include <kernel/Memory/MMU.h>
#define PAGE_SIZE 0x1000
#define PAGE_MASK ~(PAGE_SIZE - 1)
#define FLAGS_MASK (PAGE_SIZE - 1)
#define PAGE_MASK (~FLAGS_MASK)
#define CLEANUP_STRUCTURE(s) \
for (uint64_t i = 0; i < 512; i++) \
@ -11,6 +11,12 @@
return; \
kfree(s)
extern uint8_t g_kernel_end[];
namespace Kernel
{
static MMU* s_instance = nullptr;
void MMU::initialize()
@ -36,8 +42,6 @@ static uint64_t* allocate_page_aligned_page()
return (uint64_t*)page;
}
extern uint8_t g_kernel_end[];
void MMU::initialize_kernel()
{
// FIXME: We should just identity map until g_kernel_end
@ -85,7 +89,7 @@ MMU::MMU()
uint64_t* global_pdpt = (uint64_t*)(global_pml4[pml4e] & PAGE_MASK);
uint64_t* pdpt = allocate_page_aligned_page();
pml4[pml4e] = (uint64_t)pdpt | (global_pml4[pml4e] & ~PAGE_MASK);
pml4[pml4e] = (uint64_t)pdpt | (global_pml4[pml4e] & FLAGS_MASK);
for (uint32_t pdpte = 0; pdpte < 512; pdpte++)
{
@ -95,7 +99,7 @@ MMU::MMU()
uint64_t* global_pd = (uint64_t*)(global_pdpt[pdpte] & PAGE_MASK);
uint64_t* pd = allocate_page_aligned_page();
pdpt[pdpte] = (uint64_t)pd | (global_pdpt[pdpte] & ~PAGE_MASK);
pdpt[pdpte] = (uint64_t)pd | (global_pdpt[pdpte] & FLAGS_MASK);
for (uint32_t pde = 0; pde < 512; pde++)
{
@ -105,7 +109,7 @@ MMU::MMU()
uint64_t* global_pt = (uint64_t*)(global_pd[pde] & PAGE_MASK);
uint64_t* pt = allocate_page_aligned_page();
pd[pde] = (uint64_t)pt | (global_pd[pde] & ~PAGE_MASK);
pd[pde] = (uint64_t)pt | (global_pd[pde] & FLAGS_MASK);
memcpy(pt, global_pt, PAGE_SIZE);
}
@ -146,21 +150,21 @@ void MMU::load()
asm volatile("movq %0, %%cr3" :: "r"(m_highest_paging_struct));
}
void MMU::map_page(uintptr_t address, uint8_t flags)
void MMU::identity_map_page(paddr_t address, uint8_t flags)
{
address &= PAGE_MASK;
map_page_at(address, address, flags);
}
void MMU::map_range(uintptr_t address, ptrdiff_t size, uint8_t flags)
void MMU::identity_map_range(paddr_t address, ptrdiff_t size, uint8_t flags)
{
uintptr_t s_page = address & PAGE_MASK;
uintptr_t e_page = (address + size - 1) & PAGE_MASK;
for (uintptr_t page = s_page; page <= e_page; page += PAGE_SIZE)
map_page(page, flags);
paddr_t s_page = address & PAGE_MASK;
paddr_t e_page = (address + size - 1) & PAGE_MASK;
for (paddr_t page = s_page; page <= e_page; page += PAGE_SIZE)
identity_map_page(page, flags);
}
void MMU::unmap_page(uintptr_t address)
void MMU::unmap_page(vaddr_t address)
{
ASSERT((address >> 48) == 0);
@ -197,11 +201,11 @@ void MMU::unmap_page(uintptr_t address)
pml4[pml4e] = 0;
}
void MMU::unmap_range(uintptr_t address, ptrdiff_t size)
void MMU::unmap_range(vaddr_t address, ptrdiff_t size)
{
uintptr_t s_page = address & PAGE_MASK;
uintptr_t e_page = (address + size - 1) & PAGE_MASK;
for (uintptr_t page = s_page; page <= e_page; page += PAGE_SIZE)
vaddr_t s_page = address & PAGE_MASK;
vaddr_t e_page = (address + size - 1) & PAGE_MASK;
for (vaddr_t page = s_page; page <= e_page; page += PAGE_SIZE)
unmap_page(page);
}
@ -210,8 +214,8 @@ void MMU::map_page_at(paddr_t paddr, vaddr_t vaddr, uint8_t flags)
ASSERT((paddr >> 48) == 0);
ASSERT((vaddr >> 48) == 0);
ASSERT((paddr & ~PAGE_MASK) == 0);
ASSERT((vaddr & ~PAGE_MASK) == 0);;
ASSERT(paddr % PAGE_SIZE == 0);
ASSERT(vaddr % PAGE_SIZE == 0);;
ASSERT(flags & Flags::Present);
@ -248,3 +252,33 @@ void MMU::map_page_at(paddr_t paddr, vaddr_t vaddr, uint8_t flags)
if ((pt[pte] & flags) != flags)
pt[pte] = paddr | flags;
}
uint8_t MMU::get_page_flags(vaddr_t address) const
{
ASSERT(address % PAGE_SIZE == 0);
uint64_t pml4e = (address >> 39) & 0x1FF;
uint64_t pdpte = (address >> 30) & 0x1FF;
uint64_t pde = (address >> 21) & 0x1FF;
uint64_t pte = (address >> 12) & 0x1FF;
uint64_t* pml4 = m_highest_paging_struct;
if (!(pml4[pml4e] & Flags::Present))
return 0;
uint64_t* pdpt = (uint64_t*)(pml4[pml4e] & PAGE_MASK);
if (!(pdpt[pdpte] & Flags::Present))
return 0;
uint64_t* pd = (uint64_t*)(pdpt[pdpte] & PAGE_MASK);
if (!(pd[pde] & Flags::Present))
return 0;
uint64_t* pt = (uint64_t*)(pd[pde] & PAGE_MASK);
if (!(pt[pte] & Flags::Present))
return 0;
return pt[pte] & FLAGS_MASK;
}
}

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

@ -7,9 +7,10 @@
#define PAGE_SIZE 4096
namespace Kernel::Memory
namespace Kernel
{
using vaddr_t = uintptr_t;
using paddr_t = uintptr_t;
class PhysicalRange

21
kernel/include/kernel/Memory/MMU.h
View File

@ -1,7 +1,9 @@
#pragma once
#include <stddef.h>
#include <stdint.h>
#include <kernel/Memory/Heap.h>
namespace Kernel
{
class MMU
{
@ -13,9 +15,6 @@ public:
UserSupervisor = 4,
};
using vaddr_t = uintptr_t;
using paddr_t = uintptr_t;
public:
static void initialize();
static MMU& get();
@ -23,14 +22,16 @@ public:
MMU();
~MMU();
void map_page(uintptr_t, uint8_t);
void map_range(uintptr_t, ptrdiff_t, uint8_t);
void identity_map_page(paddr_t, uint8_t);
void identity_map_range(paddr_t, ptrdiff_t, uint8_t);
void unmap_page(uintptr_t);
void unmap_range(uintptr_t, ptrdiff_t);
void unmap_page(vaddr_t);
void unmap_range(vaddr_t, ptrdiff_t);
void map_page_at(paddr_t, vaddr_t, uint8_t);
uint8_t get_page_flags(vaddr_t) const;
void load();
private:
@ -39,3 +40,5 @@ private:
private:
uint64_t* m_highest_paging_struct;
};
}

2
kernel/include/kernel/Process.h
View File

@ -82,7 +82,7 @@ namespace Kernel
BAN::ErrorOr<int> get_free_fd();
BAN::Vector<OpenFileDescription> m_open_files;
BAN::Vector<Memory::paddr_t> m_allocated_pages;
BAN::Vector<paddr_t> m_allocated_pages;
mutable RecursiveSpinLock m_lock;

10
kernel/kernel/ACPI.cpp
View File

@ -105,7 +105,7 @@ namespace Kernel
if (rsdp->revision >= 2)
{
const XSDT* xsdt = (const XSDT*)rsdp->xsdt_address;
MMU::get().map_page((uintptr_t)xsdt, MMU::Flags::Present);
MMU::get().identity_map_page((uintptr_t)xsdt, MMU::Flags::Present);
BAN::ScopeGuard _([xsdt] { MMU::get().unmap_page((uintptr_t)xsdt); });
if (memcmp(xsdt->signature, "XSDT", 4) != 0)
@ -120,7 +120,7 @@ namespace Kernel
else
{
const RSDT* rsdt = (const RSDT*)(uintptr_t)rsdp->rsdt_address;
MMU::get().map_page((uintptr_t)rsdt, MMU::Flags::Present);
MMU::get().identity_map_page((uintptr_t)rsdt, MMU::Flags::Present);
BAN::ScopeGuard _([rsdt] { MMU::get().unmap_page((uintptr_t)rsdt); });
if (memcmp(rsdt->signature, "RSDT", 4) != 0)
@ -133,13 +133,13 @@ namespace Kernel
m_entry_count = (rsdt->length - sizeof(SDTHeader)) / 4;
}
MMU::get().map_range(m_header_table, m_entry_count * m_entry_size, MMU::Flags::Present);
MMU::get().identity_map_range(m_header_table, m_entry_count * m_entry_size, MMU::Flags::Present);
for (uint32_t i = 0; i < m_entry_count; i++)
{
auto* header = get_header_from_index(i);
MMU::get().map_page((uintptr_t)header, MMU::Flags::Present);
MMU::get().map_range((uintptr_t)header, header->length, MMU::Flags::Present);
MMU::get().identity_map_page((uintptr_t)header, MMU::Flags::Present);
MMU::get().identity_map_range((uintptr_t)header, header->length, MMU::Flags::Present);
}
return {};

6
kernel/kernel/APIC.cpp
View File

@ -81,6 +81,8 @@ union RedirectionEntry
};
};
using namespace Kernel;
APIC* APIC::create()
{
uint32_t ecx, edx;
@ -144,10 +146,10 @@ APIC* APIC::create()
return nullptr;
}
MMU::get().map_page(apic->m_local_apic, MMU::Flags::ReadWrite | MMU::Flags::Present);
MMU::get().identity_map_page(apic->m_local_apic, MMU::Flags::ReadWrite | MMU::Flags::Present);
for (auto& io_apic : apic->m_io_apics)
{
MMU::get().map_page(io_apic.address, MMU::Flags::ReadWrite | MMU::Flags::Present);
MMU::get().identity_map_page(io_apic.address, MMU::Flags::ReadWrite | MMU::Flags::Present);
io_apic.max_redirs = io_apic.read(IOAPIC_MAX_REDIRS);
}

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

@ -4,7 +4,7 @@
extern uint8_t g_kernel_end[];
namespace Kernel::Memory
namespace Kernel
{
PhysicalRange::PhysicalRange(paddr_t start, size_t size)
@ -36,7 +36,7 @@ namespace Kernel::Memory
m_list_pages = BAN::Math::div_round_up<uint64_t>(m_total_pages * sizeof(node), PAGE_SIZE);
m_reservable_pages = m_total_pages - m_list_pages;
MMU::get().map_range(m_start, m_list_pages * PAGE_SIZE, MMU::Flags::ReadWrite | MMU::Flags::Present);
MMU::get().identity_map_range(m_start, m_list_pages * PAGE_SIZE, MMU::Flags::ReadWrite | MMU::Flags::Present);
// Initialize page list so that every page points to the next one
node* page_list = (node*)m_start;

4
kernel/kernel/Process.cpp
View File

@ -77,7 +77,7 @@ namespace Kernel
MUST(process->m_allocated_pages.reserve(page_end - page_start + 1));
for (size_t page = page_start; page <= page_end; page++)
{
auto paddr = Memory::Heap::get().take_free_page();
auto paddr = Heap::get().take_free_page();
MUST(process->m_allocated_pages.push_back(paddr));
process->m_mmu->map_page_at(paddr, page * 4096, flags);
}
@ -115,7 +115,7 @@ namespace Kernel
delete m_mmu;
}
for (auto paddr : m_allocated_pages)
Memory::Heap::get().release_page(paddr);
Heap::get().release_page(paddr);
}
void Process::add_thread(Thread* thread)

4
kernel/kernel/Terminal/VesaTerminalDriver.cpp
View File

@ -4,6 +4,8 @@
#include <kernel/multiboot.h>
#include <kernel/Terminal/VesaTerminalDriver.h>
using namespace Kernel;
VesaTerminalDriver* VesaTerminalDriver::create()
{
if (!(g_multiboot_info->flags & MULTIBOOT_FLAGS_FRAMEBUFFER))
@ -34,7 +36,7 @@ VesaTerminalDriver* VesaTerminalDriver::create()
return nullptr;
}
MMU::get().map_range(framebuffer.addr, framebuffer.pitch * framebuffer.height, MMU::Flags::UserSupervisor | MMU::Flags::ReadWrite | MMU::Flags::Present);
MMU::get().identity_map_range(framebuffer.addr, framebuffer.pitch * framebuffer.height, MMU::Flags::UserSupervisor | MMU::Flags::ReadWrite | MMU::Flags::Present);
auto* driver = new VesaTerminalDriver(
framebuffer.width,

2
kernel/kernel/Thread.cpp
View File

@ -44,7 +44,7 @@ namespace Kernel
delete thread;
return BAN::Error::from_errno(ENOMEM);
}
process->mmu().map_range(thread->stack_base(), thread->stack_size(), MMU::Flags::UserSupervisor | MMU::Flags::ReadWrite | MMU::Flags::Present);
process->mmu().identity_map_range(thread->stack_base(), thread->stack_size(), MMU::Flags::UserSupervisor | MMU::Flags::ReadWrite | MMU::Flags::Present);
return thread;
}

2
kernel/kernel/kernel.cpp
View File

@ -139,7 +139,7 @@ extern "C" void kernel_main()
ASSERT(tty1);
dprintln("TTY initialized");
Memory::Heap::initialize();
Heap::initialize();
dprintln("Heap initialzed");
parse_command_line();