scsi_debug: fix cmd_per_lun, set to max_queue
PATCH 1/1 scsi_debug: fix cmd_per_lun, set to max_queue
Make sure that the cmd_per_lun value placed in the host template never exceeds the can_queue value. If the max_queue driver parameter is not specified then both cmd_per_lun and can_queue are set to CAN_QUEUE. CAN_QUEUE is a compile time constant and is used to dimension an array to hold queued requests. If the max_queue driver parameter is given it is must be less than or equal to CAN_QUEUE and if so, the host template values are adjusted.
Remove undocumented code that allowed queue_depth to exceed CAN_QUEUE and cause stack full type errors. There is a documented way to do that with every_nth and
echo 0x8000 > /sys/bus/pseudo/drivers/scsi_debug/opts
See: https://sg.danny.cz/sg/scsi_debug.html
Tweak some formatting, and add a suggestion to the "trim poll_queues" warning.
--- drivers/scsi/scsi_debug.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/scsi/scsi_debug.c +16 -8
@@ -218,7 +218,7 @@ static const char *sdebug_version_date = "20200710";*/ #define SDEBUG_CANQUEUE_WORDS 3/* a WORD is bits in a long */ #define SDEBUG_CANQUEUE (SDEBUG_CANQUEUE_WORDS * BITS_PER_LONG) -#define DEF_CMD_PER_LUN 255 +#define DEF_CMD_PER_LUN SDEBUG_CANQUEUE/* UA - Unit Attention; SA - Service Action; SSU - Start Stop Unit */ #define F_D_IN 1/* Data-in command (e.g. READ) */
@@ -5695,8 +5695,8 @@ MODULE_PARM_DESC(lbpu, "enable LBP, support UNMAP command (def=0)");MODULE_PARM_DESC (lbpws,"enable LBP, support WRITE SAME(16) with UNMAP bit (def=0)" );MODULE_PARM_DESC (lbpws10,"enable LBP, support WRITE SAME(10) with UNMAP bit (def=0)" );MODULE_PARM_DESC (lowest_aligned,"lowest aligned lba (def=0)" ); -MODULE_PARM_DESC (max_luns,"number of LUNs per target to simulate(def=1)" );MODULE_PARM_DESC (lun_format,"LUN format: 0->peripheral (def); 1 --> flat address method" ); +MODULE_PARM_DESC (max_luns,"number of LUNs per target to simulate(def=1)" );MODULE_PARM_DESC (max_queue,"max number of queued commands (1 to max(def))" );MODULE_PARM_DESC (medium_error_count,"count of sectors to return follow on MEDIUM error" );MODULE_PARM_DESC (medium_error_start,"starting sector number to return MEDIUM error" );
@@ -5710,7 +5710,7 @@ MODULE_PARM_DESC(opt_xferlen_exp, "optimal transfer length granularity exponentMODULE_PARM_DESC (opts,"1->noise, 2->medium_err, 4->timeout, 8->recovered_err... (def=0)" );MODULE_PARM_DESC (per_host_store,"If set, next positive add_host will get new store (def=0)" );MODULE_PARM_DESC (physblk_exp,"physical block exponent (def=0)" ); -MODULE_PARM_DESC (poll_queues,"support for iouring iopoll queues (1 to max(submit_queues - 1)" ); +MODULE_PARM_DESC (poll_queues,"support for iouring iopoll queues (1 to max(submit_queues - 1))" );MODULE_PARM_DESC (ptype,"SCSI peripheral type(def=0[disk])" );MODULE_PARM_DESC (random,"If set, uniformly randomize command duration between 0 and delay_in_ns" );MODULE_PARM_DESC (removable,"claim to have removable media (def=0)" );
@@ -7165,12 +7165,15 @@ static int sdebug_change_qdepth(struct scsi_device *sdev, int qdepth) } num_in_q =atomic_read (&devip->num_in_q); +if (qdepth >SDEBUG_CANQUEUE ) { + qdepth =SDEBUG_CANQUEUE ; +pr_warn ("%s: requested qdepth [%d] exceeds canqueue [%d], trim\n" , __func__, + qdepth,SDEBUG_CANQUEUE ); + }if (qdepth <1 ) qdepth =1 ; -/* allow to exceed max host qc_arr elements for testing */ -if (qdepth >SDEBUG_CANQUEUE +10 ) - qdepth =SDEBUG_CANQUEUE +10 ; -scsi_change_queue_depth (sdev, qdepth); +if (qdepth != sdev->queue_depth) +scsi_change_queue_depth (sdev, qdepth);if (SDEBUG_OPT_Q_NOISE & sdebug_opts) { sdev_printk(KERN_INFO, sdev, "%s: qdepth=%d, num_in_q=%d\n",
@@ -7558,6 +7561,7 @@ static int sdebug_driver_probe(struct device *dev) sdbg_host =to_sdebug_host (dev); sdebug_driver_template.can_queue = sdebug_max_queue; + sdebug_driver_template.cmd_per_lun = sdebug_max_queue;if (!sdebug_clustering) sdebug_driver_template.dma_boundary =PAGE_SIZE -1 ;
@@ -7593,7 +7597,11 @@ static int sdebug_driver_probe(struct device *dev)* If condition not met, trim poll_queues to 1 (just for simplicity). */ if (poll_queues >= submit_queues) { -pr_warn ("%s: trim poll_queues to 1\n" , my_name); +if (submit_queues <3 ) +pr_warn ("%s: trim poll_queues to 1\n" , my_name); +else +pr_warn ("%s: trim poll_queues to 1. Perhaps try poll_queues=%d\n" , + my_name, submit_queues -1 ); poll_queues =1 ; }if (poll_queues)
Signature · 1 line
2.25.1
This looks ok.
Apart from this, I tested linux-next (without this patch) - which includes Ming's changes to replace sdev-->device_busy with sbitmap - and, as expected, it has the issue.
So I think it is also worth having this to stop this happening elsewhere:
------>8-------
Subject: [PATCH] scsi: core: Cap initial sdev queue depth at Shost.can_queue
Function sdev_store_queue_depth() enforces that the sdev queue depth cannot exceed Shost.can_queue.
However, the LLDD may still set cmd_per_lun > can_queue, which would lead to an initial sdev queue depth greater than can_queue.
Stop this happened by capping initial sdev queue depth at can_queue.
<insert credits>
drivers/scsi/scsi_scan.c +8 -2
@@ -218,6 +218,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,struct scsi_device *sdev;int display_failure_msg =1 , ret;struct Scsi_Host *shost =dev_to_shost (starget->dev.parent); +int depth; sdev =kzalloc (sizeof (*sdev) + shost->transportt->device_size,GFP_KERNEL );
@@ -276,8 +277,13 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,WARN_ON_ONCE (!blk_get_queue (sdev->request_queue)); sdev->request_queue->queuedata = sdev; -scsi_change_queue_depth (sdev, sdev->host->cmd_per_lun ? - sdev->host->cmd_per_lun :1 ); +if (sdev->host->cmd_per_lun) + depth =min_t (int, sdev->host->cmd_per_lun, + sdev->host->can_queue); +else + depth =1 ; + +scsi_change_queue_depth (sdev, depth);scsi_sysfs_device_initialize (sdev);
Quoted 40 lines · John Garry
This looks ok.
Apart from this, I tested linux-next (without this patch) - which includes Ming's changes to replace sdev-->device_busy with sbitmap - and, as expected, it has the issue.
So I think it is also worth having this to stop this happening elsewhere:
------>8-------
Subject: [PATCH] scsi: core: Cap initial sdev queue depth at Shost.can_queue
Function
sdev_store_queue_depth()enforces that the sdev queue depth cannot exceed Shost.can_queue.However, the LLDD may still set
cmd_per_lun>can_queue, which would lead to an initial sdev queue depth greater thancan_queue.Stop this happened by capping initial sdev queue depth at
can_queue.<insert credits>
Signed-off-by John Garry <[email protected]>drivers/scsi/scsi_scan.c +1
-0@@ -218,6 +218,7 @@ static struct scsi_device *scsi_alloc_sdev(structscsi_target *starget, struct scsi_device *sdev;int display_failure_msg =1 , ret;struct Scsi_Host *shost =dev_to_shost (starget->dev.parent); +int depth; sdev = kzalloc(sizeof(*sdev) + shost->transportt->device_size,drivers/scsi/scsi_scan.c +0
-0GFP_KERNEL);@@ -276,8 +277,13 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,WARN_ON_ONCE (!blk_get_queue (sdev->request_queue)); sdev->request_queue->queuedata = sdev;
drivers/scsi/scsi_scan.c static struct scsi_device *scsi_alloc_sdev(struct · line 287
Quoted 10 lines
drivers/scsi/scsi_scan.c +7
-2-scsi_change_queue_depth (sdev, sdev->host->cmd_per_lun ? - sdev->host->cmd_per_lun :1 ); +if (sdev->host->cmd_per_lun) + depth =min_t (int, sdev->host->cmd_per_lun, + sdev->host->can_queue); +else + depth =1 ; + +scsi_change_queue_depth (sdev, depth);
'cmd_per_lun' should have been set as correct from the beginning instead of capping it for changing queue depth:
drivers/scsi/hosts.c +1 -1
@@ -414,7 +414,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) shost->can_queue = sht->can_queue; shost->sg_tablesize = sht->sg_tablesize; shost->sg_prot_tablesize = sht->sg_prot_tablesize; - shost->cmd_per_lun = sht->cmd_per_lun; + shost->cmd_per_lun =min_t (int, sht->cmd_per_lun, shost->can_queue); shost->no_write_same = sht->no_write_same; shost->host_tagset = sht->host_tagset;
Thanks,
Ming
Quoted 28 lines · Ming Lei
Quoted 10 lines
int display_failure_msg = 1, ret; struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);(quoted diff) +1
-0+ int depth; sdev = kzalloc(sizeof(*sdev) + shost->transportt->device_size, GFP_KERNEL);@@ -276,8 +277,13 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, WARN_ON_ONCE(!blk_get_queue(sdev->request_queue)); sdev->request_queue->queuedata = sdev;Review static struct scsi_device *scsi_alloc_sdev(struct · line 287
Quoted 10 lines
(quoted diff) +7
-2- scsi_change_queue_depth(sdev, sdev->host->cmd_per_lun ? - sdev->host->cmd_per_lun : 1); + if (sdev->host->cmd_per_lun) + depth = min_t(int, sdev->host->cmd_per_lun, + sdev->host->can_queue); + else + depth = 1; + + scsi_change_queue_depth(sdev, depth);'
cmd_per_lun' should have been set as correct from the beginning instead of capping it for changing queue depth:drivers/scsi/hosts.c +0
-0
drivers/scsi/hosts.c struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) · line 419
Quoted 7 lines
drivers/scsi/hosts.c +1
-1@@ -414,7 +414,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) shost->can_queue = sht->can_queue; shost->sg_tablesize = sht->sg_tablesize; shost->sg_prot_tablesize = sht->sg_prot_tablesize; - shost->cmd_per_lun = sht->cmd_per_lun; + shost->cmd_per_lun =min_t (int, sht->cmd_per_lun, shost->can_queue); shost->no_write_same = sht->no_write_same; shost->host_tagset = sht->host_tagset;
My concern here is that it is a common pattern in LLDDs to overwrite the initial shost member values between scsi_host_alloc() and scsi_add_host().
Thanks,
John
Quoted 24 lines · John Garry
Quoted 23 lines · Ming Lei
Quoted 10 lines
int display_failure_msg = 1, ret; struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);(quoted diff) +1
-0+ int depth; sdev = kzalloc(sizeof(*sdev) + shost->transportt->device_size, GFP_KERNEL);@@ -276,8 +277,13 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, WARN_ON_ONCE(!blk_get_queue(sdev->request_queue)); sdev->request_queue->queuedata = sdev;Review static struct scsi_device *scsi_alloc_sdev(struct · line 287
Quoted 10 lines
(quoted diff) +7
-2- scsi_change_queue_depth(sdev, sdev->host->cmd_per_lun ? - sdev->host->cmd_per_lun : 1); + if (sdev->host->cmd_per_lun) + depth = min_t(int, sdev->host->cmd_per_lun, + sdev->host->can_queue); + else + depth = 1; + + scsi_change_queue_depth(sdev, depth);'
cmd_per_lun' should have been set as correct from the beginning instead of capping it for changing queue depth:
Quoted 15 lines
drivers/scsi/hosts.c struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) · line 419
Quoted 12 lines
drivers/scsi/hosts.c +1
-1@@ -414,7 +414,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) shost->can_queue = sht->can_queue; shost->sg_tablesize = sht->sg_tablesize; shost->sg_prot_tablesize = sht->sg_prot_tablesize; - shost->cmd_per_lun = sht->cmd_per_lun; + shost->cmd_per_lun =min_t (int, sht->cmd_per_lun, shost->can_queue); shost->no_write_same = sht->no_write_same; shost->host_tagset = sht->host_tagset;My concern here is that it is a common pattern in LLDDs to overwrite the initial shost member values between
scsi_host_alloc()andscsi_add_host().
OK, then can we move the fix into beginning of scsi_add_host()?
Thanks,
Ming
Quoted 17 lines · Ming Lei
Quoted 17 lines
Quoted 8 lines
'
cmd_per_lun' should have been set as correct from the beginning instead of capping it for changing queue depth:drivers/scsi/hosts.c +0
-0drivers/scsi/hosts.c struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) · line 419
Quoted 7 lines
drivers/scsi/hosts.c +1
-1@@ -414,7 +414,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) shost->can_queue = sht->can_queue; shost->sg_tablesize = sht->sg_tablesize; shost->sg_prot_tablesize = sht->sg_prot_tablesize; - shost->cmd_per_lun = sht->cmd_per_lun; + shost->cmd_per_lun =min_t (int, sht->cmd_per_lun, shost->can_queue); shost->no_write_same = sht->no_write_same; shost->host_tagset = sht->host_tagset;My concern here is that it is a common pattern in LLDDs to overwrite the initial shost member values between
scsi_host_alloc()andscsi_add_host().
Quoted 1 line
OK, then can we move the fix into beginning of
scsi_add_host()?
I suppose that would be ok, but we don't do much sanitizing shost values at that point. Apart from failing can_queue == 0. I suppose failing can_queue < cmd_per_lun could also be added.
Thanks,
John
Quoted 18 lines · John Garry
Quoted 17 lines · Ming Lei
Quoted 17 lines
Quoted 8 lines
'
cmd_per_lun' should have been set as correct from the beginning instead of capping it for changing queue depth:drivers/scsi/hosts.c +0
-0drivers/scsi/hosts.c struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) · line 419
Quoted 7 lines
drivers/scsi/hosts.c +1
-1@@ -414,7 +414,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) shost->can_queue = sht->can_queue; shost->sg_tablesize = sht->sg_tablesize; shost->sg_prot_tablesize = sht->sg_prot_tablesize; - shost->cmd_per_lun = sht->cmd_per_lun; + shost->cmd_per_lun =min_t (int, sht->cmd_per_lun, shost->can_queue); shost->no_write_same = sht->no_write_same; shost->host_tagset = sht->host_tagset;My concern here is that it is a common pattern in LLDDs to overwrite the initial shost member values between
scsi_host_alloc()andscsi_add_host().
Quoted 4 lines
Quoted 1 line
OK, then can we move the fix into beginning of
scsi_add_host()?I suppose that would be ok, but we don't do much sanitizing shost values at that point. Apart from failing
can_queue== 0.
.can_queue has been finalized in scsi_add_host(), since it will be used for setting tagset, so .can_queue is reliable at that time.
Quoted 1 line
I suppose failing
can_queue<cmd_per_luncould also be added.
That will fail add host for scsi_debug simply.
Thanks,
Ming
Quoted 10 lines · Ming Lei
Quoted 5 lines
Quoted 3 lines
Quoted 2 lines
My concern here is that it is a common pattern in LLDDs to overwrite the initial shost member values between
scsi_host_alloc()andscsi_add_host().OK, then can we move the fix into beginning of
scsi_add_host()?I suppose that would be ok, but we don't do much sanitizing shost values at that point. Apart from failing
can_queue== 0..can_queue has been finalized in
scsi_add_host(), since it will be used for setting tagset, so .can_queue is reliable at that time.Quoted 1 line
I suppose failing
can_queue<cmd_per_luncould also be added.That will fail add host for
scsi_debugsimply.
But we still should have Doug's patch regardless.
Anyway, I'll prepare a patch, so we can discuss further on that thread.
Thanks,
John
Quoted 11 lines · Douglas Gilbert
Make sure that the
cmd_per_lunvalue placed in the host template never exceeds thecan_queuevalue. If themax_queuedriver parameter is not specified then bothcmd_per_lunandcan_queueare set toCAN_QUEUE.CAN_QUEUEis a compile time constant and is used to dimension an array to hold queued requests. If themax_queuedriver parameter is given it is must be less than or equal toCAN_QUEUEand if so, the host template values are adjusted.Remove undocumented code that allowed
queue_depthto exceedCAN_QUEUEand cause stack full type errors. There is a documented way to do that withevery_nthand
Quoted 8 lines
echo 0x8000 > /sys/bus/pseudo/drivers/scsi_debug/optsSee: https://sg.danny.cz/sg/scsi_debug.html
Tweak some formatting, and add a suggestion to the "trim
poll_queues" warning.Reported-by Kashyap Desai <[email protected]>Signed-off-by Douglas Gilbert <[email protected]>
Just one comment, below:
Thanks
Quoted 18 lines
--- drivers/scsi/scsi_debug.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)drivers/scsi/scsi_debug.c +1
-1@@ -218,7 +218,7 @@ static const char *sdebug_version_date = "20200710";*/ #define SDEBUG_CANQUEUE_WORDS 3/* a WORD is bits in a long */ #define SDEBUG_CANQUEUE (SDEBUG_CANQUEUE_WORDS * BITS_PER_LONG) -#define DEF_CMD_PER_LUN 255 +#define DEF_CMD_PER_LUN SDEBUG_CANQUEUE/* UA - Unit Attention; SA - Service Action; SSU - Start Stop Unit */ #define F_D_IN 1/* Data-in command (e.g. READ) */
drivers/scsi/scsi_debug.c MODULE_PARM_DESC(lbpu, "enable LBP, support UNMAP command (def=0)"); · line 5699
Quoted 6 lines
drivers/scsi/scsi_debug.c +1
-1@@ -5695,8 +5695,8 @@ MODULE_PARM_DESC(lbpu, "enable LBP, support UNMAP command (def=0)");MODULE_PARM_DESC (lbpws,"enable LBP, support WRITE SAME(16) with UNMAP bit (def=0)" );MODULE_PARM_DESC (lbpws10,"enable LBP, support WRITE SAME(10) with UNMAP bit (def=0)" );MODULE_PARM_DESC (lowest_aligned,"lowest aligned lba (def=0)" ); -MODULE_PARM_DESC (max_luns,"number of LUNs per target to simulate(def=1)" );MODULE_PARM_DESC (lun_format,"LUN format: 0->peripheral (def); 1 --> flat address method" ); +MODULE_PARM_DESC (max_luns,"number of LUNs per target to simulate(def=1)" );
Changes like this should really be in another patch.
Quoted 54 lines
drivers/scsi/scsi_debug.c +14
-6MODULE_PARM_DESC (max_queue,"max number of queued commands (1 to max(def))" );MODULE_PARM_DESC (medium_error_count,"count of sectors to return follow on MEDIUM error" );MODULE_PARM_DESC (medium_error_start,"starting sector number to return MEDIUM error" );@@ -5710,7 +5710,7 @@ MODULE_PARM_DESC(opt_xferlen_exp, "optimal transfer length granularity exponentMODULE_PARM_DESC (opts,"1->noise, 2->medium_err, 4->timeout, 8->recovered_err... (def=0)" );MODULE_PARM_DESC (per_host_store,"If set, next positive add_host will get new store (def=0)" );MODULE_PARM_DESC (physblk_exp,"physical block exponent (def=0)" ); -MODULE_PARM_DESC (poll_queues,"support for iouring iopoll queues (1 to max(submit_queues - 1)" ); +MODULE_PARM_DESC (poll_queues,"support for iouring iopoll queues (1 to max(submit_queues - 1))" );MODULE_PARM_DESC (ptype,"SCSI peripheral type(def=0[disk])" );MODULE_PARM_DESC (random,"If set, uniformly randomize command duration between 0 and delay_in_ns" );MODULE_PARM_DESC (removable,"claim to have removable media (def=0)" );@@ -7165,12 +7165,15 @@ static int sdebug_change_qdepth(struct scsi_device *sdev, int qdepth) } num_in_q =atomic_read (&devip->num_in_q); +if (qdepth >SDEBUG_CANQUEUE ) { + qdepth =SDEBUG_CANQUEUE ; +pr_warn ("%s: requested qdepth [%d] exceeds canqueue [%d], trim\n" , __func__, + qdepth,SDEBUG_CANQUEUE ); + }if (qdepth <1 ) qdepth =1 ; -/* allow to exceed max host qc_arr elements for testing */ -if (qdepth >SDEBUG_CANQUEUE +10 ) - qdepth =SDEBUG_CANQUEUE +10 ; -scsi_change_queue_depth (sdev, qdepth); +if (qdepth != sdev->queue_depth) +scsi_change_queue_depth (sdev, qdepth);if (SDEBUG_OPT_Q_NOISE & sdebug_opts) { sdev_printk(KERN_INFO, sdev, "%s: qdepth=%d, num_in_q=%d\n",@@ -7558,6 +7561,7 @@ static int sdebug_driver_probe(struct device *dev) sdbg_host =to_sdebug_host (dev); sdebug_driver_template.can_queue = sdebug_max_queue; + sdebug_driver_template.cmd_per_lun = sdebug_max_queue;if (!sdebug_clustering) sdebug_driver_template.dma_boundary =PAGE_SIZE -1 ;@@ -7593,7 +7597,11 @@ static int sdebug_driver_probe(struct device *dev)* If condition not met, trim poll_queues to 1 (just for simplicity). */ if (poll_queues >= submit_queues) { -pr_warn ("%s: trim poll_queues to 1\n" , my_name); +if (submit_queues <3 ) +pr_warn ("%s: trim poll_queues to 1\n" , my_name); +else +pr_warn ("%s: trim poll_queues to 1. Perhaps try poll_queues=%d\n" , + my_name, submit_queues -1 ); poll_queues =1 ; }if (poll_queues)
Quoted 15 lines · John Garry
Quoted 14 lines · Douglas Gilbert
Make sure that the
cmd_per_lunvalue placed in the host template never exceeds thecan_queuevalue. If themax_queuedriver parameter is not specified then bothcmd_per_lunandcan_queueare set toCAN_QUEUE.CAN_QUEUEis a compile time constant and is used to dimension an array to hold queued requests. If themax_queuedriver parameter is given it is must be less than or equal toCAN_QUEUEand if so, the host template values are adjusted.Remove undocumented code that allowed
queue_depthto exceedCAN_QUEUEand cause stack full type errors. There is a documented way to do that withevery_nthand
echo0x8000>/sys/bus/pseudo/drivers/scsi_debug/opts
See: https://sg.danny.cz/sg/scsi_debug.html
Quoted 7 lines
Quoted 5 lines
Tweak some formatting, and add a suggestion to the "trim
poll_queues" warning.Reported-by Kashyap Desai <[email protected]>Signed-off-by Douglas Gilbert <[email protected]>Just one comment, below:
The scsi_debug driver has around 64 driver startup and sysfs parameters, many from other users. Trying to track and document these is a pain, so to lighten my load I try to keep them in alphabetical order. In my experience suggesting that a new patch follows that convention doesn't always work, it gets applied in its original form.
Anyway, I just updated:
https://sg.danny.cz/sg/scsi_debug.html
Suggested improvements welcome.
Quoted 1 line
Reviewed-by John Garry <[email protected]>
Thanks.
Doug Gilbert
Quoted 83 lines
Quoted 17 lines
---
drivers/scsi/scsi_debug.c| 24 ++++++++++++++++--------1 file changed, 16 insertions(+), 8 deletions(-)drivers/scsi/scsi_debug.c +1
-1@@ -218,7 +218,7 @@ static const char *sdebug_version_date = "20200710";*/ #define SDEBUG_CANQUEUE_WORDS 3 /* a WORD is bits in a long */ #define SDEBUG_CANQUEUE (SDEBUG_CANQUEUE_WORDS * BITS_PER_LONG) -#define DEF_CMD_PER_LUN 255 +#define DEF_CMD_PER_LUN SDEBUG_CANQUEUE /* UA - Unit Attention; SA - Service Action; SSU - Start Stop Unit */ #define F_D_IN 1 /* Data-in command (e.g. READ) */drivers/scsi/scsi_debug.c MODULE_PARM_DESC(lbpu, "enable LBP, support UNMAP · line 5700
Quoted 7 lines
drivers/scsi/scsi_debug.c +1
-1@@ -5695,8 +5695,8 @@ MODULE_PARM_DESC(lbpu, "enable LBP, support UNMAP command (def=0)"); MODULE_PARM_DESC(lbpws, "enable LBP, support WRITE SAME(16) with UNMAP bit (def=0)"); MODULE_PARM_DESC(lbpws10, "enable LBP, support WRITE SAME(10) with UNMAP bit (def=0)"); MODULE_PARM_DESC(lowest_aligned, "lowest aligned lba (def=0)"); -MODULE_PARM_DESC (max_luns,"number of LUNs per target to simulate(def=1)" ); MODULE_PARM_DESC(lun_format, "LUN format: 0->peripheral (def); 1 --> flat address method"); +MODULE_PARM_DESC (max_luns,"number of LUNs per target to simulate(def=1)" );Changes like this should really be in another patch.
Quoted 55 lines
drivers/scsi/scsi_debug.c +0
-0MODULE_PARM_DESC(max_queue, "max number of queued commands (1 to max(def))"); MODULE_PARM_DESC(medium_error_count, "count of sectors to return follow on MEDIUM error");
MODULE_PARM_DESC(medium_error_start, "starting sector number to return MEDIUM error");drivers/scsi/scsi_debug.c +0
-0@@ -5710,7 +5710,7 @@ MODULE_PARM_DESC(opt_xferlen_exp, "optimal transferlength granularity exponent
MODULE_PARM_DESC(opts, "1->noise, 2->medium_err, 4->timeout, 8->recovered_err... (def=0)");MODULE_PARM_DESC(per_host_store, "If set, next positive add_host will get new store (def=0)");MODULE_PARM_DESC(physblk_exp, "physical block exponent (def=0)"); -MODULE_PARM_DESC(poll_queues, "support for iouring iopoll queues (1 tomax(submit_queues - 1)");
+MODULE_PARM_DESC(poll_queues, "support for iouring iopoll queues (1 tomax(submit_queues - 1))");
MODULE_PARM_DESC(ptype, "SCSI peripheral type(def=0[disk])");MODULE_PARM_DESC(random, "If set, uniformly randomize command duration between 0 and delay_in_ns");MODULE_PARM_DESC(removable, "claim to have removable media (def=0)");drivers/scsi/scsi_debug.c +13
-5@@ -7165,12 +7165,15 @@ static int sdebug_change_qdepth(struct scsi_device *sdev, int qdepth) } num_in_q = atomic_read(&devip->num_in_q); + if (qdepth > SDEBUG_CANQUEUE) { + qdepth = SDEBUG_CANQUEUE; + pr_warn("%s: requested qdepth [%d] exceeds canqueue [%d], trim\n", __func__, + qdepth, SDEBUG_CANQUEUE); + } if (qdepth < 1) qdepth = 1; - /* allow to exceed max host qc_arr elements for testing */ - if (qdepth > SDEBUG_CANQUEUE + 10) - qdepth = SDEBUG_CANQUEUE + 10; - scsi_change_queue_depth(sdev, qdepth); + if (qdepth != sdev->queue_depth) + scsi_change_queue_depth(sdev, qdepth); if (SDEBUG_OPT_Q_NOISE & sdebug_opts) { sdev_printk(KERN_INFO, sdev, "%s: qdepth=%d, num_in_q=%d\n",@@ -7558,6 +7561,7 @@ static int sdebug_driver_probe(struct device *dev) sdbg_host = to_sdebug_host(dev); sdebug_driver_template.can_queue = sdebug_max_queue; + sdebug_driver_template.cmd_per_lun = sdebug_max_queue; if (!sdebug_clustering) sdebug_driver_template.dma_boundary = PAGE_SIZE - 1;@@ -7593,7 +7597,11 @@ static int sdebug_driver_probe(struct device *dev)* If condition not met, trim poll_queues to 1 (just for simplicity). */ if (poll_queues >= submit_queues) { - pr_warn("%s: trim poll_queues to 1\n", my_name); + if (submit_queues < 3) + pr_warn("%s: trim poll_queues to 1\n", my_name); + else + pr_warn("%s: trim poll_queues to 1. Perhaps try poll_queues=%d\n", + my_name, submit_queues - 1); poll_queues = 1; } if (poll_queues)
Quoted 16 lines · Douglas Gilbert
Quoted 15 lines · John Garry
Quoted 14 lines · Douglas Gilbert
Make sure that the
cmd_per_lunvalue placed in the host template never exceeds thecan_queuevalue. If themax_queuedriver parameter is not specified then bothcmd_per_lunandcan_queueare set toCAN_QUEUE.CAN_QUEUEis a compile time constant and is used to dimension an array to hold queued requests. If themax_queuedriver parameter is given it is must be less than or equal toCAN_QUEUEand if so, the host template values are adjusted.Remove undocumented code that allowed
queue_depthto exceedCAN_QUEUEand cause stack full type errors. There is a documented way to do that withevery_nthand
echo0x8000>/sys/bus/pseudo/drivers/scsi_debug/opts
See: https://sg.danny.cz/sg/scsi_debug.html
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Tweak some formatting, and add a suggestion to the "trim
poll_queues" warning.Reported-by Kashyap Desai <[email protected]>Signed-off-by Douglas Gilbert <[email protected]>
Hi Martin,
Could we get this picked up please?
Thanks!