Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 97 additions & 0 deletions awkernel_lib/src/dma_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ pub struct DmaMap {
numa_id: usize,
}

#[derive(Debug, Clone, Copy)]
pub enum DmaSyncOp {
PreRead,
PostRead,
PreWrite,
PostWrite,
}

#[derive(Debug)]
pub enum DmaError {
AddressTooHigh,
Expand Down Expand Up @@ -202,4 +210,93 @@ impl DmaMap {
self.orig_vaddr = None;
self.mapsize = 0;
}

pub fn sync(&self, offset: usize, len: usize, op: DmaSyncOp) -> Result<(), DmaError> {
if self.segments.is_empty() {
return Err(DmaError::NotLoaded);
}

// Validate offset and length
if offset + len > self.mapsize {
return Err(DmaError::SizeTooLarge);
}

if let (Some(ref bounce), Some(orig_vaddr)) = (&self.owned_memory, self.orig_vaddr) {
match op {
// READ: device -> memory
DmaSyncOp::PostRead => unsafe {
core::ptr::copy_nonoverlapping(
bounce.get_virt_addr().as_ptr::<u8>().add(offset),
orig_vaddr.as_mut_ptr::<u8>().add(offset),
len,
);
},
// WRITE: memory -> device
DmaSyncOp::PreWrite => unsafe {
core::ptr::copy_nonoverlapping(
orig_vaddr.as_ptr::<u8>().add(offset),
bounce.get_virt_addr().as_mut_ptr::<u8>().add(offset),
len,
);
},
// PREREAD and POSTWRITE are no-ops.
_ => (),
}
}

// TODO: Implement cache operations for non-coherent devices.
// Currently only memory barriers are implemented, which is insufficient
// for non-coherent devices but works for cache-coherent systems.
//
// Note: The barrier and cache invalidation are not atomic, which could
// theoretically allow speculative loads between them. This is mitigated
// in practice by running in interrupt context and exclusive buffer access.

#[cfg(any(target_arch = "riscv32", target_arch = "riscv64"))]
if matches!(op, DmaSyncOp::PostRead) {
crate::barrier::membar_sync();
// TODO: cpu_dcache_inv_range(paddr, len)
}

#[cfg(target_arch = "aarch64")]
if matches!(op, DmaSyncOp::PostRead) {
crate::barrier::membar_sync();
// TODO: cpu_dcache_inv_range(paddr, len)
}

Ok(())
}

pub fn get_segments(&self) -> &[DmaSegment] {
&self.segments
}

pub fn is_bounced(&self) -> bool {
self.owned_memory.is_some()
}
}

impl DmaMap {
pub fn from_dma_pool<T>(pool: DMAPool<T>, tag: DmaConstraints) -> Result<Self, DmaError> {
let paddr = pool.get_phy_addr();
let size = pool.get_size();
let vaddr = pool.get_virt_addr();
let numa_id = pool.get_numa_id();

if size > tag.maxsize {
return Err(DmaError::SizeTooLarge);
}

Ok(Self {
tag,
segments: alloc::vec![DmaSegment {
ds_addr: paddr,
ds_len: size,
}],
owned_memory: Some(pool.into_bytes()),
orig_vaddr: Some(vaddr),
mapsize: size,
numa_id,
})
}
}
18 changes: 18 additions & 0 deletions awkernel_lib/src/dma_pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,24 @@ impl<T> DMAPool<T> {
ptr
}

/// Convert DMAPool<T> to DMAPool<u8>
pub fn into_bytes(self) -> DMAPool<u8> {
let virt_addr = self.virt_addr;
let phy_addr = self.phy_addr;
let size = self.size;
let numa_id = self.numa_id;

core::mem::forget(self);

DMAPool {
virt_addr,
phy_addr,
size,
numa_id,
ptr: unsafe { NonNull::new_unchecked(virt_addr.as_mut_ptr()) },
}
}

#[inline(always)]
pub fn get_virt_addr(&self) -> VirtAddr {
self.virt_addr
Expand Down