io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER
Subsystems (2)
v3 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 this seems very 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.
In io_uring_register(), continue to always acquire the uring_lock mutex. io_uring_register() can be called on a disabled io_ring_ctx (indeed, it's required to enable it), when submitter_task isn't set yet. After submitter_task is set, io_uring_register() is only permitted on submitter_task, so uring_lock suffices to exclude all other users.
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 (4):
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 | 36 +++--- io_uring/eventfd.c | 5 +- io_uring/fdinfo.c | 6 +- io_uring/filetable.c | 8 +- io_uring/futex.c | 14 ++- io_uring/io_uring.c | 205 ++++++++++++++++++++------------- io_uring/io_uring.h | 204 +++++++++++++++++++++++++++++--- io_uring/kbuf.c | 38 +++--- 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 | 34 +++--- io_uring/rsrc.c | 37 +++--- io_uring/rsrc.h | 3 +- io_uring/rw.c | 2 +- io_uring/splice.c | 5 +- io_uring/sqpoll.c | 5 +- io_uring/tctx.c | 24 ++-- io_uring/uring_cmd.c | 13 ++- io_uring/waitid.c | 13 ++- io_uring/zcrx.c | 2 +- 25 files changed, 506 insertions(+), 234 deletions(-)
Signature · 1 line
2.45.2
PATCH v3 1/4 io_uring: clear IORING_SETUP_SINGLE_ISSUER for IORING_SETUP_SQPOLL
IORING_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 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 v3 2/4 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 v3 3/4 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. A separate set of helpers is provided for the io_uring_register() syscall, as it will need a different locking mechanism in IORING_SETUP_SINGLE_ISSUER mode. 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.
Non-io_uring_register() helpers:
- io_ring_ctx_lock() for mutex_lock(&ctx->uring_lock)
- io_ring_ctx_trylock() for mutex_trylock(&ctx->uring_lock)
- io_ring_ctx_unlock() for mutex_unlock(&ctx->uring_lock)
- io_ring_ctx_assert_locked() for lockdep_assert_held(&ctx->uring_lock)
io_uring_register() helpers:
- io_ring_register_ctx_lock() for mutex_lock(&ctx->uring_lock)
- io_ring_register_ctx_lock_nested() for mutex_lock_nested(&ctx->uring_lock, ...)
- io_ring_register_ctx_unlock() for mutex_unlock(&ctx->uring_lock)
- io_ring_register_ctx_lock_held() for lockdep_is_held(&ctx->uring_lock)
- io_ring_register_ctx_assert_locked() for lockdep_assert_held(&ctx->uring_lock)
- must_hold_io_ring_register_ctx_lock for __must_hold(&ctx->uring_lock)
- releases_io_ring_register_ctx_lock for __releases(ctx->uring_lock)
- acquires_io_ring_register_ctx_lock for __acquires(ctx->uring_lock)
--- include/linux/io_uring_types.h | 12 +-- io_uring/cancel.c | 36 ++++--- io_uring/eventfd.c | 5 +- io_uring/fdinfo.c | 6 +- io_uring/filetable.c | 8 +- io_uring/futex.c | 14 +-- io_uring/io_uring.c | 185 +++++++++++++++++++-------------- io_uring/io_uring.h | 109 ++++++++++++++++--- io_uring/kbuf.c | 38 ++++--- 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 | 34 +++--- io_uring/rsrc.c | 37 ++++--- io_uring/rsrc.h | 3 +- io_uring/rw.c | 2 +- io_uring/splice.c | 5 +- io_uring/sqpoll.c | 5 +- io_uring/tctx.c | 24 +++-- io_uring/uring_cmd.c | 13 ++- io_uring/waitid.c | 13 +-- io_uring/zcrx.c | 2 +- 25 files changed, 392 insertions(+), 233 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 +20 -16
@@ -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);
@@ -255,11 +256,11 @@ 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) +must_hold_io_ring_register_ctx_lock (ctx) {struct io_cancel_data cd = { .ctx = ctx, .seq =atomic_inc_return (&ctx->cancel_seq), };
@@ -317,11 +318,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_register_ctx_unlock (ctx);if (ret != -EALREADY )break ; ret =io_run_task_work_sig (ctx);if (ret <0 )
@@ -329,15 +330,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_register_ctx_lock (ctx); }while (1 );finish_wait (&ctx->cq_wait, &wait); -mutex_lock (&ctx->uring_lock); +io_ring_register_ctx_lock (ctx);if (ret == -ENOENT || ret >0 ) ret =0 ; out:if (file)
@@ -351,11 +352,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 +369,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 +479,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 +546,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/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_register_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_register_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 +3 -3
@@ -75,11 +75,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);
@@ -255,10 +255,10 @@ __cold void io_uring_show_fdinfo(struct seq_file *m, struct file *file)/* * 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)) {__io_uring_show_fdinfo (ctx, m); -mutex_unlock (&ctx->uring_lock); +io_ring_ctx_unlock (ctx,NULL ); } }
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 +109 -76
774 lines not on this page · raw message
io_uring/io_uring.h +94 -15
168 lines not on this page · raw message
io_uring/kbuf.c +23 -15
@@ -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 ;
@@ -409,12 +412,16 @@ static int io_remove_buffers_legacy(struct io_ring_ctx *ctx, unsigned long nbufs) {unsigned long i =0 ;struct io_buffer *nxt; -/* protects io_buffers_cache */ -lockdep_assert_held (&ctx->uring_lock); +/* +* ctx uring lock protects io_buffers_cache. io_remove_buffers_legacy() +* is called from both issue and io_uring_register() paths, +* but io_ring_ctx_assert_locked() is valid for both. +*/ +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 +586,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 +612,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_register_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 +688,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_register_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))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 +17 -17
@@ -205,13 +205,13 @@ static __cold int __io_register_iowq_aff(struct io_ring_ctx *ctx,int ret;if (!(ctx->flags &IORING_SETUP_SQPOLL )) { ret =io_wq_cpu_affinity (current->io_uring, new_mask); }else { -mutex_unlock (&ctx->uring_lock); +io_ring_register_ctx_unlock (ctx); ret =io_sqpoll_wq_cpu_affinity (ctx, new_mask); -mutex_lock (&ctx->uring_lock); +io_ring_register_ctx_lock (ctx); }return ret; }
@@ -252,11 +252,11 @@ static __cold int io_unregister_iowq_aff(struct io_ring_ctx *ctx)return __io_register_iowq_aff (ctx,NULL ); }static __cold int io_register_iowq_max_workers (struct io_ring_ctx *ctx,void __user *arg) - __must_hold(&ctx->uring_lock) +must_hold_io_ring_register_ctx_lock (ctx) {struct io_tctx_node *node;struct io_uring_task *tctx =NULL ;struct io_sq_data *sqd =NULL ;__u32 new_count[2 ];
@@ -272,18 +272,18 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx, sqd = ctx->sq_data;if (sqd) {struct task_struct *tsk;/* -* Observe the correct sqd->lock -> ctx->uring_lock -* ordering. Fine to drop uring_lock here, we hold +* Observe the correct sqd->lock -> ctx uring lock +* ordering. Fine to drop ctx uring lock here, we hold * a ref to the ctx. */ refcount_inc (&sqd->refs); -mutex_unlock (&ctx->uring_lock); +io_ring_register_ctx_unlock (ctx);mutex_lock (&sqd->lock); -mutex_lock (&ctx->uring_lock); +io_ring_register_ctx_lock (ctx); tsk =sqpoll_task_locked (sqd);if (tsk) tctx = tsk->io_uring; } }else {
@@ -304,14 +304,14 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx, }else {memset (new_count,0 ,sizeof (new_count)); }if (sqd) { -mutex_unlock (&ctx->uring_lock); +io_ring_register_ctx_unlock (ctx);mutex_unlock (&sqd->lock);io_put_sq_data (sqd); -mutex_lock (&ctx->uring_lock); +io_ring_register_ctx_lock (ctx); }if (copy_to_user (arg, new_count,sizeof (new_count)))return -EFAULT ;
@@ -331,14 +331,14 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx, (void )io_wq_max_workers (tctx->io_wq, new_count); }return 0 ; err:if (sqd) { -mutex_unlock (&ctx->uring_lock); +io_ring_register_ctx_unlock (ctx);mutex_unlock (&sqd->lock);io_put_sq_data (sqd); -mutex_lock (&ctx->uring_lock); +io_ring_register_ctx_lock (ctx); }return ret; } static int io_register_clock(struct io_ring_ctx *ctx,
@@ -468,13 +468,13 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)/* * If using SQPOLL, park the thread */ if (ctx->sq_data) { -mutex_unlock (&ctx->uring_lock); +io_ring_register_ctx_unlock (ctx);io_sq_thread_park (ctx->sq_data); -mutex_lock (&ctx->uring_lock); +io_ring_register_ctx_lock (ctx); }/* * We'll do the swap. Grab the ctx->mmap_lock, which will exclude * any new mmap's on the ring fd. Clear out existing mappings to prevent
@@ -606,12 +606,12 @@ static int io_register_mem_region(struct io_ring_ctx *ctx, void __user *uarg)return 0 ; }static int __io_uring_register (struct io_ring_ctx *ctx,unsigned opcode,void __user *arg,unsigned nr_args) - __releases(ctx->uring_lock) - __acquires(ctx->uring_lock) +releases_io_ring_register_ctx_lock (ctx) +acquires_io_ring_register_ctx_lock (ctx) {int ret;/* * We don't quiesce the refs for register anymore and so it can't be
@@ -913,15 +913,15 @@ SYSCALL_DEFINE4(io_uring_register, unsigned int, fd, unsigned int, opcode, file =io_uring_register_get_file (fd, use_registered_ring);if (IS_ERR (file))return PTR_ERR (file); ctx = file->private_data; -mutex_lock (&ctx->uring_lock); +io_ring_register_ctx_lock (ctx); ret =__io_uring_register (ctx, opcode, arg, nr_args);trace_io_uring_register (ctx, opcode, ctx->file_table.data.nr, ctx->buf_table.nr, ret); -mutex_unlock (&ctx->uring_lock); +io_ring_register_ctx_unlock (ctx);fput (file);return ret; }
io_uring/rsrc.c +21 -16
@@ -349,11 +349,11 @@ static int __io_register_rsrc_update(struct io_ring_ctx *ctx, unsigned type, struct io_uring_rsrc_update2 *up, unsigned nr_args) {__u32 tmp; -lockdep_assert_held (&ctx->uring_lock); +io_ring_ctx_assert_locked (ctx);if (check_add_overflow (up->offset, nr_args, &tmp))return -EOVERFLOW ;switch (type) {
@@ -497,14 +497,16 @@ int io_files_update(struct io_kiocb *req, unsigned int issue_flags) up2.resv2 =0 ;if (up->offset ==IORING_FILE_INDEX_ALLOC ) { ret =io_files_update_with_index_alloc (req, issue_flags); }else { -io_ring_submit_lock (ctx, issue_flags); +struct io_ring_ctx_lock_state lock_state; + +io_ring_submit_lock (ctx, issue_flags, &lock_state); ret =__io_register_rsrc_update (ctx,IORING_RSRC_FILE , &up2, up->nr_args); -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 );
@@ -940,18 +942,19 @@ int io_buffer_register_bvec(struct io_uring_cmd *cmd, struct request *rq, void (*release)(void *), unsigned int index, unsigned int issue_flags) { struct io_ring_ctx *ctx = cmd_to_io_kiocb(cmd)->ctx;struct io_rsrc_data *data = &ctx->buf_table; +struct io_ring_ctx_lock_state lock_state;struct req_iterator rq_iter;struct io_mapped_ubuf *imu;struct io_rsrc_node *node;struct bio_vec bv;unsigned int nr_bvecs =0 ;int ret =0 ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state);if (index >= data->nr) { ret = -EINVAL ; goto unlock; } index =array_index_nospec (index, data->nr);
@@ -993,24 +996,25 @@ int io_buffer_register_bvec(struct io_uring_cmd *cmd, struct request *rq, imu->nr_bvecs = nr_bvecs; node->buf = imu; data->nodes[index] = node; unlock: -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return ret; }EXPORT_SYMBOL_GPL (io_buffer_register_bvec);int io_buffer_unregister_bvec (struct io_uring_cmd *cmd,unsigned int index,unsigned int issue_flags) {struct io_ring_ctx *ctx =cmd_to_io_kiocb (cmd)->ctx;struct io_rsrc_data *data = &ctx->buf_table; +struct io_ring_ctx_lock_state lock_state;struct io_rsrc_node *node;int ret =0 ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state);if (index >= data->nr) { ret = -EINVAL ; goto unlock; } index =array_index_nospec (index, data->nr);
@@ -1026,11 +1030,11 @@ int io_buffer_unregister_bvec(struct io_uring_cmd *cmd, unsigned int index, }io_put_rsrc_node (ctx, node); data->nodes[index] =NULL ; unlock: -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return ret; }EXPORT_SYMBOL_GPL (io_buffer_unregister_bvec); static int validate_fixed_range(u64 buf_addr, size_t len,
@@ -1117,27 +1121,28 @@ static int io_import_fixed(int ddir, struct iov_iter *iter, }inline struct io_rsrc_node *io_find_buf_node (struct io_kiocb *req,unsigned issue_flags) { +struct io_ring_ctx_lock_state lock_state;struct io_ring_ctx *ctx = req->ctx;struct io_rsrc_node *node;if (req->flags &REQ_F_BUF_NODE )return req->buf_node; req->flags |=REQ_F_BUF_NODE ; -io_ring_submit_lock (ctx, issue_flags); +io_ring_submit_lock (ctx, issue_flags, &lock_state); node =io_rsrc_node_lookup (&ctx->buf_table, req->buf_index);if (node) { node->refs++; req->buf_node = node; -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return node; } req->flags &= ~REQ_F_BUF_NODE ; -io_ring_submit_unlock (ctx, issue_flags); +io_ring_submit_unlock (ctx, issue_flags, &lock_state);return NULL ; } int io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter, u64 buf_addr, size_t len, int ddir,
@@ -1154,24 +1159,24 @@ int io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter,/* Lock two rings at once. The rings must be different! */ static void lock_two_rings (struct io_ring_ctx *ctx1,struct io_ring_ctx *ctx2) {if (ctx1 > ctx2)swap (ctx1, ctx2); -mutex_lock (&ctx1->uring_lock); -mutex_lock_nested (&ctx2->uring_lock,SINGLE_DEPTH_NESTING ); +io_ring_register_ctx_lock (ctx1); +io_ring_register_ctx_lock_nested (ctx2,SINGLE_DEPTH_NESTING ); }/* Both rings are locked by the caller. */ static int io_clone_buffers (struct io_ring_ctx *ctx,struct io_ring_ctx *src_ctx,struct io_uring_clone_buffers *arg) {struct io_rsrc_data data;int i, ret, off, nr;unsigned int nbufs; -lockdep_assert_held (&ctx->uring_lock); -lockdep_assert_held (&src_ctx->uring_lock); +io_ring_register_ctx_assert_locked (ctx); +io_ring_register_ctx_assert_locked (src_ctx);/* * Accounting state is shared between the two rings; that only works if * both rings are accounted towards the same counters. */
@@ -1300,11 +1305,11 @@ int io_register_clone_buffers(struct io_ring_ctx *ctx, void __user *arg)if (IS_ERR (file))return PTR_ERR (file); src_ctx = file->private_data;if (src_ctx != ctx) { -mutex_unlock (&ctx->uring_lock); +io_ring_register_ctx_unlock (ctx);lock_two_rings (ctx, src_ctx);if (src_ctx->submitter_task && src_ctx->submitter_task != current) { ret = -EEXIST ;
@@ -1314,11 +1319,11 @@ int io_register_clone_buffers(struct io_ring_ctx *ctx, void __user *arg) ret =io_clone_buffers (ctx, src_ctx, &buf); out:if (src_ctx != ctx) -mutex_unlock (&src_ctx->uring_lock); +io_ring_register_ctx_unlock (src_ctx);fput (file);return ret; }
io_uring/rsrc.h +2 -1
@@ -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,
@@ -97,11 +98,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 +14 -10
@@ -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 ; } }
@@ -269,13 +273,13 @@ int io_ringfd_register(struct io_ring_ctx *ctx, void __user *__arg,int ret, i;if (!nr_args || nr_args >IO_RINGFD_REG_MAX )return -EINVAL ; -mutex_unlock (&ctx->uring_lock); +io_ring_register_ctx_unlock (ctx); ret =__io_uring_add_tctx_node (ctx); -mutex_lock (&ctx->uring_lock); +io_ring_register_ctx_lock (ctx);if (ret)return ret; tctx = current->io_uring;for (i =0 ; i < nr_args; i++) {
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 v3 4/4 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.
In io_uring_register(), continue to always acquire the uring_lock mutex. io_uring_register() can be called on a disabled io_ring_ctx (indeed, it's required to enable it), when submitter_task isn't set yet. After submitter_task is set, io_uring_register() is only permitted on submitter_task, so uring_lock suffices to exclude all other users.
--- io_uring/io_uring.c | 11 +++++ io_uring/io_uring.h | 101 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 109 insertions(+), 3 deletions(-)
io_uring/io_uring.c +11 -0
@@ -363,10 +363,21 @@ 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->lock_state->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 +98 -3
142 lines not on this page · raw message
Signature · 1 line
2.45.2
kernel test robot
build botkernel test robot noticed "WARNING:at_io_uring/io_uring.h:#io_ring_ctx_wait_and_kill" on:
Hello,
kernel test robot noticed "WARNING:at_io_uring/io_uring.h:#io_ring_ctx_wait_and_kill" on:
commit: f82bff8359e8780d831f1180c9e8196d2d20f03c ("[PATCH v3 4/4] io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER")
url: https://github.com/intel-lab-lkp/linux/commits/Caleb-Sander-Mateos/io_uring-clear-IORING_SETUP_SINGLE_ISSUER-for-IORING_SETUP_SQPOLL/20251126-074303
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 v3 4/4] io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER
in testcase: trinity
version:
with following parameters:
runtime: 300s group: group-01 nr_groups: 5
config: x86_64-kexec
compiler: clang-20
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]
[ 22.144951][ T6341] ------------[ cut here ]------------ [ 22.145674][ T1564] [main] futex: 0 owner:0 [ 22.146000][ T6341] WARNING: CPU: 1 PID: 6341 at io_uring/io_uring.h:266 io_ring_ctx_wait_and_kill (io_uring/io_uring.h:266) [ 22.146149][ T1564] [ 22.146482][ T6341] Modules linked in: [ 22.147631][ T1564] [main] futex: 0 owner:0 [ 22.147751][ T6341] can_bcm [ 22.148030][ T1564] [ 22.148330][ T6341] can_raw [ 22.148974][ T1564] [main] futex: 0 owner:0 [ 22.149038][ T6341] can [ 22.149264][ T1564] [ 22.149572][ T6341] cn scsi_transport_iscsi sr_mod cdrom [ 22.149579][ T6341] CPU: 1 UID: 65534 PID: 6341 Comm: trinity-c3 Not tainted 6.18.0-rc6-00278-gf82bff8359e8 #1 PREEMPT(voluntary) [ 22.149582][ T6341] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 22.151109][ T1564] [main] Reserved/initialized 10 futexes. [ 22.151645][ T6341] RIP: 0010:io_ring_ctx_wait_and_kill (io_uring/io_uring.h:266) [ 22.152382][ T1564] [ 22.152774][ T6341] Code: 02 00 00 e8 af e2 0b 00 65 48 8b 05 97 1a 5f 02 48 3b 44 24 48 0f 85 98 00 00 00 48 83 c4 50 5b 41 5e 41 5f e9 be c6 f8 00 cc <0f> 0b e9 ed fe ff ff 31 c0 4c 8d 7c 24 28 49 89 47 18 49 89 47 10 All code ======== 0: 02 00 add (%rax),%al 2: 00 e8 add %ch,%al 4: af scas %es:(%rdi),%eax 5: e2 0b loop 0x12 7: 00 65 48 add %ah,0x48(%rbp) a: 8b 05 97 1a 5f 02 mov 0x25f1a97(%rip),%eax # 0x25f1aa7 10: 48 3b 44 24 48 cmp 0x48(%rsp),%rax 15: 0f 85 98 00 00 00 jne 0xb3 1b: 48 83 c4 50 add $0x50,%rsp 1f: 5b pop %rbx 20: 41 5e pop %r14 22: 41 5f pop %r15 24: e9 be c6 f8 00 jmp 0xf8c6e7 29: cc int3 2a:* 0f 0b ud2 <-- trapping instruction 2c: e9 ed fe ff ff jmp 0xffffffffffffff1e 31: 31 c0 xor %eax,%eax 33: 4c 8d 7c 24 28 lea 0x28(%rsp),%r15 38: 49 89 47 18 mov %rax,0x18(%r15) 3c: 49 89 47 10 mov %rax,0x10(%r15)
Code starting with the faulting instruction
===========================================
0: 0f 0b ud2 2: e9 ed fe ff ff jmp 0xfffffffffffffef4 7: 31 c0 xor %eax,%eax 9: 4c 8d 7c 24 28 lea 0x28(%rsp),%r15 e: 49 89 47 18 mov %rax,0x18(%r15) 12: 49 89 47 10 mov %rax,0x10(%r15) [ 22.154288][ T1564] [main] sysv_shm: id:0 size:40960 flags:7b0 ptr:(nil) [ 22.155063][ T6341] RSP: 0018:ffffc90000217db0 EFLAGS: 00010246 [ 22.155249][ T1564] [ 22.155714][ T6341] [ 22.157177][ T1564] [main] sysv_shm: id:1 size:4096 flags:17b0 ptr:(nil) [ 22.157242][ T6341] RAX: 0000000000000000 RBX: ffff88810d435800 RCX: 0000000000000001 [ 22.157489][ T1564] [ 22.157954][ T6341] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88810d435800 [ 22.159286][ T1564] [main] Added 28 filenames from /dev [ 22.159684][ T6341] RBP: 00000000fffffff2 R08: 0000000000000000 R09: ffffffff00000000 [ 22.159688][ T6341] R10: 0000000000000010 R11: 0000000000100000 R12: 0000000000000000 [ 22.160050][ T1564] [ 22.160414][ T6341] R13: 0000000000000000 R14: 0000000000000000 R15: ffff888119bf9000 [ 22.161762][ T1564] [main] Added 17230 filenames from /proc [ 22.161924][ T6341] FS: 00000000010a2880(0000) GS:ffff88889c519000(0000) knlGS:0000000000000000 [ 22.162568][ T1564] [ 22.162958][ T6341] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 22.164372][ T1564] [main] Added 15134 filenames from /sys [ 22.164448][ T6341] CR2: 0000000000000008 CR3: 0000000165c9c000 CR4: 00000000000406f0 [ 22.164456][ T6341] Call Trace: [ 22.164626][ T1564] [ 22.166367][ T6341] <TASK> [ 22.168128][ T1564] [main] Couldn't open socket (30:1:0). Address family not supported by protocol [ 22.168186][ T6341] io_uring_create (io_uring/io_uring.c:?) [ 22.168352][ T1564] [ 22.168974][ T6341] __x64_sys_io_uring_setup (io_uring/io_uring.c:3766) [ 22.170902][ T1564] [main] Couldn't open socket (27:1:3). Address family not supported by protocol [ 22.172459][ T6341] do_syscall_64 (arch/x86/entry/syscall_64.c:?) [ 22.172512][ T1564] [ 22.173163][ T6341] ? exc_page_fault (arch/x86/include/asm/irqflags.h:37 arch/x86/include/asm/irqflags.h:114 arch/x86/mm/fault.c:1484 arch/x86/mm/fault.c:1532) [ 22.175090][ T1564] [main] Couldn't open socket (44:3:0). Address family not supported by protocol [ 22.175097][ T6341] entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) [ 22.175309][ T1564] [ 22.175935][ T6341] RIP: 0033:0x453b29 [ 22.176865][ T1564] Can't do protocol NETBEUI [ 22.176935][ T6341] Code: 00 f3 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 3b 84 00 00 c3 66 2e 0f 1f 84 00 00 00 00
All code
========
0: 00 f3 add %dh,%bl
2: c3 ret
3: 66 2e 0f 1f 84 00 00 cs nopw 0x0(%rax,%rax,1)
a: 00 00 00
d: 0f 1f 40 00 nopl 0x0(%rax) 11: 48 89 f8 mov %rdi,%rax 14: 48 89 f7 mov %rsi,%rdi 17: 48 89 d6 mov %rdx,%rsi 1a: 48 89 ca mov %rcx,%rdx 1d: 4d 89 c2 mov %r8,%r10 20: 4d 89 c8 mov %r9,%r8 23: 4c 8b 4c 24 08 mov 0x8(%rsp),%r9 28: 0f 05 syscall 2a:* 48 3d 01 f0 ff ff cmp $0xfffffffffffff001,%rax <-- trapping instruction 30: 0f 83 3b 84 00 00 jae 0x8471 36: c3 ret 37: 66 data16 38: 2e cs 39: 0f .byte 0xf 3a: 1f (bad) 3b: 84 00 test %al,(%rax) 3d: 00 00 add %al,(%rax) ...
Code starting with the faulting instruction
===========================================
0: 48 3d 01 f0 ff ff cmp $0xfffffffffffff001,%rax 6: 0f 83 3b 84 00 00 jae 0x8447 c: c3 ret d: 66 data16 e: 2e cs f: 0f .byte 0xf 10: 1f (bad) 11: 84 00 test %al,(%rax) 13: 00 00 add %al,(%rax)
The kernel config and materials to reproduce are available at:
https://download.01.org/0day-ci/archive/20251127/[email protected]
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
syzbot ci has tested the following series
syzbot ci has tested the following series
[v3] io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER
https://lore.kernel.org/all/[email protected]
* [PATCH v3 1/4] io_uring: clear IORING_SETUP_SINGLE_ISSUER for IORING_SETUP_SQPOLL
* [PATCH v3 2/4] io_uring: use io_ring_submit_lock() in io_iopoll_req_issued()
* [PATCH v3 3/4] io_uring: factor out uring_lock helpers
* [PATCH v3 4/4] io_uring: avoid uring_lock for IORING_SETUP_SINGLE_ISSUER
and found the following issues:
* SYZFAIL: failed to recv rpc
* WARNING in io_ring_ctx_wait_and_kill
* WARNING in io_uring_alloc_task_context
* WARNING: suspicious RCU usage in io_eventfd_unregister
Full report is available here:
https://ci.syzbot.org/series/dde98852-0135-44b2-bbef-9ff9d772f924
***
SYZFAIL: failed to recv rpc
tree: linux-next URL: https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next base: 92fd6e84175befa1775e5c0ab682938eca27c0b2 arch: amd64 compiler: Debian clang version 20.1.8 (++20250708063551+0c9f909b7976-1~exp1~20250708183702.136), Debian LLD 20.1.8 config: https://ci.syzbot.org/builds/9d67ded7-d9a8-41e3-8b58-51340991cf96/config C repro: https://ci.syzbot.org/findings/19ae4090-3486-4e2a-973e-dcb6ec3ba0d1/c_repro syz repro: https://ci.syzbot.org/findings/19ae4090-3486-4e2a-973e-dcb6ec3ba0d1/syz_repro
SYZFAIL: failed to recv rpc
fd=3 want=4 recv=0 n=0 (errno 9: Bad file descriptor)
***
WARNING in io_ring_ctx_wait_and_kill
tree: linux-next URL: https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next base: 92fd6e84175befa1775e5c0ab682938eca27c0b2 arch: amd64 compiler: Debian clang version 20.1.8 (++20250708063551+0c9f909b7976-1~exp1~20250708183702.136), Debian LLD 20.1.8 config: https://ci.syzbot.org/builds/9d67ded7-d9a8-41e3-8b58-51340991cf96/config C repro: https://ci.syzbot.org/findings/f5ff9320-bf6f-40b4-a6b3-eee18fa83053/c_repro syz repro: https://ci.syzbot.org/findings/f5ff9320-bf6f-40b4-a6b3-eee18fa83053/syz_repro
------------[ cut here ]------------ WARNING: io_uring/io_uring.h:266 at io_ring_ctx_lock io_uring/io_uring.h:266 [inline], CPU#0: syz.0.17/5967 WARNING: io_uring/io_uring.h:266 at io_ring_ctx_wait_and_kill+0x35f/0x490 io_uring/io_uring.c:3119, CPU#0: syz.0.17/5967 Modules linked in: CPU: 0 UID: 0 PID: 5967 Comm: syz.0.17 Not tainted syzkaller #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 RIP: 0010:io_ring_ctx_lock io_uring/io_uring.h:266 [inline] RIP: 0010:io_ring_ctx_wait_and_kill+0x35f/0x490 io_uring/io_uring.c:3119 Code: 4e 11 48 3b 84 24 20 01 00 00 0f 85 1e 01 00 00 48 8d 65 d8 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc cc e8 92 fa 96 00 90 <0f> 0b 90 e9 be fd ff ff 48 8d 7c 24 40 ba 70 00 00 00 31 f6 e8 08 RSP: 0018:ffffc90004117b80 EFLAGS: 00010293 RAX: ffffffff812ac5ee RBX: ffff88810d784000 RCX: ffff888104363a80 RDX: 0000000000000000 RSI: 0000000000001000 RDI: 0000000000000000 RBP: ffffc90004117d00 R08: ffffc90004117c7f R09: 0000000000000000 R10: ffffc90004117c40 R11: fffff52000822f90 R12: 1ffff92000822f74 R13: dffffc0000000000 R14: ffffc90004117c70 R15: 0000000000000000 FS: 000055558ddb3500(0000) GS:ffff88818e88a000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f07135e7dac CR3: 00000001728f4000 CR4: 00000000000006f0 Call Trace: <TASK> io_uring_create+0x6b6/0x940 io_uring/io_uring.c:3738 io_uring_setup io_uring/io_uring.c:3764 [inline] __do_sys_io_uring_setup io_uring/io_uring.c:3798 [inline] __se_sys_io_uring_setup+0x235/0x240 io_uring/io_uring.c:3789 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xfa/0xf80 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f071338f749 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007fff80b05b58 EFLAGS: 00000246 ORIG_RAX: 00000000000001a9 RAX: ffffffffffffffda RBX: 00007f07135e5fa0 RCX: 00007f071338f749 RDX: 0000000000000000 RSI: 0000200000000040 RDI: 0000000000000024 RBP: 00007f0713413f91 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007f07135e5fa0 R14: 00007f07135e5fa0 R15: 0000000000000002 </TASK>
***
WARNING in io_uring_alloc_task_context
tree: linux-next URL: https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next base: 92fd6e84175befa1775e5c0ab682938eca27c0b2 arch: amd64 compiler: Debian clang version 20.1.8 (++20250708063551+0c9f909b7976-1~exp1~20250708183702.136), Debian LLD 20.1.8 config: https://ci.syzbot.org/builds/9d67ded7-d9a8-41e3-8b58-51340991cf96/config C repro: https://ci.syzbot.org/findings/7aa56677-dbe1-4fdc-bbc4-cc701c10fa7e/c_repro syz repro: https://ci.syzbot.org/findings/7aa56677-dbe1-4fdc-bbc4-cc701c10fa7e/syz_repro
------------[ cut here ]------------ WARNING: io_uring/io_uring.h:266 at io_ring_ctx_lock io_uring/io_uring.h:266 [inline], CPU#0: syz.0.17/5982 WARNING: io_uring/io_uring.h:266 at io_init_wq_offload io_uring/tctx.c:23 [inline], CPU#0: syz.0.17/5982 WARNING: io_uring/io_uring.h:266 at io_uring_alloc_task_context+0x677/0x8c0 io_uring/tctx.c:86, CPU#0: syz.0.17/5982 Modules linked in: CPU: 0 UID: 0 PID: 5982 Comm: syz.0.17 Not tainted syzkaller #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 RIP: 0010:io_ring_ctx_lock io_uring/io_uring.h:266 [inline] RIP: 0010:io_init_wq_offload io_uring/tctx.c:23 [inline] RIP: 0010:io_uring_alloc_task_context+0x677/0x8c0 io_uring/tctx.c:86 Code: d8 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc cc e8 3d ad 96 00 bb f4 ff ff ff eb ab e8 31 ad 96 00 eb 9c e8 2a ad 96 00 90 <0f> 0b 90 e9 12 fb ff ff 4c 8d 64 24 60 4c 8d b4 24 f0 00 00 00 ba RSP: 0018:ffffc90003dcf9c0 EFLAGS: 00010293 RAX: ffffffff812b1356 RBX: 0000000000000000 RCX: ffff8881777957c0 RDX: 0000000000000000 RSI: 0000000000001000 RDI: 0000000000000000 RBP: ffffc90003dcfb50 R08: ffffffff8f7de377 R09: 1ffffffff1efbc6e R10: dffffc0000000000 R11: fffffbfff1efbc6f R12: ffff8881052bf000 R13: ffff888104bf2000 R14: 0000000000001000 R15: 1ffff1102097e400 FS: 00005555613bd500(0000) GS:ffff88818e88a000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f7773fe7dac CR3: 000000016cd1c000 CR4: 00000000000006f0 Call Trace: <TASK> __io_uring_add_tctx_node+0x455/0x710 io_uring/tctx.c:112 io_uring_create+0x559/0x940 io_uring/io_uring.c:3719 io_uring_setup io_uring/io_uring.c:3764 [inline] __do_sys_io_uring_setup io_uring/io_uring.c:3798 [inline] __se_sys_io_uring_setup+0x235/0x240 io_uring/io_uring.c:3789 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xfa/0xf80 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f7773d8f749 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffe094f0b68 EFLAGS: 00000246 ORIG_RAX: 00000000000001a9 RAX: ffffffffffffffda RBX: 00007f7773fe5fa0 RCX: 00007f7773d8f749 RDX: 0000000000000000 RSI: 0000200000000780 RDI: 0000000000000f08 RBP: 00007f7773e13f91 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007f7773fe5fa0 R14: 00007f7773fe5fa0 R15: 0000000000000002 </TASK>
***
WARNING: suspicious RCU usage in io_eventfd_unregister
tree: linux-next URL: https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next base: 92fd6e84175befa1775e5c0ab682938eca27c0b2 arch: amd64 compiler: Debian clang version 20.1.8 (++20250708063551+0c9f909b7976-1~exp1~20250708183702.136), Debian LLD 20.1.8 config: https://ci.syzbot.org/builds/9d67ded7-d9a8-41e3-8b58-51340991cf96/config C repro: https://ci.syzbot.org/findings/84c08f15-f4f9-4123-b889-1d8d19f3e0b1/c_repro syz repro: https://ci.syzbot.org/findings/84c08f15-f4f9-4123-b889-1d8d19f3e0b1/syz_repro
=============================
WARNING: suspicious RCU usage
syzkaller #0 Not tainted
-----------------------------io_uring/eventfd.c:160 suspicious rcu_dereference_protected() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
2 locks held by kworker/u10:12/3941:
#0: ffff888168f41148 ((wq_completion)iou_exit){+.+.}-{0:0}, at: process_one_work+0x841/0x15a0 kernel/workqueue.c:3236 #1: ffffc90021f3fb80 ((work_completion)(&ctx->exit_work)){+.+.}-{0:0}, at: process_one_work+0x868/0x15a0 kernel/workqueue.c:3237
stack backtrace: CPU: 1 UID: 0 PID: 3941 Comm: kworker/u10:12 Not tainted syzkaller #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 Workqueue: iou_exit io_ring_exit_work Call Trace: <TASK> dump_stack_lvl+0x189/0x250 lib/dump_stack.c:120 lockdep_rcu_suspicious+0x140/0x1d0 kernel/locking/lockdep.c:6876 io_eventfd_unregister+0x18b/0x1c0 io_uring/eventfd.c:159 io_ring_ctx_free+0x18a/0x820 io_uring/io_uring.c:2882 io_ring_exit_work+0xe71/0x1030 io_uring/io_uring.c:3110 process_one_work+0x93a/0x15a0 kernel/workqueue.c:3261 process_scheduled_works kernel/workqueue.c:3344 [inline] worker_thread+0x9b0/0xee0 kernel/workqueue.c:3425 kthread+0x711/0x8a0 kernel/kthread.c:463 ret_from_fork+0x599/0xb30 arch/x86/kernel/process.c:158 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:246 </TASK>
***
If these findings have caused you to resend the series or submit a separate fix, please add the following tag to your commit message:
---
This report is generated by a bot. It may contain errors. syzbot ci engineers can be reached at [email protected].
Quoted 10 lines · syzbot ci
syzbot ci has tested the following series
[v3]
io_uring: avoiduring_lockforIORING_SETUP_SINGLE_ISSUER
https://lore.kernel.org/all/[email protected]
* [PATCH v3 1/4]io_uring: clearIORING_SETUP_SINGLE_ISSUERforIORING_SETUP_SQPOLL
* [PATCH v3 2/4]io_uring: useio_ring_submit_lock()inio_iopoll_req_issued()
* [PATCH v3 3/4]io_uring: factor outuring_lockhelpers
* [PATCH v3 4/4]io_uring: avoiduring_lockforIORING_SETUP_SINGLE_ISSUER
Quoted 2 lines
and found the following issues:
* SYZFAIL: failed to recv rpc
Looks like this might be a side effect of the "WARNING: suspicious RCU usage in io_eventfd_unregister" report.
Quoted 1 line
* WARNING in
io_ring_ctx_wait_and_kill
Looks like io_ring_ctx_wait_and_kill() can be called on a IORING_SETUP_SINGLE_ISSUER io_ring_ctx before submitter_task has been set if io_uring_create() errors out or a IORING_SETUP_R_DISABLED io_ring_ctx is never enabled. I can relax this WARN_ON_ONCE() condition.
Quoted 1 line
* WARNING in
io_uring_alloc_task_context
Similar issue, __io_uring_add_tctx_node() is always called in io_uring_create(), where submitter_task won't exist yet for IORING_SETUP_SINGLE_ISSUER and IORING_SETUP_R_DISABLED.
Quoted 1 line
* WARNING: suspicious RCU usage in
io_eventfd_unregister
Missed that io_eventfd_unregister() is also called from io_ring_ctx_free(), not just __io_uring_register(). So we can't assert that the uring_lock mutex is held.
Thanks, syzbot!
Quoted 182 lines
Full report is available here:
https://ci.syzbot.org/series/dde98852-0135-44b2-bbef-9ff9d772f924***
SYZFAIL: failed to recv rpc
tree: linux-next URL: https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next base: 92fd6e84175befa1775e5c0ab682938eca27c0b2 arch: amd64 compiler: Debian clang version 20.1.8 (++20250708063551+0c9f909b7976-1~exp1~20250708183702.136), Debian LLD 20.1.8 config: https://ci.syzbot.org/builds/9d67ded7-d9a8-41e3-8b58-51340991cf96/config C repro: https://ci.syzbot.org/findings/19ae4090-3486-4e2a-973e-dcb6ec3ba0d1/c_repro syz repro: https://ci.syzbot.org/findings/19ae4090-3486-4e2a-973e-dcb6ec3ba0d1/syz_reproSYZFAIL: failed to recv rpc
fd=3 want=4 recv=0 n=0 (errno 9: Bad file descriptor)***
WARNING in
io_ring_ctx_wait_and_killtree: linux-next URL: https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next base: 92fd6e84175befa1775e5c0ab682938eca27c0b2 arch: amd64 compiler: Debian clang version 20.1.8 (++20250708063551+0c9f909b7976-1~exp1~20250708183702.136), Debian LLD 20.1.8 config: https://ci.syzbot.org/builds/9d67ded7-d9a8-41e3-8b58-51340991cf96/config C repro: https://ci.syzbot.org/findings/f5ff9320-bf6f-40b4-a6b3-eee18fa83053/c_repro syz repro: https://ci.syzbot.org/findings/f5ff9320-bf6f-40b4-a6b3-eee18fa83053/syz_repro------------[ cut here ]------------ WARNING: io_uring/io_uring.h:266 at io_ring_ctx_lock io_uring/io_uring.h:266 [inline], CPU#0: syz.0.17/5967 WARNING: io_uring/io_uring.h:266 at io_ring_ctx_wait_and_kill+0x35f/0x490 io_uring/io_uring.c:3119, CPU#0: syz.0.17/5967 Modules linked in: CPU: 0 UID: 0 PID: 5967 Comm: syz.0.17 Not tainted syzkaller #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 RIP: 0010:io_ring_ctx_lock io_uring/io_uring.h:266 [inline] RIP: 0010:io_ring_ctx_wait_and_kill+0x35f/0x490 io_uring/io_uring.c:3119 Code: 4e 11 48 3b 84 24 20 01 00 00 0f 85 1e 01 00 00 48 8d 65 d8 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc cc e8 92 fa 96 00 90 <0f> 0b 90 e9 be fd ff ff 48 8d 7c 24 40 ba 70 00 00 00 31 f6 e8 08 RSP: 0018:ffffc90004117b80 EFLAGS: 00010293 RAX: ffffffff812ac5ee RBX: ffff88810d784000 RCX: ffff888104363a80 RDX: 0000000000000000 RSI: 0000000000001000 RDI: 0000000000000000 RBP: ffffc90004117d00 R08: ffffc90004117c7f R09: 0000000000000000 R10: ffffc90004117c40 R11: fffff52000822f90 R12: 1ffff92000822f74 R13: dffffc0000000000 R14: ffffc90004117c70 R15: 0000000000000000 FS: 000055558ddb3500(0000) GS:ffff88818e88a000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f07135e7dac CR3: 00000001728f4000 CR4: 00000000000006f0 Call Trace: <TASK> io_uring_create+0x6b6/0x940 io_uring/io_uring.c:3738 io_uring_setup io_uring/io_uring.c:3764 [inline] __do_sys_io_uring_setup io_uring/io_uring.c:3798 [inline] __se_sys_io_uring_setup+0x235/0x240 io_uring/io_uring.c:3789 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xfa/0xf80 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f071338f749 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007fff80b05b58 EFLAGS: 00000246 ORIG_RAX: 00000000000001a9 RAX: ffffffffffffffda RBX: 00007f07135e5fa0 RCX: 00007f071338f749 RDX: 0000000000000000 RSI: 0000200000000040 RDI: 0000000000000024 RBP: 00007f0713413f91 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007f07135e5fa0 R14: 00007f07135e5fa0 R15: 0000000000000002 </TASK>***
WARNING in
io_uring_alloc_task_contexttree: linux-next URL: https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next base: 92fd6e84175befa1775e5c0ab682938eca27c0b2 arch: amd64 compiler: Debian clang version 20.1.8 (++20250708063551+0c9f909b7976-1~exp1~20250708183702.136), Debian LLD 20.1.8 config: https://ci.syzbot.org/builds/9d67ded7-d9a8-41e3-8b58-51340991cf96/config C repro: https://ci.syzbot.org/findings/7aa56677-dbe1-4fdc-bbc4-cc701c10fa7e/c_repro syz repro: https://ci.syzbot.org/findings/7aa56677-dbe1-4fdc-bbc4-cc701c10fa7e/syz_repro------------[ cut here ]------------ WARNING: io_uring/io_uring.h:266 at io_ring_ctx_lock io_uring/io_uring.h:266 [inline], CPU#0: syz.0.17/5982 WARNING: io_uring/io_uring.h:266 at io_init_wq_offload io_uring/tctx.c:23 [inline], CPU#0: syz.0.17/5982 WARNING: io_uring/io_uring.h:266 at io_uring_alloc_task_context+0x677/0x8c0 io_uring/tctx.c:86, CPU#0: syz.0.17/5982 Modules linked in: CPU: 0 UID: 0 PID: 5982 Comm: syz.0.17 Not tainted syzkaller #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 RIP: 0010:io_ring_ctx_lock io_uring/io_uring.h:266 [inline] RIP: 0010:io_init_wq_offload io_uring/tctx.c:23 [inline] RIP: 0010:io_uring_alloc_task_context+0x677/0x8c0 io_uring/tctx.c:86 Code: d8 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc cc e8 3d ad 96 00 bb f4 ff ff ff eb ab e8 31 ad 96 00 eb 9c e8 2a ad 96 00 90 <0f> 0b 90 e9 12 fb ff ff 4c 8d 64 24 60 4c 8d b4 24 f0 00 00 00 ba RSP: 0018:ffffc90003dcf9c0 EFLAGS: 00010293 RAX: ffffffff812b1356 RBX: 0000000000000000 RCX: ffff8881777957c0 RDX: 0000000000000000 RSI: 0000000000001000 RDI: 0000000000000000 RBP: ffffc90003dcfb50 R08: ffffffff8f7de377 R09: 1ffffffff1efbc6e R10: dffffc0000000000 R11: fffffbfff1efbc6f R12: ffff8881052bf000 R13: ffff888104bf2000 R14: 0000000000001000 R15: 1ffff1102097e400 FS: 00005555613bd500(0000) GS:ffff88818e88a000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f7773fe7dac CR3: 000000016cd1c000 CR4: 00000000000006f0 Call Trace: <TASK> __io_uring_add_tctx_node+0x455/0x710 io_uring/tctx.c:112 io_uring_create+0x559/0x940 io_uring/io_uring.c:3719 io_uring_setup io_uring/io_uring.c:3764 [inline] __do_sys_io_uring_setup io_uring/io_uring.c:3798 [inline] __se_sys_io_uring_setup+0x235/0x240 io_uring/io_uring.c:3789 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xfa/0xf80 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f7773d8f749 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffe094f0b68 EFLAGS: 00000246 ORIG_RAX: 00000000000001a9 RAX: ffffffffffffffda RBX: 00007f7773fe5fa0 RCX: 00007f7773d8f749 RDX: 0000000000000000 RSI: 0000200000000780 RDI: 0000000000000f08 RBP: 00007f7773e13f91 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007f7773fe5fa0 R14: 00007f7773fe5fa0 R15: 0000000000000002 </TASK>***
WARNING: suspicious RCU usage in
io_eventfd_unregistertree: linux-next URL: https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next base: 92fd6e84175befa1775e5c0ab682938eca27c0b2 arch: amd64 compiler: Debian clang version 20.1.8 (++20250708063551+0c9f909b7976-1~exp1~20250708183702.136), Debian LLD 20.1.8 config: https://ci.syzbot.org/builds/9d67ded7-d9a8-41e3-8b58-51340991cf96/config C repro: https://ci.syzbot.org/findings/84c08f15-f4f9-4123-b889-1d8d19f3e0b1/c_repro syz repro: https://ci.syzbot.org/findings/84c08f15-f4f9-4123-b889-1d8d19f3e0b1/syz_repro=============================
WARNING: suspicious RCU usage
syzkaller #0 Not tainted
-----------------------------io_uring/eventfd.c:160suspiciousrcu_dereference_protected()usage!other info that might help us debug this:
rcu_scheduler_active= 2,debug_locks= 1
2 locks held by kworker/u10:12/3941:
#0:ffff888168f41148((wq_completion)iou_exit){+.+.}-{0:0}, at:process_one_work+0x841/0x15a0kernel/workqueue.c:3236#1:ffffc90021f3fb80((work_completion)(&ctx->exit_work)){+.+.}-{0:0}, at:process_one_work+0x868/0x15a0kernel/workqueue.c:3237stack backtrace: CPU: 1 UID: 0 PID: 3941 Comm: kworker/u10:12 Not tainted syzkaller #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 Workqueue: iou_exit io_ring_exit_work Call Trace: <TASK> dump_stack_lvl+0x189/0x250 lib/dump_stack.c:120 lockdep_rcu_suspicious+0x140/0x1d0 kernel/locking/lockdep.c:6876 io_eventfd_unregister+0x18b/0x1c0 io_uring/eventfd.c:159 io_ring_ctx_free+0x18a/0x820 io_uring/io_uring.c:2882 io_ring_exit_work+0xe71/0x1030 io_uring/io_uring.c:3110 process_one_work+0x93a/0x15a0 kernel/workqueue.c:3261 process_scheduled_works kernel/workqueue.c:3344 [inline] worker_thread+0x9b0/0xee0 kernel/workqueue.c:3425 kthread+0x711/0x8a0 kernel/kthread.c:463 ret_from_fork+0x599/0xb30 arch/x86/kernel/process.c:158 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:246 </TASK>***
If these findings have caused you to resend the series or submit a separate fix, please add the following tag to your commit message:
Tested-by [email protected]---
This report is generated by a bot. It may contain errors. syzbot ci engineers can be reached at [email protected].