Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-19 04:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor VmReader&VmWriter as given fallibility marker

Browse Source
This commit is contained in:
Shaowei Song
2024-08-20 02:05:25 +00:00
committed by Tate, Hongliang Tian
parent 562e644375
commit 2102107be1
16 changed files with 172 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/comps/network/src/buffer.rs
View File

@ -5,7 +5,8 @@ use alloc::{collections::LinkedList, sync::Arc};
use align_ext::AlignExt;
use ostd::{
mm::{
Daddr, DmaDirection, DmaStream, FrameAllocOptions, HasDaddr, VmReader, VmWriter, PAGE_SIZE,
Daddr, DmaDirection, DmaStream, FrameAllocOptions, HasDaddr, Infallible, VmReader,
VmWriter, PAGE_SIZE,
},
sync::SpinLock,
Pod,
@ -52,7 +53,7 @@ impl TxBuffer {
tx_buffer
}
pub fn writer(&self) -> VmWriter<'_> {
pub fn writer(&self) -> VmWriter<'_, Infallible> {
self.dma_stream.writer().unwrap().limit(self.nbytes)
}
@ -106,7 +107,7 @@ impl RxBuffer {
self.packet_len = packet_len;
}
pub fn packet(&self) -> VmReader<'_> {
pub fn packet(&self) -> VmReader<'_, Infallible> {
self.segment
.sync(self.header_len..self.header_len + self.packet_len)
.unwrap();
@ -117,7 +118,7 @@ impl RxBuffer {
.limit(self.packet_len)
}
pub fn buf(&self) -> VmReader<'_> {
pub fn buf(&self) -> VmReader<'_, Infallible> {
self.segment
.sync(0..self.header_len + self.packet_len)
.unwrap();

7
kernel/comps/network/src/dma_pool.rs
View File

@ -11,7 +11,8 @@ use core::ops::Range;
use bitvec::{array::BitArray, prelude::Lsb0};
use ostd::{
mm::{
Daddr, DmaDirection, DmaStream, FrameAllocOptions, HasDaddr, VmReader, VmWriter, PAGE_SIZE,
Daddr, DmaDirection, DmaStream, FrameAllocOptions, HasDaddr, Infallible, VmReader,
VmWriter, PAGE_SIZE,
},
sync::{RwLock, SpinLock},
};
@ -233,12 +234,12 @@ impl DmaSegment {
self.size
}
pub fn reader(&self) -> Result<VmReader<'_>, ostd::Error> {
pub fn reader(&self) -> Result<VmReader<'_, Infallible>, ostd::Error> {
let offset = self.start_addr - self.dma_stream.daddr();
Ok(self.dma_stream.reader()?.skip(offset).limit(self.size))
}
pub fn writer(&self) -> Result<VmWriter<'_>, ostd::Error> {
pub fn writer(&self) -> Result<VmWriter<'_, Infallible>, ostd::Error> {
let offset = self.start_addr - self.dma_stream.daddr();
Ok(self.dma_stream.writer()?.skip(offset).limit(self.size))
}