Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-28 03:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change physical address accees to MMIO

Browse Source
This commit is contained in:
Yuke Peng
2023-05-05 03:07:51 -07:00
committed by Tate, Hongliang Tian
parent 5656805520
commit 42ecbe1b04
9 changed files with 184 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
framework/jinux-frame/src/vm/frame.rs
View File

@ -35,9 +35,6 @@ impl VmFrameVec {
let page_size = options.page_size;
let mut frame_list = Vec::new();
if options.is_contiguous {
if options.paddr.is_some() {
panic!("not support contiguous paddr");
}
let frames = frame_allocator::alloc_continuous(options.page_size);
if frames.is_none() {
return Err(Error::NoMemory);
@ -45,15 +42,7 @@ impl VmFrameVec {
return Ok(Self(frames.unwrap()));
}
for i in 0..page_size {
let vm_frame = if let Some(paddr) = options.paddr {
frame_allocator::alloc_with_paddr(paddr + i * PAGE_SIZE)
} else {
frame_allocator::alloc()
};
if vm_frame.is_none() {
return Err(Error::NoMemory);
}
frame_list.push(vm_frame.unwrap());
frame_list.push(frame_allocator::alloc().unwrap());
}
Ok(Self(frame_list))
}
@ -211,7 +200,6 @@ impl<'a> Iterator for VmFrameVecIter<'a> {
/// See `VmFrameVec::alloc`.
pub struct VmAllocOptions {
page_size: usize,
paddr: Option<Paddr>,
is_contiguous: bool,
}
@ -220,22 +208,10 @@ impl VmAllocOptions {
pub fn new(len: usize) -> Self {
Self {
page_size: len,
paddr: None,
is_contiguous: false,
}
}
/// Sets the physical address of the first frame.
///
/// If the physical address is given, then the allocated frames will be
/// contiguous.
///
/// The default value is `None`.
pub fn paddr(&mut self, paddr: Option<Paddr>) -> &mut Self {
self.paddr = paddr;
self
}
/// Sets whether the allocated frames should be contiguous.
///
/// If the physical address is set, then the frames must be contiguous.
@ -366,14 +342,13 @@ impl VmIo for VmFrame {
/// Read a value of a specified type at a specified offset.
fn read_val<T: Pod>(&self, offset: usize) -> Result<T> {
let paddr = self.start_paddr() + offset;
let val = unsafe { &mut *(super::paddr_to_vaddr(paddr) as *mut T) };
Ok(*val)
Ok(unsafe { core::ptr::read(super::paddr_to_vaddr(paddr) as *const T) })
}
/// Write a value of a specified type at a specified offset.
fn write_val<T: Pod>(&self, offset: usize, new_val: &T) -> Result<()> {
let paddr = self.start_paddr() + offset;
unsafe { (super::paddr_to_vaddr(paddr) as *mut T).write(*new_val) };
unsafe { core::ptr::write(super::paddr_to_vaddr(paddr) as *mut T, *new_val) };
Ok(())
}
}

37
framework/jinux-frame/src/vm/frame_allocator.rs
View File

@ -41,43 +41,6 @@ pub fn alloc_continuous(frame_count: usize) -> Option<Vec<VmFrame>> {
})
}
pub fn alloc_with_paddr(paddr: Paddr) -> Option<VmFrame> {
if !is_paddr_valid(paddr..paddr + PAGE_SIZE) {
debug!("not a valid paddr:{:x}", paddr);
return None;
}
unsafe {
Some(VmFrame::new(
paddr.align_down(PAGE_SIZE),
VmFrameFlags::empty(),
))
}
}
/// Check if the physical address in range is valid
fn is_paddr_valid(range: Range<usize>) -> bool {
// special area in x86
#[cfg(target_arch = "x86_64")]
if range.start >= 0xFE00_0000 && range.end <= 0xFFFF_FFFF {
return true;
}
for i in super::MEMORY_REGIONS.get().unwrap().iter() {
match i.typ {
MemoryRegionsType::Usable => {}
MemoryRegionsType::Reserved => {}
MemoryRegionsType::Framebuffer => {}
_ => {
continue;
}
}
if range.start as u64 >= i.base && (range.end as u64) <= i.base + i.len {
return true;
}
}
false
}
pub(crate) fn alloc_zero() -> Option<VmFrame> {
let frame = alloc()?;
frame.zero();