mii/nel_os
1
0
Fork 0
mirror of https://github.com/mii443/nel_os.git synced 2025-08-22 16:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix address translation

Browse Source
This commit is contained in:
Masato Imai
2025-04-27 09:19:38 +00:00
parent 6f342db5c2
commit 4e3a92cdbb
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/vmm/ept.rs
View File

@ -1,9 +1,8 @@
use core::sync::atomic::Ordering;
use bitfield::bitfield; use bitfield::bitfield;
use x86_64::PhysAddr; use x86_64::{
structures::paging::{OffsetPageTable, Translate},
use crate::memory; PhysAddr, VirtAddr,
};
pub enum Assert<const CHECK: bool> {} pub enum Assert<const CHECK: bool> {}
@ -16,7 +15,10 @@ pub struct TableEntry<const LEVEL: u8> {
} }
impl<const LEVEL: u8> TableEntry<LEVEL> { impl<const LEVEL: u8> TableEntry<LEVEL> {
pub fn new_map_table<const L: u8>(table: TableEntry<L>) -> Self pub fn new_map_table<const L: u8>(
table: TableEntry<L>,
mapper: OffsetPageTable<'static>,
) -> Self
where where
Assert<{ LEVEL > L }>: IsTrue, Assert<{ LEVEL > L }>: IsTrue,
Assert<{ L > 0 }>: IsTrue, Assert<{ L > 0 }>: IsTrue,
@ -26,14 +28,17 @@ impl<const LEVEL: u8> TableEntry<LEVEL> {
entry.set_map_memory(false); entry.set_map_memory(false);
entry.set_typ(0); entry.set_typ(0);
entry.set_phys( entry.set_phys(
(&table as *const _ as u64 + memory::PHYSICAL_MEMORY_OFFSET.load(Ordering::Relaxed)) (mapper
.translate_addr(VirtAddr::from_ptr(&table))
.unwrap()
.as_u64())
>> 12, >> 12,
); );
Self { entry } Self { entry }
} }
pub fn new_map_page<const L: u8>(phys: u64) -> Self pub fn new_map_page<const L: u8>(phys: u64, mapper: OffsetPageTable<'static>) -> Self
where where
Assert<{ L < 4 }>: IsTrue, Assert<{ L < 4 }>: IsTrue,
Assert<{ L > 0 }>: IsTrue, Assert<{ L > 0 }>: IsTrue,
@ -45,7 +50,12 @@ impl<const LEVEL: u8> TableEntry<LEVEL> {
entry.set_exec_user(true); entry.set_exec_user(true);
entry.set_map_memory(true); entry.set_map_memory(true);
entry.set_typ(0); entry.set_typ(0);
entry.set_phys((phys + memory::PHYSICAL_MEMORY_OFFSET.load(Ordering::Relaxed)) >> 12); entry.set_phys(
(mapper.translate_addr(VirtAddr::new(phys)))
.unwrap()
.as_u64()
>> 12,
);
Self { entry } Self { entry }
} }