io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER
Subsystems (2)
v4 cover io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER
Setting IORING_SETUP_SINGLE_ISSUER when creating an io_uring doesn't actually enable any additional optimizations (aside from being a requirement for IORING_SETUP_DEFER_TASKRUN). This series leverages IORING_SETUP_SINGLE_ISSUER's guarantee that only one task submits SQEs to skip taking the uring_lock mutex for the issue and task work paths.
First, we need to disable this optimization for IORING_SETUP_SQPOLL by clearing the IORING_SETUP_SINGLE_ISSUER flag. For IORING_SETUP_SQPOLL, the SQ thread is the one taking the uring_lock mutex in the issue path. Since concurrent io_uring_register() syscalls are allowed on the thread that created/enabled the io_uring, some additional synchronization method would be required to synchronize the two threads. This is possible in principle by having io_uring_register() schedule a task work item to suspend the SQ thread, but seems complex for a niche use case.
Then we factor out helpers for interacting with uring_lock to centralize the logic.
Finally, we implement the optimization for IORING_SETUP_SINGLE_ISSUER. If the io_ring_ctx is setup with IORING_SETUP_SINGLE_ISSUER, skip the uring_lock mutex_lock() and mutex_unlock() on the submitter_task. On other tasks acquiring the ctx uring lock, use a task work item to suspend the submitter_task for the critical section.
If the io_ring_ctx is IORING_SETUP_R_DISABLED (possible during io_uring_setup(), io_uring_register(), or io_uring exit), submitter_task may be set concurrently, so acquire the uring_lock before checking it. If submitter_task isn't set yet, the uring_lock suffices to provide mutual exclusion.
v4:
- Handle IORING_SETUP_SINGLE_ISSUER and IORING_SETUP_R_DISABLED correctly (syzbot)
- Remove separate set of helpers for io_uring_register()
- Add preliminary fix to prevent races between accessing ctx->flags and submitter_task
v3:
- Ensure mutual exclusion on threads other than submitter_task via a task work item to suspend submitter_task
- Drop patches already merged
v2:
- Don't enable these optimizations for IORING_SETUP_SQPOLL, as we still need to synchronize SQ thread submission with io_uring_register()
Caleb Sander Mateos (5):
io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
io_uring: clear IORING_SETUP_SINGLE_ISSUER for IORING_SETUP_SQPOLL
io_uring: use io_ring_submit_lock() in io_iopoll_req_issued()
io_uring: factor out uring_lock helpers
io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER
include/linux/io_uring_types.h | 12 +- io_uring/cancel.c | 40 ++++--- io_uring/cancel.h | 5 +- io_uring/eventfd.c | 5 +- io_uring/fdinfo.c | 8 +- io_uring/filetable.c | 8 +- io_uring/futex.c | 14 ++- io_uring/io_uring.c | 208 ++++++++++++++++++++------------- io_uring/io_uring.h | 189 +++++++++++++++++++++++++++--- io_uring/kbuf.c | 32 ++--- io_uring/memmap.h | 2 +- io_uring/msg_ring.c | 33 +++--- io_uring/notif.c | 5 +- io_uring/notif.h | 3 +- io_uring/openclose.c | 14 ++- io_uring/poll.c | 21 ++-- io_uring/register.c | 81 +++++++------ io_uring/rsrc.c | 51 ++++---- io_uring/rsrc.h | 6 +- io_uring/rw.c | 2 +- io_uring/splice.c | 5 +- io_uring/sqpoll.c | 5 +- io_uring/tctx.c | 27 +++-- io_uring/tctx.h | 5 +- io_uring/uring_cmd.c | 13 ++- io_uring/waitid.c | 13 ++- io_uring/zcrx.c | 2 +- 27 files changed, 544 insertions(+), 265 deletions(-)
Signature · 1 line
2.45.2
PATCH v4 1/5 io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
io_uring_enter() and io_msg_ring() read ctx->flags and ctx->submitter_task without holding the ctx's uring_lock. This means they may race with the assignment to ctx->submitter_task and the clearing of IORING_SETUP_R_DISABLED from ctx->flags in io_register_enable_rings(). Ensure the correct ordering of the ctx->flags and ctx->submitter_task memory accesses by storing to ctx->flags using release ordering and loading it using acquire ordering.
--- io_uring/io_uring.c | 2 +- io_uring/msg_ring.c | 4 ++-- io_uring/register.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
io_uring/io_uring.c +1 -1
@@ -3244,11 +3244,11 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit, goto out; } ctx = file->private_data; ret = -EBADFD ; -if (unlikely (ctx->flags &IORING_SETUP_R_DISABLED )) +if (unlikely (smp_load_acquire (&ctx->flags) &IORING_SETUP_R_DISABLED )) goto out;/* * For SQ polling, the thread will do all submissions and completions. * Just return the requested submit count, and wake the thread if
io_uring/msg_ring.c +2 -2
@@ -123,11 +123,11 @@ static int __io_msg_ring_data(struct io_ring_ctx *target_ctx,if (msg->src_fd || msg->flags & ~IORING_MSG_RING_FLAGS_PASS )return -EINVAL ;if (!(msg->flags &IORING_MSG_RING_FLAGS_PASS ) && msg->dst_fd)return -EINVAL ; -if (target_ctx->flags &IORING_SETUP_R_DISABLED ) +if (smp_load_acquire (&target_ctx->flags) &IORING_SETUP_R_DISABLED )return -EBADFD ;if (io_msg_need_remote (target_ctx))return io_msg_data_remote (target_ctx, msg);
@@ -243,11 +243,11 @@ static int io_msg_send_fd(struct io_kiocb *req, unsigned int issue_flags)if (msg->len)return -EINVAL ;if (target_ctx == ctx)return -EINVAL ; -if (target_ctx->flags &IORING_SETUP_R_DISABLED ) +if (smp_load_acquire (&target_ctx->flags) &IORING_SETUP_R_DISABLED )return -EBADFD ;if (!msg->src_file) {int ret =io_msg_grab_file (req, issue_flags);if (unlikely (ret))return ret;
io_uring/register.c +1 -1
@@ -191,11 +191,11 @@ static int io_register_enable_rings(struct io_ring_ctx *ctx) }if (ctx->restrictions.registered) ctx->restricted =1 ; - ctx->flags &= ~IORING_SETUP_R_DISABLED ; +smp_store_release (&ctx->flags, ctx->flags & ~IORING_SETUP_R_DISABLED );if (ctx->sq_data &&wq_has_sleeper (&ctx->sq_data->wait))wake_up (&ctx->sq_data->wait);return 0 ; }
Signature · 1 line
2.45.2
Re: [PATCH v4 1/5] io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
Quoted 11 lines · Caleb Sander Mateos
io_uring_enter()andio_msg_ring()readctx->flagsandctx->submitter_taskwithout holding the ctx'suring_lock. This means they may race with the assignment toctx->submitter_taskand the clearing ofIORING_SETUP_R_DISABLEDfromctx->flagsinio_register_enable_rings(). Ensure the correct ordering of thectx->flagsandctx->submitter_taskmemory accesses by storing toctx->flagsusing release ordering and loading it using acquire ordering.Signed-off-by Caleb Sander Mateos <[email protected]>Fixes 7e84e1c7566a ("io_uring: allow disabling rings during the creation")
This LGTM. But should the fixes be commit 7cae596bc31f ("io_uring:
register single issuer task at creation")? AFAICT, that's the commit that introduces the ctx->submitter_task assignment in io_register_enable_rings() that causes the memory reordering issue with the unlocked read in io_uring_add_tctx_node(). I don't see this issue in 7e84e1c7566a.
Thanks,
Joanne
Quoted 73 lines
--- io_uring/io_uring.c | 2 +- io_uring/msg_ring.c | 4 ++-- io_uring/register.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)io_uring/io_uring.c +1
-1@@ -3244,11 +3244,11 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit, goto out; } ctx = file->private_data; ret = -EBADFD ; -if (unlikely (ctx->flags &IORING_SETUP_R_DISABLED )) +if (unlikely (smp_load_acquire (&ctx->flags) &IORING_SETUP_R_DISABLED )) goto out;/* * For SQ polling, the thread will do all submissions and completions. * Just return the requested submit count, and wake the thread if io_uring/msg_ring.c +2
-2@@ -123,11 +123,11 @@ static int __io_msg_ring_data(struct io_ring_ctx *target_ctx,if (msg->src_fd || msg->flags & ~IORING_MSG_RING_FLAGS_PASS )return -EINVAL ;if (!(msg->flags &IORING_MSG_RING_FLAGS_PASS ) && msg->dst_fd)return -EINVAL ; -if (target_ctx->flags &IORING_SETUP_R_DISABLED ) +if (smp_load_acquire (&target_ctx->flags) &IORING_SETUP_R_DISABLED )return -EBADFD ;if (io_msg_need_remote (target_ctx))return io_msg_data_remote (target_ctx, msg);@@ -243,11 +243,11 @@ static int io_msg_send_fd(struct io_kiocb *req, unsigned int issue_flags)if (msg->len)return -EINVAL ;if (target_ctx == ctx)return -EINVAL ; -if (target_ctx->flags &IORING_SETUP_R_DISABLED ) +if (smp_load_acquire (&target_ctx->flags) &IORING_SETUP_R_DISABLED )return -EBADFD ;if (!msg->src_file) {int ret =io_msg_grab_file (req, issue_flags);if (unlikely (ret))return ret;io_uring/register.c +1
-2@@ -191,11 +191,11 @@ static int io_register_enable_rings(struct io_ring_ctx *ctx) }if (ctx->restrictions.registered) ctx->restricted =1 ; - ctx->flags &= ~IORING_SETUP_R_DISABLED ; +smp_store_release (&ctx->flags, ctx->flags & ~IORING_SETUP_R_DISABLED );if (ctx->sq_data &&wq_has_sleeper (&ctx->sq_data->wait))wake_up (&ctx->sq_data->wait);return 0 ; } --2.45.2
Re: [PATCH v4 1/5] io_uring: use release-acquire ordering for IORING_SETUP_R_DISABLED
Quoted 15 lines · Joanne Koong
Quoted 11 lines · Caleb Sander Mateos
io_uring_enter()andio_msg_ring()readctx->flagsandctx->submitter_taskwithout holding the ctx'suring_lock. This means they may race with the assignment toctx->submitter_taskand the clearing ofIORING_SETUP_R_DISABLEDfromctx->flagsinio_register_enable_rings(). Ensure the correct ordering of thectx->flagsandctx->submitter_taskmemory accesses by storing toctx->flagsusing release ordering and loading it using acquire ordering.Signed-off-by Caleb Sander Mateos <[email protected]>Fixes 7e84e1c7566a ("io_uring: allow disabling rings during the creation")
Quoted 6 lines
This LGTM. But should the fixes be commit
7cae596bc31f("io_uring:
register single issuer task at creation")? AFAICT, that's the commit that introduces thectx->submitter_taskassignment inio_register_enable_rings()that causes the memory reordering issue with the unlocked read inio_uring_add_tctx_node(). I don't see this issue in7e84e1c7566a.
Yes, that looks correct to me. Thanks for taking a look.
--Caleb
PATCH v4 2/5 io_uring: clear IORING_SETUP_SINGLE_ISSUER for IORING_SETUP_SQPOLL
In reply to Caleb Sander MateosIORING_SETUP_SINGLE_ISSUER doesn't currently enable any optimizations, but it will soon be used to avoid taking io_ring_ctx's uring_lock when submitting from the single issuer task. If the IORING_SETUP_SQPOLL flag is set, the SQ thread is the sole task issuing SQEs. However, other tasks may make io_uring_register() syscalls, which must be synchronized with SQE submission. So it wouldn't be safe to skip the uring_lock around the SQ thread's submission even if IORING_SETUP_SINGLE_ISSUER is set. Therefore, clear IORING_SETUP_SINGLE_ISSUER from the io_ring_ctx flags if IORING_SETUP_SQPOLL is set.
--- io_uring/io_uring.c | 9 +++++++++ 1 file changed, 9 insertions(+)
io_uring/io_uring.c +9 -0
@@ -3473,10 +3473,19 @@ static int io_uring_sanitise_params(struct io_uring_params *p)*/ if ((flags & (IORING_SETUP_SQE128 |IORING_SETUP_SQE_MIXED )) == (IORING_SETUP_SQE128 |IORING_SETUP_SQE_MIXED ))return -EINVAL ; +/* +* If IORING_SETUP_SQPOLL is set, only the SQ thread issues SQEs, +* but other threads may call io_uring_register() concurrently. +* We still need ctx uring lock to synchronize these io_ring_ctx +* accesses, so disable the single issuer optimizations. +*/ +if (flags &IORING_SETUP_SQPOLL ) + p->flags &= ~IORING_SETUP_SINGLE_ISSUER ; +return 0 ; }static int io_uring_fill_params (struct io_uring_params *p) {
Signature · 1 line
2.45.2
PATCH v4 3/5 io_uring: use io_ring_submit_lock() in io_iopoll_req_issued()
In reply to Caleb Sander MateosUse the io_ring_submit_lock() helper in io_iopoll_req_issued() instead of open-coding the logic. io_ring_submit_unlock() can't be used for the unlock, though, due to the extra logic before releasing the mutex.
--- io_uring/io_uring.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
io_uring/io_uring.c +2 -4
@@ -1668,15 +1668,13 @@ void io_req_task_complete(struct io_tw_req tw_req, io_tw_token_t tw)* accessing the kiocb cookie. */ static void io_iopoll_req_issued (struct io_kiocb *req,unsigned int issue_flags) {struct io_ring_ctx *ctx = req->ctx; -const bool needs_lock = issue_flags &IO_URING_F_UNLOCKED ;/* workqueue context doesn't hold uring_lock, grab it now */ -if (unlikely (needs_lock)) -mutex_lock (&ctx->uring_lock); +io_ring_submit_lock (ctx, issue_flags);/* * Track whether we have multiple files in our lists. This will impact * how we do polling eventually, not spinning if we're on potentially * different devices.
@@ -1699,11 +1697,11 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags)if (READ_ONCE (req->iopoll_completed))wq_list_add_head (&req->comp_list, &ctx->iopoll_list);else wq_list_add_tail (&req->comp_list, &ctx->iopoll_list); -if (unlikely (needs_lock)) { +if (unlikely (issue_flags &IO_URING_F_UNLOCKED )) {/* * If IORING_SETUP_SQPOLL is enabled, sqes are either handle * in sq thread task context or in io worker task context. If * current task context is sq thread, we don't need to check * whether should wake up sq thread.
Signature · 1 line
2.45.2
PATCH v4 4/5 io_uring: factor out uring_lock helpers
In reply to Caleb Sander MateosA subsequent commit will skip acquiring the io_ring_ctx uring_lock in io_uring_enter() and io_handle_tw_list() for IORING_SETUP_SINGLE_ISSUER. Prepare for this change by factoring out the uring_lock accesses under these functions into helpers. Aside from the helpers, the only remaining access of uring_lock is its mutex_init() call. Define a struct io_ring_ctx_lock_state to pass state from io_ring_ctx_lock() to io_ring_ctx_unlock(). It's currently empty but a subsequent commit will add fields.
Helpers:
- io_ring_ctx_lock() for mutex_lock()
- io_ring_ctx_lock_nested() for mutex_lock_nested()
- io_ring_ctx_trylock() for mutex_trylock()
- io_ring_ctx_unlock() for mutex_unlock()
- io_ring_ctx_lock_held() for lockdep_is_held()
- io_ring_ctx_assert_locked() for lockdep_assert_held()
--- include/linux/io_uring_types.h | 12 +-- io_uring/cancel.c | 40 ++++---- io_uring/cancel.h | 5 +- io_uring/eventfd.c | 5 +- io_uring/fdinfo.c | 8 +- io_uring/filetable.c | 8 +- io_uring/futex.c | 14 +-- io_uring/io_uring.c | 181 +++++++++++++++++++-------------- io_uring/io_uring.h | 75 +++++++++++--- io_uring/kbuf.c | 32 +++--- io_uring/memmap.h | 2 +- io_uring/msg_ring.c | 29 ++++-- io_uring/notif.c | 5 +- io_uring/notif.h | 3 +- io_uring/openclose.c | 14 +-- io_uring/poll.c | 21 ++-- io_uring/register.c | 79 +++++++------- io_uring/rsrc.c | 51 ++++++---- io_uring/rsrc.h | 6 +- io_uring/rw.c | 2 +- io_uring/splice.c | 5 +- io_uring/sqpoll.c | 5 +- io_uring/tctx.c | 27 +++-- io_uring/tctx.h | 5 +- io_uring/uring_cmd.c | 13 ++- io_uring/waitid.c | 13 +-- io_uring/zcrx.c | 2 +- 27 files changed, 404 insertions(+), 258 deletions(-)
include/linux/io_uring_types.h +6 -6
@@ -86,11 +86,11 @@ struct io_mapped_region {/* * Return value from io_buffer_list selection, to avoid stashing it in * struct io_kiocb. For legacy/classic provided buffers, keeping a reference * across execution contexts are fine. But for ring provided buffers, the -* list may go away as soon as ->uring_lock is dropped. As the io_kiocb +* list may go away as soon as the ctx uring lock is dropped. As the io_kiocb * persists, it's better to just keep the buffer local for those cases. */ struct io_br_sel {struct io_buffer_list *buf_list;/*
@@ -231,11 +231,11 @@ struct io_submit_link {struct io_kiocb *head;struct io_kiocb *last; };struct io_submit_state { -/* inline/task_work completion list, under ->uring_lock */ +/* inline/task_work completion list, under ctx uring lock */ struct io_wq_work_node free_list;/* batch completion logic */ struct io_wq_work_list compl_reqs;struct io_submit_link link;
@@ -303,16 +303,16 @@ struct io_ring_ctx {unsigned cached_sq_head;unsigned sq_entries;/* * Fixed resources fast path, should be accessed only under -* uring_lock, and updated through io_uring_register(2) +* ctx uring lock, and updated through io_uring_register(2) */ atomic_t cancel_seq;/* -* ->iopoll_list is protected by the ctx->uring_lock for +* ->iopoll_list is protected by the ctx uring lock for * io_uring instances that don't use IORING_SETUP_SQPOLL. * For SQPOLL, only the single threaded io_sq_thread() will * manipulate the list, hence no extra locking is needed there. */ bool poll_multi_queue;
@@ -324,11 +324,11 @@ struct io_ring_ctx {struct io_alloc_cache imu_cache;struct io_submit_state submit_state;/* -* Modifications are protected by ->uring_lock and ->mmap_lock. +* Modifications protected by ctx uring lock and ->mmap_lock. * The buffer list's io mapped region should be stable once * published. */ struct xarray io_bl_xa;
@@ -467,11 +467,11 @@ struct io_ring_ctx {struct io_mapped_region param_region; };/* * Token indicating function is called in task work context: -* ctx->uring_lock is held and any completions generated will be flushed. +* ctx uring lock is held and any completions generated will be flushed. * ONLY core io_uring.c should instantiate this struct. */ struct io_tw_state {bool cancel; };
io_uring/cancel.c +23 -17
@@ -168,10 +168,11 @@ int io_async_cancel_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)static int __io_async_cancel (struct io_cancel_data *cd,struct io_uring_task *tctx,unsigned int issue_flags) {bool all = cd->flags & (IORING_ASYNC_CANCEL_ALL |IORING_ASYNC_CANCEL_ANY ); +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = cd->ctx;struct io_tctx_node *node;int ret, nr =0 ; do {
@@ -182,21 +183,21 @@ static int __io_async_cancel(struct io_cancel_data *cd,return ret; nr++; }while (1 );/* slow path, try all io-wq's */ -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); ret = -ENOENT ;list_for_each_entry (node, &ctx->tctx_list, ctx_node) { ret =io_async_cancel_one (node->task->io_uring, cd);if (ret != -ENOENT ) {if (!all)break ; nr++; } } -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return all ? nr : ret; }int io_async_cancel (struct io_kiocb *req,unsigned int issue_flags) {
@@ -238,11 +239,11 @@ int io_async_cancel(struct io_kiocb *req, unsigned int issue_flags)static int __io_sync_cancel (struct io_uring_task *tctx,struct io_cancel_data *cd,int fd) {struct io_ring_ctx *ctx = cd->ctx; -/* fixed must be grabbed every time since we drop the uring_lock */ +/* fixed must be grabbed every time since we drop the ctx uring lock */ if ((cd->flags &IORING_ASYNC_CANCEL_FD ) && (cd->flags &IORING_ASYNC_CANCEL_FD_FIXED )) {struct io_rsrc_node *node; node =io_rsrc_node_lookup (&ctx->file_table.data, fd);
@@ -254,12 +255,12 @@ static int __io_sync_cancel(struct io_uring_task *tctx, }return __io_async_cancel (cd, tctx,0 ); } -int io_sync_cancel (struct io_ring_ctx *ctx,void __user *arg) - __must_hold(&ctx->uring_lock) +int io_sync_cancel (struct io_ring_ctx *ctx,void __user *arg, +struct io_ring_ctx_lock_state *lock_state) {struct io_cancel_data cd = { .ctx = ctx, .seq =atomic_inc_return (&ctx->cancel_seq), };
@@ -267,10 +268,12 @@ int io_sync_cancel(struct io_ring_ctx *ctx, void __user *arg)struct io_uring_sync_cancel_reg sc;struct file *file =NULL ;DEFINE_WAIT (wait);int ret, i; +io_ring_ctx_assert_locked (ctx); +if (copy_from_user (&sc, arg,sizeof (sc)))return -EFAULT ;if (sc.flags & ~CANCEL_FLAGS )return -EINVAL ;for (i =0 ; i <ARRAY_SIZE (sc.pad); i++)
@@ -317,11 +320,11 @@ int io_sync_cancel(struct io_ring_ctx *ctx, void __user *arg)prepare_to_wait (&ctx->cq_wait, &wait,TASK_INTERRUPTIBLE ); ret =__io_sync_cancel (current->io_uring, &cd, sc.fd); -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx, lock_state);if (ret != -EALREADY )break ; ret =io_run_task_work_sig (ctx);if (ret <0 )
@@ -329,15 +332,15 @@ int io_sync_cancel(struct io_ring_ctx *ctx, void __user *arg) ret =schedule_hrtimeout (&timeout,HRTIMER_MODE_ABS );if (!ret) { ret = -ETIME ;break ; } -mutex_lock (&ctx->uring_lock); +io_ring_ctx_lock (ctx, lock_state); }while (1 );finish_wait (&ctx->cq_wait, &wait); -mutex_lock (&ctx->uring_lock); +io_ring_ctx_lock (ctx, lock_state);if (ret == -ENOENT || ret >0 ) ret =0 ; out:if (file)
@@ -351,11 +354,11 @@ bool io_cancel_remove_all(struct io_ring_ctx *ctx, struct io_uring_task *tctx, {struct hlist_node *tmp;struct io_kiocb *req;bool found = false; -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx);hlist_for_each_entry_safe (req, tmp, list, hash_node) {if (!io_match_task_safe (req, tctx, cancel_all))continue ;hlist_del_init (&req->hash_node);
@@ -368,24 +371,25 @@ bool io_cancel_remove_all(struct io_ring_ctx *ctx, struct io_uring_task *tctx,int io_cancel_remove (struct io_ring_ctx *ctx,struct io_cancel_data *cd,unsigned int issue_flags,struct hlist_head *list,bool (*cancel)(struct io_kiocb *)) { +struct io_ring_ctx_lock_state lock_state;struct hlist_node *tmp;struct io_kiocb *req;int nr =0 ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state);hlist_for_each_entry_safe (req, tmp, list, hash_node) {if (!io_cancel_req_match (req, cd))continue ;if (cancel (req)) nr++;if (!(cd->flags &IORING_ASYNC_CANCEL_ALL ))break ; } -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return nr ?: -ENOENT ; }static bool io_match_linked (struct io_kiocb *head) {
@@ -477,37 +481,39 @@ __cold bool io_cancel_ctx_cb(struct io_wq_work *work, void *data)return req->ctx == data; }static __cold bool io_uring_try_cancel_iowq (struct io_ring_ctx *ctx) { +struct io_ring_ctx_lock_state lock_state;struct io_tctx_node *node;enum io_wq_cancel cret;bool ret = false; -mutex_lock (&ctx->uring_lock); +io_ring_ctx_lock (ctx, &lock_state);list_for_each_entry (node, &ctx->tctx_list, ctx_node) {struct io_uring_task *tctx = node->task->io_uring;/* -* io_wq will stay alive while we hold uring_lock, because it's -* killed after ctx nodes, which requires to take the lock. +* io_wq will stay alive while we hold ctx uring lock, because +* it's killed after ctx nodes, which requires to take the lock. */ if (!tctx || !tctx->io_wq)continue ; cret =io_wq_cancel_cb (tctx->io_wq, io_cancel_ctx_cb, ctx, true); ret |= (cret !=IO_WQ_CANCEL_NOTFOUND ); } -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx, &lock_state);return ret; }__cold bool io_uring_try_cancel_requests (struct io_ring_ctx *ctx,struct io_uring_task *tctx,bool cancel_all,bool is_sqpoll_thread) {struct io_task_cancel cancel = { .tctx = tctx, .all = cancel_all, }; +struct io_ring_ctx_lock_state lock_state;enum io_wq_cancel cret;bool ret = false;/* set it so io_req_local_work_add() would wake us up */ if (ctx->flags &IORING_SETUP_DEFER_TASKRUN ) {
@@ -542,17 +548,17 @@ __cold bool io_uring_try_cancel_requests(struct io_ring_ctx *ctx, }if ((ctx->flags &IORING_SETUP_DEFER_TASKRUN ) &&io_allowed_defer_tw_run (ctx)) ret |=io_run_local_work (ctx,INT_MAX ,INT_MAX ) >0 ; -mutex_lock (&ctx->uring_lock); +io_ring_ctx_lock (ctx, &lock_state); ret |=io_cancel_defer_files (ctx, tctx, cancel_all); ret |=io_poll_remove_all (ctx, tctx, cancel_all); ret |=io_waitid_remove_all (ctx, tctx, cancel_all); ret |=io_futex_remove_all (ctx, tctx, cancel_all); ret |=io_uring_try_cancel_uring_cmd (ctx, tctx, cancel_all); -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx, &lock_state); ret |=io_kill_timeouts (ctx, tctx, cancel_all);if (tctx) ret |=io_run_task_work () >0 ;else ret |=flush_delayed_work (&ctx->fallback_work);
io_uring/cancel.h +4 -1
@@ -2,10 +2,12 @@ #ifndef IORING_CANCEL_H #define IORING_CANCEL_H #include <linux/io_uring_types.h> +#include "io_uring.h" + struct io_cancel_data { struct io_ring_ctx *ctx; union { u64 data; struct file *file;
@@ -19,11 +21,12 @@ int io_async_cancel_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);int io_async_cancel (struct io_kiocb *req,unsigned int issue_flags);int io_try_cancel (struct io_uring_task *tctx,struct io_cancel_data *cd,unsigned int issue_flags); -int io_sync_cancel (struct io_ring_ctx *ctx,void __user *arg); +int io_sync_cancel (struct io_ring_ctx *ctx,void __user *arg, +struct io_ring_ctx_lock_state *lock_state);bool io_cancel_req_match (struct io_kiocb *req,struct io_cancel_data *cd);bool io_match_task_safe (struct io_kiocb *head,struct io_uring_task *tctx,bool cancel_all); bool io_cancel_remove_all(struct io_ring_ctx *ctx, struct io_uring_task *tctx,
io_uring/eventfd.c +3 -2
@@ -6,10 +6,11 @@#include <linux/eventfd.h> #include <linux/eventpoll.h> #include <linux/io_uring.h> #include <linux/io_uring_types.h> +#include "io_uring.h" #include "io-wq.h" #include "eventfd.h" struct io_ev_fd {struct eventfd_ctx *cq_ev_fd;
@@ -118,11 +119,11 @@ int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,struct io_ev_fd *ev_fd;__s32 __user *fds = arg;int fd; ev_fd =rcu_dereference_protected (ctx->io_ev_fd, -lockdep_is_held (&ctx->uring_lock)); +io_ring_ctx_lock_held (ctx));if (ev_fd)return -EBUSY ;if (copy_from_user (&fd, fds,sizeof (*fds)))return -EFAULT ;
@@ -154,11 +155,11 @@ int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,int io_eventfd_unregister (struct io_ring_ctx *ctx) {struct io_ev_fd *ev_fd; ev_fd =rcu_dereference_protected (ctx->io_ev_fd, -lockdep_is_held (&ctx->uring_lock)); +io_ring_ctx_lock_held (ctx));if (ev_fd) { ctx->has_evfd = false;rcu_assign_pointer (ctx->io_ev_fd,NULL );io_eventfd_put (ev_fd);return 0 ;
io_uring/fdinfo.c +5 -3
@@ -9,10 +9,11 @@#include <linux/io_uring.h> #include <uapi/linux/io_uring.h> #include "filetable.h" +#include "io_uring.h" #include "sqpoll.h" #include "fdinfo.h" #include "cancel.h" #include "rsrc.h" #include "opdef.h"
@@ -75,11 +76,11 @@ static void __io_uring_show_fdinfo(struct io_ring_ctx *ctx, struct seq_file *m)if (ctx->flags &IORING_SETUP_SQE128 ) sq_shift =1 ;/* * we may get imprecise sqe and cqe info if uring is actively running -* since we get cached_sq_head and cached_cq_tail without uring_lock +* since we get cached_sq_head and cached_cq_tail without ctx uring lock * and sq_tail and cq_head are changed by userspace. But it's ok since * we usually use these info when it is stuck. */ seq_printf (m,"SqMask:\t0x%x\n" , sq_mask);seq_printf (m,"SqHead:\t%u\n" , sq_head);
@@ -249,16 +250,17 @@ static void __io_uring_show_fdinfo(struct io_ring_ctx *ctx, struct seq_file *m)* anything else to get an extra reference. */ __cold void io_uring_show_fdinfo (struct seq_file *m,struct file *file) {struct io_ring_ctx *ctx = file->private_data; +struct io_ring_ctx_lock_state lock_state;/* * Avoid ABBA deadlock between the seq lock and the io_uring mutex, * since fdinfo case grabs it in the opposite direction of normal use * cases. */ -if (mutex_trylock (&ctx->uring_lock)) { +if (io_ring_ctx_trylock (ctx, &lock_state)) {__io_uring_show_fdinfo (ctx, m); -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx, &lock_state); } }
io_uring/filetable.c +5 -3
@@ -55,14 +55,15 @@ void io_free_file_tables(struct io_ring_ctx *ctx, struct io_file_table *table) table->bitmap =NULL ; }static int io_install_fixed_file (struct io_ring_ctx *ctx,struct file *file,u32 slot_index) - __must_hold(&ctx->uring_lock) {struct io_rsrc_node *node; +io_ring_ctx_assert_locked (ctx); +if (io_is_uring_fops (file))return -EBADF ;if (!ctx->file_table.data.nr)return -ENXIO ;if (slot_index >= ctx->file_table.data.nr)
@@ -105,16 +106,17 @@ int __io_fixed_fd_install(struct io_ring_ctx *ctx, struct file *file,* fput() is called correspondingly. */ int io_fixed_fd_install (struct io_kiocb *req,unsigned int issue_flags,struct file *file,unsigned int file_slot) { +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;int ret; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); ret =__io_fixed_fd_install (ctx, file, file_slot); -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);if (unlikely (ret <0 ))fput (file);return ret; }
io_uring/futex.c +8 -6
@@ -220,22 +220,23 @@ static void io_futex_wake_fn(struct wake_q_head *wake_q, struct futex_q *q)int io_futexv_wait (struct io_kiocb *req,unsigned int issue_flags) { struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex);struct io_futexv_data *ifd = req->async_data; +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;int ret, woken =-1 ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); ret =futex_wait_multiple_setup (ifd->futexv, iof->futex_nr, &woken);/* * Error case, ret is < 0. Mark the request as failed. */ if (unlikely (ret <0 )) { -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);req_set_fail (req);io_req_set_res (req, ret,0 );io_req_async_data_free (req);return IOU_COMPLETE ; }
@@ -265,27 +266,28 @@ int io_futexv_wait(struct io_kiocb *req, unsigned int issue_flags) iof->futexv_unqueued =1 ;if (woken !=-1 )io_req_set_res (req, woken,0 ); } -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return IOU_ISSUE_SKIP_COMPLETE ; }int io_futex_wait (struct io_kiocb *req,unsigned int issue_flags) { struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;struct io_futex_data *ifd =NULL ;int ret;if (!iof->futex_mask) { ret = -EINVAL ; goto done; } -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); ifd =io_cache_alloc (&ctx->futex_cache,GFP_NOWAIT );if (!ifd) { ret = -ENOMEM ; goto done_unlock; }
@@ -299,17 +301,17 @@ int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags) ret =futex_wait_setup (iof->uaddr, iof->futex_val, iof->futex_flags, &ifd->q,NULL ,NULL );if (!ret) {hlist_add_head (&req->hash_node, &ctx->futex_list); -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return IOU_ISSUE_SKIP_COMPLETE ; } done_unlock: -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state); done:if (ret <0 )req_set_fail (req);io_req_set_res (req, ret,0 );io_req_async_data_free (req);
io_uring/io_uring.c +107 -74
760 lines not on this page · raw message
io_uring/io_uring.h +60 -15
134 lines not on this page · raw message
io_uring/kbuf.c +18 -14
@@ -72,22 +72,22 @@ bool io_kbuf_commit(struct io_kiocb *req, }static inline struct io_buffer_list *io_buffer_get_list (struct io_ring_ctx *ctx,unsigned int bgid) { -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx);return xa_load (&ctx->io_bl_xa, bgid); }static int io_buffer_add_list (struct io_ring_ctx *ctx,struct io_buffer_list *bl,unsigned int bgid) {/* * Store buffer group ID and finally mark the list as visible. * The normal lookup doesn't care about the visibility as we're -* always under the ->uring_lock, but lookups from mmap do. +* always under the ctx uring lock, but lookups from mmap do. */ bl->bgid = bgid;guard (mutex)(&ctx->mmap_lock);return xa_err (xa_store (&ctx->io_bl_xa, bgid, bl,GFP_KERNEL )); }
@@ -101,23 +101,24 @@ void io_kbuf_drop_legacy(struct io_kiocb *req) req->kbuf =NULL ; }bool io_kbuf_recycle_legacy (struct io_kiocb *req,unsigned issue_flags) { +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;struct io_buffer_list *bl;struct io_buffer *buf; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); buf = req->kbuf; bl =io_buffer_get_list (ctx, buf->bgid);list_add (&buf->list, &bl->buf_list); bl->nbufs++; req->flags &= ~REQ_F_BUFFER_SELECTED ; -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return true; }static void __user *io_provided_buffer_select (struct io_kiocb *req,size_t *len,struct io_buffer_list *bl)
@@ -210,24 +211,25 @@ static struct io_br_sel io_ring_buffer_select(struct io_kiocb *req, size_t *len, }struct io_br_sel io_buffer_select (struct io_kiocb *req,size_t *len,unsigned buf_group,unsigned int issue_flags) { +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;struct io_br_sel sel = { };struct io_buffer_list *bl; -io_ring_submit_lock (req->ctx, issue_flags); +io_ring_submit_lock (req->ctx, issue_flags, &lock_state); bl =io_buffer_get_list (ctx, buf_group);if (likely (bl)) {if (bl->flags &IOBL_BUF_RING ) sel =io_ring_buffer_select (req, len, bl, issue_flags);else sel.addr =io_provided_buffer_select (req, len, bl); } -io_ring_submit_unlock (req->ctx, issue_flags); +io_ring_submit_unlock (req->ctx, issue_flags, &lock_state);return sel; }/* cap it at a reasonable 256, will be one page even for 4K */ #define PEEK_MAX_IMPORT 256
@@ -315,14 +317,15 @@ static int io_ring_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg, }int io_buffers_select (struct io_kiocb *req,struct buf_sel_arg *arg,struct io_br_sel *sel,unsigned int issue_flags) { +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;int ret = -ENOENT ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); sel->buf_list =io_buffer_get_list (ctx, arg->buf_group);if (unlikely (!sel->buf_list)) goto out_unlock;if (sel->buf_list->flags &IOBL_BUF_RING ) {
@@ -342,11 +345,11 @@ int io_buffers_select(struct io_kiocb *req, struct buf_sel_arg *arg, ret =io_provided_buffers_select (req, &arg->out_len, sel->buf_list, arg->iovs); } out_unlock:if (issue_flags &IO_URING_F_UNLOCKED ) { sel->buf_list =NULL ; -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx, &lock_state); }return ret; } int io_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg,
@@ -354,11 +357,11 @@ int io_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg, {struct io_ring_ctx *ctx = req->ctx;struct io_buffer_list *bl;int ret; -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx); bl =io_buffer_get_list (ctx, arg->buf_group);if (unlikely (!bl))return -ENOENT ;
@@ -410,11 +413,11 @@ static int io_remove_buffers_legacy(struct io_ring_ctx *ctx, {unsigned long i =0 ;struct io_buffer *nxt;/* protects io_buffers_cache */ -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx);WARN_ON_ONCE (bl->flags &IOBL_BUF_RING );for (i =0 ; i < nbufs && !list_empty (&bl->buf_list); i++) { nxt = list_first_entry(&bl->buf_list, struct io_buffer, list);list_del (&nxt->list);
@@ -579,18 +582,19 @@ static int __io_manage_buffers_legacy(struct io_kiocb *req, }int io_manage_buffers_legacy (struct io_kiocb *req,unsigned int issue_flags) { struct io_provide_buf *p = io_kiocb_to_cmd(req, struct io_provide_buf); +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;struct io_buffer_list *bl;int ret; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); bl =io_buffer_get_list (ctx, p->bgid); ret =__io_manage_buffers_legacy (req, bl); -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);if (ret <0 )req_set_fail (req);io_req_set_res (req, ret,0 );return IOU_COMPLETE ;
@@ -604,11 +608,11 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg)struct io_uring_buf_ring *br;unsigned long mmap_offset;unsigned long ring_size;int ret; -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx);if (copy_from_user (®, arg,sizeof (reg)))return -EFAULT ;if (!mem_is_zero (reg.resv,sizeof (reg.resv)))return -EINVAL ;
@@ -680,11 +684,11 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg)int io_unregister_pbuf_ring (struct io_ring_ctx *ctx,void __user *arg) {struct io_uring_buf_reg reg;struct io_buffer_list *bl; -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx);if (copy_from_user (®, arg,sizeof (reg)))return -EFAULT ;if (!mem_is_zero (reg.resv,sizeof (reg.resv)) || reg.flags)return -EINVAL ;
io_uring/memmap.h +1 -1
@@ -35,11 +35,11 @@ static inline void io_region_publish(struct io_ring_ctx *ctx,struct io_mapped_region *src_region, struct io_mapped_region *dst_region) {/* * Once published mmap can find it without holding only the ->mmap_lock -* and not ->uring_lock. +* and not the ctx uring lock. */ guard(mutex)(&ctx->mmap_lock); *dst_region = *src_region; }
io_uring/msg_ring.c +18 -11
@@ -30,29 +30,31 @@ struct io_msg {u32 cqe_flags; };u32 flags; }; -static void io_double_unlock_ctx (struct io_ring_ctx *octx) +static void io_double_unlock_ctx (struct io_ring_ctx *octx, +struct io_ring_ctx_lock_state *lock_state) { -mutex_unlock (&octx->uring_lock); +io_ring_ctx_unlock (octx, lock_state); }static int io_lock_external_ctx (struct io_ring_ctx *octx, -unsigned int issue_flags) +unsigned int issue_flags, +struct io_ring_ctx_lock_state *lock_state) {/* * To ensure proper ordering between the two ctxs, we can only * attempt a trylock on the target. If that fails and we already have * the source ctx lock, punt to io-wq. */ if (!(issue_flags &IO_URING_F_UNLOCKED )) { -if (!mutex_trylock (&octx->uring_lock)) +if (!io_ring_ctx_trylock (octx, lock_state))return -EAGAIN ;return 0 ; } -mutex_lock (&octx->uring_lock); +io_ring_ctx_lock (octx, lock_state);return 0 ; }void io_msg_ring_cleanup (struct io_kiocb *req) {
@@ -116,10 +118,11 @@ static int io_msg_data_remote(struct io_ring_ctx *target_ctx, }static int __io_msg_ring_data (struct io_ring_ctx *target_ctx,struct io_msg *msg,unsigned int issue_flags) { +struct io_ring_ctx_lock_state lock_state;u32 flags =0 ;int ret;if (msg->src_fd || msg->flags & ~IORING_MSG_RING_FLAGS_PASS )return -EINVAL ;
@@ -134,17 +137,18 @@ static int __io_msg_ring_data(struct io_ring_ctx *target_ctx,if (msg->flags &IORING_MSG_RING_FLAGS_PASS ) flags = msg->cqe_flags; ret = -EOVERFLOW ;if (target_ctx->flags &IORING_SETUP_IOPOLL ) { -if (unlikely (io_lock_external_ctx (target_ctx, issue_flags))) +if (unlikely (io_lock_external_ctx (target_ctx, issue_flags, + &lock_state)))return -EAGAIN ; }if (io_post_aux_cqe (target_ctx, msg->user_data, msg->len, flags)) ret =0 ;if (target_ctx->flags &IORING_SETUP_IOPOLL ) -io_double_unlock_ctx (target_ctx); +io_double_unlock_ctx (target_ctx, &lock_state);return ret; }static int io_msg_ring_data (struct io_kiocb *req,unsigned int issue_flags) {
@@ -155,35 +159,38 @@ static int io_msg_ring_data(struct io_kiocb *req, unsigned int issue_flags) }static int io_msg_grab_file (struct io_kiocb *req,unsigned int issue_flags) { struct io_msg *msg = io_kiocb_to_cmd(req, struct io_msg); +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;struct io_rsrc_node *node;int ret = -EBADF ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); node =io_rsrc_node_lookup (&ctx->file_table.data, msg->src_fd);if (node) { msg->src_file =io_slot_file (node);if (msg->src_file)get_file (msg->src_file); req->flags |=REQ_F_NEED_CLEANUP ; ret =0 ; } -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return ret; }static int io_msg_install_complete (struct io_kiocb *req,unsigned int issue_flags) {struct io_ring_ctx *target_ctx = req->file->private_data; struct io_msg *msg = io_kiocb_to_cmd(req, struct io_msg); +struct io_ring_ctx_lock_state lock_state;struct file *src_file = msg->src_file;int ret; -if (unlikely (io_lock_external_ctx (target_ctx, issue_flags))) +if (unlikely (io_lock_external_ctx (target_ctx, issue_flags, + &lock_state)))return -EAGAIN ; ret =__io_fixed_fd_install (target_ctx, src_file, msg->dst_fd);if (ret <0 ) goto out_unlock;
@@ -200,11 +207,11 @@ static int io_msg_install_complete(struct io_kiocb *req, unsigned int issue_flag* later IORING_OP_MSG_RING delivers the message. */ if (!io_post_aux_cqe (target_ctx, msg->user_data, ret,0 )) ret = -EOVERFLOW ; out_unlock: -io_double_unlock_ctx (target_ctx); +io_double_unlock_ctx (target_ctx, &lock_state);return ret; }static void io_msg_tw_fd_complete (struct callback_head *head) {
io_uring/notif.c +3 -2
@@ -15,11 +15,11 @@ static void io_notif_tw_complete(struct io_tw_req tw_req, io_tw_token_t tw) {struct io_kiocb *notif = tw_req.req;struct io_notif_data *nd =io_notif_to_data (notif);struct io_ring_ctx *ctx = notif->ctx; -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx); do { notif = cmd_to_io_kiocb(nd); if (WARN_ON_ONCE(ctx != notif->ctx))
@@ -109,15 +109,16 @@ static const struct ubuf_info_ops io_ubuf_ops = { .complete = io_tx_ubuf_complete, .link_skb = io_link_skb, };struct io_kiocb *io_alloc_notif (struct io_ring_ctx *ctx) - __must_hold(&ctx->uring_lock) {struct io_kiocb *notif;struct io_notif_data *nd; +io_ring_ctx_assert_locked (ctx); +if (unlikely (!io_alloc_req (ctx, ¬if)))return NULL ; notif->ctx = ctx; notif->opcode =IORING_OP_NOP ; notif->flags =0 ;
io_uring/notif.h +2 -1
@@ -31,14 +31,15 @@ static inline struct io_notif_data *io_notif_to_data(struct io_kiocb *notif) { return io_kiocb_to_cmd(notif, struct io_notif_data); }static inline void io_notif_flush (struct io_kiocb *notif) - __must_hold(¬if->ctx->uring_lock) {struct io_notif_data *nd =io_notif_to_data (notif); +io_ring_ctx_assert_locked (notif->ctx); +io_tx_ubuf_complete (NULL , &nd->uarg, true); }static inline int io_notif_account_mem (struct io_kiocb *notif,unsigned len) {
io_uring/openclose.c +8 -6
@@ -189,15 +189,16 @@ void io_open_cleanup(struct io_kiocb *req) }int __io_close_fixed (struct io_ring_ctx *ctx,unsigned int issue_flags,unsigned int offset) { +struct io_ring_ctx_lock_state lock_state;int ret; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); ret =io_fixed_fd_remove (ctx, offset); -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return ret; }static inline int io_close_fixed (struct io_kiocb *req,unsigned int issue_flags)
@@ -333,18 +334,19 @@ int io_pipe_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)static int io_pipe_fixed (struct io_kiocb *req,struct file **files,unsigned int issue_flags) { struct io_pipe *p = io_kiocb_to_cmd(req, struct io_pipe); +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;int ret, fds[2 ] = {-1 ,-1 };int slot = p->file_slot;if (p->flags &O_CLOEXEC )return -EINVAL ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); ret =__io_fixed_fd_install (ctx, files[0 ], slot);if (ret <0 ) goto err; fds[0 ] = ret;
@@ -361,23 +363,23 @@ static int io_pipe_fixed(struct io_kiocb *req, struct file **files,if (ret <0 ) goto err; fds[1 ] = ret; files[1 ] =NULL ; -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);if (!copy_to_user (p->fds, fds,sizeof (fds)))return 0 ; ret = -EFAULT ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); err:if (fds[0 ] !=-1 )io_fixed_fd_remove (ctx, fds[0 ]);if (fds[1 ] !=-1 )io_fixed_fd_remove (ctx, fds[1 ]); -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return ret; }static int io_pipe_fd (struct io_kiocb *req,struct file **files) {
io_uring/poll.c +12 -9
@@ -121,11 +121,11 @@ static struct io_poll *io_poll_get_single(struct io_kiocb *req)static void io_poll_req_insert (struct io_kiocb *req) {struct io_hash_table *table = &req->ctx->cancel_table;u32 index =hash_long (req->cqe.user_data, table->hash_bits); -lockdep_assert_held (&req->ctx->uring_lock); +io_ring_ctx_assert_locked (req->ctx);hlist_add_head (&req->hash_node, &table->hbs[index].list); }static void io_init_poll_iocb (struct io_poll *poll,__poll_t events)
@@ -321,11 +321,11 @@ void io_poll_task_func(struct io_tw_req tw_req, io_tw_token_t tw) }else if (ret ==IOU_POLL_REQUEUE ) {__io_poll_execute (req,0 );return ; }io_poll_remove_entries (req); -/* task_work always has ->uring_lock held */ +/* task_work always holds ctx uring lock */ hash_del (&req->hash_node);if (req->opcode ==IORING_OP_POLL_ADD ) {if (ret ==IOU_POLL_DONE ) {struct io_poll *poll;
@@ -524,15 +524,16 @@ static bool io_poll_can_finish_inline(struct io_kiocb *req,return pt->owning ||io_poll_get_ownership (req); }static void io_poll_add_hash (struct io_kiocb *req,unsigned int issue_flags) { +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state);io_poll_req_insert (req); -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state); }/* * Returns 0 when it's handed over for polling. The caller owns the requests if * it returns non-zero, but otherwise should not touch it. Negative values
@@ -727,11 +728,11 @@ __cold bool io_poll_remove_all(struct io_ring_ctx *ctx, struct io_uring_task *tcstruct hlist_node *tmp;struct io_kiocb *req;bool found = false;int i; -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx);for (i =0 ; i < nr_buckets; i++) {struct io_hash_bucket *hb = &ctx->cancel_table.hbs[i];hlist_for_each_entry_safe (req, tmp, &hb->list, hash_node) {
@@ -813,15 +814,16 @@ static int __io_poll_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd) }int io_poll_cancel (struct io_ring_ctx *ctx,struct io_cancel_data *cd,unsigned issue_flags) { +struct io_ring_ctx_lock_state lock_state;int ret; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); ret =__io_poll_cancel (ctx, cd); -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return ret; }static __poll_t io_poll_parse_events (const struct io_uring_sqe *sqe,unsigned int flags)
@@ -904,16 +906,17 @@ int io_poll_add(struct io_kiocb *req, unsigned int issue_flags) }int io_poll_remove (struct io_kiocb *req,unsigned int issue_flags) { struct io_poll_update *poll_update = io_kiocb_to_cmd(req, struct io_poll_update); +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;struct io_cancel_data cd = { .ctx = ctx, .data = poll_update->old_user_data, };struct io_kiocb *preq;int ret2, ret =0 ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); preq =io_poll_find (ctx, true, &cd); ret2 =io_poll_disarm (preq);if (ret2) { ret = ret2; goto out;
@@ -944,11 +947,11 @@ int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags)req_set_fail (preq);io_req_set_res (preq, -ECANCELED ,0 ); preq->io_task_work.func = io_req_task_complete;io_req_task_work_add (preq); out: -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);if (ret <0 ) {req_set_fail (req);return ret; }/* complete update request, we're done with it */
io_uring/register.c +43 -36
268 lines not on this page · raw message
io_uring/rsrc.c +31 -20
199 lines not on this page · raw message
io_uring/rsrc.h +4 -2
@@ -2,10 +2,11 @@#ifndef IOU_RSRC_H #define IOU_RSRC_H #include <linux/io_uring_types.h> #include <linux/lockdep.h> +#include "io_uring.h" #define IO_VEC_CACHE_SOFT_CAP 256enum { IORING_RSRC_FILE = 0,
@@ -68,11 +69,12 @@ int io_import_reg_vec(int ddir, struct iov_iter *iter, struct io_kiocb *req, struct iou_vec *vec, unsigned nr_iovs, unsigned issue_flags);int io_prep_reg_iovec (struct io_kiocb *req,struct iou_vec *iv,const struct iovec __user *uvec,size_t uvec_segs); -int io_register_clone_buffers (struct io_ring_ctx *ctx,void __user *arg); +int io_register_clone_buffers (struct io_ring_ctx *ctx,void __user *arg, +struct io_ring_ctx_lock_state *lock_state);int io_sqe_buffers_unregister (struct io_ring_ctx *ctx);int io_sqe_buffers_register (struct io_ring_ctx *ctx,void __user *arg,unsigned int nr_args,u64 __user *tags);int io_sqe_files_unregister (struct io_ring_ctx *ctx); int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg,
@@ -97,11 +99,11 @@ static inline struct io_rsrc_node *io_rsrc_node_lookup(struct io_rsrc_data *datareturn NULL ; }static inline void io_put_rsrc_node (struct io_ring_ctx *ctx,struct io_rsrc_node *node) { -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx);if (!--node->refs)io_free_rsrc_node (ctx, node); } static inline bool io_reset_rsrc_node(struct io_ring_ctx *ctx,
io_uring/rw.c +1 -1
@@ -463,11 +463,11 @@ int io_read_mshot_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)void io_readv_writev_cleanup (struct io_kiocb *req) {struct io_async_rw *rw = req->async_data; -lockdep_assert_held (&req->ctx->uring_lock); +io_ring_ctx_assert_locked (req->ctx);io_vec_free (&rw->vec);io_rw_recycle (req,0 ); }static inline loff_t *io_kiocb_update_pos (struct io_kiocb *req)
io_uring/splice.c +3 -2
@@ -58,26 +58,27 @@ void io_splice_cleanup(struct io_kiocb *req)static struct file *io_splice_get_file (struct io_kiocb *req,unsigned int issue_flags) { struct io_splice *sp = io_kiocb_to_cmd(req, struct io_splice); +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;struct io_rsrc_node *node;struct file *file =NULL ;if (!(sp->flags &SPLICE_F_FD_IN_FIXED ))return io_file_get_normal (req, sp->splice_fd_in); -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); node =io_rsrc_node_lookup (&ctx->file_table.data, sp->splice_fd_in);if (node) { node->refs++; sp->rsrc_node = node; file =io_slot_file (node); req->flags |=REQ_F_NEED_CLEANUP ; } -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return file; }int io_tee (struct io_kiocb *req,unsigned int issue_flags) {
io_uring/sqpoll.c +3 -2
@@ -211,29 +211,30 @@ static int __io_sq_thread(struct io_ring_ctx *ctx, struct io_sq_data *sqd,/* if we're handling multiple rings, cap submit size for fairness */ if (cap_entries && to_submit >IORING_SQPOLL_CAP_ENTRIES_VALUE ) to_submit =IORING_SQPOLL_CAP_ENTRIES_VALUE ;if (to_submit || !wq_list_empty (&ctx->iopoll_list)) { +struct io_ring_ctx_lock_state lock_state;const struct cred *creds =NULL ;io_sq_start_worktime (ist);if (ctx->sq_creds !=current_cred ()) creds =override_creds (ctx->sq_creds); -mutex_lock (&ctx->uring_lock); +io_ring_ctx_lock (ctx, &lock_state);if (!wq_list_empty (&ctx->iopoll_list))io_do_iopoll (ctx, true);/* * Don't submit if refs are dying, good for io_uring_register(), * but also it is relied upon by io_ring_exit_work() */ if (to_submit &&likely (!percpu_ref_is_dying (&ctx->refs)) && !(ctx->flags &IORING_SETUP_R_DISABLED )) ret =io_submit_sqes (ctx, to_submit); -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx, &lock_state);if (to_submit &&wq_has_sleeper (&ctx->sqo_sq_wait))wake_up (&ctx->sqo_sq_wait);if (creds)revert_creds (creds);
io_uring/tctx.c +16 -11
@@ -13,27 +13,28 @@#include "tctx.h" static struct io_wq *io_init_wq_offload (struct io_ring_ctx *ctx,struct task_struct *task) { +struct io_ring_ctx_lock_state lock_state;struct io_wq_hash *hash;struct io_wq_data data;unsigned int concurrency; -mutex_lock (&ctx->uring_lock); +io_ring_ctx_lock (ctx, &lock_state); hash = ctx->hash_map;if (!hash) { hash =kzalloc (sizeof (*hash),GFP_KERNEL );if (!hash) { -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx, &lock_state);return ERR_PTR (-ENOMEM ); }refcount_set (&hash->refs,1 );init_waitqueue_head (&hash->wait); ctx->hash_map = hash; } -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx, &lock_state); data.hash = hash; data.task = task;/* Do QD, or 4 * CPUS, whatever is smallest */
@@ -121,10 +122,12 @@ int __io_uring_add_tctx_node(struct io_ring_ctx *ctx)if (ret)return ret; } }if (!xa_load (&tctx->xa, (unsigned long )ctx)) { +struct io_ring_ctx_lock_state lock_state; + node =kmalloc (sizeof (*node),GFP_KERNEL );if (!node)return -ENOMEM ; node->ctx = ctx; node->task = current;
@@ -134,13 +137,13 @@ int __io_uring_add_tctx_node(struct io_ring_ctx *ctx)if (ret) {kfree (node);return ret; } -mutex_lock (&ctx->uring_lock); +io_ring_ctx_lock (ctx, &lock_state);list_add (&node->ctx_node, &ctx->tctx_list); -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx, &lock_state); }return 0 ; }int __io_uring_add_tctx_node_from_submit (struct io_ring_ctx *ctx)
@@ -163,10 +166,11 @@ int __io_uring_add_tctx_node_from_submit(struct io_ring_ctx *ctx)* Remove this io_uring_file -> task mapping. */ __cold void io_uring_del_tctx_node (unsigned long index) {struct io_uring_task *tctx = current->io_uring; +struct io_ring_ctx_lock_state lock_state;struct io_tctx_node *node;if (!tctx)return ; node =xa_erase (&tctx->xa, index);
@@ -174,13 +178,13 @@ __cold void io_uring_del_tctx_node(unsigned long index)return ;WARN_ON_ONCE (current != node->task);WARN_ON_ONCE (list_empty (&node->ctx_node)); -mutex_lock (&node->ctx->uring_lock); +io_ring_ctx_lock (node->ctx, &lock_state);list_del (&node->ctx_node); -mutex_unlock (&node->ctx->uring_lock); +io_ring_ctx_unlock (node->ctx, &lock_state);if (tctx->last == node->ctx) tctx->last =NULL ;kfree (node); }
@@ -196,11 +200,11 @@ __cold void io_uring_clean_tctx(struct io_uring_task *tctx)cond_resched (); }if (wq) {/* * Must be after io_uring_del_tctx_node() (removes nodes under -* uring_lock) to avoid race with io_uring_try_cancel_iowq(). +* ctx uring lock) to avoid race with io_uring_try_cancel_iowq() */ io_wq_put_and_exit (wq); tctx->io_wq =NULL ; } }
@@ -259,23 +263,24 @@ static int io_ring_add_registered_fd(struct io_uring_task *tctx, int fd,* index. If no index is desired, application may set ->offset == -1U * and we'll find an available index. Returns number of entries * successfully processed, or < 0 on error if none were processed. */ int io_ringfd_register (struct io_ring_ctx *ctx,void __user *__arg, -unsigned nr_args) +unsigned nr_args, +struct io_ring_ctx_lock_state *lock_state) {struct io_uring_rsrc_update __user *arg = __arg;struct io_uring_rsrc_update reg;struct io_uring_task *tctx;int ret, i;if (!nr_args || nr_args >IO_RINGFD_REG_MAX )return -EINVAL ; -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx, lock_state); ret =__io_uring_add_tctx_node (ctx); -mutex_lock (&ctx->uring_lock); +io_ring_ctx_lock (ctx, lock_state);if (ret)return ret; tctx = current->io_uring;for (i =0 ; i < nr_args; i++) {
io_uring/tctx.h +4 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 +#include "io_uring.h" +struct io_tctx_node {struct list_head ctx_node;struct task_struct *task;struct io_ring_ctx *ctx; };
@@ -13,11 +15,12 @@ int __io_uring_add_tctx_node(struct io_ring_ctx *ctx);int __io_uring_add_tctx_node_from_submit (struct io_ring_ctx *ctx);void io_uring_clean_tctx (struct io_uring_task *tctx);void io_uring_unreg_ringfd (void );int io_ringfd_register (struct io_ring_ctx *ctx,void __user *__arg, -unsigned nr_args); +unsigned nr_args, +struct io_ring_ctx_lock_state *lock_state);int io_ringfd_unregister (struct io_ring_ctx *ctx,void __user *__arg,unsigned nr_args);/* * Note that this task has used io_uring. We use it for cancelation purposes.
io_uring/uring_cmd.c +8 -5
@@ -51,11 +51,11 @@ bool io_uring_try_cancel_uring_cmd(struct io_ring_ctx *ctx, {struct hlist_node *tmp;struct io_kiocb *req;bool ret = false; -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx);hlist_for_each_entry_safe (req, tmp, &ctx->cancelable_uring_cmd, hash_node) {struct io_uring_cmd *cmd =io_kiocb_to_cmd (req, struct io_uring_cmd);
@@ -76,19 +76,20 @@ bool io_uring_try_cancel_uring_cmd(struct io_ring_ctx *ctx,static void io_uring_cmd_del_cancelable (struct io_uring_cmd *cmd,unsigned int issue_flags) {struct io_kiocb *req =cmd_to_io_kiocb (cmd); +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;if (!(cmd->flags &IORING_URING_CMD_CANCELABLE ))return ; cmd->flags &= ~IORING_URING_CMD_CANCELABLE ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state);hlist_del (&req->hash_node); -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state); }/* * Mark this command as concelable, then io_uring_try_cancel_uring_cmd() * will try to cancel this issued command by sending ->uring_cmd() with
@@ -103,14 +104,16 @@ void io_uring_cmd_mark_cancelable(struct io_uring_cmd *cmd, {struct io_kiocb *req =cmd_to_io_kiocb (cmd);struct io_ring_ctx *ctx = req->ctx;if (!(cmd->flags &IORING_URING_CMD_CANCELABLE )) { +struct io_ring_ctx_lock_state lock_state; + cmd->flags |=IORING_URING_CMD_CANCELABLE ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state);hlist_add_head (&req->hash_node, &ctx->cancelable_uring_cmd); -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state); } }EXPORT_SYMBOL_GPL (io_uring_cmd_mark_cancelable); void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,
io_uring/waitid.c +7 -6
@@ -130,11 +130,11 @@ static void io_waitid_complete(struct io_kiocb *req, int ret) struct io_waitid *iw = io_kiocb_to_cmd(req, struct io_waitid);/* anyone completing better be holding a reference */ WARN_ON_ONCE (!(atomic_read (&iw->refs) &IO_WAITID_REF_MASK )); -lockdep_assert_held (&req->ctx->uring_lock); +io_ring_ctx_assert_locked (req->ctx);hlist_del_init (&req->hash_node);io_waitid_remove_wq (req); ret =io_waitid_finish (req, ret);
@@ -145,11 +145,11 @@ static void io_waitid_complete(struct io_kiocb *req, int ret)static bool __io_waitid_cancel (struct io_kiocb *req) { struct io_waitid *iw = io_kiocb_to_cmd(req, struct io_waitid); -lockdep_assert_held (&req->ctx->uring_lock); +io_ring_ctx_assert_locked (req->ctx);/* * Mark us canceled regardless of ownership. This will prevent a * potential retry from a spurious wakeup. */
@@ -280,10 +280,11 @@ int io_waitid_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_waitid (struct io_kiocb *req,unsigned int issue_flags) { struct io_waitid *iw = io_kiocb_to_cmd(req, struct io_waitid);struct io_waitid_async *iwa = req->async_data; +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;int ret; ret =kernel_waitid_prepare (&iwa->wo, iw->which, iw->upid, &iw->info, iw->options,NULL );
@@ -301,11 +302,11 @@ int io_waitid(struct io_kiocb *req, unsigned int issue_flags)* Cancel must hold the ctx lock, so there's no risk of cancelation * finding us until a) we remain on the list, and b) the lock is * dropped. We only need to worry about racing with the wakeup * callback. */ -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state);/* * iw->head is valid under the ring lock, and as long as the request * is on the waitid_list where cancelations may find it. */
@@ -321,27 +322,27 @@ int io_waitid(struct io_kiocb *req, unsigned int issue_flags)/* * Nobody else grabbed a reference, it'll complete when we get * a waitqueue callback, or if someone cancels it. */ if (!io_waitid_drop_issue_ref (req)) { -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return IOU_ISSUE_SKIP_COMPLETE ; }/* * Wakeup triggered, racing with us. It was prevented from * completing because of that, queue up the tw to do that. */ -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return IOU_ISSUE_SKIP_COMPLETE ; }hlist_del_init (&req->hash_node);io_waitid_remove_wq (req); ret =io_waitid_finish (req, ret); -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state); done:if (ret <0 )req_set_fail (req);io_req_set_res (req, ret,0 );return IOU_COMPLETE ;
io_uring/zcrx.c +1 -1
@@ -851,11 +851,11 @@ static struct net_iov *__io_zcrx_get_free_niov(struct io_zcrx_area *area)void io_unregister_zcrx_ifqs (struct io_ring_ctx *ctx) {struct io_zcrx_ifq *ifq; -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx);while (1 ) { scoped_guard(mutex, &ctx->mmap_lock) {unsigned long id =0 ;
Signature · 1 line
2.45.2
PATCH v4 5/5 io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER
In reply to Caleb Sander Mateosio_ring_ctx's mutex uring_lock can be quite expensive in high-IOPS workloads. Even when only one thread pinned to a single CPU is accessing the io_ring_ctx, the atomic CASes required to lock and unlock the mutex are very hot instructions. The mutex's primary purpose is to prevent concurrent io_uring system calls on the same io_ring_ctx. However, there is already a flag IORING_SETUP_SINGLE_ISSUER that promises only one task will make io_uring_enter() and io_uring_register() system calls on the io_ring_ctx once it's enabled.
So if the io_ring_ctx is setup with IORING_SETUP_SINGLE_ISSUER, skip the uring_lock mutex_lock() and mutex_unlock() on the submitter_task. On other tasks acquiring the ctx uring lock, use a task work item to suspend the submitter_task for the critical section.
If the io_ring_ctx is IORING_SETUP_R_DISABLED (possible during io_uring_setup(), io_uring_register(), or io_uring exit), submitter_task may be set concurrently, so acquire the uring_lock before checking it. If submitter_task isn't set yet, the uring_lock suffices to provide mutual exclusion.
--- io_uring/io_uring.c | 12 +++++ io_uring/io_uring.h | 114 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 123 insertions(+), 3 deletions(-)
io_uring/io_uring.c +12 -0
@@ -363,10 +363,22 @@ static __cold struct io_ring_ctx *io_ring_ctx_alloc(struct io_uring_params *p)xa_destroy (&ctx->io_bl_xa);kfree (ctx);return NULL ; } +void io_ring_suspend_work (struct callback_head *cb_head) +{ +struct io_ring_suspend_work *suspend_work = + container_of(cb_head, struct io_ring_suspend_work, cb_head); +DECLARE_COMPLETION_ONSTACK (suspend_end); + + *suspend_work->suspend_end = &suspend_end; +complete (&suspend_work->suspend_start); + +wait_for_completion (&suspend_end); +} +static void io_clean_op (struct io_kiocb *req) {if (unlikely (req->flags &REQ_F_BUFFER_SELECTED ))io_kbuf_drop_legacy (req);
io_uring/io_uring.h +111 -3
167 lines not on this page · raw message
Signature · 1 line
2.45.2
kernel test robot
build botkernel test robot noticed "Oops:general_protection_fault,probably_for_non-canonical_address#:#[##]KASAN" on:
Hello,
kernel test robot noticed "Oops:general_protection_fault,probably_for_non-canonical_address#:#[##]KASAN" on:
commit: a924e7ffd1b0b2e015ed1174662d52053a2339c4 ("[PATCH v4 5/5] io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER")
url: https://github.com/intel-lab-lkp/linux/commits/Caleb-Sander-Mateos/io_uring-use-release-acquire-ordering-for-IORING_SETUP_R_DISABLED/20251203-004502
base: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux.git for-next
patch link: https://lore.kernel.org/all/[email protected]/
patch subject: [PATCH v4 5/5] io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER
in testcase: trinity
version:
with following parameters:
runtime: 300s group: group-00 nr_groups: 5
config: x86_64-randconfig-015-20251205
compiler: gcc-14
test machine: qemu-system-x86_64 -enable-kvm -cpu SandyBridge -smp 2 -m 32G
(please refer to attached dmesg/kmsg for entire log/backtrace)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-lkp/[email protected]
[ 617.261968][ T3783] Oops: general protection fault, probably for non-canonical address 0xdffffc00000000f3: 0000 [#1] KASAN [ 617.267361][ T3783] KASAN: null-ptr-deref in range [0x0000000000000798-0x000000000000079f] [ 617.268334][ T3783] CPU: 0 UID: 65534 PID: 3783 Comm: trinity-c0 Not tainted 6.18.0-rc6-00312-ga924e7ffd1b0 #1 PREEMPT(lazy) f22e3d733e0666690a06b271bf82578b56b40aa3 [ 617.269927][ T3783] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 617.271108][ T3783] RIP: 0010:task_work_add (kbuild/src/consumer/kernel/task_work.c:68 (discriminator 2)) [ 617.271772][ T3783] Code: 39 25 df fe 67 03 0f 85 8c 01 00 00 e8 1c bd 24 00 4d 8d ac 24 98 07 00 00 48 b8 00 00 00 00 00 fc ff df 4c 89 ea 48 c1 ea 03 <80> 3c 02 00 0f 85 2f 02 00 00 49 89 df 48 8d 44 24 38 4d 8b b4 24 All code ======== 0: 39 25 df fe 67 03 cmp %esp,0x367fedf(%rip) # 0x367fee5 6: 0f 85 8c 01 00 00 jne 0x198 c: e8 1c bd 24 00 call 0x24bd2d 11: 4d 8d ac 24 98 07 00 lea 0x798(%r12),%r13 18: 00 19: 48 b8 00 00 00 00 00 movabs $0xdffffc0000000000,%rax 20: fc ff df 23: 4c 89 ea mov %r13,%rdx 26: 48 c1 ea 03 shr $0x3,%rdx 2a:* 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1) <-- trapping instruction 2e: 0f 85 2f 02 00 00 jne 0x263 34: 49 89 df mov %rbx,%r15 37: 48 8d 44 24 38 lea 0x38(%rsp),%rax 3c: 4d rex.WRB 3d: 8b .byte 0x8b 3e: b4 24 mov $0x24,%ah
Code starting with the faulting instruction
===========================================
0: 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1) 4: 0f 85 2f 02 00 00 jne 0x239 a: 49 89 df mov %rbx,%r15 d: 48 8d 44 24 38 lea 0x38(%rsp),%rax 12: 4d rex.WRB 13: 8b .byte 0x8b 14: b4 24 mov $0x24,%ah [ 617.273774][ T3783] RSP: 0018:ffff88816ac9fb10 EFLAGS: 00010206 [ 617.274486][ T3783] RAX: dffffc0000000000 RBX: ffff88816ac9fbe0 RCX: 0000000000000000 [ 617.275413][ T3783] RDX: 00000000000000f3 RSI: 0000000000000000 RDI: 0000000000000000 [ 617.276336][ T3783] RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000000 [ 617.277257][ T3783] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 [ 617.278178][ T3783] R13: 0000000000000798 R14: 1ffff1102d593f65 R15: ffff88816ac9fcf0 [ 617.279075][ T3783] FS: 00000000010a2880(0000) GS:0000000000000000(0000) knlGS:0000000000000000 [ 617.280114][ T3783] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 617.280856][ T3783] CR2: 00000000d684d000 CR3: 000000015f35b000 CR4: 00000000000406f0 [ 617.281749][ T3783] Call Trace: [ 617.282202][ T3783] <TASK> [ 617.282613][ T3783] ? lockdep_init_map_type (kbuild/src/consumer/kernel/locking/lockdep.c:4973 (discriminator 1)) [ 617.283274][ T3783] ? task_work_set_notify_irq (kbuild/src/consumer/kernel/task_work.c:56) [ 617.283904][ T3783] ? lockdep_init_map_type (kbuild/src/consumer/kernel/locking/lockdep.c:4973 (discriminator 1)) [ 617.284515][ T3783] ? __init_swait_queue_head (kbuild/src/consumer/include/linux/list.h:45 (discriminator 2) kbuild/src/consumer/kernel/sched/swait.c:12 (discriminator 2))
The kernel config and materials to reproduce are available at:
https://download.01.org/0day-ci/archive/20251210/[email protected]
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Quoted 88 lines · kernel test robot
Hello,
kernel test robot noticed "Oops:general_protection_fault,probably_for_non-canonical_address#:#[##]KASAN" on:
commit:
a924e7ffd1b0b2e015ed1174662d52053a2339c4("[PATCH v4 5/5]io_uring: avoiduring_lockforIORING_SETUP_SINGLE_ISSUER")
url: https://github.com/intel-lab-lkp/linux/commits/Caleb-Sander-Mateos/io_uring-use-release-acquire-ordering-for-IORING_SETUP_R_DISABLED/20251203-004502
base: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux.git for-next
patch link: https://lore.kernel.org/all/[email protected]/
patch subject: [PATCH v4 5/5]io_uring: avoiduring_lockforIORING_SETUP_SINGLE_ISSUERin testcase: trinity
version:
with following parameters:runtime: 300s group: group-00 nr_groups: 5config: x86_64-randconfig-015-20251205
compiler: gcc-14
test machine: qemu-system-x86_64 -enable-kvm -cpu SandyBridge -smp 2 -m 32G(please refer to attached dmesg/kmsg for entire log/backtrace)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-lkp/[email protected][ 617.261968][ T3783] Oops: general protection fault, probably for non-canonical address 0xdffffc00000000f3: 0000 [#1] KASAN [ 617.267361][ T3783] KASAN: null-ptr-deref in range [0x0000000000000798-0x000000000000079f] [ 617.268334][ T3783] CPU: 0 UID: 65534 PID: 3783 Comm: trinity-c0 Not tainted 6.18.0-rc6-00312-ga924e7ffd1b0 #1 PREEMPT(lazy) f22e3d733e0666690a06b271bf82578b56b40aa3 [ 617.269927][ T3783] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 617.271108][ T3783] RIP: 0010:task_work_add (kbuild/src/consumer/kernel/task_work.c:68 (discriminator 2)) [ 617.271772][ T3783] Code: 39 25 df fe 67 03 0f 85 8c 01 00 00 e8 1c bd 24 00 4d 8d ac 24 98 07 00 00 48 b8 00 00 00 00 00 fc ff df 4c 89 ea 48 c1 ea 03 <80> 3c 02 00 0f 85 2f 02 00 00 49 89 df 48 8d 44 24 38 4d 8b b4 24 All code ======== 0: 39 25 df fe 67 03 cmp %esp,0x367fedf(%rip) # 0x367fee5 6: 0f 85 8c 01 00 00 jne 0x198 c: e8 1c bd 24 00 call 0x24bd2d 11: 4d 8d ac 24 98 07 00 lea 0x798(%r12),%r13 18: 00 19: 48 b8 00 00 00 00 00 movabs $0xdffffc0000000000,%rax 20: fc ff df 23: 4c 89 ea mov %r13,%rdx 26: 48 c1 ea 03 shr $0x3,%rdx 2a:* 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1) <-- trapping instruction 2e: 0f 85 2f 02 00 00 jne 0x263 34: 49 89 df mov %rbx,%r15 37: 48 8d 44 24 38 lea 0x38(%rsp),%rax 3c: 4d rex.WRB 3d: 8b .byte 0x8b 3e: b4 24 mov $0x24,%ahCode starting with the faulting instruction
===========================================0: 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1) 4: 0f 85 2f 02 00 00 jne 0x239 a: 49 89 df mov %rbx,%r15 d: 48 8d 44 24 38 lea 0x38(%rsp),%rax 12: 4d rex.WRB 13: 8b .byte 0x8b 14: b4 24 mov $0x24,%ah [ 617.273774][ T3783] RSP: 0018:ffff88816ac9fb10 EFLAGS: 00010206 [ 617.274486][ T3783] RAX: dffffc0000000000 RBX: ffff88816ac9fbe0 RCX: 0000000000000000 [ 617.275413][ T3783] RDX: 00000000000000f3 RSI: 0000000000000000 RDI: 0000000000000000 [ 617.276336][ T3783] RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000000 [ 617.277257][ T3783] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 [ 617.278178][ T3783] R13: 0000000000000798 R14: 1ffff1102d593f65 R15: ffff88816ac9fcf0 [ 617.279075][ T3783] FS: 00000000010a2880(0000) GS:0000000000000000(0000) knlGS:0000000000000000 [ 617.280114][ T3783] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 617.280856][ T3783] CR2: 00000000d684d000 CR3: 000000015f35b000 CR4: 00000000000406f0 [ 617.281749][ T3783] Call Trace: [ 617.282202][ T3783] <TASK> [ 617.282613][ T3783] ? lockdep_init_map_type (kbuild/src/consumer/kernel/locking/lockdep.c:4973 (discriminator 1)) [ 617.283274][ T3783] ? task_work_set_notify_irq (kbuild/src/consumer/kernel/task_work.c:56) [ 617.283904][ T3783] ? lockdep_init_map_type (kbuild/src/consumer/kernel/locking/lockdep.c:4973 (discriminator 1)) [ 617.284515][ T3783] ? __init_swait_queue_head (kbuild/src/consumer/include/linux/list.h:45 (discriminator 2) kbuild/src/consumer/kernel/sched/swait.c:12 (discriminator 2))
Quoted 2 lines
The kernel config and materials to reproduce are available at:
https://download.01.org/0day-ci/archive/20251210/[email protected]
The full Call Trace is more useful:
[ 617.261968][ T3783] Oops: general protection fault, probably for non-canonical address 0xdffffc00000000f3: 0000 [#1] KASAN [ 617.267361][ T3783] KASAN: null-ptr-deref in range [0x0000000000000798-0x000000000000079f] [ 617.268334][ T3783] CPU: 0 UID: 65534 PID: 3783 Comm: trinity-c0 Not tainted 6.18.0-rc6-00312-ga924e7ffd1b0 #1 PREEMPT(lazy) f22e3d733e0666690a06b271bf82578b56b40aa3 [ 617.269927][ T3783] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 617.271108][ T3783] RIP: 0010:task_work_add+0xbd/0x330 [ 617.271772][ T3783] Code: 39 25 df fe 67 03 0f 85 8c 01 00 00 e8 1c bd 24 00 4d 8d ac 24 98 07 00 00 48 b8 00 00 00 00 00 fc ff df 4c 89 ea 48 c1 ea 03 <80> 3c 02 00 0f 85 2f 02 00 00 49 89 df 48 8d 44 24 38 4d 8b b4 24 [ 617.273774][ T3783] RSP: 0018:ffff88816ac9fb10 EFLAGS: 00010206 [ 617.274486][ T3783] RAX: dffffc0000000000 RBX: ffff88816ac9fbe0 RCX: 0000000000000000 [ 617.275413][ T3783] RDX: 00000000000000f3 RSI: 0000000000000000 RDI: 0000000000000000 [ 617.276336][ T3783] RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000000 [ 617.277257][ T3783] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 [ 617.278178][ T3783] R13: 0000000000000798 R14: 1ffff1102d593f65 R15: ffff88816ac9fcf0 [ 617.279075][ T3783] FS: 00000000010a2880(0000) GS:0000000000000000(0000) knlGS:0000000000000000 [ 617.280114][ T3783] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 617.280856][ T3783] CR2: 00000000d684d000 CR3: 000000015f35b000 CR4: 00000000000406f0 [ 617.281749][ T3783] Call Trace: [ 617.282202][ T3783] <TASK> [ 617.282613][ T3783] ? lockdep_init_map_type+0x5c/0x240 [ 617.283274][ T3783] ? task_work_set_notify_irq+0x60/0x60 [ 617.283904][ T3783] ? lockdep_init_map_type+0x5c/0x240 [ 617.284515][ T3783] ? __init_swait_queue_head+0xca/0x160 [ 617.285149][ T3783] io_ring_ctx_lock_nested+0x295/0x340 [ 617.285859][ T3783] ? io_cqring_timer_wakeup+0xb0/0xb0 [ 617.286469][ T3783] ? perf_trace_io_uring_submit_req+0x20/0x20 [ 617.287193][ T3783] ? nohz_balancer_kick+0x140/0x7a0 [ 617.294458][ T3783] ? io_rings_free+0x7b/0xe0 [ 617.295099][ T3783] io_ring_ctx_wait_and_kill+0x6e/0x220 [ 617.295749][ T3783] ? percpu_counter_add+0x90/0x90 [ 617.296356][ T3783] ? security_capset+0xa0/0xc0 [ 617.296941][ T3783] io_uring_create+0xa0f/0xa52 [ 617.297537][ T3783] ? io_uring_poll.cold+0x1a/0x1a [ 617.298159][ T3783] io_uring_setup.cold+0x1a/0x2e [ 617.298772][ T3783] ? io_prepare_config+0xb10/0xb10 [ 617.299469][ T3783] __x64_sys_io_uring_setup+0xc4/0x170 [ 617.300135][ T3783] do_syscall_64+0x72/0xe40 [ 617.300725][ T3783] entry_SYSCALL_64_after_hwframe+0x4b/0x53
So we're calling io_ring_ctx_wait_and_kill() from io_uring_create(), meaning the io_uring creation errored out early. Looks like there are several "goto err;" paths before ctx->submitter_task is assigned. If those error paths are taken, io_ring_ctx_lock_nested() can be called in the IORING_SETUP_SINGLE_ISSUER && !IORING_SETUP_R_DISABLED case with a NULL submitter_task. I think this can be fixed by just initializing submitter_task earlier.
Thanks,
Caleb
Quoted 7 lines
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki