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>,
Hannes Reinecke <hare@suse.de>, Ming Lei <ming.lei@redhat.com>,
linux-scsi@vger.kernel.org, linux-block@vger.kernel.org,
Stanley Chu <stanley.chu@mediatek.com>,
Alan Stern <stern@rowland.harvard.edu>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Martin Kepplinger <martin.kepplinger@puri.sm>
Subject: Re: [PATCH v5 6/8] scsi: Only process PM requests if rpm_status != RPM_ACTIVE
Date: Wed, 09 Dec 2020 14:06:09 +0800 [thread overview]
Message-ID: <c6b64b3fb553648c0849d608414b464d@codeaurora.org> (raw)
In-Reply-To: <20201209052951.16136-7-bvanassche@acm.org>
On 2020-12-09 13:29, Bart Van Assche wrote:
> Instead of submitting all SCSI commands submitted with scsi_execute()
> to a
> SCSI device if rpm_status != RPM_ACTIVE, only submit RQF_PM (power
> management requests) if rpm_status != RPM_ACTIVE. This patch makes the
> SCSI core handle the runtime power management status (rpm_status) as it
> should be handled.
>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Hannes Reinecke <hare@suse.de>
> Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Can Guo <cang@codeaurora.org>
> Cc: Can Guo <cang@codeaurora.org>
> Cc: Stanley Chu <stanley.chu@mediatek.com>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Ming Lei <ming.lei@redhat.com>
> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Cc: Martin Kepplinger <martin.kepplinger@puri.sm>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
> drivers/scsi/scsi_lib.c | 27 ++++++++++++++-------------
> 1 file changed, 14 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index b7ac14571415..91bc39a4c3c3 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -249,7 +249,8 @@ int __scsi_execute(struct scsi_device *sdev, const
> unsigned char *cmd,
>
> req = blk_get_request(sdev->request_queue,
> data_direction == DMA_TO_DEVICE ?
> - REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, BLK_MQ_REQ_PREEMPT);
> + REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN,
> + rq_flags & RQF_PM ? BLK_MQ_REQ_PM : 0);
> if (IS_ERR(req))
> return ret;
> rq = scsi_req(req);
> @@ -1206,6 +1207,8 @@ static blk_status_t
> scsi_device_state_check(struct scsi_device *sdev, struct request *req)
> {
> switch (sdev->sdev_state) {
> + case SDEV_CREATED:
> + return BLK_STS_OK;
> case SDEV_OFFLINE:
> case SDEV_TRANSPORT_OFFLINE:
> /*
> @@ -1232,18 +1235,18 @@ scsi_device_state_check(struct scsi_device
> *sdev, struct request *req)
> return BLK_STS_RESOURCE;
> case SDEV_QUIESCE:
> /*
> - * If the devices is blocked we defer normal commands.
> + * If the device is blocked we only accept power management
> + * commands.
> */
> - if (req && !(req->rq_flags & RQF_PREEMPT))
> + if (req && WARN_ON_ONCE(!(req->rq_flags & RQF_PM)))
> return BLK_STS_RESOURCE;
> return BLK_STS_OK;
> default:
> /*
> * For any other not fully online state we only allow
> - * special commands. In particular any user initiated
> - * command is not allowed.
> + * power management commands.
> */
> - if (req && !(req->rq_flags & RQF_PREEMPT))
> + if (req && !(req->rq_flags & RQF_PM))
> return BLK_STS_IOERR;
> return BLK_STS_OK;
> }
> @@ -2517,15 +2520,13 @@ void sdev_evt_send_simple(struct scsi_device
> *sdev,
> EXPORT_SYMBOL_GPL(sdev_evt_send_simple);
>
> /**
> - * scsi_device_quiesce - Block user issued commands.
> + * scsi_device_quiesce - Block all commands except power management.
> * @sdev: scsi device to quiesce.
> *
> * This works by trying to transition to the SDEV_QUIESCE state
> * (which must be a legal transition). When the device is in this
> - * state, only special requests will be accepted, all others will
> - * be deferred. Since special requests may also be requeued requests,
> - * a successful return doesn't guarantee the device will be
> - * totally quiescent.
> + * state, only power management requests will be accepted, all others
> will
> + * be deferred.
> *
> * Must be called with user context, may sleep.
> *
> @@ -2587,12 +2588,12 @@ void scsi_device_resume(struct scsi_device
> *sdev)
> * device deleted during suspend)
> */
> mutex_lock(&sdev->state_mutex);
> + if (sdev->sdev_state == SDEV_QUIESCE)
> + scsi_device_set_state(sdev, SDEV_RUNNING);
> if (sdev->quiesced_by) {
> sdev->quiesced_by = NULL;
> blk_clear_pm_only(sdev->request_queue);
> }
> - if (sdev->sdev_state == SDEV_QUIESCE)
> - scsi_device_set_state(sdev, SDEV_RUNNING);
> mutex_unlock(&sdev->state_mutex);
> }
> EXPORT_SYMBOL(scsi_device_resume);
next prev parent reply other threads:[~2020-12-09 6:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 5:29 [PATCH v5 0/8] Rework runtime suspend and SPI domain validation Bart Van Assche
2020-12-09 5:29 ` [PATCH v5 1/8] block: Fix a race in the runtime power management code Bart Van Assche
2020-12-09 5:29 ` [PATCH v5 2/8] block: Introduce BLK_MQ_REQ_PM Bart Van Assche
2020-12-09 6:06 ` Can Guo
2020-12-09 5:29 ` [PATCH v5 3/8] ide: Do not set the RQF_PREEMPT flag for sense requests Bart Van Assche
2020-12-09 5:29 ` [PATCH v5 4/8] ide: Mark power management requests with RQF_PM instead of RQF_PREEMPT Bart Van Assche
2020-12-09 5:29 ` [PATCH v5 5/8] scsi_transport_spi: Set RQF_PM for domain validation commands Bart Van Assche
2020-12-09 7:34 ` Hannes Reinecke
2020-12-09 5:29 ` [PATCH v5 6/8] scsi: Only process PM requests if rpm_status != RPM_ACTIVE Bart Van Assche
2020-12-09 6:06 ` Can Guo [this message]
2020-12-09 5:29 ` [PATCH v5 7/8] block: Remove RQF_PREEMPT and BLK_MQ_REQ_PREEMPT Bart Van Assche
2020-12-09 6:05 ` Can Guo
2020-12-09 5:29 ` [PATCH v5 8/8] block: Do not accept any requests while suspended Bart Van Assche
2020-12-09 6:04 ` Can Guo
2020-12-09 7:36 ` Hannes Reinecke
2020-12-09 16:44 ` [PATCH v5 0/8] Rework runtime suspend and SPI domain validation Martin K. Petersen
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=c6b64b3fb553648c0849d608414b464d@codeaurora.org \
--to=cang@codeaurora.org \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.kepplinger@puri.sm \
--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).