scsi: scsi_debug: Use scsi_host_busy() in delay_store() and ndelay_store()

The functions to update ndelay and delay value first check whether we have
any in-flight IO for any host. It does this by checking if any tag is used
in the global submit queues.

We can achieve the same by setting the host as blocked and then ensuring
that we have no in-flight commands with scsi_host_busy().

Note that scsi_host_busy() checks SCMD_STATE_INFLIGHT flag, which is only
set per command after we ensure that the host is not blocked, i.e. we see
more commands active after the check for scsi_host_busy() returns 0.

Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20230327074310.1862889-10-john.g.garry@oracle.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 9e1586b127bc5c938ecf9092220f38d7253a6197..9a741b1983cae4002bea67b0062bce6c4ee3b88d 100644 (file)
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -6062,16 +6062,15 @@ static ssize_t delay_store(struct device_driver *ddp, const char *buf,
        if (count > 0 && sscanf(buf, "%d", &jdelay) == 1) {
                res = count;
                if (sdebug_jdelay != jdelay) {
-                       int j, k;
-                       struct sdebug_queue *sqp;
+                       struct sdebug_host_info *sdhp;
 
                        mutex_lock(&sdebug_host_list_mutex);
                        block_unblock_all_queues(true);
-                       for (j = 0, sqp = sdebug_q_arr; j < submit_queues;
-                            ++j, ++sqp) {
-                               k = find_first_bit(sqp->in_use_bm,
-                                                  sdebug_max_queue);
-                               if (k != sdebug_max_queue) {
+
+                       list_for_each_entry(sdhp, &sdebug_host_list, host_list) {
+                               struct Scsi_Host *shost = sdhp->shost;
+
+                               if (scsi_host_busy(shost)) {
                                        res = -EBUSY;   /* queued commands */
                                        break;
                                }
@@ -6104,20 +6103,20 @@ static ssize_t ndelay_store(struct device_driver *ddp, const char *buf,
            (ndelay >= 0) && (ndelay < (1000 * 1000 * 1000))) {
                res = count;
                if (sdebug_ndelay != ndelay) {
-                       int j, k;
-                       struct sdebug_queue *sqp;
+                       struct sdebug_host_info *sdhp;
 
                        mutex_lock(&sdebug_host_list_mutex);
                        block_unblock_all_queues(true);
-                       for (j = 0, sqp = sdebug_q_arr; j < submit_queues;
-                            ++j, ++sqp) {
-                               k = find_first_bit(sqp->in_use_bm,
-                                                  sdebug_max_queue);
-                               if (k != sdebug_max_queue) {
+
+                       list_for_each_entry(sdhp, &sdebug_host_list, host_list) {
+                               struct Scsi_Host *shost = sdhp->shost;
+
+                               if (scsi_host_busy(shost)) {
                                        res = -EBUSY;   /* queued commands */
                                        break;
                                }
                        }
+
                        if (res > 0) {
                                sdebug_ndelay = ndelay;
                                sdebug_jdelay = ndelay  ? JDELAY_OVERRIDDEN