mirrors/alioth
1
0
Fork 0
mirror of https://github.com/google/alioth.git synced 2024-11-28 01:06:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(virtio): monitor ioeventfds with IORING_OP_POLL_ADD

Browse source 
Signed-off-by: Changyuan Lyu <changyuanl@google.com>
This commit is contained in:
Changyuan Lyu 2024-10-06 22:26:02 -07:00 committed by Lencerf
parent bc40ba6c71
commit acdfb5dbca
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
alioth/src/virtio/worker/io_uring.rs
View file

@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use std::cell::UnsafeCell;
use std::collections::HashMap; use std::collections::HashMap;
use std::os::fd::AsRawFd; use std::os::fd::AsRawFd;
use std::sync::mpsc::Receiver; use std::sync::mpsc::Receiver;
@ -63,7 +62,6 @@ const TOKEN_QUEUE: u64 = 1 << 62;
const TOKEN_DESCRIPTOR: u64 = 1 << 62 | 1 << 61; const TOKEN_DESCRIPTOR: u64 = 1 << 62 | 1 << 61;
pub struct IoUring<E> { pub struct IoUring<E> {
efd_buffer: UnsafeCell<u64>,
queue_ioeventfds: Arc<[(E, bool)]>, queue_ioeventfds: Arc<[(E, bool)]>,
queue_submits: Box<[QueueSubmit]>, queue_submits: Box<[QueueSubmit]>,
waker: Arc<Waker>, waker: Arc<Waker>,
@ -77,8 +75,8 @@ where
fn submit_queue_ioeventfd(&self, index: u16, fd: &E, data: &mut RingData) -> Result<()> { fn submit_queue_ioeventfd(&self, index: u16, fd: &E, data: &mut RingData) -> Result<()> {
let token = index as u64 | TOKEN_QUEUE; let token = index as u64 | TOKEN_QUEUE;
let fd = types::Fd(fd.as_fd().as_raw_fd()); let fd = types::Fd(fd.as_fd().as_raw_fd());
let read = opcode::Read::new(fd, self.efd_buffer.get() as *mut u8, 8); let poll = opcode::PollAdd::new(fd, libc::EPOLLIN as _).multi(true);
let entry = read.build().user_data(token); let entry = poll.build().user_data(token);
unsafe { data.ring.submission().push(&entry) }.unwrap(); unsafe { data.ring.submission().push(&entry) }.unwrap();
Ok(()) Ok(())
} }
@ -105,7 +103,6 @@ where
{ {
let waker = Waker::new_eventfd()?; let waker = Waker::new_eventfd()?;
let ring = IoUring { let ring = IoUring {
efd_buffer: UnsafeCell::new(0),
queue_ioeventfds: fds, queue_ioeventfds: fds,
waker: Arc::new(waker), waker: Arc::new(waker),
waker_token: 0, waker_token: 0,
@ -267,10 +264,7 @@ where
}; };
let queue_submit = self.queue_submits.get_mut(index as usize).unwrap(); let queue_submit = self.queue_submits.get_mut(index as usize).unwrap();
submit_buffer(q, queue_submit, dev, index, irq_sender, data)?; submit_buffer(q, queue_submit, dev, index, irq_sender, data)
let (fd, _) = self.queue_ioeventfds.get(index as usize).unwrap();
self.submit_queue_ioeventfd(index, fd, data)?;
Ok(())
} }
fn reset(&self, _dev: &mut D) -> Result<()> { fn reset(&self, _dev: &mut D) -> Result<()> {