Skip to content

Commit a0473bf

Browse files
johnpgarrymartinkpetersen
authored andcommitted
scsi: scsi_debug: Use scsi_block_requests() to block queues
The feature to block queues is quite dubious, since it races with in-flight IO. Indeed, it seems unnecessary for block queues for any times we do so. Anyway, to keep the same behaviour, use standard SCSI API to stop IO being sent - scsi_{un}block_requests(). Signed-off-by: John Garry <john.g.garry@oracle.com> Link: https://lore.kernel.org/r/20230327074310.1862889-6-john.g.garry@oracle.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 25b80b2 commit a0473bf

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

drivers/scsi/scsi_debug.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ struct sdebug_queue {
359359
struct sdebug_queued_cmd qc_arr[SDEBUG_CANQUEUE];
360360
unsigned long in_use_bm[SDEBUG_CANQUEUE_WORDS];
361361
spinlock_t qc_lock;
362-
atomic_t blocked; /* to temporarily stop more being queued */
363362
};
364363

365364
static atomic_t sdebug_cmnd_count; /* number of incoming commands */
@@ -5494,13 +5493,18 @@ static void sdebug_build_parts(unsigned char *ramp, unsigned long store_size)
54945493

54955494
static void block_unblock_all_queues(bool block)
54965495
{
5497-
int j;
5498-
struct sdebug_queue *sqp;
5496+
struct sdebug_host_info *sdhp;
54995497

55005498
lockdep_assert_held(&sdebug_host_list_mutex);
55015499

5502-
for (j = 0, sqp = sdebug_q_arr; j < submit_queues; ++j, ++sqp)
5503-
atomic_set(&sqp->blocked, (int)block);
5500+
list_for_each_entry(sdhp, &sdebug_host_list, host_list) {
5501+
struct Scsi_Host *shost = sdhp->shost;
5502+
5503+
if (block)
5504+
scsi_block_requests(shost);
5505+
else
5506+
scsi_unblock_requests(shost);
5507+
}
55045508
}
55055509

55065510
/* Adjust (by rounding down) the sdebug_cmnd_count so abs(every_nth)-1
@@ -5572,10 +5576,6 @@ static int schedule_resp(struct scsi_cmnd *cmnd, struct sdebug_dev_info *devip,
55725576

55735577
sqp = get_queue(cmnd);
55745578
spin_lock_irqsave(&sqp->qc_lock, iflags);
5575-
if (unlikely(atomic_read(&sqp->blocked))) {
5576-
spin_unlock_irqrestore(&sqp->qc_lock, iflags);
5577-
return SCSI_MLQUEUE_HOST_BUSY;
5578-
}
55795579

55805580
if (unlikely(sdebug_every_nth && (SDEBUG_OPT_RARE_TSF & sdebug_opts) &&
55815581
(scsi_result == 0))) {

0 commit comments

Comments
 (0)