xwayland: use io_uring to prevent lockups
See https://gitlab.freedesktop.org/wayland/wayland/-/issues/296
This commit is contained in:
parent
5573b2a1b7
commit
285724b4f1
13 changed files with 1173 additions and 34 deletions
80
src/io_uring/ops/write.rs
Normal file
80
src/io_uring/ops/write.rs
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
use {
|
||||
crate::io_uring::{
|
||||
pending_result::PendingResult,
|
||||
sys::{io_uring_sqe, IORING_OP_WRITE},
|
||||
IoUring, IoUringData, IoUringError, Task,
|
||||
},
|
||||
std::{
|
||||
cell::{Cell, RefCell},
|
||||
ops::Range,
|
||||
rc::Rc,
|
||||
},
|
||||
uapi::OwnedFd,
|
||||
};
|
||||
|
||||
impl IoUring {
|
||||
pub async fn write(
|
||||
&self,
|
||||
fd: &Rc<OwnedFd>,
|
||||
buf: &Rc<Vec<u8>>,
|
||||
offset: usize,
|
||||
n: usize,
|
||||
) -> Result<usize, IoUringError> {
|
||||
self.ring.check_destroyed()?;
|
||||
let id = self.ring.id();
|
||||
let pr = self.ring.pending_results.acquire();
|
||||
{
|
||||
let pw = self.ring.cached_writes.pop().unwrap_or_else(|| {
|
||||
Box::new(WriteTask {
|
||||
id: Cell::new(0),
|
||||
data: Default::default(),
|
||||
})
|
||||
});
|
||||
pw.id.set(id.id);
|
||||
*pw.data.borrow_mut() = Some(WriteTaskData {
|
||||
fd: fd.clone(),
|
||||
buf: buf.clone(),
|
||||
range: offset..offset + n,
|
||||
res: pr.clone(),
|
||||
});
|
||||
self.ring.schedule(pw);
|
||||
}
|
||||
Ok(pr.await? as usize)
|
||||
}
|
||||
}
|
||||
|
||||
struct WriteTaskData {
|
||||
fd: Rc<OwnedFd>,
|
||||
buf: Rc<Vec<u8>>,
|
||||
range: Range<usize>,
|
||||
res: PendingResult,
|
||||
}
|
||||
|
||||
pub struct WriteTask {
|
||||
id: Cell<u64>,
|
||||
data: RefCell<Option<WriteTaskData>>,
|
||||
}
|
||||
|
||||
unsafe impl Task for WriteTask {
|
||||
fn id(&self) -> u64 {
|
||||
self.id.get()
|
||||
}
|
||||
|
||||
fn complete(self: Box<Self>, ring: &IoUringData, res: i32) {
|
||||
if let Some(data) = self.data.borrow_mut().take() {
|
||||
data.res.complete(res);
|
||||
}
|
||||
ring.clone().cached_writes.push(self);
|
||||
}
|
||||
|
||||
fn encode(&self, sqe: &mut io_uring_sqe) {
|
||||
let data = self.data.borrow_mut();
|
||||
let data = data.as_ref().unwrap();
|
||||
sqe.opcode = IORING_OP_WRITE;
|
||||
sqe.fd = data.fd.raw();
|
||||
sqe.u1.off = !0;
|
||||
sqe.u2.addr = data.buf[data.range.clone()].as_ptr() as _;
|
||||
sqe.u3.rw_flags = 0;
|
||||
sqe.len = data.range.len() as _;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue