Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove cancel queue for io-uring driver. #90

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Remove cancel queue for io-uring driver. #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 19 additions & 14 deletions compio-driver/src/iour/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ pub trait OpCode {
/// Low-level driver of io-uring.
pub(crate) struct Driver {
inner: IoUring,
cancel_queue: VecDeque<u64>,
squeue: VecDeque<squeue::Entry>,
}

Expand All @@ -36,7 +35,6 @@ impl Driver {
pub fn new(entries: u32) -> io::Result<Self> {
Ok(Self {
inner: IoUring::new(entries)?,
cancel_queue: VecDeque::default(),
squeue: VecDeque::with_capacity(entries as usize),
})
}
Expand Down Expand Up @@ -67,31 +65,34 @@ impl Driver {

fn flush_submissions(&mut self) -> bool {
let mut ended_ops = false;
let mut ended_cancel = false;

let mut inner_squeue = self.inner.submission();

while !inner_squeue.is_full() {
if let Some(entry) = self.squeue.pop_front() {
unsafe { inner_squeue.push(&entry) }.expect("queue has enough space");
} else {
if self.squeue.len() <= inner_squeue.capacity() - inner_squeue.len() {
let (s1, s2) = self.squeue.as_slices();
unsafe {
inner_squeue
.push_multiple(s1)
.expect("queue has enough space");
inner_squeue
.push_multiple(s2)
.expect("queue has enough space");
}
self.squeue.clear();
ended_ops = true;
break;
}
}
while !inner_squeue.is_full() {
if let Some(user_data) = self.cancel_queue.pop_front() {
let entry = AsyncCancel::new(user_data).build().user_data(Self::CANCEL);
} else if let Some(entry) = self.squeue.pop_front() {
unsafe { inner_squeue.push(&entry) }.expect("queue has enough space");
} else {
ended_cancel = true;
ended_ops = true;
break;
}
}

inner_squeue.sync();

ended_ops && ended_cancel
ended_ops
}

fn poll_entries(&mut self, entries: &mut impl Extend<Entry>) {
Expand All @@ -110,7 +111,11 @@ impl Driver {
}

pub fn cancel(&mut self, user_data: usize, _registry: &mut Slab<RawOp>) {
self.cancel_queue.push_back(user_data as _);
self.squeue.push_back(
AsyncCancel::new(user_data as _)
.build()
.user_data(Self::CANCEL),
);
}

pub fn push(&mut self, user_data: usize, op: &mut RawOp) -> Poll<io::Result<usize>> {
Expand Down