On 2020-07-19 18:32, Ming Lei wrote:
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index b9adee0a9266..9798fbffe307 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -564,6 +564,15 @@ static void scsi_mq_uninit_cmd(struct scsi_cmnd *cmd)
> scsi_uninit_cmd(cmd);
> }
>
> +static void scsi_run_queue_async(struct scsi_device *sdev)
> +{
> + if (scsi_target(sdev)->single_lun ||
> + !list_empty(&sdev->host->starved_list))
> + kblockd_schedule_work(&sdev->requeue_work);
> + else
> + blk_mq_run_hw_queues(sdev->request_queue, true);
> +}
> +
> /* Returns false when no more bytes to process, true if there are more */
> static bool scsi_end_request(struct request *req, blk_status_t error,
> unsigned int bytes)
> @@ -608,11 +617,7 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
>
> __blk_mq_end_request(req, error);
>
> - if (scsi_target(sdev)->single_lun ||
> - !list_empty(&sdev->host->starved_list))
> - kblockd_schedule_work(&sdev->requeue_work);
> - else
> - blk_mq_run_hw_queues(q, true);
> + scsi_run_queue_async(sdev);
>
> percpu_ref_put(&q->q_usage_counter);
> return false;
> @@ -1721,6 +1726,7 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,
> */
> if (req->rq_flags & RQF_DONTPREP)
> scsi_mq_uninit_cmd(cmd);
> + scsi_run_queue_async(sdev);
> break;
> }
> return ret;
Looks good to me. Feel free to add:
Reviewed-by: Bart Van Assche <bvanassche@xxxxxxx>
