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 v4 13/18] nvme: Add pr_ops read_reservation support Date: Fri, 24 Feb 2023 11:44:57 -0600 [thread overview] Message-ID: <20230224174502.321490-14-michael.christie@oracle.com> (raw) In-Reply-To: <20230224174502.321490-1-michael.christie@oracle.com> This patch adds support for the pr_ops read_reservation callout by calling the NVMe Reservation Report helper. It then parses that info to detect if there is a reservation and if there is then convert the returned info to a pr_ops pr_held_reservation struct. Signed-off-by: Mike Christie <michael.christie@oracle.com> --- drivers/nvme/host/pr.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/drivers/nvme/host/pr.c b/drivers/nvme/host/pr.c index 66086369dbce..cadf61dc60c3 100644 --- a/drivers/nvme/host/pr.c +++ b/drivers/nvme/host/pr.c @@ -26,6 +26,26 @@ static enum nvme_pr_type nvme_pr_type_from_blk(enum pr_type type) return 0; } +static enum pr_type block_pr_type_from_nvme(enum nvme_pr_type type) +{ + switch (type) { + case NVME_PR_WRITE_EXCLUSIVE: + return PR_WRITE_EXCLUSIVE; + case NVME_PR_EXCLUSIVE_ACCESS: + return PR_EXCLUSIVE_ACCESS; + case NVME_PR_WRITE_EXCLUSIVE_REG_ONLY: + return PR_WRITE_EXCLUSIVE_REG_ONLY; + case NVME_PR_EXCLUSIVE_ACCESS_REG_ONLY: + return PR_EXCLUSIVE_ACCESS_REG_ONLY; + case NVME_PR_WRITE_EXCLUSIVE_ALL_REGS: + return PR_WRITE_EXCLUSIVE_ALL_REGS; + case NVME_PR_EXCLUSIVE_ACCESS_ALL_REGS: + return NVME_PR_EXCLUSIVE_ACCESS_ALL_REGS; + } + + return 0; +} + static int nvme_send_ns_head_pr_command(struct block_device *bdev, struct nvme_command *c, void *data, unsigned int data_len) { @@ -215,6 +235,66 @@ static int nvme_pr_read_keys(struct block_device *bdev, return ret; } +static int nvme_pr_read_reservation(struct block_device *bdev, + struct pr_held_reservation *resv) +{ + struct nvme_reservation_status tmp_rs, *rs; + int ret, i, num_regs; + u32 rs_len; + bool eds; + +get_num_regs: + /* + * Get the number of registrations so we know how big to allocate + * the response buffer. + */ + ret = nvme_pr_resv_report(bdev, &tmp_rs, sizeof(tmp_rs), &eds); + if (ret) + return ret; + + num_regs = get_unaligned_le16(&tmp_rs.regctl); + if (!num_regs) { + resv->generation = le32_to_cpu(tmp_rs.gen); + return 0; + } + + rs_len = sizeof(*rs) + + num_regs * sizeof(struct nvme_registered_ctrl_ext); + rs = kzalloc(rs_len, GFP_KERNEL); + if (!rs) + return -ENOMEM; + + ret = nvme_pr_resv_report(bdev, rs, rs_len, &eds); + if (ret) + goto free_rs; + + if (num_regs != get_unaligned_le16(&rs->regctl)) { + kfree(rs); + goto get_num_regs; + } + + resv->generation = le32_to_cpu(rs->gen); + resv->type = block_pr_type_from_nvme(rs->rtype); + + for (i = 0; i < num_regs; i++) { + if (eds) { + if (rs->regctl_eds[i].rcsts) { + resv->key = le64_to_cpu(rs->regctl_eds[i].rkey); + break; + } + } else { + if (rs->regctl_ds[i].rcsts) { + resv->key = le64_to_cpu(rs->regctl_ds[i].rkey); + break; + } + } + } + +free_rs: + kfree(rs); + return ret; +} + const struct pr_ops nvme_pr_ops = { .pr_register = nvme_pr_register, .pr_reserve = nvme_pr_reserve, @@ -222,4 +302,5 @@ const struct pr_ops nvme_pr_ops = { .pr_preempt = nvme_pr_preempt, .pr_clear = nvme_pr_clear, .pr_read_keys = nvme_pr_read_keys, + .pr_read_reservation = nvme_pr_read_reservation, }; -- 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 v4 13/18] nvme: Add pr_ops read_reservation support Date: Fri, 24 Feb 2023 11:44:57 -0600 [thread overview] Message-ID: <20230224174502.321490-14-michael.christie@oracle.com> (raw) In-Reply-To: <20230224174502.321490-1-michael.christie@oracle.com> This patch adds support for the pr_ops read_reservation callout by calling the NVMe Reservation Report helper. It then parses that info to detect if there is a reservation and if there is then convert the returned info to a pr_ops pr_held_reservation struct. Signed-off-by: Mike Christie <michael.christie@oracle.com> --- drivers/nvme/host/pr.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/drivers/nvme/host/pr.c b/drivers/nvme/host/pr.c index 66086369dbce..cadf61dc60c3 100644 --- a/drivers/nvme/host/pr.c +++ b/drivers/nvme/host/pr.c @@ -26,6 +26,26 @@ static enum nvme_pr_type nvme_pr_type_from_blk(enum pr_type type) return 0; } +static enum pr_type block_pr_type_from_nvme(enum nvme_pr_type type) +{ + switch (type) { + case NVME_PR_WRITE_EXCLUSIVE: + return PR_WRITE_EXCLUSIVE; + case NVME_PR_EXCLUSIVE_ACCESS: + return PR_EXCLUSIVE_ACCESS; + case NVME_PR_WRITE_EXCLUSIVE_REG_ONLY: + return PR_WRITE_EXCLUSIVE_REG_ONLY; + case NVME_PR_EXCLUSIVE_ACCESS_REG_ONLY: + return PR_EXCLUSIVE_ACCESS_REG_ONLY; + case NVME_PR_WRITE_EXCLUSIVE_ALL_REGS: + return PR_WRITE_EXCLUSIVE_ALL_REGS; + case NVME_PR_EXCLUSIVE_ACCESS_ALL_REGS: + return NVME_PR_EXCLUSIVE_ACCESS_ALL_REGS; + } + + return 0; +} + static int nvme_send_ns_head_pr_command(struct block_device *bdev, struct nvme_command *c, void *data, unsigned int data_len) { @@ -215,6 +235,66 @@ static int nvme_pr_read_keys(struct block_device *bdev, return ret; } +static int nvme_pr_read_reservation(struct block_device *bdev, + struct pr_held_reservation *resv) +{ + struct nvme_reservation_status tmp_rs, *rs; + int ret, i, num_regs; + u32 rs_len; + bool eds; + +get_num_regs: + /* + * Get the number of registrations so we know how big to allocate + * the response buffer. + */ + ret = nvme_pr_resv_report(bdev, &tmp_rs, sizeof(tmp_rs), &eds); + if (ret) + return ret; + + num_regs = get_unaligned_le16(&tmp_rs.regctl); + if (!num_regs) { + resv->generation = le32_to_cpu(tmp_rs.gen); + return 0; + } + + rs_len = sizeof(*rs) + + num_regs * sizeof(struct nvme_registered_ctrl_ext); + rs = kzalloc(rs_len, GFP_KERNEL); + if (!rs) + return -ENOMEM; + + ret = nvme_pr_resv_report(bdev, rs, rs_len, &eds); + if (ret) + goto free_rs; + + if (num_regs != get_unaligned_le16(&rs->regctl)) { + kfree(rs); + goto get_num_regs; + } + + resv->generation = le32_to_cpu(rs->gen); + resv->type = block_pr_type_from_nvme(rs->rtype); + + for (i = 0; i < num_regs; i++) { + if (eds) { + if (rs->regctl_eds[i].rcsts) { + resv->key = le64_to_cpu(rs->regctl_eds[i].rkey); + break; + } + } else { + if (rs->regctl_ds[i].rcsts) { + resv->key = le64_to_cpu(rs->regctl_ds[i].rkey); + break; + } + } + } + +free_rs: + kfree(rs); + return ret; +} + const struct pr_ops nvme_pr_ops = { .pr_register = nvme_pr_register, .pr_reserve = nvme_pr_reserve, @@ -222,4 +302,5 @@ const struct pr_ops nvme_pr_ops = { .pr_preempt = nvme_pr_preempt, .pr_clear = nvme_pr_clear, .pr_read_keys = nvme_pr_read_keys, + .pr_read_reservation = nvme_pr_read_reservation, }; -- 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-02-24 17:48 UTC|newest] Thread overview: 98+ 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 ` [dm-devel] " Mike Christie 2023-02-24 17:44 ` [PATCH v4 01/18] block: Add PR callouts for read keys and reservation Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-03-06 5:03 ` Chaitanya Kulkarni 2023-03-06 5:03 ` [dm-devel] " Chaitanya Kulkarni 2023-03-14 17:10 ` Christoph Hellwig 2023-03-14 17:10 ` [dm-devel] " Christoph Hellwig 2023-02-24 17:44 ` [PATCH v4 02/18] block: Rename BLK_STS_NEXUS to BLK_STS_RESV_CONFLICT Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-03-14 17:11 ` Christoph Hellwig 2023-03-14 17:11 ` [dm-devel] " Christoph Hellwig 2023-03-15 10:04 ` Stefan Haberland 2023-03-15 10:04 ` [dm-devel] " Stefan Haberland 2023-03-15 13:30 ` Christoph Hellwig 2023-03-15 13:30 ` [dm-devel] " Christoph Hellwig 2023-03-16 10:17 ` Stefan Haberland 2023-03-16 10:17 ` [dm-devel] " Stefan Haberland 2023-03-16 16:36 ` Mike Christie 2023-03-16 16:36 ` [dm-devel] " Mike Christie 2023-03-20 13:06 ` Christoph Hellwig 2023-03-20 13:06 ` [dm-devel] " Christoph Hellwig 2023-03-20 16:39 ` Mike Christie 2023-03-20 16:39 ` [dm-devel] " Mike Christie 2023-02-24 17:44 ` [PATCH v4 03/18] scsi: Rename sd_pr_command Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-02-24 17:44 ` [PATCH v4 04/18] scsi: Move sd_pr_type to header to share Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-03-06 5:06 ` Chaitanya Kulkarni 2023-03-06 5:06 ` [dm-devel] " Chaitanya Kulkarni 2023-02-24 17:44 ` [PATCH v4 05/18] scsi: Add support for block PR read keys/reservation Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-03-06 5:08 ` Chaitanya Kulkarni 2023-03-06 5:08 ` [dm-devel] " Chaitanya Kulkarni 2023-03-14 17:11 ` Christoph Hellwig 2023-03-14 17:11 ` [dm-devel] " Christoph Hellwig 2023-02-24 17:44 ` [PATCH v4 06/18] dm: " Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-02-24 17:44 ` [PATCH v4 07/18] nvme: Fix reservation status related structs Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-03-05 21:26 ` Chaitanya Kulkarni 2023-03-05 21:26 ` [dm-devel] " Chaitanya Kulkarni 2023-03-14 17:12 ` Christoph Hellwig 2023-03-14 17:12 ` [dm-devel] " Christoph Hellwig 2023-03-14 17:15 ` Christoph Hellwig 2023-03-14 17:15 ` [dm-devel] " Christoph Hellwig 2023-03-14 22:23 ` Mike Christie 2023-03-14 22:23 ` [dm-devel] " Mike Christie 2023-03-15 5:40 ` Christoph Hellwig 2023-03-15 5:40 ` [dm-devel] " Christoph Hellwig 2023-03-20 17:08 ` Mike Christie 2023-03-20 17:08 ` [dm-devel] " Mike Christie 2023-02-24 17:44 ` [PATCH v4 08/18] nvme: Don't hardcode the data len for pr commands Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-02-24 17:44 ` [PATCH v4 09/18] nvme: Move pr code to it's own file Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-03-14 17:13 ` Christoph Hellwig 2023-03-14 17:13 ` [dm-devel] " Christoph Hellwig 2023-03-14 17:30 ` Keith Busch 2023-03-14 17:30 ` [dm-devel] " Keith Busch 2023-02-24 17:44 ` [PATCH v4 10/18] nvme: Add helper to send pr command Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-03-05 21:28 ` Chaitanya Kulkarni 2023-03-05 21:28 ` [dm-devel] " Chaitanya Kulkarni 2023-03-06 17:25 ` Mike Christie 2023-03-06 17:25 ` [dm-devel] " Mike Christie 2023-03-14 17:13 ` Christoph Hellwig 2023-03-14 17:13 ` [dm-devel] " Christoph Hellwig 2023-02-24 17:44 ` [PATCH v4 11/18] nvme: Add pr_ops read_keys support Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-03-14 17:16 ` Christoph Hellwig 2023-03-14 17:16 ` [dm-devel] " Christoph Hellwig 2023-02-24 17:44 ` [PATCH v4 12/18] nvme: Add a nvme_pr_type enum Mike Christie 2023-02-24 17:44 ` [dm-devel] " Mike Christie 2023-03-05 21:30 ` Chaitanya Kulkarni 2023-03-05 21:30 ` [dm-devel] " Chaitanya Kulkarni 2023-03-14 17:17 ` Christoph Hellwig 2023-03-14 17:17 ` [dm-devel] " Christoph Hellwig 2023-02-24 17:44 ` Mike Christie [this message] 2023-02-24 17:44 ` [dm-devel] [PATCH v4 13/18] nvme: Add pr_ops read_reservation support Mike Christie 2023-02-24 21:04 ` kernel test robot 2023-02-24 21:04 ` [dm-devel] " kernel test robot 2023-03-06 17:25 ` Mike Christie 2023-03-06 17:25 ` [dm-devel] " Mike Christie 2023-03-05 21:32 ` Chaitanya Kulkarni 2023-03-05 21:32 ` [dm-devel] " Chaitanya Kulkarni 2023-03-14 17:21 ` Christoph Hellwig 2023-03-14 17:21 ` [dm-devel] " 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 ` [dm-devel] " 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:44 ` [dm-devel] " 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 ` [dm-devel] " 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 ` [dm-devel] " Mike Christie 2023-02-24 17:45 ` [PATCH v4 18/18] scsi: target: Add block PR support to iblock Mike Christie 2023-02-24 17:45 ` [dm-devel] " 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-14-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: linkBe 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.