From: Kanchan Joshi <[email protected]>
To: Keith Busch <[email protected]>
Cc: [email protected], [email protected],
[email protected], [email protected], [email protected],
[email protected], Keith Busch <[email protected]>
Subject: Re: [PATCHv2 3/5] nvme: unify nvme request end_io
Date: Mon, 10 Apr 2023 17:04:58 +0530 [thread overview]
Message-ID: <20230410113458.GB16047@green5> (raw)
In-Reply-To: <[email protected]>
[-- Attachment #1: Type: text/plain, Size: 2220 bytes --]
On Fri, Apr 07, 2023 at 12:16:34PM -0700, Keith Busch wrote:
>From: Keith Busch <[email protected]>
>
>We can finish the metadata copy inline with the completion. After that,
>there's really nothing else different between the meta and non-meta data
>end_io callbacks, so unify them.
>
>Signed-off-by: Keith Busch <[email protected]>
>---
> drivers/nvme/host/ioctl.c | 57 +++++++--------------------------------
> 1 file changed, 9 insertions(+), 48 deletions(-)
>
>diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
>index 278c57ee0db91..a1e0a14dadedc 100644
>--- a/drivers/nvme/host/ioctl.c
>+++ b/drivers/nvme/host/ioctl.c
>@@ -465,29 +465,6 @@ static inline struct nvme_uring_cmd_pdu *nvme_uring_cmd_pdu(
> return (struct nvme_uring_cmd_pdu *)&ioucmd->pdu;
> }
>
>-static void nvme_uring_task_meta_cb(struct io_uring_cmd *ioucmd,
>- unsigned issue_flags)
>-{
>- struct nvme_uring_cmd_pdu *pdu = nvme_uring_cmd_pdu(ioucmd);
>- struct request *req = pdu->req;
>- int status;
>- u64 result;
>-
>- if (nvme_req(req)->flags & NVME_REQ_CANCELLED)
>- status = -EINTR;
>- else
>- status = nvme_req(req)->status;
>-
>- result = le64_to_cpu(nvme_req(req)->result.u64);
>-
>- if (pdu->meta_len)
>- status = nvme_finish_user_metadata(req, pdu->u.meta_buffer,
>- pdu->u.meta, pdu->meta_len, status);
>- blk_mq_free_request(req);
>-
>- io_uring_cmd_done(ioucmd, status, result, issue_flags);
>-}
>-
> static void nvme_uring_task_cb(struct io_uring_cmd *ioucmd,
> unsigned issue_flags)
> {
>@@ -502,11 +479,16 @@ static enum rq_end_io_ret nvme_uring_cmd_end_io(struct request *req,
> struct io_uring_cmd *ioucmd = req->end_io_data;
> struct nvme_uring_cmd_pdu *pdu = nvme_uring_cmd_pdu(ioucmd);
> void *cookie = READ_ONCE(ioucmd->cookie);
>+ int status = nvme_req(req)->status;
>
> if (nvme_req(req)->flags & NVME_REQ_CANCELLED)
>- pdu->nvme_status = -EINTR;
>- else
>- pdu->nvme_status = nvme_req(req)->status;
>+ status = -EINTR;
>+
>+ if (pdu->meta_len)
>+ status = nvme_finish_user_metadata(req, pdu->u.meta_buffer,
>+ pdu->u.meta, pdu->meta_len, status);
nvme_finish_user_metadata does copy_to_user.
Here also the attempt was not to touch that memory in interrupt context.
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
next prev parent reply other threads:[~2023-04-10 11:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-07 19:16 [PATCHv2 0/5] nvme io_uring_cmd polling enhancements Keith Busch
2023-04-07 19:16 ` [PATCHv2 1/5] block: add request polling helper Keith Busch
2023-04-07 19:16 ` [PATCHv2 2/5] nvme: simplify passthrough bio cleanup Keith Busch
2023-04-08 0:22 ` kernel test robot
2023-04-10 11:25 ` Kanchan Joshi
2023-04-11 17:46 ` Keith Busch
2023-04-10 21:02 ` kernel test robot
2023-04-07 19:16 ` [PATCHv2 3/5] nvme: unify nvme request end_io Keith Busch
2023-04-10 11:34 ` Kanchan Joshi [this message]
2023-04-07 19:16 ` [PATCHv2 4/5] nvme: use blk-mq polling for uring commands Keith Busch
2023-04-07 19:16 ` [PATCHv2 5/5] io_uring: remove uring_cmd cookie Keith Busch
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=20230410113458.GB16047@green5 \
[email protected] \
[email protected] \
[email protected] \
[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