From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 3/6] io_uring: refactor io_req_find_next
Date: Mon, 21 Mar 2022 22:02:21 +0000 [thread overview]
Message-ID: <10bd0e564472dde0c7f8d90ae317d05356cd565a.1647897811.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Move the fast path from io_req_find_next() into callers. It prepares us
for further changes.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 71f3bea34e66..4539461ee7b3 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2391,8 +2391,6 @@ static inline struct io_kiocb *io_req_find_next(struct io_kiocb *req)
{
struct io_kiocb *nxt;
- if (likely(!(req->flags & (REQ_F_LINK|REQ_F_HARDLINK))))
- return NULL;
/*
* If LINK is set, we have dependent requests in this chain. If we
* didn't fail this request, queue the first one up, moving any other
@@ -2613,10 +2611,12 @@ static void io_req_task_queue_reissue(struct io_kiocb *req)
static inline void io_queue_next(struct io_kiocb *req)
{
- struct io_kiocb *nxt = io_req_find_next(req);
+ if (unlikely(req->flags & (REQ_F_LINK|REQ_F_HARDLINK))) {
+ struct io_kiocb *nxt = io_req_find_next(req);
- if (nxt)
- io_req_task_queue(nxt);
+ if (nxt)
+ io_req_task_queue(nxt);
+ }
}
static void io_free_req(struct io_kiocb *req)
@@ -2710,7 +2710,8 @@ static inline struct io_kiocb *io_put_req_find_next(struct io_kiocb *req)
struct io_kiocb *nxt = NULL;
if (req_ref_put_and_test(req)) {
- nxt = io_req_find_next(req);
+ if (unlikely(req->flags & (REQ_F_LINK|REQ_F_HARDLINK)))
+ nxt = io_req_find_next(req);
__io_free_req(req);
}
return nxt;
--
2.35.1
next prev parent reply other threads:[~2022-03-21 22:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 22:02 [PATCH 0/6] completion path optimisations Pavel Begunkov
2022-03-21 22:02 ` [PATCH 1/6] io_uring: small optimisation of tctx_task_work Pavel Begunkov
2022-03-21 22:02 ` [PATCH 2/6] io_uring: remove extra ifs around io_commit_cqring Pavel Begunkov
2022-03-21 22:02 ` Pavel Begunkov [this message]
2022-03-21 22:02 ` [PATCH 4/6] io_uring: optimise io_free_batch_list Pavel Begunkov
2022-03-21 22:02 ` [PATCH 5/6] io_uring: move poll recycling later in compl flushing Pavel Begunkov
2022-03-21 22:02 ` [PATCH 6/6] io_uring: clean up io_queue_next() Pavel Begunkov
2022-03-22 2:52 ` [PATCH 0/6] completion path optimisations Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10bd0e564472dde0c7f8d90ae317d05356cd565a.1647897811.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox