From: Can Guo <cang@codeaurora.org>
To: Bart Van Assche <bvanassche@acm.org>
Cc: "Martin K . Petersen" <martin.petersen@oracle.com>,
"James E . J . Bottomley" <jejb@linux.vnet.ibm.com>,
Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
linux-scsi@vger.kernel.org, linux-block@vger.kernel.org,
Alan Stern <stern@rowland.harvard.edu>,
Stanley Chu <stanley.chu@mediatek.com>,
Ming Lei <ming.lei@redhat.com>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>
Subject: Re: [PATCH v2 3/9] scsi: Pass a request queue pointer to __scsi_execute()
Date: Wed, 18 Nov 2020 09:16:48 +0800 [thread overview]
Message-ID: <175c8fc78b6c3781ba17a9137eaf7dbc@codeaurora.org> (raw)
In-Reply-To: <20201116030459.13963-4-bvanassche@acm.org>
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,
next prev parent reply other threads:[~2020-11-18 1:18 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 3:04 [PATCH v2 0/9] Rework runtime suspend and SCSI domain validation Bart Van Assche
2020-11-16 3:04 ` [PATCH v2 1/9] block: Fix a race in the runtime power management code Bart Van Assche
2020-11-16 17:14 ` Christoph Hellwig
2020-11-16 3:04 ` [PATCH v2 2/9] ide: Do not set the RQF_PREEMPT flag for sense requests Bart Van Assche
2020-11-16 17:14 ` Christoph Hellwig
2020-11-16 3:04 ` [PATCH v2 3/9] scsi: Pass a request queue pointer to __scsi_execute() Bart Van Assche
2020-11-16 17:16 ` Christoph Hellwig
2020-11-18 1:16 ` Can Guo [this message]
2020-11-16 3:04 ` [PATCH v2 4/9] scsi: Rework scsi_mq_alloc_queue() Bart Van Assche
2020-11-16 17:17 ` Christoph Hellwig
2020-11-16 18:01 ` Bart Van Assche
2020-11-20 1:36 ` Bart Van Assche
2020-11-18 1:15 ` Can Guo
2020-11-16 3:04 ` [PATCH v2 5/9] scsi: Do not wait for a request in scsi_eh_lock_door() Bart Van Assche
2020-11-16 17:18 ` Christoph Hellwig
2020-11-16 3:04 ` [PATCH v2 6/9] scsi_transport_spi: Make spi_execute() accept a request queue pointer Bart Van Assche
2020-11-16 17:18 ` Christoph Hellwig
2020-11-16 3:04 ` [PATCH v2 7/9] scsi_transport_spi: Freeze request queues instead of quiescing Bart Van Assche
2020-11-16 17:22 ` Christoph Hellwig
2020-11-16 17:51 ` Bart Van Assche
2020-11-16 3:04 ` [PATCH v2 8/9] block, scsi, ide: Only process PM requests if rpm_status != RPM_ACTIVE Bart Van Assche
2020-11-16 17:22 ` Christoph Hellwig
2020-11-18 1:13 ` Can Guo
2020-11-18 9:08 ` Stanley Chu
2020-11-16 3:04 ` [PATCH v2 9/9] block: Do not accept any requests while suspended Bart Van Assche
2020-11-16 17:23 ` Christoph Hellwig
2020-11-18 1:12 ` Can Guo
2020-11-18 9:05 ` Stanley Chu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=175c8fc78b6c3781ba17a9137eaf7dbc@codeaurora.org \
--to=cang@codeaurora.org \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=rafael.j.wysocki@intel.com \
--cc=stanley.chu@mediatek.com \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).