Skip to content

L
linux
Commit 06b76d44 authored by Jens Axboe's avatar Jens Axboe
Browse files
Options

io_uring: standardize the prep methods 

We currently have a mix of use cases. Most of the newer ones are pretty
uniform, but we have some older ones that use different calling
calling conventions. This is confusing.

For the opcodes that currently rely on the req->io->sqe copy saving
them from reuse, add a request type struct in the io_kiocb command
union to store the data they need.

Prepare for all opcodes having a standard prep method, so we can call
it in a uniform fashion and outside of the opcode handler. This is in
preparation for passing in the 'sqe' pointer, rather than storing it
in the io_kiocb. Once we have uniform prep handlers, we can leave all
the prep work to that part, and not even pass in the sqe to the opcode
handler. This ensures that we don't reuse sqe data inadvertently.
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 26a61679
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 65 deletions
fs/io_uring.c
View file @ 06b76d44
...@@ -371,7 +371,6 @@ struct io_async_rw { ...@@ -371,7 +371,6 @@ struct io_async_rw {
}; };
struct io_async_ctx { struct io_async_ctx {
struct io_uring_sqe sqe;
union { union {
struct io_async_rw rw; struct io_async_rw rw;
struct io_async_msghdr msg; struct io_async_msghdr msg;
...@@ -433,7 +432,6 @@ struct io_kiocb { ...@@ -433,7 +432,6 @@ struct io_kiocb {
#define REQ_F_INFLIGHT 16384 /* on inflight list */ #define REQ_F_INFLIGHT 16384 /* on inflight list */
#define REQ_F_COMP_LOCKED 32768 /* completion under lock */ #define REQ_F_COMP_LOCKED 32768 /* completion under lock */
#define REQ_F_HARDLINK 65536 /* doesn't sever on completion < 0 */ #define REQ_F_HARDLINK 65536 /* doesn't sever on completion < 0 */
#define REQ_F_PREPPED 131072 /* request already opcode prepared */
u64 user_data; u64 user_data;
u32 result; u32 result;
u32 sequence; u32 sequence;
...@@ -1501,6 +1499,8 @@ static int io_prep_rw(struct io_kiocb *req, bool force_nonblock) ...@@ -1501,6 +1499,8 @@ static int io_prep_rw(struct io_kiocb *req, bool force_nonblock)
unsigned ioprio; unsigned ioprio;
int ret; int ret;
if (!sqe)
return 0;
if (!req->file) if (!req->file)
return -EBADF; return -EBADF;
...@@ -1552,6 +1552,7 @@ static int io_prep_rw(struct io_kiocb *req, bool force_nonblock) ...@@ -1552,6 +1552,7 @@ static int io_prep_rw(struct io_kiocb *req, bool force_nonblock)
/* we own ->private, reuse it for the buffer index */ /* we own ->private, reuse it for the buffer index */
req->rw.kiocb.private = (void *) (unsigned long) req->rw.kiocb.private = (void *) (unsigned long)
READ_ONCE(req->sqe->buf_index); READ_ONCE(req->sqe->buf_index);
req->sqe = NULL;
return 0; return 0;
} }
...@@ -1773,13 +1774,7 @@ static void io_req_map_rw(struct io_kiocb *req, ssize_t io_size, ...@@ -1773,13 +1774,7 @@ static void io_req_map_rw(struct io_kiocb *req, ssize_t io_size,
static int io_alloc_async_ctx(struct io_kiocb *req) static int io_alloc_async_ctx(struct io_kiocb *req)
{ {
req->io = kmalloc(sizeof(*req->io), GFP_KERNEL); req->io = kmalloc(sizeof(*req->io), GFP_KERNEL);
if (req->io) { return req->io == NULL;
memcpy(&req->io->sqe, req->sqe, sizeof(req->io->sqe));
req->sqe = &req->io->sqe;
return 0;
}
return 1;
} }
static void io_rw_async(struct io_wq_work **workptr) static void io_rw_async(struct io_wq_work **workptr)
...@@ -1810,12 +1805,14 @@ static int io_read_prep(struct io_kiocb *req, struct iovec **iovec, ...@@ -1810,12 +1805,14 @@ static int io_read_prep(struct io_kiocb *req, struct iovec **iovec,
{ {
ssize_t ret; ssize_t ret;
ret = io_prep_rw(req, force_nonblock); if (req->sqe) {
if (ret) ret = io_prep_rw(req, force_nonblock);
return ret; if (ret)
return ret;
if (unlikely(!(req->file->f_mode & FMODE_READ))) if (unlikely(!(req->file->f_mode & FMODE_READ)))
return -EBADF; return -EBADF;
}
return io_import_iovec(READ, req, iovec, iter); return io_import_iovec(READ, req, iovec, iter);
} }
...@@ -1829,15 +1826,9 @@ static int io_read(struct io_kiocb *req, struct io_kiocb **nxt, ...@@ -1829,15 +1826,9 @@ static int io_read(struct io_kiocb *req, struct io_kiocb **nxt,
size_t iov_count; size_t iov_count;
ssize_t io_size, ret; ssize_t io_size, ret;
if (!req->io) { ret = io_read_prep(req, &iovec, &iter, force_nonblock);
ret = io_read_prep(req, &iovec, &iter, force_nonblock); if (ret < 0)
if (ret < 0) return ret;
return ret;
} else {
ret = io_import_iovec(READ, req, &iovec, &iter);
if (ret < 0)
return ret;
}
/* Ensure we clear previously set non-block flag */ /* Ensure we clear previously set non-block flag */
if (!force_nonblock) if (!force_nonblock)
...@@ -1901,12 +1892,14 @@ static int io_write_prep(struct io_kiocb *req, struct iovec **iovec, ...@@ -1901,12 +1892,14 @@ static int io_write_prep(struct io_kiocb *req, struct iovec **iovec,
{ {
ssize_t ret; ssize_t ret;
ret = io_prep_rw(req, force_nonblock); if (req->sqe) {
if (ret) ret = io_prep_rw(req, force_nonblock);
return ret; if (ret)
return ret;
if (unlikely(!(req->file->f_mode & FMODE_WRITE))) if (unlikely(!(req->file->f_mode & FMODE_WRITE)))
return -EBADF; return -EBADF;
}
return io_import_iovec(WRITE, req, iovec, iter); return io_import_iovec(WRITE, req, iovec, iter);
} }
...@@ -1920,15 +1913,9 @@ static int io_write(struct io_kiocb *req, struct io_kiocb **nxt, ...@@ -1920,15 +1913,9 @@ static int io_write(struct io_kiocb *req, struct io_kiocb **nxt,
size_t iov_count; size_t iov_count;
ssize_t ret, io_size; ssize_t ret, io_size;
if (!req->io) { ret = io_write_prep(req, &iovec, &iter, force_nonblock);
ret = io_write_prep(req, &iovec, &iter, force_nonblock); if (ret < 0)
if (ret < 0) return ret;
return ret;
} else {
ret = io_import_iovec(WRITE, req, &iovec, &iter);
if (ret < 0)
return ret;
}
/* Ensure we clear previously set non-block flag */ /* Ensure we clear previously set non-block flag */
if (!force_nonblock) if (!force_nonblock)
...@@ -2013,7 +2000,7 @@ static int io_prep_fsync(struct io_kiocb *req) ...@@ -2013,7 +2000,7 @@ static int io_prep_fsync(struct io_kiocb *req)
const struct io_uring_sqe *sqe = req->sqe; const struct io_uring_sqe *sqe = req->sqe;
struct io_ring_ctx *ctx = req->ctx; struct io_ring_ctx *ctx = req->ctx;
if (req->flags & REQ_F_PREPPED) if (!req->sqe)
return 0; return 0;
if (!req->file) if (!req->file)
return -EBADF; return -EBADF;
...@@ -2029,7 +2016,7 @@ static int io_prep_fsync(struct io_kiocb *req) ...@@ -2029,7 +2016,7 @@ static int io_prep_fsync(struct io_kiocb *req)
req->sync.off = READ_ONCE(sqe->off); req->sync.off = READ_ONCE(sqe->off);
req->sync.len = READ_ONCE(sqe->len); req->sync.len = READ_ONCE(sqe->len);
req->flags |= REQ_F_PREPPED; req->sqe = NULL;
return 0; return 0;
} }
...@@ -2095,7 +2082,7 @@ static int io_prep_sfr(struct io_kiocb *req) ...@@ -2095,7 +2082,7 @@ static int io_prep_sfr(struct io_kiocb *req)
const struct io_uring_sqe *sqe = req->sqe; const struct io_uring_sqe *sqe = req->sqe;
struct io_ring_ctx *ctx = req->ctx; struct io_ring_ctx *ctx = req->ctx;
if (req->flags & REQ_F_PREPPED) if (!sqe)
return 0; return 0;
if (!req->file) if (!req->file)
return -EBADF; return -EBADF;
...@@ -2108,7 +2095,7 @@ static int io_prep_sfr(struct io_kiocb *req) ...@@ -2108,7 +2095,7 @@ static int io_prep_sfr(struct io_kiocb *req)
req->sync.off = READ_ONCE(sqe->off); req->sync.off = READ_ONCE(sqe->off);
req->sync.len = READ_ONCE(sqe->len); req->sync.len = READ_ONCE(sqe->len);
req->sync.flags = READ_ONCE(sqe->sync_range_flags); req->sync.flags = READ_ONCE(sqe->sync_range_flags);
req->flags |= REQ_F_PREPPED; req->sqe = NULL;
return 0; return 0;
} }
...@@ -2173,12 +2160,17 @@ static int io_sendmsg_prep(struct io_kiocb *req, struct io_async_ctx *io) ...@@ -2173,12 +2160,17 @@ static int io_sendmsg_prep(struct io_kiocb *req, struct io_async_ctx *io)
#if defined(CONFIG_NET) #if defined(CONFIG_NET)
const struct io_uring_sqe *sqe = req->sqe; const struct io_uring_sqe *sqe = req->sqe;
struct io_sr_msg *sr = &req->sr_msg; struct io_sr_msg *sr = &req->sr_msg;
int ret;
if (!sqe)
return 0;
sr->msg_flags = READ_ONCE(sqe->msg_flags); sr->msg_flags = READ_ONCE(sqe->msg_flags);
sr->msg = u64_to_user_ptr(READ_ONCE(sqe->addr)); sr->msg = u64_to_user_ptr(READ_ONCE(sqe->addr));
io->msg.iov = io->msg.fast_iov; io->msg.iov = io->msg.fast_iov;
return sendmsg_copy_msghdr(&io->msg.msg, sr->msg, sr->msg_flags, ret = sendmsg_copy_msghdr(&io->msg.msg, sr->msg, sr->msg_flags,
&io->msg.iov); &io->msg.iov);
req->sqe = NULL;
return ret;
#else #else
return -EOPNOTSUPP; return -EOPNOTSUPP;
#endif #endif
...@@ -2253,12 +2245,18 @@ static int io_recvmsg_prep(struct io_kiocb *req, struct io_async_ctx *io) ...@@ -2253,12 +2245,18 @@ static int io_recvmsg_prep(struct io_kiocb *req, struct io_async_ctx *io)
{ {
#if defined(CONFIG_NET) #if defined(CONFIG_NET)
struct io_sr_msg *sr = &req->sr_msg; struct io_sr_msg *sr = &req->sr_msg;
int ret;
if (!req->sqe)
return 0;
sr->msg_flags = READ_ONCE(req->sqe->msg_flags); sr->msg_flags = READ_ONCE(req->sqe->msg_flags);
sr->msg = u64_to_user_ptr(READ_ONCE(req->sqe->addr)); sr->msg = u64_to_user_ptr(READ_ONCE(req->sqe->addr));
io->msg.iov = io->msg.fast_iov; io->msg.iov = io->msg.fast_iov;
return recvmsg_copy_msghdr(&io->msg.msg, sr->msg, sr->msg_flags, ret = recvmsg_copy_msghdr(&io->msg.msg, sr->msg, sr->msg_flags,
&io->msg.uaddr, &io->msg.iov); &io->msg.uaddr, &io->msg.iov);
req->sqe = NULL;
return ret;
#else #else
return -EOPNOTSUPP; return -EOPNOTSUPP;
#endif #endif
...@@ -2336,7 +2334,7 @@ static int io_accept_prep(struct io_kiocb *req) ...@@ -2336,7 +2334,7 @@ static int io_accept_prep(struct io_kiocb *req)
const struct io_uring_sqe *sqe = req->sqe; const struct io_uring_sqe *sqe = req->sqe;
struct io_accept *accept = &req->accept; struct io_accept *accept = &req->accept;
if (req->flags & REQ_F_PREPPED) if (!req->sqe)
return 0; return 0;
if (unlikely(req->ctx->flags & (IORING_SETUP_IOPOLL|IORING_SETUP_SQPOLL))) if (unlikely(req->ctx->flags & (IORING_SETUP_IOPOLL|IORING_SETUP_SQPOLL)))
...@@ -2347,7 +2345,7 @@ static int io_accept_prep(struct io_kiocb *req) ...@@ -2347,7 +2345,7 @@ static int io_accept_prep(struct io_kiocb *req)
accept->addr = u64_to_user_ptr(READ_ONCE(sqe->addr)); accept->addr = u64_to_user_ptr(READ_ONCE(sqe->addr));
accept->addr_len = u64_to_user_ptr(READ_ONCE(sqe->addr2)); accept->addr_len = u64_to_user_ptr(READ_ONCE(sqe->addr2));
accept->flags = READ_ONCE(sqe->accept_flags); accept->flags = READ_ONCE(sqe->accept_flags);
req->flags |= REQ_F_PREPPED; req->sqe = NULL;
return 0; return 0;
#else #else
return -EOPNOTSUPP; return -EOPNOTSUPP;
...@@ -2416,7 +2414,10 @@ static int io_connect_prep(struct io_kiocb *req, struct io_async_ctx *io) ...@@ -2416,7 +2414,10 @@ static int io_connect_prep(struct io_kiocb *req, struct io_async_ctx *io)
{ {
#if defined(CONFIG_NET) #if defined(CONFIG_NET)
const struct io_uring_sqe *sqe = req->sqe; const struct io_uring_sqe *sqe = req->sqe;
int ret;
if (!sqe)
return 0;
if (unlikely(req->ctx->flags & (IORING_SETUP_IOPOLL|IORING_SETUP_SQPOLL))) if (unlikely(req->ctx->flags & (IORING_SETUP_IOPOLL|IORING_SETUP_SQPOLL)))
return -EINVAL; return -EINVAL;
if (sqe->ioprio || sqe->len || sqe->buf_index || sqe->rw_flags) if (sqe->ioprio || sqe->len || sqe->buf_index || sqe->rw_flags)
...@@ -2424,8 +2425,10 @@ static int io_connect_prep(struct io_kiocb *req, struct io_async_ctx *io) ...@@ -2424,8 +2425,10 @@ static int io_connect_prep(struct io_kiocb *req, struct io_async_ctx *io)
req->connect.addr = u64_to_user_ptr(READ_ONCE(sqe->addr)); req->connect.addr = u64_to_user_ptr(READ_ONCE(sqe->addr));
req->connect.addr_len = READ_ONCE(sqe->addr2); req->connect.addr_len = READ_ONCE(sqe->addr2);
return move_addr_to_kernel(req->connect.addr, req->connect.addr_len, ret = move_addr_to_kernel(req->connect.addr, req->connect.addr_len,
&io->connect.address); &io->connect.address);
req->sqe = NULL;
return ret;
#else #else
return -EOPNOTSUPP; return -EOPNOTSUPP;
#endif #endif
...@@ -2526,7 +2529,7 @@ static int io_poll_remove_prep(struct io_kiocb *req) ...@@ -2526,7 +2529,7 @@ static int io_poll_remove_prep(struct io_kiocb *req)
{ {
const struct io_uring_sqe *sqe = req->sqe; const struct io_uring_sqe *sqe = req->sqe;
if (req->flags & REQ_F_PREPPED) if (!sqe)
return 0; return 0;
if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL; return -EINVAL;
...@@ -2535,7 +2538,7 @@ static int io_poll_remove_prep(struct io_kiocb *req) ...@@ -2535,7 +2538,7 @@ static int io_poll_remove_prep(struct io_kiocb *req)
return -EINVAL; return -EINVAL;
req->poll.addr = READ_ONCE(sqe->addr); req->poll.addr = READ_ONCE(sqe->addr);
req->flags |= REQ_F_PREPPED; req->sqe = NULL;
return 0; return 0;
} }
...@@ -2696,7 +2699,7 @@ static int io_poll_add_prep(struct io_kiocb *req) ...@@ -2696,7 +2699,7 @@ static int io_poll_add_prep(struct io_kiocb *req)
struct io_poll_iocb *poll = &req->poll; struct io_poll_iocb *poll = &req->poll;
u16 events; u16 events;
if (req->flags & REQ_F_PREPPED) if (!sqe)
return 0; return 0;
if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL; return -EINVAL;
...@@ -2705,9 +2708,9 @@ static int io_poll_add_prep(struct io_kiocb *req) ...@@ -2705,9 +2708,9 @@ static int io_poll_add_prep(struct io_kiocb *req)
if (!poll->file) if (!poll->file)
return -EBADF; return -EBADF;
req->flags |= REQ_F_PREPPED;
events = READ_ONCE(sqe->poll_events); events = READ_ONCE(sqe->poll_events);
poll->events = demangle_poll(events) | EPOLLERR | EPOLLHUP; poll->events = demangle_poll(events) | EPOLLERR | EPOLLHUP;
req->sqe = NULL;
return 0; return 0;
} }
...@@ -2845,7 +2848,7 @@ static int io_timeout_remove_prep(struct io_kiocb *req) ...@@ -2845,7 +2848,7 @@ static int io_timeout_remove_prep(struct io_kiocb *req)
{ {
const struct io_uring_sqe *sqe = req->sqe; const struct io_uring_sqe *sqe = req->sqe;
if (req->flags & REQ_F_PREPPED) if (!sqe)
return 0; return 0;
if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL; return -EINVAL;
...@@ -2857,7 +2860,7 @@ static int io_timeout_remove_prep(struct io_kiocb *req) ...@@ -2857,7 +2860,7 @@ static int io_timeout_remove_prep(struct io_kiocb *req)
if (req->timeout.flags) if (req->timeout.flags)
return -EINVAL; return -EINVAL;
req->flags |= REQ_F_PREPPED; req->sqe = NULL;
return 0; return 0;
} }
...@@ -2893,6 +2896,8 @@ static int io_timeout_prep(struct io_kiocb *req, struct io_async_ctx *io, ...@@ -2893,6 +2896,8 @@ static int io_timeout_prep(struct io_kiocb *req, struct io_async_ctx *io,
struct io_timeout_data *data; struct io_timeout_data *data;
unsigned flags; unsigned flags;
if (!sqe)
return 0;
if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL; return -EINVAL;
if (sqe->ioprio || sqe->buf_index || sqe->len != 1) if (sqe->ioprio || sqe->buf_index || sqe->len != 1)
...@@ -2921,6 +2926,7 @@ static int io_timeout_prep(struct io_kiocb *req, struct io_async_ctx *io, ...@@ -2921,6 +2926,7 @@ static int io_timeout_prep(struct io_kiocb *req, struct io_async_ctx *io,
data->mode = HRTIMER_MODE_REL; data->mode = HRTIMER_MODE_REL;
hrtimer_init(&data->timer, CLOCK_MONOTONIC, data->mode); hrtimer_init(&data->timer, CLOCK_MONOTONIC, data->mode);
req->sqe = NULL;
return 0; return 0;
} }
...@@ -2933,13 +2939,9 @@ static int io_timeout(struct io_kiocb *req) ...@@ -2933,13 +2939,9 @@ static int io_timeout(struct io_kiocb *req)
unsigned span = 0; unsigned span = 0;
int ret; int ret;
if (!req->io) { ret = io_timeout_prep(req, req->io, false);
if (io_alloc_async_ctx(req)) if (ret)
return -ENOMEM; return ret;
ret = io_timeout_prep(req, req->io, false);
if (ret)
return ret;
}
data = &req->io->timeout; data = &req->io->timeout;
/* /*
...@@ -3069,7 +3071,7 @@ static int io_async_cancel_prep(struct io_kiocb *req) ...@@ -3069,7 +3071,7 @@ static int io_async_cancel_prep(struct io_kiocb *req)
{ {
const struct io_uring_sqe *sqe = req->sqe; const struct io_uring_sqe *sqe = req->sqe;
if (req->flags & REQ_F_PREPPED) if (!sqe)
return 0; return 0;
if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL; return -EINVAL;
...@@ -3077,8 +3079,8 @@ static int io_async_cancel_prep(struct io_kiocb *req) ...@@ -3077,8 +3079,8 @@ static int io_async_cancel_prep(struct io_kiocb *req)
sqe->cancel_flags) sqe->cancel_flags)
return -EINVAL; return -EINVAL;
req->flags |= REQ_F_PREPPED;
req->cancel.addr = READ_ONCE(sqe->addr); req->cancel.addr = READ_ONCE(sqe->addr);
req->sqe = NULL;
return 0; return 0;
} }
...@@ -3213,13 +3215,9 @@ static int io_issue_sqe(struct io_kiocb *req, struct io_kiocb **nxt, ...@@ -3213,13 +3215,9 @@ static int io_issue_sqe(struct io_kiocb *req, struct io_kiocb **nxt,
ret = io_nop(req); ret = io_nop(req);
break; break;
case IORING_OP_READV: case IORING_OP_READV:
if (unlikely(req->sqe->buf_index))
return -EINVAL;
ret = io_read(req, nxt, force_nonblock); ret = io_read(req, nxt, force_nonblock);
break; break;
case IORING_OP_WRITEV: case IORING_OP_WRITEV:
if (unlikely(req->sqe->buf_index))
return -EINVAL;
ret = io_write(req, nxt, force_nonblock); ret = io_write(req, nxt, force_nonblock);
break; break;
case IORING_OP_READ_FIXED: case IORING_OP_READ_FIXED:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7