Re: [PATCH v2 3/9] scsi: Pass a request queue pointer to __scsi_execute()

Can Guo
2020-11-18T01:18:07Z

On 2020-11-16 11:04, Bart Van Assche wrote:
> This patch does not change any functionality but makes a later patch
> easier
> to read.
>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Reviewed-by: Alan Stern <stern@rowland.harvard.edu>
> Cc: Can Guo <cang@codeaurora.org>
> Cc: Stanley Chu <stanley.chu@mediatek.com>
> Cc: Ming Lei <ming.lei@redhat.com>
> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>

Reviewed-by: Can Guo <cang@codeaurora.org>

> ---
> drivers/scsi/scsi_lib.c | 12 +++++-------
> include/scsi/scsi_device.h | 8 ++++----
> 2 files changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index 855e48c7514f..e4f9ed355be6 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -221,7 +221,7 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int
> reason)
>
> /**
> * __scsi_execute - insert request and wait for the result
> - * @sdev: scsi device
> + * @q: queue to insert the request into
> * @cmd: scsi command
> * @data_direction: data direction
> * @buffer: data buffer
> @@ -237,7 +237,7 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int
> reason)
> * Returns the scsi_cmnd result field if a command was executed, or a
> negative
> * Linux error code if we didn't get that far.
> */
> -int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
> +int __scsi_execute(struct request_queue *q, const unsigned char *cmd,
> int data_direction, void *buffer, unsigned bufflen,
> unsigned char *sense, struct scsi_sense_hdr *sshdr,
> int timeout, int retries, u64 flags, req_flags_t rq_flags,
> @@ -247,15 +247,13 @@ int __scsi_execute(struct scsi_device *sdev,
> const unsigned char *cmd,
> struct scsi_request *rq;
> int ret = DRIVER_ERROR << 24;
>
> - req = blk_get_request(sdev->request_queue,
> - data_direction == DMA_TO_DEVICE ?
> + req = blk_get_request(q, data_direction == DMA_TO_DEVICE ?
> REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, BLK_MQ_REQ_PREEMPT);
> if (IS_ERR(req))
> return ret;
> rq = scsi_req(req);
>
> - if (bufflen && blk_rq_map_kern(sdev->request_queue, req,
> - buffer, bufflen, GFP_NOIO))
> + if (bufflen && blk_rq_map_kern(q, req, buffer, bufflen, GFP_NOIO))
> goto out;
>
> rq->cmd_len = COMMAND_SIZE(cmd[0]);
> @@ -268,7 +266,7 @@ int __scsi_execute(struct scsi_device *sdev, const
> unsigned char *cmd,
> /*
> * head injection *required* here otherwise quiesce won't work
> */
> - blk_execute_rq(req->q, NULL, req, 1);
> + blk_execute_rq(q, NULL, req, 1);
>
> /*
> * Some devices (USB mass-storage in particular) may transfer
> diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
> index 1a5c9a3df6d6..f47fdf9cf788 100644
> --- a/include/scsi/scsi_device.h
> +++ b/include/scsi/scsi_device.h
> @@ -438,7 +438,7 @@ extern const char *scsi_device_state_name(enum
> scsi_device_state);
> extern int scsi_is_sdev_device(const struct device *);
> extern int scsi_is_target_device(const struct device *);
> extern void scsi_sanitize_inquiry_string(unsigned char *s, int len);
> -extern int __scsi_execute(struct scsi_device *sdev, const unsigned
> char *cmd,
> +extern int __scsi_execute(struct request_queue *q, const unsigned char
> *cmd,
> int data_direction, void *buffer, unsigned bufflen,
> unsigned char *sense, struct scsi_sense_hdr *sshdr,
> int timeout, int retries, u64 flags,
> @@ -449,9 +449,9 @@ extern int __scsi_execute(struct scsi_device
> *sdev, const unsigned char *cmd,
> ({ \
> BUILD_BUG_ON((sense) != NULL && \
> sizeof(sense) != SCSI_SENSE_BUFFERSIZE); \
> - __scsi_execute(sdev, cmd, data_direction, buffer, bufflen, \
> - sense, sshdr, timeout, retries, flags, rq_flags, \
> - resid); \
> + __scsi_execute(sdev->request_queue, cmd, data_direction, \
> + buffer, bufflen, sense, sshdr, timeout, retries, \
> + flags, rq_flags, resid); \
> })
> static inline int scsi_execute_req(struct scsi_device *sdev,
> const unsigned char *cmd, int data_direction, void *buffer,