scsi: scsi_debug: default to a higher throughput config
PATCH 1/1 scsi: scsi_debug: default to a higher throughput config
Currently the default config goes not give as high a throughput as some would like.
Give a higher default throughput by modifying the following:
- set completion response delay as 0
- increase shost can_queue to 4096, which aligns better with modern high-speed HBAs
- turn on clustering
drivers/scsi/scsi_debug.c +7 -7
@@ -79,7 +79,7 @@ static const char *sdebug_version_date = "20210520";*/ #define DEF_ATO 1#define DEF_CDB_LEN 10 -#define DEF_JDELAY 1/* if > 0 unit is a jiffy */ +#define DEF_JDELAY 0/* if > 0 unit is a jiffy */ #define DEF_DEV_SIZE_PRE_INIT 0#define DEF_DEV_SIZE_MB 8#define DEF_ZBC_DEV_SIZE_MB 128
@@ -106,6 +106,7 @@ static const char *sdebug_version_date = "20210520";#define DEF_PTYPE TYPE_DISK#define DEF_RANDOM false#define DEF_REMOVABLE false +#define DEF_CLUSTERING true#define DEF_SCSI_LEVEL 7/* INQUIRY, byte2 [6->SPC-4; 7->SPC-5] */ #define DEF_SECTOR_SIZE 512#define DEF_UNMAP_ALIGNMENT 0
@@ -217,8 +218,7 @@ struct tape_block {* /sys/class/scsi_device/<h:c:t:l>/device/queue_depth * but cannot exceed SDEBUG_CANQUEUE . */ -#define SDEBUG_CANQUEUE_WORDS 3/* a WORD is bits in a long */ -#define SDEBUG_CANQUEUE (SDEBUG_CANQUEUE_WORDS * BITS_PER_LONG) +#define SDEBUG_CANQUEUE (4096)#define DEF_CMD_PER_LUN SDEBUG_CANQUEUE/* UA - Unit Attention; SA - Service Action; SSU - Start Stop Unit */
@@ -850,7 +850,7 @@ static int sdebug_num_hosts;static int sdebug_add_host =DEF_NUM_HOST ;/* in sysfs this is relative */ static int sdebug_ato =DEF_ATO ;static int sdebug_cdb_len =DEF_CDB_LEN ; -static int sdebug_jdelay =DEF_JDELAY ;/* if > 0 then unit is jiffies */ +static int sdebug_jdelay =DEF_JDELAY ;static int sdebug_dev_size_mb =DEF_DEV_SIZE_PRE_INIT ;static int sdebug_dif =DEF_DIF ;static int sdebug_dix =DEF_DIX ;
@@ -899,7 +899,7 @@ static int sdebug_uuid_ctl = DEF_UUID_CTL;static bool sdebug_random =DEF_RANDOM ;static bool sdebug_per_host_store =DEF_PER_HOST_STORE ;static bool sdebug_removable =DEF_REMOVABLE ; -static bool sdebug_clustering; +static bool sdebug_clustering =DEF_CLUSTERING ;static bool sdebug_host_lock =DEF_HOST_LOCK ;static bool sdebug_strict =DEF_STRICT ;static bool sdebug_no_rwlock;
@@ -7373,8 +7373,8 @@ MODULE_VERSION(SDEBUG_VERSION);MODULE_PARM_DESC (add_host,"add n hosts, in sysfs if negative remove host(s) (def=1)" );MODULE_PARM_DESC (ato,"application tag ownership: 0=disk 1=host (def=1)" );MODULE_PARM_DESC (cdb_len,"suggest CDB lengths to drivers (def=10)" ); -MODULE_PARM_DESC (clustering,"when set enables larger transfers (def=0)" ); -MODULE_PARM_DESC (delay,"response delay (def=1 jiffy); 0:imm, -1,-2:tiny" ); +MODULE_PARM_DESC (clustering,"when set enables larger transfers (def=1)" ); +MODULE_PARM_DESC (delay,"response delay (def=0 jiffy); 0:imm, -1,-2:tiny" );MODULE_PARM_DESC (dev_size_mb,"size in MiB of ram shared by devs(def=8)" );MODULE_PARM_DESC (dif,"data integrity field type: 0-3 (def=0)" );MODULE_PARM_DESC (dix,"data integrity extensions mask (def=0)" );
Signature · 1 line
2.43.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [Critical] Stale defer_t in sdebug_scsi_cmd causes premature double scsi_done() leading to UAF. --
commit 92c33bac6eb173f6156f5a3b2daf5604d8994b5b
Author: John Garry <[email protected]>
scsi: scsi_debug: default to a higher throughput config
Currently the default config goes not give as high a throughput as some would like. Give a higher default throughput by modifying the delay, can_queue, and clustering defaults.
drivers/scsi/scsi_debug.c static const char *sdebug_version_date = "20210520"; · line 82
Quoted 10 lines
drivers/scsi/scsi_debug.c +1
-1@@ -79,7 +79,7 @@ static const char *sdebug_version_date = "20210520";*/ #define DEF_ATO 1#define DEF_CDB_LEN 10 -#define DEF_JDELAY 1/* if > 0 unit is a jiffy */ +#define DEF_JDELAY 0/* if > 0 unit is a jiffy */
[Severity: Critical]
This is a pre-existing issue, but changing the default delay to 0 exposes it out-of-the-box to all users.
When delay=0, schedule_resp() takes the early completion path without updating sd_dp->defer_t or sd_dp->cmpl_ts:
drivers/scsi/scsi_debug.c:schedule_resp() {
...
respond_in_thread: /* call back to mid-layer using invocation thread */
cmnd->result = pfp != NULL ? pfp(cmnd, devip) : 0;
cmnd->result &= ~SDEG_RES_IMMED_MASK;
if (cmnd->result == 0 && scsi_result != 0)
cmnd->result = scsi_result;
scsi_done(cmnd);
return 0;
}Because scsi_cmd_priv(cmd) is not zeroed per-request by the SCSI midlayer, a reused tag retains its previous defer_t value.
If the previous command on this tag was polled, defer_t is left as SDEB_DEFER_POLL. Concurrently, if a userspace thread invokes sdebug_blk_mq_poll_iter(), it iterates over busy tags, sees the stale SDEB_DEFER_POLL and expired cmpl_ts, and spuriously calls scsi_done(cmd) a second time:
drivers/scsi/scsi_debug.c:sdebug_blk_mq_poll_iter() {
...
spin_lock_irqsave(&sdsc->lock, flags);
sd_dp = &sdsc->sd_dp;
if (sd_dp->defer_t != SDEB_DEFER_POLL) {
spin_unlock_irqrestore(&sdsc->lock, flags);
return true;
}
if (time < sd_dp->cmpl_ts) {
spin_unlock_irqrestore(&sdsc->lock, flags);
return true;
}
spin_unlock_irqrestore(&sdsc->lock, flags);
...
scsi_done(cmd); /* callback to mid level */
}Could this lead to a double scsi_done() and a Use-After-Free in the block layer when racing with the early completion path?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 8 lines · John Garry
Currently the default config goes not give as high a throughput as some would like.
Give a higher default throughput by modifying the following:
- set completion response delay as 0
- increase shostcan_queueto 4096, which aligns better with modern high-speed HBAs
- turn on clustering
Looks good:
John,
Quoted 2 lines
Currently the default config goes not give as high a throughput as some would like.
Applied to 7.4/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen
Quoted 10 lines · John Garry
Currently the default config goes not give as high a throughput as some would like.
Give a higher default throughput by modifying the following:
- set completion response delay as 0
- increase shostcan_queueto 4096, which aligns better with modern high-speed HBAs
- turn on clustering[...]
Applied to 7.4/scsi-queue, thanks!
[1/1] scsi: scsi_debug: default to a higher throughput config
https://git.kernel.org/mkp/scsi/c/2cf34575b649
Signature · 1 line
Martin K. Petersen