io_uring: refactor io_submit_sqe()
authorPavel Begunkov <asml.silence@gmail.com>
Fri, 15 Apr 2022 21:08:31 +0000 (22:08 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 25 Apr 2022 00:02:52 +0000 (18:02 -0600)
Remove one extra if for non-linked path of io_submit_sqe().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/03183199d1bf494b4a72eca16d792c8a5945acb4.1650056133.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index cb7c3bc7c1b79069ea5f393ff0d15fe48f4d9ba0..fe9df32be921174667f2f8e2e69be01a813f6531 100644 (file)
@@ -7765,7 +7765,7 @@ static inline int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
         * submitted sync once the chain is complete. If none of those
         * conditions are true (normal request), then just queue it.
         */
-       if (link->head) {
+       if (unlikely(link->head)) {
                ret = io_req_prep_async(req);
                if (unlikely(ret))
                        return io_submit_fail_init(sqe, req, ret);
@@ -7779,17 +7779,22 @@ static inline int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
                /* last request of the link, flush it */
                req = link->head;
                link->head = NULL;
-       } else if (req->flags & IO_REQ_LINK_FLAGS) {
-               link->head = req;
-               link->last = req;
+               if (req->flags & (REQ_F_FORCE_ASYNC | REQ_F_FAIL))
+                       goto fallback;
+
+       } else if (unlikely(req->flags & (IO_REQ_LINK_FLAGS |
+                                         REQ_F_FORCE_ASYNC | REQ_F_FAIL))) {
+               if (req->flags & IO_REQ_LINK_FLAGS) {
+                       link->head = req;
+                       link->last = req;
+               } else {
+fallback:
+                       io_queue_sqe_fallback(req);
+               }
                return 0;
        }
 
-       if (likely(!(req->flags & (REQ_F_FORCE_ASYNC | REQ_F_FAIL))))
-               io_queue_sqe(req);
-       else
-               io_queue_sqe_fallback(req);
-
+       io_queue_sqe(req);
        return 0;
 }