From: Mike Christie <michael.christie@oracle.com>
To: bvanassche@acm.org, hch@lst.de, martin.petersen@oracle.com,
linux-scsi@vger.kernel.org,
james.bottomley@hansenpartnership.com,
linux-block@vger.kernel.org, dm-devel@redhat.com,
snitzer@kernel.org, axboe@kernel.dk,
linux-nvme@lists.infradead.org, chaitanyak@nvidia.com,
kbusch@kernel.org, target-devel@vger.kernel.org
Cc: Mike Christie <michael.christie@oracle.com>,
Chaitanya Kulkarni <kch@nvidia.com>
Subject: [PATCH v4 08/18] nvme: Don't hardcode the data len for pr commands
Date: Fri, 24 Feb 2023 11:44:52 -0600 [thread overview]
Message-ID: <20230224174502.321490-9-michael.christie@oracle.com> (raw)
In-Reply-To: <20230224174502.321490-1-michael.christie@oracle.com>
Reservation Report support needs to pass in a variable sized buffer, so
this patch has the pr command helpers take a data length argument.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
---
drivers/nvme/host/core.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index ba6f1911f7ea..6323ff79386a 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2072,7 +2072,7 @@ static char nvme_pr_type(enum pr_type type)
}
static int nvme_send_ns_head_pr_command(struct block_device *bdev,
- struct nvme_command *c, u8 data[16])
+ struct nvme_command *c, u8 *data, unsigned int data_len)
{
struct nvme_ns_head *head = bdev->bd_disk->private_data;
int srcu_idx = srcu_read_lock(&head->srcu);
@@ -2081,17 +2081,17 @@ static int nvme_send_ns_head_pr_command(struct block_device *bdev,
if (ns) {
c->common.nsid = cpu_to_le32(ns->head->ns_id);
- ret = nvme_submit_sync_cmd(ns->queue, c, data, 16);
+ ret = nvme_submit_sync_cmd(ns->queue, c, data, data_len);
}
srcu_read_unlock(&head->srcu, srcu_idx);
return ret;
}
static int nvme_send_ns_pr_command(struct nvme_ns *ns, struct nvme_command *c,
- u8 data[16])
+ u8 *data, unsigned int data_len)
{
c->common.nsid = cpu_to_le32(ns->head->ns_id);
- return nvme_submit_sync_cmd(ns->queue, c, data, 16);
+ return nvme_submit_sync_cmd(ns->queue, c, data, data_len);
}
static int nvme_sc_to_pr_err(int nvme_sc)
@@ -2131,10 +2131,11 @@ static int nvme_pr_command(struct block_device *bdev, u32 cdw10,
if (IS_ENABLED(CONFIG_NVME_MULTIPATH) &&
bdev->bd_disk->fops == &nvme_ns_head_ops)
- ret = nvme_send_ns_head_pr_command(bdev, &c, data);
+ ret = nvme_send_ns_head_pr_command(bdev, &c, data,
+ sizeof(data));
else
ret = nvme_send_ns_pr_command(bdev->bd_disk->private_data, &c,
- data);
+ data, sizeof(data));
if (ret < 0)
return ret;
--
2.25.1
next prev parent reply other threads:[~2023-02-24 17:48 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 17:44 [PATCH v4 01/18] Use block pr_ops in LIO Mike Christie
2023-02-24 17:44 ` [PATCH v4 01/18] block: Add PR callouts for read keys and reservation Mike Christie
2023-03-06 5:03 ` Chaitanya Kulkarni
2023-03-14 17:10 ` Christoph Hellwig
2023-02-24 17:44 ` [PATCH v4 02/18] block: Rename BLK_STS_NEXUS to BLK_STS_RESV_CONFLICT Mike Christie
2023-03-14 17:11 ` Christoph Hellwig
2023-03-15 10:04 ` Stefan Haberland
2023-03-15 13:30 ` Christoph Hellwig
2023-03-16 10:17 ` Stefan Haberland
2023-03-16 16:36 ` Mike Christie
2023-03-20 13:06 ` Christoph Hellwig
2023-03-20 16:39 ` Mike Christie
2023-02-24 17:44 ` [PATCH v4 03/18] scsi: Rename sd_pr_command Mike Christie
2023-02-24 17:44 ` [PATCH v4 04/18] scsi: Move sd_pr_type to header to share Mike Christie
2023-03-06 5:06 ` Chaitanya Kulkarni
2023-02-24 17:44 ` [PATCH v4 05/18] scsi: Add support for block PR read keys/reservation Mike Christie
2023-03-06 5:08 ` Chaitanya Kulkarni
2023-03-14 17:11 ` Christoph Hellwig
2023-02-24 17:44 ` [PATCH v4 06/18] dm: " Mike Christie
2023-02-24 17:44 ` [PATCH v4 07/18] nvme: Fix reservation status related structs Mike Christie
2023-03-05 21:26 ` Chaitanya Kulkarni
2023-03-14 17:12 ` Christoph Hellwig
2023-03-14 17:15 ` Christoph Hellwig
2023-03-14 22:23 ` Mike Christie
2023-03-15 5:40 ` Christoph Hellwig
2023-03-20 17:08 ` Mike Christie
2023-02-24 17:44 ` Mike Christie [this message]
2023-02-24 17:44 ` [PATCH v4 09/18] nvme: Move pr code to it's own file Mike Christie
2023-03-14 17:13 ` Christoph Hellwig
2023-03-14 17:30 ` Keith Busch
2023-02-24 17:44 ` [PATCH v4 10/18] nvme: Add helper to send pr command Mike Christie
2023-03-05 21:28 ` Chaitanya Kulkarni
2023-03-06 17:25 ` Mike Christie
2023-03-14 17:13 ` Christoph Hellwig
2023-02-24 17:44 ` [PATCH v4 11/18] nvme: Add pr_ops read_keys support Mike Christie
2023-03-14 17:16 ` Christoph Hellwig
2023-02-24 17:44 ` [PATCH v4 12/18] nvme: Add a nvme_pr_type enum Mike Christie
2023-03-05 21:30 ` Chaitanya Kulkarni
2023-03-14 17:17 ` Christoph Hellwig
2023-02-24 17:44 ` [PATCH v4 13/18] nvme: Add pr_ops read_reservation support Mike Christie
2023-02-24 21:04 ` kernel test robot
2023-03-06 17:25 ` Mike Christie
2023-03-05 21:32 ` Chaitanya Kulkarni
2023-03-14 17:21 ` Christoph Hellwig
2023-02-24 17:44 ` [PATCH v4 14/18] scsi: target: Rename sbc_ops to exec_cmd_ops Mike Christie
2023-02-24 17:44 ` [PATCH v4 15/18] scsi: target: Allow backends to hook into PR handling Mike Christie
2023-02-24 17:45 ` [PATCH v4 16/18] scsi: target: Pass struct target_opcode_descriptor to enabled Mike Christie
2023-02-24 17:45 ` [PATCH v4 17/18] scsi: target: Report and detect unsupported PR commands Mike Christie
2023-02-24 17:45 ` [PATCH v4 18/18] scsi: target: Add block PR support to iblock Mike Christie
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=20230224174502.321490-9-michael.christie@oracle.com \
--to=michael.christie@oracle.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=chaitanyak@nvidia.com \
--cc=dm-devel@redhat.com \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=kbusch@kernel.org \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=snitzer@kernel.org \
--cc=target-devel@vger.kernel.org \
/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).