2023-12-26 22:24:38 +02:00
|
|
|
#![allow(unused)]
|
|
|
|
|
2023-12-18 17:04:01 +02:00
|
|
|
use core::{
|
|
|
|
ops::Range,
|
|
|
|
pin::Pin,
|
|
|
|
task::{Context, Poll},
|
|
|
|
};
|
|
|
|
|
|
|
|
use alloc::boxed::Box;
|
2023-12-18 23:25:33 +02:00
|
|
|
use futures_util::{task::AtomicWaker, Future};
|
2024-02-06 16:38:39 +02:00
|
|
|
use libk_mm::{address::PhysicalAddress, table::MapAttributes, PageBox, PageProvider};
|
2024-02-05 12:35:09 +02:00
|
|
|
use libk_util::waker::QueueWaker;
|
2023-12-18 17:04:01 +02:00
|
|
|
use yggdrasil_abi::{error::Error, io::DeviceRequest};
|
|
|
|
|
|
|
|
use crate::{
|
|
|
|
request::{IoOperation, IoRequest, IoSubmissionId},
|
|
|
|
BlockDevice,
|
|
|
|
};
|
|
|
|
|
2023-12-18 23:25:33 +02:00
|
|
|
pub trait CompletionNotify {
|
|
|
|
fn wait_for_completion<'a, D: NgBlockDevice + 'a>(
|
|
|
|
&'a self,
|
|
|
|
device: &'a D,
|
|
|
|
id: IoSubmissionId,
|
|
|
|
) -> impl Future<Output = Result<(), Error>> + Send + '_;
|
|
|
|
}
|
|
|
|
|
2023-12-18 17:04:01 +02:00
|
|
|
pub trait NgBlockDevice: Sync {
|
2023-12-18 23:25:33 +02:00
|
|
|
type CompletionNotify: CompletionNotify;
|
|
|
|
|
2023-12-18 17:04:01 +02:00
|
|
|
fn bus_id(&self) -> u32; // HBA, controller ID, etc.
|
|
|
|
fn unit_id(&self) -> u32; // Drive, slot, connector ID, etc.
|
|
|
|
|
|
|
|
fn block_size(&self) -> u64;
|
|
|
|
fn block_count(&self) -> u64;
|
|
|
|
fn max_blocks_per_request(&self) -> u64;
|
|
|
|
|
|
|
|
fn submit_request(
|
|
|
|
&self,
|
|
|
|
request: IoRequest,
|
|
|
|
) -> impl Future<Output = Result<IoSubmissionId, Error>> + Send;
|
|
|
|
|
|
|
|
fn poll_completion(&self, id: IoSubmissionId) -> Poll<Result<(), Error>>;
|
2023-12-18 23:25:33 +02:00
|
|
|
fn completion_notify(&self, id: IoSubmissionId) -> &Self::CompletionNotify;
|
2023-12-18 17:04:01 +02:00
|
|
|
|
|
|
|
fn wait_for_completion(
|
|
|
|
&self,
|
|
|
|
id: IoSubmissionId,
|
|
|
|
) -> impl Future<Output = Result<(), Error>> + Send + '_
|
|
|
|
where
|
|
|
|
Self: Sized,
|
|
|
|
{
|
2023-12-18 23:25:33 +02:00
|
|
|
self.completion_notify(id).wait_for_completion(self, id)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct NgBlockDeviceWrapper<'a, D: NgBlockDevice + 'a> {
|
|
|
|
device: &'a D,
|
|
|
|
|
|
|
|
pub(crate) block_size: u64,
|
|
|
|
pub(crate) block_count: u64,
|
|
|
|
#[allow(unused)]
|
|
|
|
max_blocks_per_request: u64,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
|
|
struct BlockChunk {
|
|
|
|
lba_start: u64,
|
|
|
|
lba_count: usize,
|
|
|
|
buffer_offset: usize,
|
|
|
|
lba_offset: usize,
|
|
|
|
byte_count: usize,
|
|
|
|
}
|
|
|
|
|
|
|
|
struct BlockChunkIter {
|
|
|
|
remaining: usize,
|
|
|
|
buffer_offset: usize,
|
|
|
|
position: u64,
|
|
|
|
|
|
|
|
block_size: u64,
|
|
|
|
max_blocks_per_request: u64,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl CompletionNotify for QueueWaker {
|
|
|
|
fn wait_for_completion<'a, D: NgBlockDevice + 'a>(
|
|
|
|
&'a self,
|
|
|
|
device: &'a D,
|
|
|
|
id: IoSubmissionId,
|
|
|
|
) -> impl Future<Output = Result<(), Error>> + Send + '_ {
|
2023-12-18 17:04:01 +02:00
|
|
|
struct F<'f, D: NgBlockDevice + 'f> {
|
|
|
|
device: &'f D,
|
|
|
|
notify: &'f QueueWaker,
|
|
|
|
id: IoSubmissionId,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'f, D: NgBlockDevice + 'f> Future for F<'f, D> {
|
|
|
|
type Output = Result<(), Error>;
|
|
|
|
|
|
|
|
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
|
|
|
|
self.notify.register(cx.waker());
|
|
|
|
match self.device.poll_completion(self.id) {
|
|
|
|
Poll::Ready(result) => {
|
|
|
|
self.notify.remove(cx.waker());
|
|
|
|
Poll::Ready(result)
|
|
|
|
}
|
|
|
|
Poll::Pending => Poll::Pending,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
F {
|
2023-12-18 23:25:33 +02:00
|
|
|
notify: self,
|
|
|
|
device,
|
2023-12-18 17:04:01 +02:00
|
|
|
id,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-12-18 23:25:33 +02:00
|
|
|
impl CompletionNotify for AtomicWaker {
|
|
|
|
fn wait_for_completion<'a, D: NgBlockDevice + 'a>(
|
|
|
|
&'a self,
|
|
|
|
device: &'a D,
|
|
|
|
id: IoSubmissionId,
|
|
|
|
) -> impl Future<Output = Result<(), Error>> + Send + '_ {
|
|
|
|
struct F<'f, D: NgBlockDevice + 'f> {
|
|
|
|
device: &'f D,
|
|
|
|
notify: &'f AtomicWaker,
|
|
|
|
id: IoSubmissionId,
|
|
|
|
}
|
2023-12-18 17:04:01 +02:00
|
|
|
|
2023-12-18 23:25:33 +02:00
|
|
|
impl<'f, D: NgBlockDevice + 'f> Future for F<'f, D> {
|
|
|
|
type Output = Result<(), Error>;
|
2023-12-18 17:04:01 +02:00
|
|
|
|
2023-12-18 23:25:33 +02:00
|
|
|
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
|
|
|
|
if let Poll::Ready(result) = self.device.poll_completion(self.id) {
|
|
|
|
return Poll::Ready(result);
|
|
|
|
}
|
|
|
|
self.notify.register(cx.waker());
|
|
|
|
self.device.poll_completion(self.id)
|
|
|
|
}
|
|
|
|
}
|
2023-12-18 17:04:01 +02:00
|
|
|
|
2023-12-18 23:25:33 +02:00
|
|
|
F {
|
|
|
|
notify: self,
|
|
|
|
device,
|
|
|
|
id,
|
|
|
|
}
|
|
|
|
}
|
2023-12-18 17:04:01 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
impl BlockChunk {
|
|
|
|
pub fn block_range(&self) -> Range<usize> {
|
|
|
|
self.lba_offset..self.lba_offset + self.byte_count
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn buffer_range(&self) -> Range<usize> {
|
|
|
|
self.buffer_offset..self.buffer_offset + self.byte_count
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl BlockChunkIter {
|
|
|
|
pub fn new(pos: u64, count: usize, lba_size: u64, max_lba_per_request: u64) -> Self {
|
|
|
|
Self {
|
|
|
|
remaining: count,
|
|
|
|
buffer_offset: 0,
|
|
|
|
position: pos,
|
|
|
|
|
|
|
|
block_size: lba_size,
|
|
|
|
max_blocks_per_request: max_lba_per_request,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Iterator for BlockChunkIter {
|
|
|
|
type Item = BlockChunk;
|
|
|
|
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
|
|
if self.remaining == 0 {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
let lba_start = self.position / self.block_size;
|
|
|
|
let lba_end =
|
|
|
|
(self.position + self.remaining as u64 + self.block_size - 1) / self.block_size;
|
|
|
|
|
|
|
|
let lba_count = core::cmp::min(lba_end - lba_start, self.max_blocks_per_request);
|
|
|
|
|
|
|
|
let lba_offset = (self.position % self.block_size) as usize;
|
|
|
|
let byte_count = core::cmp::min(
|
|
|
|
(lba_count * self.block_size) as usize - lba_offset,
|
|
|
|
self.remaining,
|
|
|
|
);
|
|
|
|
|
|
|
|
let buffer_offset = self.buffer_offset;
|
|
|
|
|
|
|
|
self.position += byte_count as u64;
|
|
|
|
self.buffer_offset += byte_count;
|
|
|
|
self.remaining -= byte_count;
|
|
|
|
|
|
|
|
Some(BlockChunk {
|
|
|
|
lba_start,
|
|
|
|
lba_count: lba_count as usize,
|
|
|
|
buffer_offset,
|
|
|
|
lba_offset,
|
|
|
|
byte_count,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, D: NgBlockDevice + 'a> NgBlockDeviceWrapper<'a, D> {
|
2023-12-18 18:35:55 +02:00
|
|
|
pub fn new(device: &'a D) -> &'a Self {
|
2023-12-18 17:04:01 +02:00
|
|
|
let block_size = device.block_size();
|
|
|
|
let block_count = device.block_count();
|
|
|
|
let max_blocks_per_request = device.max_blocks_per_request();
|
|
|
|
|
|
|
|
Box::leak(Box::new(Self {
|
|
|
|
device,
|
|
|
|
block_size,
|
|
|
|
block_count,
|
|
|
|
max_blocks_per_request,
|
|
|
|
}))
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn read_range_inner(&self, lba: u64, count: usize) -> Result<PageBox<[u8]>, Error> {
|
|
|
|
let mut data = PageBox::new_uninit_slice(self.block_size as usize * count)?;
|
|
|
|
|
|
|
|
let id = self
|
|
|
|
.device
|
|
|
|
.submit_request(IoRequest {
|
|
|
|
operation: IoOperation::Read { lba, count },
|
|
|
|
data: &mut data,
|
|
|
|
})
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
self.device.wait_for_completion(id).await?;
|
|
|
|
|
|
|
|
Ok(unsafe { data.assume_init_slice() })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-12-31 12:50:16 +02:00
|
|
|
impl<'a, D: NgBlockDevice + 'a> PageProvider for NgBlockDeviceWrapper<'a, D> {
|
|
|
|
fn get_page(&self, _offset: u64) -> Result<PhysicalAddress, Error> {
|
|
|
|
todo!()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn release_page(&self, _offset: u64, _phys: PhysicalAddress) -> Result<(), Error> {
|
|
|
|
todo!()
|
|
|
|
}
|
2024-02-06 16:38:39 +02:00
|
|
|
|
|
|
|
fn clone_page(
|
|
|
|
&self,
|
|
|
|
_offset: u64,
|
|
|
|
_src_phys: PhysicalAddress,
|
|
|
|
_src_attrs: MapAttributes,
|
|
|
|
) -> Result<PhysicalAddress, Error> {
|
|
|
|
todo!()
|
|
|
|
}
|
2023-12-31 12:50:16 +02:00
|
|
|
}
|
|
|
|
|
2023-12-18 17:04:01 +02:00
|
|
|
impl<'a, D: NgBlockDevice + 'a> BlockDevice for NgBlockDeviceWrapper<'a, D> {
|
2023-12-22 11:24:47 +02:00
|
|
|
fn poll_read(
|
|
|
|
&self,
|
|
|
|
cx: &mut Context<'_>,
|
|
|
|
pos: u64,
|
|
|
|
buf: &mut [u8],
|
|
|
|
) -> Poll<Result<usize, Error>> {
|
|
|
|
todo!()
|
|
|
|
}
|
2023-12-18 17:04:01 +02:00
|
|
|
|
2023-12-22 11:24:47 +02:00
|
|
|
fn poll_write(&self, cx: &mut Context<'_>, pos: u64, buf: &[u8]) -> Poll<Result<usize, Error>> {
|
|
|
|
todo!()
|
|
|
|
}
|
2023-12-18 17:04:01 +02:00
|
|
|
|
2023-12-22 11:24:47 +02:00
|
|
|
// fn read(&'static self, pos: u64, buf: &mut [u8]) -> Result<usize, Error> {
|
|
|
|
// // TODO block cache
|
|
|
|
// block! {
|
|
|
|
// let mut bytes_read = 0;
|
2023-12-18 17:04:01 +02:00
|
|
|
|
2023-12-22 11:24:47 +02:00
|
|
|
// for chunk in
|
|
|
|
// BlockChunkIter::new(pos, buf.len(), self.block_size, self.max_blocks_per_request)
|
|
|
|
// {
|
|
|
|
// log::debug!(
|
|
|
|
// "Read chunk: lba_start={}, lba_count={}",
|
|
|
|
// chunk.lba_start,
|
|
|
|
// chunk.lba_count
|
|
|
|
// );
|
2023-12-18 17:04:01 +02:00
|
|
|
|
2023-12-22 11:24:47 +02:00
|
|
|
// let block = self.read_range_inner(chunk.lba_start, chunk.lba_count).await?;
|
2023-12-18 17:04:01 +02:00
|
|
|
|
2023-12-22 11:24:47 +02:00
|
|
|
// buf[chunk.buffer_range()].copy_from_slice(&block[chunk.block_range()]);
|
2023-12-18 17:04:01 +02:00
|
|
|
|
2023-12-22 11:24:47 +02:00
|
|
|
// bytes_read += chunk.byte_count;
|
|
|
|
// }
|
|
|
|
|
|
|
|
// Ok(bytes_read)
|
|
|
|
// }?
|
|
|
|
// }
|
|
|
|
|
|
|
|
// fn write(&'static self, _pos: u64, _buf: &[u8]) -> Result<usize, Error> {
|
|
|
|
// todo!()
|
|
|
|
// }
|
2023-12-18 17:04:01 +02:00
|
|
|
|
|
|
|
fn size(&self) -> Result<u64, Error> {
|
|
|
|
Ok(self.block_size * self.block_count)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn device_request(&self, _req: &mut DeviceRequest) -> Result<(), Error> {
|
|
|
|
todo!()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use crate::device::BlockChunk;
|
|
|
|
|
|
|
|
use super::BlockChunkIter;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn block_chunk_iter() {
|
|
|
|
let mut it = BlockChunkIter {
|
|
|
|
remaining: 512 * 9 + 1,
|
|
|
|
position: 123,
|
|
|
|
block_size: 512,
|
|
|
|
buffer_offset: 0,
|
|
|
|
max_blocks_per_request: 2,
|
|
|
|
};
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
it.next().unwrap(),
|
|
|
|
BlockChunk {
|
|
|
|
lba_start: 0,
|
|
|
|
lba_count: 2,
|
|
|
|
buffer_offset: 0,
|
|
|
|
lba_offset: 123,
|
|
|
|
byte_count: 901
|
|
|
|
}
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
it.next().unwrap(),
|
|
|
|
BlockChunk {
|
|
|
|
lba_start: 2,
|
|
|
|
lba_count: 2,
|
|
|
|
buffer_offset: 1024 - 123,
|
|
|
|
lba_offset: 0,
|
|
|
|
byte_count: 1024
|
|
|
|
}
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
it.next().unwrap(),
|
|
|
|
BlockChunk {
|
|
|
|
lba_start: 4,
|
|
|
|
lba_count: 2,
|
|
|
|
buffer_offset: 2 * 1024 - 123,
|
|
|
|
lba_offset: 0,
|
|
|
|
byte_count: 1024
|
|
|
|
}
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
it.next().unwrap(),
|
|
|
|
BlockChunk {
|
|
|
|
lba_start: 6,
|
|
|
|
lba_count: 2,
|
|
|
|
buffer_offset: 3 * 1024 - 123,
|
|
|
|
lba_offset: 0,
|
|
|
|
byte_count: 1024
|
|
|
|
}
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
it.next().unwrap(),
|
|
|
|
BlockChunk {
|
|
|
|
lba_start: 8,
|
|
|
|
lba_count: 2,
|
|
|
|
buffer_offset: 4 * 1024 - 123,
|
|
|
|
lba_offset: 0,
|
|
|
|
byte_count: 512 + 123 + 1
|
|
|
|
}
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|