Pass data lifetime information to SCSI disk devices
v10 cover Pass data lifetime information to SCSI disk devices
Hi Martin,
UFS vendors need the data lifetime information to achieve good performance. Providing data lifetime information to UFS devices can result in up to 40% lower write amplification. Hence this patch series that adds support in F2FS and also in the block layer for data lifetime information. The SCSI disk (sd) driver is modified such that it passes write hint information to SCSI devices via the GROUP NUMBER field.
Please consider this patch series for the next merge window.
Thanks,
Bart.
Changes compared to v9:
- Rebased the patch series on top of Christian's vfs/vfs.rw branch (tag vfs-6.9.rw_hint).
- Instead of checking in sd_setup_read_write_cmnd() whether rq->write_hint != 0, set use_10_for_rw if permanent streams are supported.
Changes compared to v8:
- Removed the .apply_whint() function pointer member from struct file_operations.
- Made this patch series compatible with 'sparse' via the following change:
+/* Sparse ignores __packed annotations on enums, hence the #ifndef below. */ +#ifndef __CHECKER__
static_assert(sizeof(enum rw_hint) == 1);
+#endif
Changes compared to v7:
- As requested by Dave Chinner, changed one occurrence of file_inode(dio->iocb->ki_filp)->i_write_hint into inode->i_write_hint.
- Modified the description of patch 03/19 since the patch that restores F_[GS]ET_FILE_RW_HINT has been removed.
- Added Reviewed-by tags from v6 of this patch series and that were missing when v7 was posted.
Changes compared to v6:
- Dropped patch "fs: Restore F_[GS]ET_FILE_RW_HINT support".
Changes compared to v5:
- Added compile-time tests that compare the WRITE_LIFE_* and RWH_* constants.
- Split the F_[GS]ET_RW_HINT handlers.
- Removed the structure member kiocb.ki_hint again. Instead, copy the data lifetime information directly from struct file into a bio.
- Together with Doug Gilbert, fixed multiple bugs in the scsi_debug patches. Added Doug's Tested-by.
- Changed the type of "rscs:1" from bool into unsigned.
- Added unit tests for the new SCSI protocol data structures.
- Improved multiple patch descriptions.
Changes compared to v4:
- Dropped the patch that renames the WRITE_LIFE_* constants.
- Added a fix for an argument check in fcntl_rw_hint().
- Reordered the patches that restore data lifetime support.
- Included a fix for data lifetime support for buffered I/O to raw block devices.
Changes compared to v3:
- Renamed the data lifetime constants (WRITE_LIFE_*).
- Fixed a checkpatch complaint by changing "unsigned" into "unsigned int".
- Rebased this patch series on top of kernel v6.7-rc1.
Changes compared to v2:
- Instead of storing data lifetime information in bi_ioprio, introduce the new struct bio member bi_lifetime and also the struct request member 'lifetime'.
- Removed the bio_set_data_lifetime() and bio_get_data_lifetime() functions and replaced these with direct assignments.
- Dropped all changes related to I/O priority.
- Improved patch descriptions.
Changes compared to v1:
- Use six bits from the ioprio field for data lifetime information. The bio->bi_write_hint / req->write_hint / iocb->ki_hint members that were introduced in v1 have been removed again.
- The F_GET_FILE_RW_HINT and F_SET_FILE_RW_HINT fcntls have been removed.
- In the SCSI disk (sd) driver, query the stream status and check the PERM bit.
- The GET STREAM STATUS command has been implemented in the scsi_debug driver.
Bart Van Assche (11):
scsi: core: Query the Block Limits Extension VPD page
scsi: scsi_proto: Add structures and constants related to I/O groups
and streams
scsi: sd: Translate data lifetime information
scsi: scsi_debug: Reduce code duplication
scsi: scsi_debug: Support the block limits extension VPD page
scsi: scsi_debug: Rework page code error handling
scsi: scsi_debug: Rework subpage code error handling
scsi: scsi_debug: Allocate the MODE SENSE response from the heap
scsi: scsi_debug: Implement the IO Advice Hints Grouping mode page
scsi: scsi_debug: Implement GET STREAM STATUS
scsi: scsi_debug: Maintain write statistics per group number
drivers/scsi/Kconfig | 5 + drivers/scsi/Makefile | 2 + drivers/scsi/scsi.c | 2 + drivers/scsi/scsi_debug.c | 293 +++++++++++++++++++++++++-------- drivers/scsi/scsi_proto_test.c | 56 +++++++ drivers/scsi/scsi_sysfs.c | 10 ++ drivers/scsi/sd.c | 117 ++++++++++++- drivers/scsi/sd.h | 3 + include/scsi/scsi_device.h | 1 + include/scsi/scsi_proto.h | 78 +++++++++ 10 files changed, 497 insertions(+), 70 deletions(-) create mode 100644 drivers/scsi/scsi_proto_test.c
PATCH v10 1/11 scsi: core: Query the Block Limits Extension VPD page
Parse the Reduced Stream Control Supported (RSCS) bit from the block limits extension VPD page. The RSCS bit is defined in SBC-5 r05
(https://www.t10.org/cgi-bin/ac.pl?t=f&f=sbc5r05.pdf).
--- drivers/scsi/scsi.c | 2 ++ drivers/scsi/scsi_sysfs.c | 10 ++++++++++ drivers/scsi/sd.c | 13 +++++++++++++ drivers/scsi/sd.h | 1 + include/scsi/scsi_device.h | 1 + 5 files changed, 27 insertions(+)
drivers/scsi/scsi.c +2 -0
@@ -499,6 +499,8 @@ void scsi_attach_vpd(struct scsi_device *sdev)scsi_update_vpd_page (sdev,0xb1 , &sdev->vpd_pgb1);if (vpd_buf->data[i] ==0xb2 )scsi_update_vpd_page (sdev,0xb2 , &sdev->vpd_pgb2); +if (vpd_buf->data[i] ==0xb7 ) +scsi_update_vpd_page (sdev,0xb7 , &sdev->vpd_pgb7); }kfree (vpd_buf); }
drivers/scsi/scsi_sysfs.c +10 -0
@@ -449,6 +449,7 @@ static void scsi_device_dev_release(struct device *dev)struct scsi_vpd *vpd_pg80 =NULL , *vpd_pg83 =NULL ;struct scsi_vpd *vpd_pg0 =NULL , *vpd_pg89 =NULL ;struct scsi_vpd *vpd_pgb0 =NULL , *vpd_pgb1 =NULL , *vpd_pgb2 =NULL ; +struct scsi_vpd *vpd_pgb7 =NULL ;unsigned long flags;might_sleep ();
@@ -494,6 +495,8 @@ static void scsi_device_dev_release(struct device *dev) lockdep_is_held(&sdev->inquiry_mutex)); vpd_pgb2 =rcu_replace_pointer (sdev->vpd_pgb2, vpd_pgb2,lockdep_is_held (&sdev->inquiry_mutex)); + vpd_pgb7 =rcu_replace_pointer (sdev->vpd_pgb7, vpd_pgb7, +lockdep_is_held (&sdev->inquiry_mutex));mutex_unlock (&sdev->inquiry_mutex);if (vpd_pg0)
@@ -510,6 +513,8 @@ static void scsi_device_dev_release(struct device *dev)kfree_rcu (vpd_pgb1, rcu);if (vpd_pgb2)kfree_rcu (vpd_pgb2, rcu); +if (vpd_pgb7) +kfree_rcu (vpd_pgb7, rcu);kfree (sdev->inquiry);kfree (sdev);
@@ -921,6 +926,7 @@ sdev_vpd_pg_attr(pg89);sdev_vpd_pg_attr (pgb0);sdev_vpd_pg_attr (pgb1);sdev_vpd_pg_attr (pgb2); +sdev_vpd_pg_attr (pgb7);sdev_vpd_pg_attr (pg0); static ssize_t show_inquiry(struct file *filep, struct kobject *kobj,
@@ -1295,6 +1301,9 @@ static umode_t scsi_sdev_bin_attr_is_visible(struct kobject *kobj,if (attr == &dev_attr_vpd_pgb2 && !sdev->vpd_pgb2)return 0 ; +if (attr == &dev_attr_vpd_pgb7 && !sdev->vpd_pgb7) +return 0 ; +return S_IRUGO ; }
@@ -1347,6 +1356,7 @@ static struct bin_attribute *scsi_sdev_bin_attrs[] = { &dev_attr_vpd_pgb0, &dev_attr_vpd_pgb1, &dev_attr_vpd_pgb2, + &dev_attr_vpd_pgb7, &dev_attr_inquiry, NULL };
drivers/scsi/sd.c +13 -0
@@ -3108,6 +3108,18 @@ static void sd_read_block_limits(struct scsi_disk *sdkp)rcu_read_unlock (); } +/* Parse the Block Limits Extension VPD page (0xb7) */ +static void sd_read_block_limits_ext (struct scsi_disk *sdkp) +{ +struct scsi_vpd *vpd; + +rcu_read_lock (); + vpd =rcu_dereference (sdkp->device->vpd_pgb7); +if (vpd && vpd->len >=2 ) + sdkp->rscs = vpd->data[5 ] &1 ; +rcu_read_unlock (); +} +/** * sd_read_block_characteristics - Query block dev. characteristics * @sdkp: disk to query
@@ -3459,6 +3471,7 @@ static int sd_revalidate_disk(struct gendisk *disk)if (scsi_device_supports_vpd (sdp)) {sd_read_block_provisioning (sdkp);sd_read_block_limits (sdkp); +sd_read_block_limits_ext (sdkp);sd_read_block_characteristics (sdkp);sd_zbc_read_zones (sdkp, buffer);sd_read_cpr (sdkp);
drivers/scsi/sd.h +1 -0
@@ -151,6 +151,7 @@ struct scsi_disk { unsigned urswrz : 1; unsigned security : 1; unsigned ignore_medium_access_errors : 1; + unsigned rscs : 1; /* reduced stream control support */ };#define to_scsi_disk (obj) container_of(obj, struct scsi_disk, disk_dev)
include/scsi/scsi_device.h +1 -0
@@ -153,6 +153,7 @@ struct scsi_device {struct scsi_vpd __rcu *vpd_pgb0;struct scsi_vpd __rcu *vpd_pgb1;struct scsi_vpd __rcu *vpd_pgb2; +struct scsi_vpd __rcu *vpd_pgb7;struct scsi_target *sdev_target;
PATCH v10 2/11 scsi: scsi_proto: Add structures and constants related to I/O groups and streams
In reply to Bart Van AsschePrepare for adding code that will query the I/O advice hints group descriptors and for adding code that will retrieve the stream status.
--- drivers/scsi/Kconfig | 5 +++ drivers/scsi/Makefile | 2 + drivers/scsi/scsi_proto_test.c | 56 ++++++++++++++++++++++++ include/scsi/scsi_proto.h | 78 ++++++++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+) create mode 100644 drivers/scsi/scsi_proto_test.c
drivers/scsi/Kconfig +5 -0
@@ -232,6 +232,11 @@ config SCSI_SCAN_ASYNC Note that this setting also affects whether resuming from system suspend will be performed asynchronously. +config SCSI_PROTO_TEST + tristate "scsi_proto.h unit tests" if !KUNIT_ALL_TESTS + depends on SCSI && KUNIT + default KUNIT_ALL_TESTS + menu "SCSI Transports" depends on SCSI
drivers/scsi/Makefile +2 -0
@@ -24,6 +24,8 @@ obj-$(CONFIG_SCSI_COMMON) += scsi_common.o obj-$(CONFIG_RAID_ATTRS) += raid_class.o +obj-$(CONFIG_SCSI_PROTO_TEST) += scsi_proto_test.o + # --- NOTE ORDERING HERE --- # For kernel non-modular link, transport attributes need to # be initialised before drivers
drivers/scsi/scsi_proto_test.c new file +56 -0
56 lines not on this page · raw message
include/scsi/scsi_proto.h +78 -0
96 lines not on this page · raw message
PATCH v10 3/11 scsi: sd: Translate data lifetime information
In reply to Bart Van AsscheRecently T10 standardized SBC constrained streams. This mechanism allows to pass data lifetime information to SCSI devices in the group number field. Add support for translating write hint information into a permanent stream number in the sd driver.
--- drivers/scsi/sd.c | 104 +++++++++++++++++++++++++++++++++++++++++++++- drivers/scsi/sd.h | 2 + 2 files changed, 104 insertions(+), 2 deletions(-)
drivers/scsi/sd.c +102 -2
@@ -47,6 +47,7 @@#include <linux/blkpg.h> #include <linux/blk-pm.h> #include <linux/delay.h> +#include <linux/rw_hint.h> #include <linux/major.h> #include <linux/mutex.h> #include <linux/string_helpers.h>
@@ -1080,12 +1081,35 @@ static blk_status_t sd_setup_flush_cmnd(struct scsi_cmnd *cmd)return BLK_STS_OK ; } +/** +* sd_group_number() - Compute the GROUP NUMBER field +* @cmd: SCSI command for which to compute the value of the six-bit GROUP NUMBER +* field. +* +* From SBC-5 r05 (https://www.t10.org/cgi-bin/ac.pl?t=f&f=sbc5r05.pdf): +* 0: no relative lifetime. +* 1: shortest relative lifetime. +* 2: second shortest relative lifetime. +* 3 - 0x3d: intermediate relative lifetimes. +* 0x3e: second longest relative lifetime. +* 0x3f: longest relative lifetime. +*/ +static u8 sd_group_number (struct scsi_cmnd *cmd) +{ +const struct request *rq =scsi_cmd_to_rq (cmd); +struct scsi_disk *sdkp =scsi_disk (rq->q->disk); + +return min3 ((u32 )rq->write_hint, (u32 )sdkp->permanent_stream_count, +0x3fu ); +} +static blk_status_t sd_setup_rw32_cmnd (struct scsi_cmnd *cmd,bool write,sector_t lba,unsigned int nr_blocks,unsigned char flags,unsigned int dld) { cmd->cmd_len =SD_EXT_CDB_SIZE ; cmd->cmnd[0 ] =VARIABLE_LENGTH_CMD ; + cmd->cmnd[6 ] =sd_group_number (cmd); cmd->cmnd[7 ] =0x18 ;/* Additional CDB len */ cmd->cmnd[9 ] = write ?WRITE_32 :READ_32 ; cmd->cmnd[10 ] = flags;
@@ -1104,7 +1128,7 @@ static blk_status_t sd_setup_rw16_cmnd(struct scsi_cmnd *cmd, bool write, cmd->cmd_len =16 ; cmd->cmnd[0 ] = write ?WRITE_16 :READ_16 ; cmd->cmnd[1 ] = flags | ((dld >>2 ) &0x01 ); - cmd->cmnd[14 ] = (dld &0x03 ) <<6 ; + cmd->cmnd[14 ] = ((dld &0x03 ) <<6 ) |sd_group_number (cmd); cmd->cmnd[15 ] =0 ;put_unaligned_be64 (lba, &cmd->cmnd[2 ]);put_unaligned_be32 (nr_blocks, &cmd->cmnd[10 ]);
@@ -1119,7 +1143,7 @@ static blk_status_t sd_setup_rw10_cmnd(struct scsi_cmnd *cmd, bool write, cmd->cmd_len =10 ; cmd->cmnd[0 ] = write ?WRITE_10 :READ_10 ; cmd->cmnd[1 ] = flags; - cmd->cmnd[6 ] =0 ; + cmd->cmnd[6 ] =sd_group_number (cmd); cmd->cmnd[9 ] =0 ;put_unaligned_be32 (lba, &cmd->cmnd[2 ]);put_unaligned_be16 (nr_blocks, &cmd->cmnd[7 ]);
@@ -3001,6 +3025,81 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer) sdkp->DPOFUA =0 ; } +static bool sd_is_perm_stream (struct scsi_disk *sdkp,unsigned int stream_id) +{ +u8 cdb[16 ] = {SERVICE_ACTION_IN_16 ,SAI_GET_STREAM_STATUS }; +struct { +struct scsi_stream_status_header h; +struct scsi_stream_status s; + } buf; +struct scsi_device *sdev = sdkp->device; +struct scsi_sense_hdr sshdr; +const struct scsi_exec_args exec_args = { + .sshdr = &sshdr, + }; +int res; + +put_unaligned_be16 (stream_id, &cdb[4 ]); +put_unaligned_be32 (sizeof (buf), &cdb[10 ]); + + res =scsi_execute_cmd (sdev, cdb,REQ_OP_DRV_IN , &buf,sizeof (buf), +SD_TIMEOUT , sdkp->max_retries, &exec_args); +if (res <0 ) +return false; +if (scsi_status_is_check_condition (res) &&scsi_sense_valid (&sshdr)) +sd_print_sense_hdr (sdkp, &sshdr); +if (res) +return false; +if (get_unaligned_be32 (&buf.h.len) <sizeof (struct scsi_stream_status )) +return false; +return buf.h.stream_status[0 ].perm; +} + +static void sd_read_io_hints (struct scsi_disk *sdkp,unsigned char *buffer) +{ +struct scsi_device *sdp = sdkp->device; +const struct scsi_io_group_descriptor *desc, *start, *end; +struct scsi_sense_hdr sshdr; +struct scsi_mode_data data; +int res; + +if (!sdkp->rscs) +return ; + + res =scsi_mode_sense (sdp,/*dbd=*/ 0x8 ,/*modepage=*/ 0x0a , +/*subpage=*/ 0x05 , buffer,SD_BUF_SIZE ,SD_TIMEOUT , + sdkp->max_retries, &data, &sshdr); +if (res <0 ) +return ; + start = (void *)buffer + data.header_length +16 ; + end = (void *)buffer +ALIGN_DOWN (data.header_length + data.length, +sizeof (*end)); +/* +* From "SBC-5 Constrained Streams with Data Lifetimes": Device severs +* should assign the lowest numbered stream identifiers to permanent +* streams. +*/ +for (desc = start; desc < end; desc++) +if (!desc->st_enble || !sd_is_perm_stream (sdkp, desc - start)) +break ; + sdkp->permanent_stream_count = desc - start; +if (sdkp->permanent_stream_count <2 ) { +sd_printk (KERN_INFO , sdkp, +"Unexpected: RSCS has been set and the permanent stream count is %u\n" , + sdkp->permanent_stream_count); +return ; + } + +sd_printk (KERN_INFO , sdkp,"permanent stream count = %d\n" , + sdkp->permanent_stream_count); +/* +* Use WRITE(10) instead of WRITE(6) if data lifetime information is +* present because the WRITE(6) command does not have a GROUP NUMBER +* field. +*/ + sdp->use_10_for_rw = true; +} +/* * The ATO bit indicates whether the DIF application tag is available * for use by the operating system.
@@ -3481,6 +3580,7 @@ static int sd_revalidate_disk(struct gendisk *disk)sd_read_write_protect_flag (sdkp, buffer);sd_read_cache_type (sdkp, buffer); +sd_read_io_hints (sdkp, buffer);sd_read_app_tag_own (sdkp, buffer);sd_read_write_same (sdkp, buffer);sd_read_security (sdkp, buffer);
drivers/scsi/sd.h +2 -0
@@ -125,6 +125,8 @@ struct scsi_disk {unsigned int physical_block_size;unsigned int max_medium_access_timeouts;unsigned int medium_access_timed_out; +/* number of permanent streams */ +u16 permanent_stream_count;u8 media_present;u8 write_prot;u8 protection_type;/* Data Integrity Field */
Re: [PATCH v10 03/11] scsi: sd: Translate data lifetime information
drivers/scsi/sd.c sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer) · line 3094
Quoted 10 lines · Bart Van Assche
drivers/scsi/sd.c +10
-0+ sdkp->permanent_stream_count = desc - start; +if (sdkp->permanent_stream_count <2 ) { +sd_printk (KERN_INFO , sdkp, +"Unexpected: RSCS has been set and the permanent stream count is %u\n" , + sdkp->permanent_stream_count); +return ; + } + +sd_printk (KERN_INFO , sdkp,"permanent stream count = %d\n" , + sdkp->permanent_stream_count);
I have been testing a recent linux-next (which includes this change), and I now see this following kernel log just for writing to the bdev file, like:
# mnt/test-pwritev2 -d -l 512 -p 512 /dev/sda wrote 512 bytes at pos 512 write_size=512 # [ 22.339526] sd 0:0:0:0: [sda] permanent stream count = 5
Is that log really required, especially at info level?
That is a scsi_debug disk - I assume that the relevant io hint feature is now default enabled there.
Thanks,
John
Re: [PATCH v10 03/11] scsi: sd: Translate data lifetime information
Quoted 15 lines · John Garry
Quoted 11 lines · Bart Van Assche
+
sdkp->permanent_stream_count= desc - start;
+ if (sdkp->permanent_stream_count< 2) {
+ sd_printk(KERN_INFO, sdkp,
+ "Unexpected: RSCS has been set and the permanent stream count is %u\n",
+sdkp->permanent_stream_count);
+ return;
+ }
+
+sd_printk(KERN_INFO, sdkp, "permanent stream count = %d\n", + sdkp->permanent_stream_count);I have been testing a recent linux-next (which includes this change), and I now see this following kernel log just for writing to the bdev file, like:
Quoted 7 lines
# mnt/test-pwritev2 -d -l 512 -p 512 /dev/sda wrote 512 bytes at pos 512 write_size=512 # [ 22.339526] sd 0:0:0:0: [sda] permanent stream count = 5Is that log really required, especially at info level?
That is a
scsi_debugdisk - I assume that the relevant io hint feature is now default enabled there.
Hi John,
How about removing the sd_printk() call mentioned above and adding a sysfs attribute instead that reports the number of permanent streams?
Thanks,
Bart.
Re: [PATCH v10 03/11] scsi: sd: Translate data lifetime information
Quoted 6 lines · Bart Van Assche
Quoted 6 lines
I have been testing a recent linux-next (which includes this change), and I now see this following kernel log just for writing to the bdev file, like:
# mnt/test-pwritev2 -d -l 512 -p 512 /dev/sda wrote 512 bytes at pos 512 write_size=512 # [ 22.339526] sd 0:0:0:0: [sda] permanent stream count = 5
Quoted 8 lines
Quoted 3 lines
Is that log really required, especially at info level?
That is a
scsi_debugdisk - I assume that the relevant io hint feature is now default enabled there.Hi John,
How about removing the
sd_printk()call mentioned above and adding a sysfs attribute instead that reports the number of permanent streams?
A sysfs entry sounds reasonable, but I don't know enough about this stream count to say whether that really is a good idea.
Thanks,
John
PATCH v10 4/11 scsi: scsi_debug: Reduce code duplication
In reply to Bart Van AsscheAll VPD pages have the page code in byte one. Reduce code duplication by combining all page code assignment statements.
--- drivers/scsi/scsi_debug.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
drivers/scsi/scsi_debug.c +2 -14
@@ -1903,7 +1903,8 @@ static int resp_inquiry(struct scsi_cmnd *scp, struct sdebug_dev_info *devip)u32 len;char lu_id_str[6 ];int host_no = devip->sdbg_host->shost->host_no; - + + arr[1 ] = cmd[2 ]; port_group_id = (((host_no +1 ) &0x7f ) <<8 ) + (devip->channel &0x7f );if (sdebug_vpd_use_hostno ==0 )
@@ -1914,7 +1915,6 @@ static int resp_inquiry(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) (devip->target *1000 ) -3 ; len =scnprintf (lu_id_str,6 ,"%d" , lu_id_num);if (0 == cmd[2 ]) {/* supported vital product data pages */ - arr[1 ] = cmd[2 ];/*sanity */ n =4 ; arr[n++] =0x0 ;/* this page */ arr[n++] =0x80 ;/* unit serial number */
@@ -1935,23 +1935,18 @@ static int resp_inquiry(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) } arr[3 ] = n -4 ;/* number of supported VPD pages */ }else if (0x80 == cmd[2 ]) {/* unit serial number */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] = len;memcpy (&arr[4 ], lu_id_str, len); }else if (0x83 == cmd[2 ]) {/* device identification */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] =inquiry_vpd_83 (&arr[4 ], port_group_id, target_dev_id, lu_id_num, lu_id_str, len, &devip->lu_name); }else if (0x84 == cmd[2 ]) {/* Software interface ident. */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] =inquiry_vpd_84 (&arr[4 ]); }else if (0x85 == cmd[2 ]) {/* Management network addresses */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] =inquiry_vpd_85 (&arr[4 ]); }else if (0x86 == cmd[2 ]) {/* extended inquiry */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] =0x3c ;/* number of following entries */ if (sdebug_dif ==T10_PI_TYPE3_PROTECTION ) arr[4 ] =0x4 ;/* SPT: GRD_CHK:1 */
@@ -1961,30 +1956,23 @@ static int resp_inquiry(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) arr[4 ] =0x0 ;/* no protection stuff */ arr[5 ] =0x7 ;/* head of q, ordered + simple q's */ }else if (0x87 == cmd[2 ]) {/* mode page policy */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] =0x8 ;/* number of following entries */ arr[4 ] =0x2 ;/* disconnect-reconnect mp */ arr[6 ] =0x80 ;/* mlus, shared */ arr[8 ] =0x18 ;/* protocol specific lu */ arr[10 ] =0x82 ;/* mlus, per initiator port */ }else if (0x88 == cmd[2 ]) {/* SCSI Ports */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] =inquiry_vpd_88 (&arr[4 ], target_dev_id); }else if (is_disk_zbc &&0x89 == cmd[2 ]) {/* ATA info */ - arr[1 ] = cmd[2 ];/*sanity */ n =inquiry_vpd_89 (&arr[4 ]);put_unaligned_be16 (n, arr +2 ); }else if (is_disk_zbc &&0xb0 == cmd[2 ]) {/* Block limits */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] =inquiry_vpd_b0 (&arr[4 ]); }else if (is_disk_zbc &&0xb1 == cmd[2 ]) {/* Block char. */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] =inquiry_vpd_b1 (devip, &arr[4 ]); }else if (is_disk &&0xb2 == cmd[2 ]) {/* LB Prov. */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] =inquiry_vpd_b2 (&arr[4 ]); }else if (is_zbc && cmd[2 ] ==0xb6 ) {/* ZB dev. charact. */ - arr[1 ] = cmd[2 ];/*sanity */ arr[3 ] =inquiry_vpd_b6 (devip, &arr[4 ]); }else {mk_sense_invalid_fld (scp,SDEB_IN_CDB ,2 ,-1 );
PATCH v10 5/11 scsi: scsi_debug: Support the block limits extension VPD page
In reply to Bart Van AsscheFrom SBC-5 r05:
"Reduced stream control:
a) reduces the maximum number of streams that the device server supports; and
b) increases the number of write commands that are able to specify a stream to be written in any write command that contains the GROUP NUMBER field in its CDB.
If the RSCS bit (see 6.6.5) is set to one, then the device server shall:
a) support per group stream identifier usage as described in 4.32.2;
b) support the IO Advice Hints Grouping mode page (see 6.5.7); and
c) set the MAXIMUM NUMBER OF STREAMS field (see 6.6.5) to a value that is less than 64.
Device servers that set the RSCS bit to one may support other features (e.g., permanent streams (see 4.32.4)).
4.32.4 Permanent streams
A permanent stream is a stream for which the device server does not allow closing or otherwise modifying the configuration of that stream. The PERM bit (see 5.9.2.3) indicates whether a stream is a permanent stream. If a STREAM CONTROL command (see 5.32) specifies the closing of a permanent stream, the device server terminates that command with CHECK CONDITION status instead of closing the specified stream. A permanent stream is always an open stream. Device severs should assign the lowest numbered stream identifiers to permanent streams."
Report that reduced stream control is supported.
--- drivers/scsi/scsi_debug.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/scsi/scsi_debug.c +16 -0
@@ -1867,6 +1867,19 @@ static int inquiry_vpd_b6(struct sdebug_dev_info *devip, unsigned char *arr)return 0x3c ; } +#define SDEBUG_BLE_LEN_AFTER_B4 28/* thus vpage 32 bytes long */ + +enum {MAXIMUM_NUMBER_OF_STREAMS =6 ,PERMANENT_STREAM_COUNT =5 }; + +/* Block limits extension VPD page (SBC-4) */ +static int inquiry_vpd_b7 (unsigned char *arrb4) +{ +memset (arrb4,0 ,SDEBUG_BLE_LEN_AFTER_B4 ); + arrb4[1 ] =1 ;/* Reduced stream control support (RSCS) */ +put_unaligned_be16 (MAXIMUM_NUMBER_OF_STREAMS , &arrb4[2 ]); +return SDEBUG_BLE_LEN_AFTER_B4 ; +} +#define SDEBUG_LONG_INQ_SZ 96#define SDEBUG_MAX_INQ_ARR_SZ 584
@@ -1932,6 +1945,7 @@ static int resp_inquiry(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) arr[n++] =0xb2 ;/* LB Provisioning */ if (is_zbc) arr[n++] =0xb6 ;/* ZB dev. char. */ + arr[n++] =0xb7 ;/* Block limits extension */ } arr[3 ] = n -4 ;/* number of supported VPD pages */ }else if (0x80 == cmd[2 ]) {/* unit serial number */
@@ -1974,6 +1988,8 @@ static int resp_inquiry(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) arr[3 ] =inquiry_vpd_b2 (&arr[4 ]); }else if (is_zbc && cmd[2 ] ==0xb6 ) {/* ZB dev. charact. */ arr[3 ] =inquiry_vpd_b6 (devip, &arr[4 ]); + }else if (cmd[2 ] ==0xb7 ) {/* block limits extension page */ + arr[3 ] =inquiry_vpd_b7 (&arr[4 ]); }else {mk_sense_invalid_fld (scp,SDEB_IN_CDB ,2 ,-1 );kfree (arr);
PATCH v10 6/11 scsi: scsi_debug: Rework page code error handling
In reply to Bart Van AsscheInstead of tracking whether or not the page code is valid in a boolean variable, jump to error handling code if an unsupported page code is encountered.
--- drivers/scsi/scsi_debug.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/scsi/scsi_debug.c +12 -12
@@ -2644,7 +2644,7 @@ static int resp_mode_sense(struct scsi_cmnd *scp,unsigned char *ap;unsigned char arr[SDEBUG_MAX_MSENSE_SZ ];unsigned char *cmd = scp->cmnd; -bool dbd, llbaa, msense_6, is_disk, is_zbc, bad_pcode; +bool dbd, llbaa, msense_6, is_disk, is_zbc; dbd = !!(cmd[1 ] &0x8 );/* disable block descriptors */ pcontrol = (cmd[2 ] &0xc0 ) >>6 ;
@@ -2708,7 +2708,6 @@ static int resp_mode_sense(struct scsi_cmnd *scp,mk_sense_invalid_fld (scp,SDEB_IN_CDB ,3 ,-1 );return check_condition_result; } - bad_pcode = false;switch (pcode) {case 0x1 :/* Read-Write error recovery page, direct access */
@@ -2723,15 +2722,17 @@ static int resp_mode_sense(struct scsi_cmnd *scp,if (is_disk) { len =resp_format_pg (ap, pcontrol, target); offset += len; - }else - bad_pcode = true; + }else { + goto bad_pcode; + }break ;case 0x8 :/* Caching page, direct access */ if (is_disk || is_zbc) { len =resp_caching_pg (ap, pcontrol, target); offset += len; - }else - bad_pcode = true; + }else { + goto bad_pcode; + }break ;case 0xa :/* Control Mode page, all devices */ len =resp_ctrl_m_pg (ap, pcontrol, target);
@@ -2784,18 +2785,17 @@ static int resp_mode_sense(struct scsi_cmnd *scp, }break ;default : - bad_pcode = true; -break ; - } -if (bad_pcode) { -mk_sense_invalid_fld (scp,SDEB_IN_CDB ,2 ,5 ); -return check_condition_result; + goto bad_pcode; }if (msense_6) arr[0 ] = offset -1 ;else put_unaligned_be16 ((offset -2 ), arr +0 );return fill_from_dev_buffer (scp, arr,min_t (u32, alloc_len, offset)); + +bad_pcode: +mk_sense_invalid_fld (scp,SDEB_IN_CDB ,2 ,5 ); +return check_condition_result; }#define SDEBUG_MAX_MSELECT_SZ 512
PATCH v10 7/11 scsi: scsi_debug: Rework subpage code error handling
In reply to Bart Van AsscheMove the subpage code checks into the switch statement to make it easier to add support for new page code / subpage code combinations.
--- drivers/scsi/scsi_debug.c | 70 ++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 34 deletions(-)
drivers/scsi/scsi_debug.c +36 -34
@@ -2703,22 +2703,22 @@ static int resp_mode_sense(struct scsi_cmnd *scp, ap = arr + offset; } -if ((subpcode >0x0 ) && (subpcode <0xff ) && (0x19 != pcode)) { -/* TODO: Control Extension page */ -mk_sense_invalid_fld (scp,SDEB_IN_CDB ,3 ,-1 ); -return check_condition_result; - } -switch (pcode) {case 0x1 :/* Read-Write error recovery page, direct access */ +if (subpcode >0x0 && subpcode <0xff ) + goto bad_subpcode; len =resp_err_recov_pg (ap, pcontrol, target); offset += len;break ;case 0x2 :/* Disconnect-Reconnect page, all devices */ +if (subpcode >0x0 && subpcode <0xff ) + goto bad_subpcode; len =resp_disconnect_pg (ap, pcontrol, target); offset += len;break ;case 0x3 :/* Format device page, direct access */ +if (subpcode >0x0 && subpcode <0xff ) + goto bad_subpcode;if (is_disk) { len =resp_format_pg (ap, pcontrol, target); offset += len;
@@ -2727,6 +2727,8 @@ static int resp_mode_sense(struct scsi_cmnd *scp, }break ;case 0x8 :/* Caching page, direct access */ +if (subpcode >0x0 && subpcode <0xff ) + goto bad_subpcode;if (is_disk || is_zbc) { len =resp_caching_pg (ap, pcontrol, target); offset += len;
@@ -2735,14 +2737,14 @@ static int resp_mode_sense(struct scsi_cmnd *scp, }break ;case 0xa :/* Control Mode page, all devices */ +if (subpcode >0x0 && subpcode <0xff ) + goto bad_subpcode; len =resp_ctrl_m_pg (ap, pcontrol, target); offset += len;break ;case 0x19 :/* if spc==1 then sas phy, control+discover */ -if ((subpcode >0x2 ) && (subpcode <0xff )) { -mk_sense_invalid_fld (scp,SDEB_IN_CDB ,3 ,-1 ); -return check_condition_result; - } +if (subpcode >0x2 && subpcode <0xff ) + goto bad_subpcode; len =0 ;if ((0x0 == subpcode) || (0xff == subpcode)) len +=resp_sas_sf_m_pg (ap + len, pcontrol, target);
@@ -2754,35 +2756,31 @@ static int resp_mode_sense(struct scsi_cmnd *scp, offset += len;break ;case 0x1c :/* Informational Exceptions Mode page, all devices */ +if (subpcode >0x0 && subpcode <0xff ) + goto bad_subpcode; len =resp_iec_m_pg (ap, pcontrol, target); offset += len;break ;case 0x3f :/* Read all Mode pages */ -if ((0 == subpcode) || (0xff == subpcode)) { - len =resp_err_recov_pg (ap, pcontrol, target); - len +=resp_disconnect_pg (ap + len, pcontrol, target); -if (is_disk) { - len +=resp_format_pg (ap + len, pcontrol, - target); - len +=resp_caching_pg (ap + len, pcontrol, - target); - }else if (is_zbc) { - len +=resp_caching_pg (ap + len, pcontrol, - target); - } - len +=resp_ctrl_m_pg (ap + len, pcontrol, target); - len +=resp_sas_sf_m_pg (ap + len, pcontrol, target); -if (0xff == subpcode) { - len +=resp_sas_pcd_m_spg (ap + len, pcontrol, - target, target_dev_id); - len +=resp_sas_sha_m_spg (ap + len, pcontrol); - } - len +=resp_iec_m_pg (ap + len, pcontrol, target); - offset += len; - }else { -mk_sense_invalid_fld (scp,SDEB_IN_CDB ,3 ,-1 ); -return check_condition_result; +if (subpcode >0x0 && subpcode <0xff ) + goto bad_subpcode; + len =resp_err_recov_pg (ap, pcontrol, target); + len +=resp_disconnect_pg (ap + len, pcontrol, target); +if (is_disk) { + len +=resp_format_pg (ap + len, pcontrol, target); + len +=resp_caching_pg (ap + len, pcontrol, target); + }else if (is_zbc) { + len +=resp_caching_pg (ap + len, pcontrol, target); + } + len +=resp_ctrl_m_pg (ap + len, pcontrol, target); + len +=resp_sas_sf_m_pg (ap + len, pcontrol, target); +if (0xff == subpcode) { + len +=resp_sas_pcd_m_spg (ap + len, pcontrol, target, + target_dev_id); + len +=resp_sas_sha_m_spg (ap + len, pcontrol); } + len +=resp_iec_m_pg (ap + len, pcontrol, target); + offset += len;break ;default : goto bad_pcode;
@@ -2796,6 +2794,10 @@ static int resp_mode_sense(struct scsi_cmnd *scp, bad_pcode:mk_sense_invalid_fld (scp,SDEB_IN_CDB ,2 ,5 );return check_condition_result; + +bad_subpcode: +mk_sense_invalid_fld (scp,SDEB_IN_CDB ,3 ,-1 ); +return check_condition_result; }#define SDEBUG_MAX_MSELECT_SZ 512
PATCH v10 8/11 scsi: scsi_debug: Allocate the MODE SENSE response from the heap
In reply to Bart Van AsscheMake the MODE SENSE response buffer larger and allocate it from the heap. This patch prepares for adding support for the IO Advice Hints Grouping mode page.
--- drivers/scsi/scsi_debug.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/scsi/scsi_debug.c +7 -2
@@ -43,6 +43,7 @@#include <linux/prefetch.h> #include <linux/debugfs.h> #include <linux/async.h> +#include <linux/cleanup.h> #include <net/checksum.h>
@@ -2631,7 +2632,8 @@ static int resp_sas_sha_m_spg(unsigned char *p, int pcontrol)return sizeof (sas_sha_m_pg); } -#define SDEBUG_MAX_MSENSE_SZ 256 +/* PAGE_SIZE is more than necessary but provides room for future expansion. */ +#define SDEBUG_MAX_MSENSE_SZ PAGE_SIZEstatic int resp_mode_sense (struct scsi_cmnd *scp,struct sdebug_dev_info *devip)
@@ -2642,10 +2644,13 @@ static int resp_mode_sense(struct scsi_cmnd *scp,int target_dev_id;int target = scp->device->id;unsigned char *ap; -unsigned char arr[SDEBUG_MAX_MSENSE_SZ ]; + unsigned char *arr __free(kfree);unsigned char *cmd = scp->cmnd;bool dbd, llbaa, msense_6, is_disk, is_zbc; + arr =kzalloc (SDEBUG_MAX_MSENSE_SZ ,GFP_ATOMIC ); +if (!arr) +return -ENOMEM ; dbd = !!(cmd[1 ] &0x8 );/* disable block descriptors */ pcontrol = (cmd[2 ] &0xc0 ) >>6 ; pcode = cmd[2 ] &0x3f ;
PATCH v10 9/11 scsi: scsi_debug: Implement the IO Advice Hints Grouping mode page
In reply to Bart Van AsscheImplement an IO Advice Hints Grouping mode page with three permanent streams. A permanent stream is a stream for which the device server does not allow closing or otherwise modifying the configuration of that stream. The stream identifier enable (ST_ENBLE) bit specifies whether the stream identifier may be used in the GROUP NUMBER field of SCSI WRITE commands.
--- drivers/scsi/scsi_debug.c | 61 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 3 deletions(-)
drivers/scsi/scsi_debug.c +58 -3
@@ -1969,7 +1969,11 @@ static int resp_inquiry(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) arr[4 ] =0x5 ;/* SPT: GRD_CHK:1, REF_CHK:1 */ else arr[4 ] =0x0 ;/* no protection stuff */ - arr[5 ] =0x7 ;/* head of q, ordered + simple q's */ +/* +* GROUP_SUP=1; HEADSUP=1 (HEAD OF QUEUE); ORDSUP=1 +* (ORDERED queuing); SIMPSUP=1 (SIMPLE queuing). +*/ + arr[5 ] =0x17 ; }else if (0x87 == cmd[2 ]) {/* mode page policy */ arr[3 ] =0x8 ;/* number of following entries */ arr[4 ] =0x2 ;/* disconnect-reconnect mp */
@@ -2559,6 +2563,40 @@ static int resp_ctrl_m_pg(unsigned char *p, int pcontrol, int target)return sizeof (ctrl_m_pg); } +/* IO Advice Hints Grouping mode page */ +static int resp_grouping_m_pg (unsigned char *p,int pcontrol,int target) +{ +/* IO Advice Hints Grouping mode page */ +struct grouping_m_pg { +u8 page_code;/* OR 0x40 when subpage_code > 0 */ +u8 subpage_code; +__be16 page_length; +u8 reserved[12 ]; +struct scsi_io_group_descriptor descr[MAXIMUM_NUMBER_OF_STREAMS ]; + }; +static const struct grouping_m_pg gr_m_pg = { + .page_code =0xa |0x40 , + .subpage_code =5 , + .page_length =cpu_to_be16 (sizeof (gr_m_pg) -4 ), + .descr = { + { .st_enble =1 }, + { .st_enble =1 }, + { .st_enble =1 }, + { .st_enble =1 }, + { .st_enble =1 }, + { .st_enble =0 }, + } + }; + +BUILD_BUG_ON (sizeof (struct grouping_m_pg ) != +16 +MAXIMUM_NUMBER_OF_STREAMS *16 ); +memcpy (p, &gr_m_pg,sizeof (gr_m_pg)); +if (1 == pcontrol) { +/* There are no changeable values so clear from byte 4 on. */ +memset (p +4 ,0 ,sizeof (gr_m_pg) -4 ); + } +return sizeof (gr_m_pg); +}static int resp_iec_m_pg (unsigned char *p,int pcontrol,int target) {/* Informational Exceptions control mode page for mode_sense */
@@ -2708,6 +2746,10 @@ static int resp_mode_sense(struct scsi_cmnd *scp, ap = arr + offset; } +/* +* N.B. If len>0 before resp_*_pg() call, then form of that call should be: +* len += resp_*_pg(ap + len, pcontrol, target); +*/ switch (pcode) {case 0x1 :/* Read-Write error recovery page, direct access */ if (subpcode >0x0 && subpcode <0xff )
@@ -2742,9 +2784,20 @@ static int resp_mode_sense(struct scsi_cmnd *scp, }break ;case 0xa :/* Control Mode page, all devices */ -if (subpcode >0x0 && subpcode <0xff ) +switch (subpcode) { +case 0 : + len =resp_ctrl_m_pg (ap, pcontrol, target); +break ; +case 0x05 : + len =resp_grouping_m_pg (ap, pcontrol, target); +break ; +case 0xff : + len =resp_ctrl_m_pg (ap, pcontrol, target); + len +=resp_grouping_m_pg (ap + len, pcontrol, target); +break ; +default : goto bad_subpcode; - len =resp_ctrl_m_pg (ap, pcontrol, target); + } offset += len;break ;case 0x19 :/* if spc==1 then sas phy, control+discover */
@@ -2778,6 +2831,8 @@ static int resp_mode_sense(struct scsi_cmnd *scp, len +=resp_caching_pg (ap + len, pcontrol, target); } len +=resp_ctrl_m_pg (ap + len, pcontrol, target); +if (0xff == subpcode) + len +=resp_grouping_m_pg (ap + len, pcontrol, target); len +=resp_sas_sf_m_pg (ap + len, pcontrol, target);if (0xff == subpcode) { len += resp_sas_pcd_m_spg(ap + len, pcontrol, target,
PATCH v10 10/11 scsi: scsi_debug: Implement GET STREAM STATUS
In reply to Bart Van AsscheImplement the GET STREAM STATUS SCSI command. Report that the first five stream indexes correspond to permanent streams.
--- drivers/scsi/scsi_debug.c | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
drivers/scsi/scsi_debug.c +50 -0
@@ -533,6 +533,8 @@ static int resp_write_scat(struct scsi_cmnd *, struct sdebug_dev_info *);static int resp_start_stop (struct scsi_cmnd *,struct sdebug_dev_info *);static int resp_readcap16 (struct scsi_cmnd *,struct sdebug_dev_info *);static int resp_get_lba_status (struct scsi_cmnd *,struct sdebug_dev_info *); +static int resp_get_stream_status (struct scsi_cmnd *scp, +struct sdebug_dev_info *devip);static int resp_report_tgtpgs (struct scsi_cmnd *,struct sdebug_dev_info *);static int resp_unmap (struct scsi_cmnd *,struct sdebug_dev_info *);static int resp_rsup_opcodes (struct scsi_cmnd *,struct sdebug_dev_info *);
@@ -607,6 +609,9 @@ static const struct opcode_info_t sa_in_16_iarr[] = { {0 ,0x9e ,0x12 ,F_SA_LOW |F_D_IN , resp_get_lba_status,NULL , {16, 0x12, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0xc7} }, /* GET LBA STATUS(16) */ + {0, 0x9e, 0x16, F_SA_LOW | F_D_IN, resp_get_stream_status, NULL, + {16, 0x16, 0, 0, 0xff, 0xff, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, + 0, 0} }, /* GET STREAM STATUS */ }; static const struct opcode_info_t vl_iarr[] = { /* VARIABLE LENGTH */
@@ -4573,6 +4578,51 @@ static int resp_get_lba_status(struct scsi_cmnd *scp,return fill_from_dev_buffer (scp, arr,SDEBUG_GET_LBA_STATUS_LEN ); } +static int resp_get_stream_status (struct scsi_cmnd *scp, +struct sdebug_dev_info *devip) +{ +u16 starting_stream_id, stream_id; +const u8 *cmd = scp->cmnd; +u32 alloc_len, offset; +u8 arr[256 ] = {}; +struct scsi_stream_status_header *h = (void *)arr; + + starting_stream_id =get_unaligned_be16 (cmd +4 ); + alloc_len =get_unaligned_be32 (cmd +10 ); + +if (alloc_len <8 ) { +mk_sense_invalid_fld (scp,SDEB_IN_CDB ,10 ,-1 ); +return check_condition_result; + } + +if (starting_stream_id >=MAXIMUM_NUMBER_OF_STREAMS ) { +mk_sense_invalid_fld (scp,SDEB_IN_CDB ,4 ,-1 ); +return check_condition_result; + } + +/* +* The GET STREAM STATUS command only reports status information +* about open streams. Treat the non-permanent stream as open. +*/ +put_unaligned_be16 (MAXIMUM_NUMBER_OF_STREAMS , + &h->number_of_open_streams); + +for (offset =8 , stream_id = starting_stream_id; + offset +8 <=min_t (u32, alloc_len,sizeof (arr)) && + stream_id <MAXIMUM_NUMBER_OF_STREAMS ; + offset +=8 , stream_id++) { +struct scsi_stream_status *stream_status = (void *)arr + offset; + + stream_status->perm = stream_id <PERMANENT_STREAM_COUNT ; +put_unaligned_be16 (stream_id, + &stream_status->stream_identifier); + stream_status->rel_lifetime = stream_id +1 ; + } +put_unaligned_be32 (offset -8 , &h->len);/* PARAMETER DATA LENGTH */ + +return fill_from_dev_buffer (scp, arr,min (offset, alloc_len)); +} +static int resp_sync_cache (struct scsi_cmnd *scp,struct sdebug_dev_info *devip) {
PATCH v10 11/11 scsi: scsi_debug: Maintain write statistics per group number
In reply to Bart Van AsscheTrack per GROUP NUMBER how many write commands have been processed. Make this information available in sysfs. Reset these statistics if any data is written into the sysfs attribute.
Note: SCSI devices should only interpret the information in the GROUP NUMBER field as a stream identifier if the ST_ENBLE bit has been set to one. This patch follows a simpler approach: count the number of writes per GROUP NUMBER whether or not the group number represents a stream identifier.
--- drivers/scsi/scsi_debug.c | 49 +++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-)
drivers/scsi/scsi_debug.c +45 -4
@@ -902,6 +902,8 @@ static int sdeb_zbc_nr_conv = DEF_ZBC_NR_CONV_ZONES;static int submit_queues =DEF_SUBMIT_QUEUES ;/* > 1 for multi-queue (mq) */ static int poll_queues;/* iouring iopoll interface.*/ +static atomic_long_t writes_by_group_number[64 ]; +static char sdebug_proc_name[] =MY_NAME ;static const char *my_name =MY_NAME ;
@@ -3377,7 +3379,8 @@ static inline struct sdeb_store_info *devip2sip(struct sdebug_dev_info *devip,/* Returns number of bytes copied or -1 if error. */ static int do_device_access (struct sdeb_store_info *sip,struct scsi_cmnd *scp, -u32 sg_skip,u64 lba,u32 num,bool do_write) +u32 sg_skip,u64 lba,u32 num,bool do_write, +u8 group_number) {int ret;u64 block, rest =0 ;
@@ -3396,6 +3399,10 @@ static int do_device_access(struct sdeb_store_info *sip, struct scsi_cmnd *scp,return 0 ;if (scp->sc_data_direction != dir)return -1 ; + +if (do_write && group_number <ARRAY_SIZE (writes_by_group_number)) +atomic_long_inc (&writes_by_group_number[group_number]); + fsp = sip->storep; block =do_div (lba, sdebug_store_sectors);
@@ -3769,7 +3776,7 @@ static int resp_read_dt0(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) } } - ret =do_device_access (sip, scp,0 , lba, num, false); + ret =do_device_access (sip, scp,0 , lba, num, false,0 );sdeb_read_unlock (sip);if (unlikely (ret ==-1 ))return DID_ERROR <<16 ;
@@ -3954,6 +3961,7 @@ static int resp_write_dt0(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) {bool check_prot;u32 num; +u8 group =0 ;u32 ei_lba;int ret;u64 lba;
@@ -3965,11 +3973,13 @@ static int resp_write_dt0(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) ei_lba =0 ; lba =get_unaligned_be64 (cmd +2 ); num =get_unaligned_be32 (cmd +10 ); + group = cmd[14 ] &0x3f ; check_prot = true;break ;case WRITE_10 : ei_lba =0 ; lba =get_unaligned_be32 (cmd +2 ); + group = cmd[6 ] &0x3f ; num =get_unaligned_be16 (cmd +7 ); check_prot = true;break ;
@@ -3984,15 +3994,18 @@ static int resp_write_dt0(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) ei_lba =0 ; lba =get_unaligned_be32 (cmd +2 ); num =get_unaligned_be32 (cmd +6 ); + group = cmd[6 ] &0x3f ; check_prot = true;break ;case 0x53 :/* XDWRITEREAD(10) */ ei_lba =0 ; lba =get_unaligned_be32 (cmd +2 ); + group = cmd[6 ] &0x1f ; num =get_unaligned_be16 (cmd +7 ); check_prot = false;break ;default :/* assume WRITE(32) */ + group = cmd[6 ] &0x3f ; lba =get_unaligned_be64 (cmd +12 ); ei_lba =get_unaligned_be32 (cmd +20 ); num =get_unaligned_be32 (cmd +28 );
@@ -4047,7 +4060,7 @@ static int resp_write_dt0(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) } } - ret =do_device_access (sip, scp,0 , lba, num, true); + ret =do_device_access (sip, scp,0 , lba, num, true, group);if (unlikely (scsi_debug_lbp ()))map_region (sip, lba, num);/* If ZBC zone then bump its write pointer */
@@ -4099,12 +4112,14 @@ static int resp_write_scat(struct scsi_cmnd *scp,u32 lb_size = sdebug_sector_size;u32 ei_lba;u64 lba; +u8 group;int ret, res;bool is_16;static const u32 lrd_size =32 ;/* + parameter list header size */ if (cmd[0 ] ==VARIABLE_LENGTH_CMD ) { is_16 = false; + group = cmd[6 ] &0x3f ; wrprotect = (cmd[10 ] >>5 ) &0x7 ; lbdof =get_unaligned_be16 (cmd +12 ); num_lrd =get_unaligned_be16 (cmd +16 );
@@ -4115,6 +4130,7 @@ static int resp_write_scat(struct scsi_cmnd *scp, lbdof =get_unaligned_be16 (cmd +4 ); num_lrd =get_unaligned_be16 (cmd +8 ); bt_len =get_unaligned_be32 (cmd +10 ); + group = cmd[14 ] &0x3f ;if (unlikely (have_dif_prot)) {if (sdebug_dif ==T10_PI_TYPE2_PROTECTION && wrprotect) {
@@ -4203,7 +4219,7 @@ static int resp_write_scat(struct scsi_cmnd *scp, } } - ret =do_device_access (sip, scp, sg_off, lba, num, true); + ret =do_device_access (sip, scp, sg_off, lba, num, true, group);/* If ZBC zone then bump its write pointer */ if (sdebug_dev_is_zoned (devip))zbc_inc_wp (devip, lba, num);
@@ -7298,6 +7314,30 @@ static ssize_t tur_ms_to_ready_show(struct device_driver *ddp, char *buf) }static DRIVER_ATTR_RO (tur_ms_to_ready); +static ssize_t group_number_stats_show (struct device_driver *ddp,char *buf) +{ +char *p = buf, *end = buf +PAGE_SIZE ; +int i; + +for (i =0 ; i <ARRAY_SIZE (writes_by_group_number); i++) + p +=scnprintf (p, end - p,"%d %ld\n" , i, +atomic_long_read (&writes_by_group_number[i])); + +return p - buf; +} + +static ssize_t group_number_stats_store (struct device_driver *ddp, +const char *buf,size_t count) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (writes_by_group_number); i++) +atomic_long_set (&writes_by_group_number[i],0 ); + +return count; +} +static DRIVER_ATTR_RW (group_number_stats); +/* Note: The following array creates attribute files in the /sys/bus/pseudo/drivers/scsi_debug directory. The advantage of these files (over those found in the /sys/module/scsi_debug/parameters
@@ -7344,6 +7384,7 @@ static struct attribute *sdebug_drv_attrs[] = { &driver_attr_cdb_len.attr, &driver_attr_tur_ms_to_ready.attr, &driver_attr_zbc.attr, + &driver_attr_group_number_stats.attr,NULL , };ATTRIBUTE_GROUPS (sdebug_drv);
Quoted 6 lines · Bart Van Assche
UFS vendors need the data lifetime information to achieve good performance. Providing data lifetime information to UFS devices can result in up to 40% lower write amplification. Hence this patch series that adds support in F2FS and also in the block layer for data lifetime information. The SCSI disk (sd) driver is modified such that it passes write hint information to SCSI devices via the GROUP NUMBER field.
These patches go on top of the vfs.rw branch
(https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git/log/?h=vfs.rw).
Bart.
Martin K. Petersen
AppliedBart,
Quoted 7 lines
UFS vendors need the data lifetime information to achieve good performance. Providing data lifetime information to UFS devices can result in up to 40% lower write amplification. Hence this patch series that adds support in F2FS and also in the block layer for data lifetime information. The SCSI disk (sd) driver is modified such that it passes write hint information to SCSI devices via the GROUP NUMBER field.
Applied to 6.9/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering