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

Kernel: rework the whole PageTable structure

Browse Source 
We now have page table structure for kernel memory which is shared
between all processes.
This commit is contained in:
Bananymous
2023-07-05 23:41:35 +03:00
parent 60fe5a656c
commit 4086d7c3be
13 changed files with 215 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/include/kernel/ACPI.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include <BAN/Errors.h>
#include <BAN/Vector.h>
#include <kernel/Memory/Types.h>
namespace Kernel
{
@@ -93,9 +94,17 @@ namespace Kernel
const SDTHeader* get_header_from_index(size_t);
private:
uintptr_t m_header_table = 0;
paddr_t m_header_table_paddr = 0;
vaddr_t m_header_table_vaddr = 0;
uint32_t m_entry_size = 0;
uint32_t m_entry_count = 0;
struct MappedPage
{
Kernel::paddr_t paddr;
Kernel::vaddr_t vaddr;
};
BAN::Vector<MappedPage> m_mapped_headers;
};
}

8
kernel/include/kernel/APIC.h
View File

@@ -2,6 +2,7 @@
#include <BAN/Vector.h>
#include <kernel/InterruptController.h>
#include <kernel/Memory/Types.h>
class APIC final : public InterruptController
{
@@ -15,6 +16,7 @@ private:
void write_to_local_apic(ptrdiff_t, uint32_t);
private:
~APIC() { ASSERT_NOT_REACHED(); }
static APIC* create();
friend class InterruptController;
@@ -34,7 +36,8 @@ private:
struct IOAPIC
{
uint8_t id;
uintptr_t address;
Kernel::paddr_t paddr;
Kernel::vaddr_t vaddr;
uint32_t gsi_base;
uint8_t max_redirs;
@@ -44,7 +47,8 @@ private:
private:
BAN::Vector<Processor> m_processors;
uintptr_t m_local_apic = 0;
Kernel::paddr_t m_local_apic_paddr = 0;
Kernel::vaddr_t m_local_apic_vaddr = 0;
BAN::Vector<IOAPIC> m_io_apics;
uint8_t m_irq_overrides[0x100] {};
};

15
kernel/include/kernel/Memory/PageTable.h
View File

@@ -27,9 +27,6 @@ namespace Kernel
static BAN::ErrorOr<PageTable*> create_userspace();
~PageTable();
void identity_map_page(paddr_t, flags_t);
void identity_map_range(paddr_t, size_t bytes, flags_t);
void unmap_page(vaddr_t);
void unmap_range(vaddr_t, size_t bytes);
@@ -42,10 +39,9 @@ namespace Kernel
bool is_page_free(vaddr_t) const;
bool is_range_free(vaddr_t, size_t bytes) const;
vaddr_t get_free_page() const;
vaddr_t get_free_page(vaddr_t first_address = PAGE_SIZE) const;
vaddr_t get_free_contiguous_pages(size_t page_count, vaddr_t first_address = PAGE_SIZE) const;
void invalidate(vaddr_t);
void load();
void lock() const { m_lock.lock(); }
@@ -57,10 +53,19 @@ namespace Kernel
PageTable() = default;
uint64_t get_page_data(vaddr_t) const;
void initialize_kernel();
void map_kernel_memory();
void invalidate(vaddr_t);
private:
paddr_t m_highest_paging_struct { 0 };
mutable RecursiveSpinLock m_lock;
};
static constexpr size_t range_page_count(vaddr_t start, size_t bytes)
{
size_t first_page = start / PAGE_SIZE;
size_t last_page = BAN::Math::div_round_up<size_t>(start + bytes, PAGE_SIZE);
return last_page - first_page + 1;
}
}