Commit b4fd63f4 authored Apr 20, 2020 by Douglas Anderson Committed by Jens Axboe Apr 20, 2020

Revert "scsi: core: run queue if SCSI device queue isn't ready and queue is idle"



This reverts commit 7e70aa78.

Now that we have the patches ("blk-mq: In blk_mq_dispatch_rq_list()
"no budget" is a reason to kick") and ("blk-mq: Rerun dispatching in
the case of budget contention") we should no longer need the fix in
the SCSI code.  Revert it, resolving conflicts with other patches that
have touched this code.

With this revert (and the two new patches) I can run the script that
was in commit 7e70aa78 ("scsi: core: run queue if SCSI device
queue isn't ready and queue is idle") in a loop with no failure.  If I
do this revert without the two new patches I can easily get a failure.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent a0823421

drivers/scsi/scsi_lib.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -1610,12 +1610,7 @@ static bool scsi_mq_get_budget(struct blk_mq_hw_ctx *hctx)
		struct request_queue *q = hctx->queue;
		struct scsi_device *sdev = q->queuedata;

		if (scsi_dev_queue_ready(q, sdev))
		return true;

		if (atomic_read(&sdev->device_busy) == 0 && !scsi_device_blocked(sdev))
		blk_mq_delay_run_hw_queue(hctx, SCSI_QUEUE_DELAY);
		return false;
		return scsi_dev_queue_ready(q, sdev);
		}

		static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,

Admin message