From: Mike Christie <michael.christie@oracle.com>
To: linux-block@vger.kernel.org, dm-devel@redhat.com,
snitzer@kernel.org, hch@lst.de, axboe@kernel.dk,
martin.petersen@oracle.com,
james.bottomley@hansenpartnership.com,
linux-scsi@vger.kernel.org, target-devel@vger.kernel.org
Cc: Mike Christie <michael.christie@oracle.com>
Subject: [PATCH 05/11] scsi: Add support for block PR read keys/reservation.
Date: Fri, 3 Jun 2022 01:55:30 -0500 [thread overview]
Message-ID: <20220603065536.5641-6-michael.christie@oracle.com> (raw)
In-Reply-To: <20220603065536.5641-1-michael.christie@oracle.com>
This adds support in sd.c for the block PR read keys and read reservation
callouts.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
drivers/scsi/sd.c | 88 +++++++++++++++++++++++++++++++++++++++
include/scsi/scsi_proto.h | 5 +++
2 files changed, 93 insertions(+)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 765fca0f38c7..71283aaf3e82 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1684,6 +1684,92 @@ static int sd_get_unique_id(struct gendisk *disk, u8 id[16],
return ret;
}
+static int sd_pr_in_command(struct block_device *bdev, u8 sa,
+ unsigned char *data, int data_len)
+{
+ struct scsi_disk *sdkp = scsi_disk(bdev->bd_disk);
+ struct scsi_device *sdev = sdkp->device;
+ struct scsi_sense_hdr sshdr;
+ u8 cmd[10] = { 0, };
+ int result;
+
+ cmd[0] = PERSISTENT_RESERVE_IN;
+ cmd[1] = sa;
+ put_unaligned_be16(data_len, &cmd[7]);
+
+ result = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, data, data_len,
+ &sshdr, SD_TIMEOUT, sdkp->max_retries, NULL);
+ if (scsi_status_is_check_condition(result) &&
+ scsi_sense_valid(&sshdr)) {
+ sdev_printk(KERN_INFO, sdev, "PR command failed: %d\n", result);
+ scsi_print_sense_hdr(sdev, NULL, &sshdr);
+ }
+
+ return result;
+}
+
+static int sd_pr_read_keys(struct block_device *bdev, struct pr_keys *keys_info,
+ int keys_info_len)
+{
+ u8 *data = (u8 *)keys_info;
+ int result, i, data_offset;
+
+ if (keys_info_len < 8)
+ return -EINVAL;
+
+ result = sd_pr_in_command(bdev, READ_KEYS, data, keys_info_len);
+ if (result)
+ return result;
+ /*
+ * The device gives us the info in BE, but users want it in a easier
+ * to use format so we convert it for them.
+ */
+ keys_info->generation = get_unaligned_be32(&data[0]);
+ keys_info->num_keys = get_unaligned_be32(&data[4]) / 8;
+
+ data_offset = 8;
+ for (i = 0; i < keys_info->num_keys; i++) {
+ if (data_offset + 8 > keys_info_len - 8)
+ return -EOVERFLOW;
+
+ keys_info->keys[i] = get_unaligned_be64(&data[data_offset]);
+ data_offset += 8;
+ }
+
+ return result;
+}
+
+static int sd_pr_read_reservation(struct block_device *bdev,
+ struct pr_held_reservation *rsv)
+{
+ struct scsi_disk *sdkp = scsi_disk(bdev->bd_disk);
+ struct scsi_device *sdev = sdkp->device;
+ u8 data[24] = { 0, };
+ int result, len;
+
+ result = sd_pr_in_command(bdev, READ_RESERVATION, data, sizeof(data));
+ if (result)
+ return result;
+
+ memset(rsv, 0, sizeof(*rsv));
+ len = get_unaligned_be32(&data[4]);
+ if (!len)
+ return result;
+
+ /* Make sure we have at least the key and type */
+ if (len < 14) {
+ sdev_printk(KERN_INFO, sdev,
+ "READ RESERVATION failed due to short return buffer of %d bytes\n",
+ len);
+ return -EINVAL;
+ }
+
+ rsv->generation = get_unaligned_be32(&data[0]);
+ rsv->key = get_unaligned_be64(&data[8]);
+ rsv->type = scsi_pr_type_to_block(data[21] & 0x0f);
+ return 0;
+}
+
static int sd_pr_out_command(struct block_device *bdev, u8 sa,
u64 key, u64 sa_key, u8 type, u8 flags)
{
@@ -1758,6 +1844,8 @@ static const struct pr_ops sd_pr_ops = {
.pr_release = sd_pr_release,
.pr_preempt = sd_pr_preempt,
.pr_clear = sd_pr_clear,
+ .pr_read_keys = sd_pr_read_keys,
+ .pr_read_reservation = sd_pr_read_reservation,
};
static void scsi_disk_free_disk(struct gendisk *disk)
diff --git a/include/scsi/scsi_proto.h b/include/scsi/scsi_proto.h
index f017843a8124..07ff33ea27e9 100644
--- a/include/scsi/scsi_proto.h
+++ b/include/scsi/scsi_proto.h
@@ -151,6 +151,11 @@
#define ZO_FINISH_ZONE 0x02
#define ZO_OPEN_ZONE 0x03
#define ZO_RESET_WRITE_POINTER 0x04
+/* values for PR in service action */
+#define READ_KEYS 0x00
+#define READ_RESERVATION 0x01
+#define REPORT_CAPABILITES 0x02
+#define READ_FULL_STATUS 0x03
/* values for variable length command */
#define XDREAD_32 0x03
#define XDWRITE_32 0x04
--
2.25.1
next prev parent reply other threads:[~2022-06-03 6:57 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-03 6:55 [PATCH 0/8] Use block pr_ops in LIO Mike Christie
2022-06-03 6:55 ` [PATCH 01/11] scsi: target: Rename sbc_ops to exec_cmd_ops Mike Christie
2022-06-20 7:12 ` Christoph Hellwig
2022-06-03 6:55 ` [PATCH 02/11] scsi: Rename sd_pr_command Mike Christie
2022-06-20 7:13 ` Christoph Hellwig
2022-06-03 6:55 ` [PATCH 03/11] scsi: Move sd_pr_type to header to share Mike Christie
2022-06-05 3:58 ` Bart Van Assche
2022-06-20 7:13 ` Christoph Hellwig
2022-06-03 6:55 ` [PATCH 04/11] block: Add PR callouts for read keys and reservation Mike Christie
2022-06-20 7:14 ` Christoph Hellwig
2022-06-03 6:55 ` Mike Christie [this message]
2022-06-03 6:55 ` [PATCH 06/11] dm: Add support for block PR read keys/reservation Mike Christie
2022-06-03 6:55 ` [PATCH 07/11] scsi: target: Allow backends to hook into PR handling Mike Christie
2022-06-20 7:15 ` Christoph Hellwig
2022-06-03 6:55 ` [PATCH 08/11] scsi: target: Add block PR support to iblock Mike Christie
2022-06-20 7:18 ` Christoph Hellwig
2022-06-03 6:55 ` [PATCH 09/11] block, nvme: Add error for reservation conflicts Mike Christie
2022-06-03 19:45 ` Keith Busch
2022-06-03 23:08 ` Mike Christie
2022-06-04 7:38 ` Hannes Reinecke
2022-06-04 17:13 ` michael.christie
2022-06-05 9:42 ` Hannes Reinecke
2022-06-20 7:23 ` Christoph Hellwig
2022-06-05 4:00 ` [dm-devel] " Bart Van Assche
2022-06-03 6:55 ` [PATCH 10/11] scsi: Use BLK_STS_RSV_CONFLICT " Mike Christie
2022-06-03 6:55 ` [PATCH 11/11] scsi: target: Handle BLK_STS_RSV_CONFLICT Mike Christie
2022-06-03 11:46 ` [PATCH 0/8] Use block pr_ops in LIO Christoph Hellwig
2022-06-03 17:55 ` Mike Christie
2022-06-20 7:12 ` Christoph Hellwig
2022-06-05 4:01 ` [dm-devel] " Bart Van Assche
2022-06-05 16:55 ` Mike Christie
2022-06-05 18:15 ` Bart Van Assche
2022-06-06 16:38 ` 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=20220603065536.5641-6-michael.christie@oracle.com \
--to=michael.christie@oracle.com \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-block@vger.kernel.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