Skip to content

Commit b1e5c0b

Browse files
bvanasschemartinkpetersen
authored andcommitted
scsi: scsi_debug: Support the block limits extension VPD page
>From 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. Cc: Martin K. Petersen <martin.petersen@oracle.com> Cc: Douglas Gilbert <dgilbert@interlog.com> Tested-by: Douglas Gilbert <dgilbert@interlog.com> Signed-off-by: Bart Van Assche <bvanassche@acm.org> Link: https://lore.kernel.org/r/20240130214911.1863909-14-bvanassche@acm.org Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent a5fe98e commit b1e5c0b

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

drivers/scsi/scsi_debug.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,6 +1867,19 @@ static int inquiry_vpd_b6(struct sdebug_dev_info *devip, unsigned char *arr)
18671867
return 0x3c;
18681868
}
18691869

1870+
#define SDEBUG_BLE_LEN_AFTER_B4 28 /* thus vpage 32 bytes long */
1871+
1872+
enum { MAXIMUM_NUMBER_OF_STREAMS = 6, PERMANENT_STREAM_COUNT = 5 };
1873+
1874+
/* Block limits extension VPD page (SBC-4) */
1875+
static int inquiry_vpd_b7(unsigned char *arrb4)
1876+
{
1877+
memset(arrb4, 0, SDEBUG_BLE_LEN_AFTER_B4);
1878+
arrb4[1] = 1; /* Reduced stream control support (RSCS) */
1879+
put_unaligned_be16(MAXIMUM_NUMBER_OF_STREAMS, &arrb4[2]);
1880+
return SDEBUG_BLE_LEN_AFTER_B4;
1881+
}
1882+
18701883
#define SDEBUG_LONG_INQ_SZ 96
18711884
#define SDEBUG_MAX_INQ_ARR_SZ 584
18721885

@@ -1932,6 +1945,7 @@ static int resp_inquiry(struct scsi_cmnd *scp, struct sdebug_dev_info *devip)
19321945
arr[n++] = 0xb2; /* LB Provisioning */
19331946
if (is_zbc)
19341947
arr[n++] = 0xb6; /* ZB dev. char. */
1948+
arr[n++] = 0xb7; /* Block limits extension */
19351949
}
19361950
arr[3] = n - 4; /* number of supported VPD pages */
19371951
} 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)
19741988
arr[3] = inquiry_vpd_b2(&arr[4]);
19751989
} else if (is_zbc && cmd[2] == 0xb6) { /* ZB dev. charact. */
19761990
arr[3] = inquiry_vpd_b6(devip, &arr[4]);
1991+
} else if (cmd[2] == 0xb7) { /* block limits extension page */
1992+
arr[3] = inquiry_vpd_b7(&arr[4]);
19771993
} else {
19781994
mk_sense_invalid_fld(scp, SDEB_IN_CDB, 2, -1);
19791995
kfree(arr);

0 commit comments

Comments
 (0)