public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>,
	[email protected], [email protected]
Subject: [PATCH v2 4/5] io_uring: don't do full *prep_worker() from io-wq
Date: Sun, 16 Feb 2020 01:01:21 +0300	[thread overview]
Message-ID: <b1d0bfedb3d30f406a1adbd34a3ef52cc23764d2.1581785642.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

io_prep_async_worker() called io_wq_assign_next() do many useless checks:
io_req_work_grab_env() was already called during prep, and @do_hashed
is not ever used. Add io_prep_next_work() -- simplified version, that
can be called io-wq.

Signed-off-by: Pavel Begunkov <[email protected]>
---
 fs/io_uring.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 0dd2f10d8ad8..4515db6a64d6 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -952,6 +952,17 @@ static inline void io_req_work_drop_env(struct io_kiocb *req)
 	}
 }
 
+static inline void io_prep_next_work(struct io_kiocb *req,
+				     struct io_kiocb **link)
+{
+	const struct io_op_def *def = &io_op_defs[req->opcode];
+
+	if (!(req->flags & REQ_F_ISREG) && def->unbound_nonreg_file)
+			req->work.flags |= IO_WQ_WORK_UNBOUND;
+
+	*link = io_prep_linked_timeout(req);
+}
+
 static inline bool io_prep_async_work(struct io_kiocb *req,
 				      struct io_kiocb **link)
 {
@@ -2459,7 +2470,7 @@ static void io_wq_assign_next(struct io_wq_work **workptr, struct io_kiocb *nxt)
 {
 	struct io_kiocb *link;
 
-	io_prep_async_work(nxt, &link);
+	io_prep_next_work(nxt, &link);
 	*workptr = &nxt->work;
 	if (link) {
 		nxt->work.flags |= IO_WQ_WORK_CB;
-- 
2.24.0


  parent reply	other threads:[~2020-02-15 22:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-15 22:01 [PATCH v2 0/5] async punting improvements for io_uring Pavel Begunkov
2020-02-15 22:01 ` [PATCH v2 1/5] io_uring: add missing io_req_cancelled() Pavel Begunkov
2020-02-16 17:15   ` Jens Axboe
2020-02-16 19:09     ` Pavel Begunkov
2020-02-15 22:01 ` [PATCH v2 2/5] io_uring: remove REQ_F_MUST_PUNT Pavel Begunkov
2020-02-15 22:01 ` [PATCH v2 3/5] io_uring: don't call work.func from sync ctx Pavel Begunkov
2020-02-15 22:01 ` Pavel Begunkov [this message]
2020-02-15 22:01 ` [PATCH v2 5/5] io_uring: remove req->in_async Pavel Begunkov

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=b1d0bfedb3d30f406a1adbd34a3ef52cc23764d2.1581785642.git.asml.silence@gmail.com \
    [email protected] \
    [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