Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
This commit is contained in:
1 parent
f844883192
commit
2433d99bc7
4 files changed
+113
-69
No files matched your search
+68
-52
@@ -1,18 +1,20 @@
|
||||
use multiboot2::{BootInformation, ElfSection};
|
||||
pub use x86_64::structures::paging::{FrameAllocator, Size4KiB, PageTable, RecursivePageTable, Page, PageTableFlags as Flags, Mapper, PhysFrame as Frame};
|
||||
use crate::println;
|
||||
use x86_64::{VirtAddr, PhysAddr};
|
||||
use x86_64::registers::control;
|
||||
use temporary_page::TemporaryPage;
|
||||
use super::PAGE_SIZE;
|
||||
use crate::println;
|
||||
use multiboot2::{BootInformation, ElfSection};
|
||||
use temporary_page::TemporaryPage;
|
||||
use x86_64::registers::control;
|
||||
pub use x86_64::structures::paging::{
|
||||
FrameAllocator, Mapper, Page, PageTable, PageTableFlags as Flags, PhysFrame as Frame,
|
||||
RecursivePageTable, Size4KiB,
|
||||
};
|
||||
use x86_64::{PhysAddr, VirtAddr};
|
||||
|
||||
mod temporary_page;
|
||||
|
||||
pub const P4: *mut PageTable = 0o177777_777_777_777_777_0000 as *mut _;
|
||||
|
||||
fn get_flags_from_elf_section(section: &ElfSection) -> Flags {
|
||||
use multiboot2::{ELF_SECTION_ALLOCATED, ELF_SECTION_WRITABLE,
|
||||
ELF_SECTION_EXECUTABLE};
|
||||
use multiboot2::{ELF_SECTION_ALLOCATED, ELF_SECTION_EXECUTABLE, ELF_SECTION_WRITABLE};
|
||||
|
||||
let mut flags = Flags::empty();
|
||||
|
||||
@@ -30,53 +32,83 @@ fn get_flags_from_elf_section(section: &ElfSection) -> Flags {
|
||||
}
|
||||
|
||||
pub fn kernel_remap<A>(allocator: &mut A, boot_info: &BootInformation)
|
||||
where A: FrameAllocator<Size4KiB>
|
||||
where
|
||||
A: FrameAllocator<Size4KiB>,
|
||||
{
|
||||
println!("Remapping kernel");
|
||||
let mut temporary_page = TemporaryPage::new(Page::containing_address(VirtAddr::new(0xcafebabe)), allocator);
|
||||
let mut temporary_page = TemporaryPage::new(
|
||||
Page::containing_address(VirtAddr::new(0xcafebabe)),
|
||||
allocator,
|
||||
);
|
||||
let mut active_table = get_active_page_table();
|
||||
let mut new_table = {
|
||||
let frame = allocator.allocate_frame().expect("No more frames");
|
||||
InactivePageTable::new(frame, &mut active_table, &mut temporary_page)
|
||||
};
|
||||
new_table.under(&mut active_table, &mut temporary_page, |mapper| {
|
||||
let elf_sections_tag = boot_info.elf_sections_tag().expect("Elf sections tag required");
|
||||
let elf_sections_tag = boot_info
|
||||
.elf_sections_tag()
|
||||
.expect("Elf sections tag required");
|
||||
|
||||
for section in elf_sections_tag.sections() {
|
||||
if !section.is_allocated() {
|
||||
// section is not loaded to memory
|
||||
continue;
|
||||
}
|
||||
assert!(section.start_address() % PAGE_SIZE == 0,
|
||||
"sections need to be page aligned");
|
||||
|
||||
assert!(
|
||||
section.start_address() % PAGE_SIZE == 0,
|
||||
"sections need to be page aligned"
|
||||
);
|
||||
|
||||
let flags = get_flags_from_elf_section(section);
|
||||
|
||||
let start_frame = Frame::<Size4KiB>::containing_address(PhysAddr::new(section.start_address() as u64));
|
||||
let end_frame = Frame::containing_address(PhysAddr::new(section.end_address() as u64 - 1));
|
||||
let start_frame = Frame::<Size4KiB>::containing_address(PhysAddr::new(
|
||||
section.start_address() as u64,
|
||||
));
|
||||
let end_frame =
|
||||
Frame::containing_address(PhysAddr::new(section.end_address() as u64 - 1));
|
||||
for frame in Frame::range_inclusive(start_frame, end_frame) {
|
||||
unsafe {
|
||||
mapper.identity_map(frame, flags, allocator).expect("Failed to identity map kernel").flush();
|
||||
mapper
|
||||
.identity_map(frame, flags, allocator)
|
||||
.expect("Failed to identity map kernel")
|
||||
.flush();
|
||||
}
|
||||
}
|
||||
}
|
||||
let vga_buffer_frame = Frame::<Size4KiB>::containing_address(PhysAddr::new(0xb8000));
|
||||
unsafe {
|
||||
mapper.identity_map(vga_buffer_frame, Flags::PRESENT | Flags::WRITABLE, allocator).expect("Failed to identity map VGA buffer").flush();
|
||||
mapper
|
||||
.identity_map(
|
||||
vga_buffer_frame,
|
||||
Flags::PRESENT | Flags::WRITABLE,
|
||||
allocator,
|
||||
)
|
||||
.expect("Failed to identity map VGA buffer")
|
||||
.flush();
|
||||
}
|
||||
|
||||
let multiboot_start = Frame::<Size4KiB>::containing_address(PhysAddr::new(boot_info.start_address() as u64));
|
||||
let multiboot_end = Frame::containing_address(PhysAddr::new(boot_info.end_address() as u64 - 1));
|
||||
let multiboot_start =
|
||||
Frame::<Size4KiB>::containing_address(PhysAddr::new(boot_info.start_address() as u64));
|
||||
let multiboot_end =
|
||||
Frame::containing_address(PhysAddr::new(boot_info.end_address() as u64 - 1));
|
||||
for frame in Frame::range_inclusive(multiboot_start, multiboot_end) {
|
||||
unsafe {
|
||||
mapper.identity_map(frame, Flags::PRESENT, allocator).expect("Failed to identity map multiboot info struct").flush();
|
||||
mapper
|
||||
.identity_map(frame, Flags::PRESENT, allocator)
|
||||
.expect("Failed to identity map multiboot info struct")
|
||||
.flush();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
new_table.activate();
|
||||
let old_table = new_table.activate();
|
||||
println!("Loaded new page table!");
|
||||
let old_p4_page = Page::<Size4KiB>::containing_address(VirtAddr::new(
|
||||
old_table.p4_frame.start_address().as_u64(),
|
||||
));
|
||||
active_table.unmap(old_p4_page).expect("Failed to unmap old P4").1.flush();
|
||||
println!("Stack guard page at {:#x}", old_p4_page.start_address());
|
||||
}
|
||||
|
||||
struct InactivePageTable {
|
||||
@@ -84,8 +116,11 @@ struct InactivePageTable {
|
||||
}
|
||||
|
||||
impl InactivePageTable {
|
||||
pub fn new(frame: Frame, active_table: & mut RecursivePageTable,
|
||||
temporary_page: &mut TemporaryPage) -> InactivePageTable {
|
||||
pub fn new(
|
||||
frame: Frame,
|
||||
active_table: &mut RecursivePageTable,
|
||||
temporary_page: &mut TemporaryPage,
|
||||
) -> InactivePageTable {
|
||||
let table = temporary_page.map_table_frame(frame, active_table);
|
||||
table.zero();
|
||||
table[511].set_frame(frame.clone(), Flags::PRESENT | Flags::WRITABLE);
|
||||
@@ -93,9 +128,13 @@ impl InactivePageTable {
|
||||
InactivePageTable { p4_frame: frame }
|
||||
}
|
||||
|
||||
pub fn under<F>(&mut self, active_table: &mut RecursivePageTable,
|
||||
temporary_page: &mut TemporaryPage, f: F)
|
||||
where F: FnOnce(&mut RecursivePageTable)
|
||||
pub fn under<F>(
|
||||
&mut self,
|
||||
active_table: &mut RecursivePageTable,
|
||||
temporary_page: &mut TemporaryPage,
|
||||
f: F,
|
||||
) where
|
||||
F: FnOnce(&mut RecursivePageTable),
|
||||
{
|
||||
let backup = control::Cr3::read().0;
|
||||
let p4_table = temporary_page.map_table_frame(backup, active_table);
|
||||
@@ -114,9 +153,7 @@ impl InactivePageTable {
|
||||
|
||||
pub fn activate(&mut self) -> InactivePageTable {
|
||||
let old_table = InactivePageTable {
|
||||
p4_frame: Frame::containing_address(
|
||||
control::Cr3::read().0.start_address()
|
||||
),
|
||||
p4_frame: Frame::containing_address(control::Cr3::read().0.start_address()),
|
||||
};
|
||||
unsafe {
|
||||
control::Cr3::write(self.p4_frame, control::Cr3Flags::empty());
|
||||
@@ -126,26 +163,5 @@ impl InactivePageTable {
|
||||
}
|
||||
|
||||
pub fn get_active_page_table() -> RecursivePageTable<'static> {
|
||||
unsafe {
|
||||
RecursivePageTable::new(&mut *P4).expect("Could not create Page Table")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pub fn test_paging<A>(allocator: &mut A)
|
||||
where A: FrameAllocator<Size4KiB>
|
||||
{
|
||||
let mut page_table = get_active_page_table();
|
||||
|
||||
let addr = 42 * 512 * 512 * 4096; // 42th P3 entry
|
||||
let page = Page::containing_address(VirtAddr::new(addr));
|
||||
let frame = allocator.allocate_frame().expect("no more frames");
|
||||
println!("None = , map to {:?}", frame);
|
||||
unsafe { page_table.map_to(page, frame, Flags::PRESENT, allocator).expect("Could not map").flush() };
|
||||
println!("next free frame: {:?}", allocator.allocate_frame());
|
||||
|
||||
let page_ptr: *mut u8 = page.start_address().as_mut_ptr();
|
||||
let frame_ptr: *mut u8 = frame.start_address().as_u64() as *mut u8;
|
||||
|
||||
println!("Page: {:#?}, Frame: {:#?}", page_ptr, frame_ptr);
|
||||
unsafe { RecursivePageTable::new(&mut *P4).expect("Could not create Page Table") }
|
||||
}
|
||||