| Message ID | 7e5f68281acb0f081f65fde435833c68a3b7e02f.1736257837.git.asml.silence@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] io_uring: silence false positive warnings | expand |
On Tue, 07 Jan 2025 14:11:32 +0000, Pavel Begunkov wrote: > If we kill a ring and then immediately exit the task, we'll get > cancellattion running by the task and a kthread in io_ring_exit_work. > For DEFER_TASKRUN, we do want to limit it to only one entity executing > it, however it's currently not an issue as it's protected by uring_lock. > > Silence lockdep assertions for now, we'll return to it later. > > [...] Applied, thanks! [1/1] io_uring: silence false positive warnings commit: 60495b08cf7a6920035c5172a22655ca2001270b Best regards,
diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index 032758b28d78..f65e3f3ede51 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -127,6 +127,9 @@ static inline void io_lockdep_assert_cq_locked(struct io_ring_ctx *ctx) #if defined(CONFIG_PROVE_LOCKING) lockdep_assert(in_task()); + if (ctx->flags & IORING_SETUP_DEFER_TASKRUN) + lockdep_assert_held(&ctx->uring_lock); + if (ctx->flags & IORING_SETUP_IOPOLL) { lockdep_assert_held(&ctx->uring_lock); } else if (!ctx->task_complete) { @@ -138,9 +141,7 @@ static inline void io_lockdep_assert_cq_locked(struct io_ring_ctx *ctx) * Not from an SQE, as those cannot be submitted, but via * updating tagged resources. */ - if (percpu_ref_is_dying(&ctx->refs)) - lockdep_assert(current_work()); - else + if (!percpu_ref_is_dying(&ctx->refs)) lockdep_assert(current == ctx->submitter_task); } #endif
If we kill a ring and then immediately exit the task, we'll get cancellattion running by the task and a kthread in io_ring_exit_work. For DEFER_TASKRUN, we do want to limit it to only one entity executing it, however it's currently not an issue as it's protected by uring_lock. Silence lockdep assertions for now, we'll return to it later. Reported-by: syzbot+1bcb75613069ad4957fc@syzkaller.appspotmail.com Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> --- io_uring/io_uring.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)