io_uring: refactor io_fill_cqe_req_aux

The restriction on multishot execution context disallowing io-wq is
driven by rules of io_fill_cqe_req_aux(), it should only be called in
the master task context, either from the syscall path or in task_work.
Since task_work now always takes the ctx lock implying
IO_URING_F_COMPLETE_DEFER, we can just assume that the function is
always called with its defer argument set to true.

Kill the argument. Also rename the function for more consistency as
"fill" in CQE related functions was usually meant for raw interfaces
only copying data into the CQ without any locking, waking the user
and other accounting "post" functions take care of.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Tested-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/93423d106c33116c7d06bf277f651aa68b427328.1710799188.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index ecb59bb2418b7c5aaeb4a17a683726ece068d79e..9ae5e7db7c6a542c32985eb5f68d697ffec15029 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -907,40 +907,30 @@ static void __io_flush_post_cqes(struct io_ring_ctx *ctx)
        state->cqes_count = 0;
 }
 
-static bool __io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags,
-                             bool allow_overflow)
+bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags)
 {
        bool filled;
 
        io_cq_lock(ctx);
        filled = io_fill_cqe_aux(ctx, user_data, res, cflags);
-       if (!filled && allow_overflow)
+       if (!filled)
                filled = io_cqring_event_overflow(ctx, user_data, res, cflags, 0, 0);
 
        io_cq_unlock_post(ctx);
        return filled;
 }
 
-bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags)
-{
-       return __io_post_aux_cqe(ctx, user_data, res, cflags, true);
-}
-
 /*
  * A helper for multishot requests posting additional CQEs.
  * Should only be used from a task_work including IO_URING_F_MULTISHOT.
  */
-bool io_fill_cqe_req_aux(struct io_kiocb *req, bool defer, s32 res, u32 cflags)
+bool io_req_post_cqe(struct io_kiocb *req, s32 res, u32 cflags)
 {
        struct io_ring_ctx *ctx = req->ctx;
        u64 user_data = req->cqe.user_data;
        struct io_uring_cqe *cqe;
 
        lockdep_assert(!io_wq_current_is_worker());
-
-       if (!defer)
-               return __io_post_aux_cqe(ctx, user_data, res, cflags, false);
-
        lockdep_assert_held(&ctx->uring_lock);
 
        if (ctx->submit_state.cqes_count == ARRAY_SIZE(ctx->completion_cqes)) {

diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
index 7f921daae9c39b00cfd6b2f7856385d8869e32fe..460290e1bdec61e039ffb5f1bf1213bc4bdc1644 100644 (file)
--- a/io_uring/io_uring.h
+++ b/io_uring/io_uring.h
@@ -67,7 +67,7 @@ int io_run_task_work_sig(struct io_ring_ctx *ctx);
 void io_req_defer_failed(struct io_kiocb *req, s32 res);
 void io_req_complete_post(struct io_kiocb *req, unsigned issue_flags);
 bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags);
-bool io_fill_cqe_req_aux(struct io_kiocb *req, bool defer, s32 res, u32 cflags);
+bool io_req_post_cqe(struct io_kiocb *req, s32 res, u32 cflags);
 void __io_commit_cqring_flush(struct io_ring_ctx *ctx);
 
 struct page **io_pin_pages(unsigned long ubuf, unsigned long len, int *npages);

diff --git a/io_uring/net.c b/io_uring/net.c
index 4afb475d41974b95a86a22bd84771d8c29781c08..48bf5ca1a671d1a967255a691ef0e89a0f41af3a 100644 (file)
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -706,8 +706,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret,
         * receive from this socket.
         */
        if ((req->flags & REQ_F_APOLL_MULTISHOT) && !mshot_finished &&
-           io_fill_cqe_req_aux(req, issue_flags & IO_URING_F_COMPLETE_DEFER,
-                               *ret, cflags | IORING_CQE_F_MORE)) {
+           io_req_post_cqe(req, *ret, cflags | IORING_CQE_F_MORE)) {
                struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
                int mshot_retry_ret = IOU_ISSUE_SKIP_COMPLETE;
 
@@ -1429,8 +1428,7 @@ retry:
 
        if (ret < 0)
                return ret;
-       if (io_fill_cqe_req_aux(req, issue_flags & IO_URING_F_COMPLETE_DEFER,
-                               ret, IORING_CQE_F_MORE))
+       if (io_req_post_cqe(req, ret, IORING_CQE_F_MORE))
                goto retry;
 
        io_req_set_res(req, ret, 0);

diff --git a/io_uring/poll.c b/io_uring/poll.c
index 8901dd118e500cda6d502a5cfd32ecdcab5ac5a3..5d55bbf1de1597c131757cb51438981066ca7f9a 100644 (file)
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -322,8 +322,7 @@ static int io_poll_check_events(struct io_kiocb *req, struct io_tw_state *ts)
                        __poll_t mask = mangle_poll(req->cqe.res &
                                                    req->apoll_events);
 
-                       if (!io_fill_cqe_req_aux(req, true, mask,
-                                                IORING_CQE_F_MORE)) {
+                       if (!io_req_post_cqe(req, mask, IORING_CQE_F_MORE)) {
                                io_req_set_res(req, mask, 0);
                                return IOU_POLL_REMOVE_POLL_USE_RES;
                        }

diff --git a/io_uring/rw.c b/io_uring/rw.c
index 674581bda8d74de64899841e24650dfa192bdabf..b5165d1c9686d3619097a9d84723f4a056637d82 100644 (file)
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -962,9 +962,7 @@ int io_read_mshot(struct io_kiocb *req, unsigned int issue_flags)
                cflags = io_put_kbuf(req, issue_flags);
                rw->len = 0; /* similarly to above, reset len to 0 */
 
-               if (io_fill_cqe_req_aux(req,
-                                       issue_flags & IO_URING_F_COMPLETE_DEFER,
-                                       ret, cflags | IORING_CQE_F_MORE)) {
+               if (io_req_post_cqe(req, ret, cflags | IORING_CQE_F_MORE)) {
                        if (issue_flags & IO_URING_F_MULTISHOT) {
                                /*
                                 * Force retry, as we might have more data to

diff --git a/io_uring/timeout.c b/io_uring/timeout.c
index 0a48e6acd0b213accc53ae78bdcd651459ae1c55..3458ca550b833b7fcd2b10cf10c410e8f488bfa0 100644 (file)
--- a/io_uring/timeout.c
+++ b/io_uring/timeout.c
@@ -72,7 +72,7 @@ static void io_timeout_complete(struct io_kiocb *req, struct io_tw_state *ts)
        struct io_ring_ctx *ctx = req->ctx;
 
        if (!io_timeout_finish(timeout, data)) {
-               if (io_fill_cqe_req_aux(req, true, -ETIME, IORING_CQE_F_MORE)) {
+               if (io_req_post_cqe(req, -ETIME, IORING_CQE_F_MORE)) {
                        /* re-arm timer */
                        spin_lock_irq(&ctx->timeout_lock);
                        list_add(&timeout->list, ctx->timeout_list.prev);