io_uring: ensure io_lockdep_assert_cq_locked() handles disabled rings
Jens Axboe
maintainerPATCH 1/1 io_uring: ensure io_lockdep_assert_cq_locked() handles disabled rings
io_lockdep_assert_cq_locked() checks that locking is correctly done when a CQE is posted. If the ring is setup in a disabled state with IORING_SETUP_R_DISABLED, then ctx->submitter_task isn't assigned until the ring is later enabled. We generally don't post CQEs in this state, as no SQEs can be submitted. However it is possible to generate a CQE if tagged resources are being updated. If this happens and PROVE_LOCKING is enabled, then the locking check helper will dereference ctx->submitter_task, which hasn't been set yet.
Fixup io_lockdep_assert_cq_locked() to handle this case correctly. While at it, convert it to a static inline as well, so that generated line offsets will actually reflect which condition failed, rather than just the line offset for io_lockdep_assert_cq_locked() itself.
---
io_uring/io_uring.h +21 -14
@@ -86,20 +86,27 @@ bool __io_alloc_req_refill(struct io_ring_ctx *ctx);bool io_match_task_safe (struct io_kiocb *head,struct task_struct *task,bool cancel_all); -#define io_lockdep_assert_cq_locked (ctx) \ - do { \ - lockdep_assert(in_task()); \ - \ - if (ctx->flags & IORING_SETUP_IOPOLL) { \ - lockdep_assert_held(&ctx->uring_lock); \ - } else if (!ctx->task_complete) { \ - lockdep_assert_held(&ctx->completion_lock); \ - } else if (ctx->submitter_task->flags & PF_EXITING) { \ - lockdep_assert(current_work()); \ - } else { \ - lockdep_assert(current == ctx->submitter_task); \ - } \ - } while (0) +#if defined(CONFIG_PROVE_LOCKING ) +static inline void io_lockdep_assert_cq_locked (struct io_ring_ctx *ctx) +{ +lockdep_assert (in_task ()); + +if (ctx->flags &IORING_SETUP_IOPOLL ) { +lockdep_assert_held (&ctx->uring_lock); + }else if (!ctx->task_complete) { +lockdep_assert_held (&ctx->completion_lock); + }else if (ctx->submitter_task) { +if (ctx->submitter_task->flags &PF_EXITING ) +lockdep_assert (current_work ()); +else +lockdep_assert (current == ctx->submitter_task); + } +} +#else +static inline void io_lockdep_assert_cq_locked (struct io_ring_ctx *ctx) +{ +} +#endif static inline void io_req_task_work_add (struct io_kiocb *req) {
Signature · 1 line
Jens Axboe