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>
Subject: [PATCH v5 11/18] nvme: Add pr_ops read_keys support
Date: Fri, 24 Mar 2023 13:17:34 -0500 [thread overview]
Message-ID: <20230324181741.13908-12-michael.christie@oracle.com> (raw)
In-Reply-To: <20230324181741.13908-1-michael.christie@oracle.com>
This patch adds support for the pr_ops read_keys callout by calling the
NVMe Reservation Report helper, then parsing that info to get the
controller's registered keys. Because the callout is only used in the
kernel where the callers, like LIO, do not know about controller/host IDs,
the callout just returns the registered keys which is required by the SCSI
PR in READ KEYS command.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
drivers/nvme/host/pr.c | 69 ++++++++++++++++++++++++++++++++++++++++++
include/linux/nvme.h | 4 +++
2 files changed, 73 insertions(+)
diff --git a/drivers/nvme/host/pr.c b/drivers/nvme/host/pr.c
index cd93d2e5b340..6aadcc25f3e2 100644
--- a/drivers/nvme/host/pr.c
+++ b/drivers/nvme/host/pr.c
@@ -154,10 +154,79 @@ static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type type
return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
}
+static int nvme_pr_resv_report(struct block_device *bdev, void *data,
+ u32 data_len, bool *eds)
+{
+ struct nvme_command c = { };
+ int ret;
+
+ c.common.opcode = nvme_cmd_resv_report;
+ c.common.cdw10 = cpu_to_le32(nvme_bytes_to_numd(data_len));
+ c.common.cdw11 = NVME_EXTENDED_DATA_STRUCT;
+ *eds = true;
+
+retry:
+ ret = nvme_send_pr_command(bdev, &c, data, data_len);
+ if (ret == NVME_SC_HOST_ID_INCONSIST &&
+ c.common.cdw11 == NVME_EXTENDED_DATA_STRUCT) {
+ c.common.cdw11 = 0;
+ *eds = false;
+ goto retry;
+ }
+
+ if (ret < 0)
+ return ret;
+
+ return nvme_sc_to_pr_err(ret);
+}
+
+static int nvme_pr_read_keys(struct block_device *bdev,
+ struct pr_keys *keys_info)
+{
+ u32 rse_len, num_keys = keys_info->num_keys;
+ struct nvme_reservation_status_ext *rse;
+ int ret, i;
+ bool eds;
+
+ /*
+ * Assume we are using 128-bit host IDs and allocate a buffer large
+ * enough to get enough keys to fill the return keys buffer.
+ */
+ rse_len = struct_size(rse, regctl_eds, num_keys);
+ rse = kzalloc(rse_len, GFP_KERNEL);
+ if (!rse)
+ return -ENOMEM;
+
+ ret = nvme_pr_resv_report(bdev, rse, rse_len, &eds);
+ if (ret)
+ goto free_rse;
+
+ keys_info->generation = le32_to_cpu(rse->gen);
+ keys_info->num_keys = get_unaligned_le16(&rse->regctl);
+
+ num_keys = min(num_keys, keys_info->num_keys);
+ for (i = 0; i < num_keys; i++) {
+ if (eds) {
+ keys_info->keys[i] =
+ le64_to_cpu(rse->regctl_eds[i].rkey);
+ } else {
+ struct nvme_reservation_status *rs;
+
+ rs = (struct nvme_reservation_status *)rse;
+ keys_info->keys[i] = le64_to_cpu(rs->regctl_ds[i].rkey);
+ }
+ }
+
+free_rse:
+ kfree(rse);
+ return ret;
+}
+
const struct pr_ops nvme_pr_ops = {
.pr_register = nvme_pr_register,
.pr_reserve = nvme_pr_reserve,
.pr_release = nvme_pr_release,
.pr_preempt = nvme_pr_preempt,
.pr_clear = nvme_pr_clear,
+ .pr_read_keys = nvme_pr_read_keys,
};
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 83704fc04a94..c18bd55a4ead 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -759,6 +759,10 @@ enum {
NVME_LBART_ATTRIB_HIDE = 1 << 1,
};
+enum nvme_eds {
+ NVME_EXTENDED_DATA_STRUCT = 0x1,
+};
+
struct nvme_registered_ctrl {
__le16 cntlid;
__u8 rcsts;
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
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>
Subject: [dm-devel] [PATCH v5 11/18] nvme: Add pr_ops read_keys support
Date: Fri, 24 Mar 2023 13:17:34 -0500 [thread overview]
Message-ID: <20230324181741.13908-12-michael.christie@oracle.com> (raw)
In-Reply-To: <20230324181741.13908-1-michael.christie@oracle.com>
This patch adds support for the pr_ops read_keys callout by calling the
NVMe Reservation Report helper, then parsing that info to get the
controller's registered keys. Because the callout is only used in the
kernel where the callers, like LIO, do not know about controller/host IDs,
the callout just returns the registered keys which is required by the SCSI
PR in READ KEYS command.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
drivers/nvme/host/pr.c | 69 ++++++++++++++++++++++++++++++++++++++++++
include/linux/nvme.h | 4 +++
2 files changed, 73 insertions(+)
diff --git a/drivers/nvme/host/pr.c b/drivers/nvme/host/pr.c
index cd93d2e5b340..6aadcc25f3e2 100644
--- a/drivers/nvme/host/pr.c
+++ b/drivers/nvme/host/pr.c
@@ -154,10 +154,79 @@ static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type type
return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
}
+static int nvme_pr_resv_report(struct block_device *bdev, void *data,
+ u32 data_len, bool *eds)
+{
+ struct nvme_command c = { };
+ int ret;
+
+ c.common.opcode = nvme_cmd_resv_report;
+ c.common.cdw10 = cpu_to_le32(nvme_bytes_to_numd(data_len));
+ c.common.cdw11 = NVME_EXTENDED_DATA_STRUCT;
+ *eds = true;
+
+retry:
+ ret = nvme_send_pr_command(bdev, &c, data, data_len);
+ if (ret == NVME_SC_HOST_ID_INCONSIST &&
+ c.common.cdw11 == NVME_EXTENDED_DATA_STRUCT) {
+ c.common.cdw11 = 0;
+ *eds = false;
+ goto retry;
+ }
+
+ if (ret < 0)
+ return ret;
+
+ return nvme_sc_to_pr_err(ret);
+}
+
+static int nvme_pr_read_keys(struct block_device *bdev,
+ struct pr_keys *keys_info)
+{
+ u32 rse_len, num_keys = keys_info->num_keys;
+ struct nvme_reservation_status_ext *rse;
+ int ret, i;
+ bool eds;
+
+ /*
+ * Assume we are using 128-bit host IDs and allocate a buffer large
+ * enough to get enough keys to fill the return keys buffer.
+ */
+ rse_len = struct_size(rse, regctl_eds, num_keys);
+ rse = kzalloc(rse_len, GFP_KERNEL);
+ if (!rse)
+ return -ENOMEM;
+
+ ret = nvme_pr_resv_report(bdev, rse, rse_len, &eds);
+ if (ret)
+ goto free_rse;
+
+ keys_info->generation = le32_to_cpu(rse->gen);
+ keys_info->num_keys = get_unaligned_le16(&rse->regctl);
+
+ num_keys = min(num_keys, keys_info->num_keys);
+ for (i = 0; i < num_keys; i++) {
+ if (eds) {
+ keys_info->keys[i] =
+ le64_to_cpu(rse->regctl_eds[i].rkey);
+ } else {
+ struct nvme_reservation_status *rs;
+
+ rs = (struct nvme_reservation_status *)rse;
+ keys_info->keys[i] = le64_to_cpu(rs->regctl_ds[i].rkey);
+ }
+ }
+
+free_rse:
+ kfree(rse);
+ return ret;
+}
+
const struct pr_ops nvme_pr_ops = {
.pr_register = nvme_pr_register,
.pr_reserve = nvme_pr_reserve,
.pr_release = nvme_pr_release,
.pr_preempt = nvme_pr_preempt,
.pr_clear = nvme_pr_clear,
+ .pr_read_keys = nvme_pr_read_keys,
};
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 83704fc04a94..c18bd55a4ead 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -759,6 +759,10 @@ enum {
NVME_LBART_ATTRIB_HIDE = 1 << 1,
};
+enum nvme_eds {
+ NVME_EXTENDED_DATA_STRUCT = 0x1,
+};
+
struct nvme_registered_ctrl {
__le16 cntlid;
__u8 rcsts;
--
2.25.1
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2023-03-24 18:20 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-24 18:17 [PATCH v5 00/18] Use block pr_ops in LIO Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 01/18] block: Add PR callouts for read keys and reservation Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 19:45 ` Bart Van Assche
2023-03-24 19:45 ` [dm-devel] " Bart Van Assche
2023-03-28 16:36 ` Mike Snitzer
2023-03-28 16:36 ` [dm-devel] " Mike Snitzer
2023-03-28 17:11 ` Mike Christie
2023-03-28 17:11 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 02/18] block: Rename BLK_STS_NEXUS to BLK_STS_RESV_CONFLICT Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 19:46 ` Bart Van Assche
2023-03-24 19:46 ` [dm-devel] " Bart Van Assche
2023-03-24 18:17 ` [PATCH v5 03/18] scsi: Rename sd_pr_command Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 19:46 ` Bart Van Assche
2023-03-24 19:46 ` [dm-devel] " Bart Van Assche
2023-03-24 18:17 ` [PATCH v5 04/18] scsi: Move sd_pr_type to header to share Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:25 ` Bart Van Assche
2023-03-24 18:25 ` [dm-devel] " Bart Van Assche
2023-03-24 18:41 ` michael.christie
2023-03-24 18:41 ` [dm-devel] " michael.christie
2023-03-24 18:17 ` [PATCH v5 05/18] scsi: Add support for block PR read keys/reservation Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 06/18] dm: " Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 07/18] nvme: Fix reservation status related structs Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 08/18] nvme: Don't hardcode the data len for pr commands Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 09/18] nvme: Move pr code to it's own file Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 10/18] nvme: Add helper to send pr command Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` Mike Christie [this message]
2023-03-24 18:17 ` [dm-devel] [PATCH v5 11/18] nvme: Add pr_ops read_keys support Mike Christie
2023-03-28 7:11 ` kernel test robot
2023-03-28 7:11 ` [dm-devel] " kernel test robot
2023-03-28 15:50 ` Mike Christie
2023-03-28 15:50 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 12/18] nvme: Add a nvme_pr_type enum Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 13/18] nvme: Add pr_ops read_reservation support Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 14/18] scsi: target: Rename sbc_ops to exec_cmd_ops Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 15/18] scsi: target: Allow backends to hook into PR handling Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 16/18] scsi: target: Pass struct target_opcode_descriptor to enabled Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 17/18] scsi: target: Report and detect unsupported PR commands Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-03-24 18:17 ` [PATCH v5 18/18] scsi: target: Add block PR support to iblock Mike Christie
2023-03-24 18:17 ` [dm-devel] " Mike Christie
2023-04-04 5:29 ` kernel test robot
2023-04-04 5:29 ` [dm-devel] " kernel test robot
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=20230324181741.13908-12-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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.