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 05/13] nvme/io_uring: don't hard code IO_URING_F_UNLOCKED
Date: Mon, 18 Mar 2024 22:00:27 +0000 [thread overview]
Message-ID: <f5e1a1f344a7ccce485a45badf02a792e77f18cb.1710799188.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
uring_cmd implementations should not try to guess issue_flags, use a
freshly added helper io_uring_cmd_complete() instead.
Reviewed-by: Kanchan Joshi <[email protected]>
Signed-off-by: Pavel Begunkov <[email protected]>
---
drivers/nvme/host/ioctl.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
index 3dfd5ae99ae0..1a7b5af42dbc 100644
--- a/drivers/nvme/host/ioctl.c
+++ b/drivers/nvme/host/ioctl.c
@@ -426,10 +426,13 @@ static enum rq_end_io_ret nvme_uring_cmd_end_io(struct request *req,
* For iopoll, complete it directly.
* Otherwise, move the completion to task work.
*/
- if (blk_rq_is_poll(req))
- nvme_uring_task_cb(ioucmd, IO_URING_F_UNLOCKED);
- else
+ if (blk_rq_is_poll(req)) {
+ if (pdu->bio)
+ blk_rq_unmap_user(pdu->bio);
+ io_uring_cmd_complete(ioucmd, pdu->status, pdu->result);
+ } else {
io_uring_cmd_do_in_task_lazy(ioucmd, nvme_uring_task_cb);
+ }
return RQ_END_IO_FREE;
}
--
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 ` Pavel Begunkov [this message]
2024-03-19 1:40 ` [PATCH v3 05/13] nvme/io_uring: don't hard code IO_URING_F_UNLOCKED Ming Lei
2024-03-18 22:00 ` [PATCH v3 06/13] io_uring/rw: avoid punting to io-wq directly Pavel Begunkov
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=f5e1a1f344a7ccce485a45badf02a792e77f18cb.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