[PATCH 2/6] io_uring: disallow defer-tw run w/ no submitters

Pavel Begunkov
2022-09-08T15:59:05Z

We try to restrict CQ waiters when IORING_SETUP_DEFER_TASKRUN is set,
but if nothing has been submitted yet it'll allow any waiter, which
violates the contract.

Fixes: dacbb30102689 ("io_uring: add IORING_SETUP_DEFER_TASKRUN")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
io_uring/io_uring.c | 7 +------
io_uring/io_uring.h | 9 ++-------
2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index dc6f64ecd926..7f60d384e917 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1169,13 +1169,8 @@ int __io_run_local_work(struct io_ring_ctx *ctx, bool locked)
int ret;
unsigned int loops = 1;

- if (unlikely(ctx->submitter_task != current)) {
- /* maybe this is before any submissions */
- if (!ctx->submitter_task)
- return 0;
-
+ if (unlikely(ctx->submitter_task != current))
return -EEXIST;
- }

node = io_llist_xchg(&ctx->work_llist, &fake);
ret = 0;
diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
index 4eea0836170e..d38173b9ac19 100644
--- a/io_uring/io_uring.h
+++ b/io_uring/io_uring.h
@@ -331,13 +331,8 @@ static inline struct io_kiocb *io_alloc_req(struct io_ring_ctx *ctx)

static inline bool io_allowed_run_tw(struct io_ring_ctx *ctx)
{
- if (!(ctx->flags & IORING_SETUP_DEFER_TASKRUN))
- return true;
- if (unlikely(ctx->submitter_task != current)) {
- /* maybe this is before any submissions */
- return !ctx->submitter_task;
- }
- return true;
+ return likely(!(ctx->flags & IORING_SETUP_DEFER_TASKRUN) ||
+ ctx->submitter_task == current);
}

#endif
--
2.37.2