From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: [email protected], Jens Axboe <[email protected]>,
[email protected], Kanchan Joshi <[email protected]>,
Ming Lei <[email protected]>
Subject: [PATCH v3 06/13] io_uring/rw: avoid punting to io-wq directly
Date: Mon, 18 Mar 2024 22:00:28 +0000 [thread overview]
Message-ID: <413564e550fe23744a970e1783dfa566291b0e6f.1710799188.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
kiocb_done() should care to specifically redirecting requests to io-wq.
Remove the hopping to tw to then queue an io-wq, return -EAGAIN and let
the core code io_uring handle offloading.
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/io_uring.c | 8 ++++----
io_uring/io_uring.h | 1 -
io_uring/rw.c | 8 +-------
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 6ca7f2a9c296..feff8f530c22 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -492,7 +492,7 @@ static void io_prep_async_link(struct io_kiocb *req)
}
}
-void io_queue_iowq(struct io_kiocb *req, struct io_tw_state *ts_dont_use)
+static void io_queue_iowq(struct io_kiocb *req)
{
struct io_kiocb *link = io_prep_linked_timeout(req);
struct io_uring_task *tctx = req->task->io_uring;
@@ -1499,7 +1499,7 @@ void io_req_task_submit(struct io_kiocb *req, struct io_tw_state *ts)
if (unlikely(req->task->flags & PF_EXITING))
io_req_defer_failed(req, -EFAULT);
else if (req->flags & REQ_F_FORCE_ASYNC)
- io_queue_iowq(req, ts);
+ io_queue_iowq(req);
else
io_queue_sqe(req);
}
@@ -2082,7 +2082,7 @@ static void io_queue_async(struct io_kiocb *req, int ret)
break;
case IO_APOLL_ABORTED:
io_kbuf_recycle(req, 0);
- io_queue_iowq(req, NULL);
+ io_queue_iowq(req);
break;
case IO_APOLL_OK:
break;
@@ -2129,7 +2129,7 @@ static void io_queue_sqe_fallback(struct io_kiocb *req)
if (unlikely(req->ctx->drain_active))
io_drain_req(req);
else
- io_queue_iowq(req, NULL);
+ io_queue_iowq(req);
}
}
diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
index 935d8d0747dc..0861d49e83de 100644
--- a/io_uring/io_uring.h
+++ b/io_uring/io_uring.h
@@ -79,7 +79,6 @@ struct file *io_file_get_fixed(struct io_kiocb *req, int fd,
void __io_req_task_work_add(struct io_kiocb *req, unsigned flags);
bool io_alloc_async_data(struct io_kiocb *req);
void io_req_task_queue(struct io_kiocb *req);
-void io_queue_iowq(struct io_kiocb *req, struct io_tw_state *ts_dont_use);
void io_req_task_complete(struct io_kiocb *req, struct io_tw_state *ts);
void io_req_task_queue_fail(struct io_kiocb *req, int ret);
void io_req_task_submit(struct io_kiocb *req, struct io_tw_state *ts);
diff --git a/io_uring/rw.c b/io_uring/rw.c
index 0585ebcc9773..576934dbf833 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -187,12 +187,6 @@ static inline loff_t *io_kiocb_update_pos(struct io_kiocb *req)
return NULL;
}
-static void io_req_task_queue_reissue(struct io_kiocb *req)
-{
- req->io_task_work.func = io_queue_iowq;
- io_req_task_work_add(req);
-}
-
#ifdef CONFIG_BLOCK
static bool io_resubmit_prep(struct io_kiocb *req)
{
@@ -405,7 +399,7 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret,
if (req->flags & REQ_F_REISSUE) {
req->flags &= ~REQ_F_REISSUE;
if (io_resubmit_prep(req))
- io_req_task_queue_reissue(req);
+ return -EAGAIN;
else
io_req_task_queue_fail(req, final_ret);
}
--
2.44.0
next prev parent reply other threads:[~2024-03-18 22:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-18 22:00 [PATCH v3 00/13] Remove aux CQE caches Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 01/13] io_uring/cmd: move io_uring_try_cancel_uring_cmd() Pavel Begunkov
2024-03-19 1:29 ` Ming Lei
2024-03-18 22:00 ` [PATCH v3 02/13] io_uring/cmd: kill one issue_flags to tw conversion Pavel Begunkov
2024-03-19 1:33 ` Ming Lei
2024-03-18 22:00 ` [PATCH v3 03/13] io_uring/cmd: fix tw <-> issue_flags conversion Pavel Begunkov
2024-03-19 1:37 ` Ming Lei
2024-03-18 22:00 ` [PATCH v3 04/13] io_uring/cmd: introduce io_uring_cmd_complete Pavel Begunkov
2024-03-19 1:39 ` Ming Lei
2024-03-18 22:00 ` [PATCH v3 05/13] nvme/io_uring: don't hard code IO_URING_F_UNLOCKED Pavel Begunkov
2024-03-19 1:40 ` Ming Lei
2024-03-18 22:00 ` Pavel Begunkov [this message]
2024-03-18 22:00 ` [PATCH v3 07/13] io_uring: force tw ctx locking Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 08/13] io_uring: remove struct io_tw_state::locked Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 09/13] io_uring: refactor io_fill_cqe_req_aux Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 10/13] io_uring: get rid of intermediate aux cqe caches Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 11/13] io_uring: remove current check from complete_post Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 12/13] io_uring: refactor io_req_complete_post() Pavel Begunkov
2024-03-18 22:00 ` [PATCH v3 13/13] io_uring: clean up io_lockdep_assert_cq_locked Pavel Begunkov
2024-03-19 1:42 ` [PATCH v3 00/13] Remove aux CQE caches Ming Lei
2024-03-19 2:19 ` 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=413564e550fe23744a970e1783dfa566291b0e6f.1710799188.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[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