From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org
Cc: Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>,
Max Gurtovoy <maxg@mellanox.com>,
Stephen Bates <sbates@raithlin.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH v15 2/9] nvme: Create helper function to obtain command effects
Date: Thu, 16 Jul 2020 14:33:12 -0600 [thread overview]
Message-ID: <20200716203319.16022-3-logang@deltatee.com> (raw)
In-Reply-To: <20200716203319.16022-1-logang@deltatee.com>
Separate the code to obtain command effects from the code
to start a passthru request and open code nvme_known_admin_effects()
in the new helper.
The new helper function will be necessary for nvmet passthru
code to determine if we need to change out of interrupt context
to handle the effects.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
---
drivers/nvme/host/core.c | 39 ++++++++++++++++++++++-----------------
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 63a59186e68b..80d534c5bc44 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1377,22 +1377,8 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
metadata, meta_len, lower_32_bits(io.slba), NULL, 0);
}
-static u32 nvme_known_admin_effects(u8 opcode)
-{
- switch (opcode) {
- case nvme_admin_format_nvm:
- return NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBCC |
- NVME_CMD_EFFECTS_CSE_MASK;
- case nvme_admin_sanitize_nvm:
- return NVME_CMD_EFFECTS_CSE_MASK;
- default:
- break;
- }
- return 0;
-}
-
-static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
- u8 opcode)
+static u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
+ u8 opcode)
{
u32 effects = 0;
@@ -1408,7 +1394,26 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
if (ctrl->effects)
effects = le32_to_cpu(ctrl->effects->acs[opcode]);
- effects |= nvme_known_admin_effects(opcode);
+
+ switch (opcode) {
+ case nvme_admin_format_nvm:
+ effects |= NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBCC |
+ NVME_CMD_EFFECTS_CSE_MASK;
+ break;
+ case nvme_admin_sanitize_nvm:
+ effects |= NVME_CMD_EFFECTS_CSE_MASK;
+ break;
+ default:
+ break;
+ }
+
+ return effects;
+}
+
+static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
+ u8 opcode)
+{
+ u32 effects = nvme_command_effects(ctrl, ns, opcode);
/*
* For simplicity, IO to all namespaces is quiesced even if the command
--
2.20.1
next prev parent reply other threads:[~2020-07-16 21:18 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 20:33 [PATCH v15 0/9] nvmet: add target passthru commands support Logan Gunthorpe
2020-07-16 20:33 ` [PATCH v15 1/9] nvme-core: Clear any SGL flags in passthru commands Logan Gunthorpe
2020-07-20 14:01 ` Christoph Hellwig
2020-07-16 20:33 ` Logan Gunthorpe [this message]
2020-07-20 14:04 ` [PATCH v15 2/9] nvme: Create helper function to obtain command effects Christoph Hellwig
2020-07-16 20:33 ` [PATCH v15 3/9] nvme: Move nvme_passthru_[start|end]() calls to common helper Logan Gunthorpe
2020-07-20 14:06 ` Christoph Hellwig
2020-07-16 20:33 ` [PATCH v15 4/9] nvmet-passthru: Introduce NVMet passthru Kconfig option Logan Gunthorpe
2020-07-20 14:06 ` Christoph Hellwig
2020-07-16 20:33 ` [PATCH v15 5/9] nvme-core: Introduce nvme_ctrl_get_by_path() Logan Gunthorpe
2020-07-20 14:09 ` Christoph Hellwig
2020-07-16 20:33 ` [PATCH v15 6/9] nvme: Export existing nvme core functions Logan Gunthorpe
2020-07-16 20:33 ` [PATCH v15 7/9] nvmet-passthru: Add passthru code to process commands Logan Gunthorpe
2020-07-20 14:16 ` Christoph Hellwig
2020-07-20 19:35 ` Sagi Grimberg
2020-07-20 21:41 ` Logan Gunthorpe
2020-07-20 21:58 ` Chaitanya Kulkarni
2020-07-20 22:35 ` Sagi Grimberg
2020-07-20 23:01 ` Logan Gunthorpe
2020-07-20 23:15 ` Sagi Grimberg
2020-07-20 23:17 ` Keith Busch
2020-07-20 23:28 ` Sagi Grimberg
2020-07-21 0:06 ` Keith Busch
2020-07-21 0:39 ` Sagi Grimberg
2020-07-22 21:09 ` Logan Gunthorpe
2020-07-22 22:31 ` Sagi Grimberg
2020-07-16 20:33 ` [PATCH v15 8/9] nvmet-passthru: Add enable/disable helpers Logan Gunthorpe
2020-07-16 20:33 ` [PATCH v15 9/9] nvmet-configfs: Introduce passthru configfs interface Logan Gunthorpe
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=20200716203319.16022-3-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=Chaitanya.Kulkarni@wdc.com \
--cc=axboe@fb.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=maxg@mellanox.com \
--cc=sagi@grimberg.me \
--cc=sbates@raithlin.com \
/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;
as well as URLs for NNTP newsgroup(s).