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.

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

Add io_uring_register flags #1011

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/backend/libc/io_uring/syscalls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::backend::c;
use crate::backend::conv::{borrowed_fd, ret_owned_fd, ret_u32};
use crate::fd::{BorrowedFd, OwnedFd};
use crate::io;
use crate::io_uring::{io_uring_params, IoringEnterFlags, IoringRegisterOp};
use crate::io_uring::{io_uring_params, IoringEnterFlags, IoringRegisterFlags, IoringRegisterOp};

#[inline]
pub(crate) fn io_uring_setup(entries: u32, params: &mut io_uring_params) -> io::Result<OwnedFd> {
Expand All @@ -21,6 +21,7 @@ pub(crate) fn io_uring_setup(entries: u32, params: &mut io_uring_params) -> io::
pub(crate) unsafe fn io_uring_register(
fd: BorrowedFd<'_>,
opcode: IoringRegisterOp,
flags: IoringRegisterFlags,
arg: *const c::c_void,
nr_args: u32,
) -> io::Result<u32> {
Expand All @@ -34,7 +35,7 @@ pub(crate) unsafe fn io_uring_register(
}
ret_u32(io_uring_register(
borrowed_fd(fd) as _,
opcode as u32,
opcode as u32 | flags.bits(),
arg,
nr_args,
))
Expand Down
5 changes: 3 additions & 2 deletions src/backend/linux_raw/io_uring/syscalls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use crate::backend::conv::{by_mut, c_uint, pass_usize, ret_c_uint, ret_owned_fd};
use crate::fd::{BorrowedFd, OwnedFd};
use crate::io;
use crate::io_uring::{io_uring_params, IoringEnterFlags, IoringRegisterOp};
use crate::io_uring::{io_uring_params, IoringEnterFlags, IoringRegisterFlags, IoringRegisterOp};
use core::ffi::c_void;

#[inline]
Expand All @@ -26,13 +26,14 @@ pub(crate) fn io_uring_setup(entries: u32, params: &mut io_uring_params) -> io::
pub(crate) unsafe fn io_uring_register(
fd: BorrowedFd<'_>,
opcode: IoringRegisterOp,
flags: IoringRegisterFlags,
arg: *const c_void,
nr_args: u32,
) -> io::Result<u32> {
ret_c_uint(syscall_readonly!(
__NR_io_uring_register,
fd,
c_uint(opcode as u32),
c_uint(opcode as u32 | flags.bits()),
arg,
c_uint(nr_args)
))
Expand Down
16 changes: 15 additions & 1 deletion src/io_uring.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,11 @@ pub fn io_uring_setup(entries: u32, params: &mut io_uring_params) -> io::Result<
pub unsafe fn io_uring_register<Fd: AsFd>(
fd: Fd,
opcode: IoringRegisterOp,
flags: IoringRegisterFlags,
arg: *const c_void,
nr_args: u32,
) -> io::Result<u32> {
backend::io_uring::syscalls::io_uring_register(fd.as_fd(), opcode, arg, nr_args)
backend::io_uring::syscalls::io_uring_register(fd.as_fd(), opcode, flags, arg, nr_args)
}

/// `io_uring_enter(fd, to_submit, min_complete, flags, arg, size)`—Initiate
Expand Down Expand Up @@ -260,6 +261,19 @@ pub enum IoringRegisterOp {
RegisterFileAllocRange = sys::IORING_REGISTER_FILE_ALLOC_RANGE as _,
}

bitflags::bitflags! {
/// `IORING_REGISTER*` flags for use with [`io_uring_register`].
#[repr(transparent)]
#[derive(Default, Copy, Clone, Eq, PartialEq, Hash, Debug)]
pub struct IoringRegisterFlags: u32 {
/// `IORING_REGISTER_USE_REGISTERED_RING`
const USE_REGISTERED_RING = sys::IORING_REGISTER_USE_REGISTERED_RING as _;

/// <https://docs.rs/bitflags/*/bitflags/#externally-defined-flags>
const _ = !0;
}
}

/// `IORING_OP_*` constants for use with [`io_uring_sqe`].
#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
#[repr(u8)]
Expand Down
Loading