mbox series

[v4,0/9] Rework runtime suspend and SPI domain validation

Message ID 20201130024615.29171-1-bvanassche@acm.org
Headers show
Series Rework runtime suspend and SPI domain validation | expand

Message

Bart Van Assche Nov. 30, 2020, 2:46 a.m. UTC
Hi Martin,

The SCSI runtime suspend and SPI domain validation mechanisms both use
scsi_device_quiesce(). scsi_device_quiesce() restricts blk_queue_enter() to
BLK_MQ_REQ_PREEMPT requests. There is a conflict between the requirements
of runtime suspend and SCSI domain validation: no requests must be sent to
runtime suspended devices that are in the state RPM_SUSPENDED while
BLK_MQ_REQ_PREEMPT requests must be processed during SCSI domain
validation. This conflict is resolved by reworking the SCSI domain
validation implementation.

Hybernation, runtime suspend and SCSI domain validation have been retested.

Please consider this patch series for kernel v5.11.

Thanks,

Bart.

Changes between v3 and v4:
- Instead of creating a second request queue for SPI DV, set RQF_PM.

Changes between v2 and v3:
- Inlined scsi_mq_alloc_queue() into scsi_alloc_sdev() as requested by
  Christoph.

Changes between v1 and v2:
- Rebased this patch series on top of kernel v5.10-rc1.

Alan Stern (1):
  block: Do not accept any requests while suspended

Bart Van Assche (8):
  block: Fix a race in the runtime power management code
  block: Introduce BLK_MQ_REQ_PM
  ide: Do not set the RQF_PREEMPT flag for sense requests
  ide: Mark power management requests with RQF_PM instead of RQF_PREEMPT
  scsi: Do not wait for a request in scsi_eh_lock_door()
  scsi_transport_spi: Set RQF_PM for domain validation commands
  scsi: Only process PM requests if rpm_status != RPM_ACTIVE
  block: Remove RQF_PREEMPT and BLK_MQ_REQ_PREEMPT

 block/blk-core.c                  | 12 ++++++------
 block/blk-mq-debugfs.c            |  1 -
 block/blk-mq.c                    |  4 ++--
 block/blk-pm.c                    | 15 +++++++++------
 block/blk-pm.h                    | 14 +++++++++-----
 drivers/ide/ide-atapi.c           |  1 -
 drivers/ide/ide-io.c              |  7 +------
 drivers/ide/ide-pm.c              |  2 +-
 drivers/scsi/scsi_error.c         |  7 ++++++-
 drivers/scsi/scsi_lib.c           | 27 ++++++++++++++-------------
 drivers/scsi/scsi_transport_spi.c | 27 +++++++++++++++++++--------
 include/linux/blk-mq.h            |  4 ++--
 include/linux/blkdev.h            |  6 +-----
 13 files changed, 70 insertions(+), 57 deletions(-)

Comments

Christoph Hellwig Dec. 1, 2020, 11:31 a.m. UTC | #1
Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>
Christoph Hellwig Dec. 1, 2020, 11:31 a.m. UTC | #2
Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>
Christoph Hellwig Dec. 1, 2020, 11:31 a.m. UTC | #3
Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>
Christoph Hellwig Dec. 1, 2020, 11:32 a.m. UTC | #4
Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>
Martin K. Petersen Dec. 2, 2020, 1:51 a.m. UTC | #5
Jens,

Any objections to me picking this up?

> The SCSI runtime suspend and SPI domain validation mechanisms both use

> scsi_device_quiesce(). scsi_device_quiesce() restricts

> blk_queue_enter() to BLK_MQ_REQ_PREEMPT requests. There is a conflict

> between the requirements of runtime suspend and SCSI domain

> validation: no requests must be sent to runtime suspended devices that

> are in the state RPM_SUSPENDED while BLK_MQ_REQ_PREEMPT requests must

> be processed during SCSI domain validation. This conflict is resolved

> by reworking the SCSI domain validation implementation.

>

> Hybernation, runtime suspend and SCSI domain validation have been

> retested.


-- 
Martin K. Petersen	Oracle Linux Engineering
Hannes Reinecke Dec. 2, 2020, 6:50 a.m. UTC | #6
On 11/30/20 3:46 AM, Bart Van Assche wrote:
> Introduce the BLK_MQ_REQ_PM flag. This flag makes the request allocation

> functions set RQF_PM. This is the first step towards removing

> BLK_MQ_REQ_PREEMPT.

> 

> Cc: Alan Stern <stern@rowland.harvard.edu>

> Cc: Stanley Chu <stanley.chu@mediatek.com>

> Cc: Christoph Hellwig <hch@lst.de>

> Cc: Hannes Reinecke <hare@suse.de>

> Cc: Ming Lei <ming.lei@redhat.com>

> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> Cc: Can Guo <cang@codeaurora.org>

> Signed-off-by: Bart Van Assche <bvanassche@acm.org>

> ---

>   block/blk-core.c       | 7 ++++---

>   block/blk-mq.c         | 2 ++

>   include/linux/blk-mq.h | 2 ++

>   3 files changed, 8 insertions(+), 3 deletions(-)

> 

Reviewed-by: Hannes Reinecke <hare@suse.de>


Cheers,

Hannes
-- 
Dr. Hannes Reinecke                Kernel Storage Architect
hare@suse.de                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Hannes Reinecke Dec. 2, 2020, 6:53 a.m. UTC | #7
On 11/30/20 3:46 AM, Bart Van Assche wrote:
> This is another step that prepares for the removal of RQF_PREEMPT.

> 

> Cc: Christoph Hellwig <hch@lst.de>

> Cc: Hannes Reinecke <hare@suse.de>

> Cc: David S. Miller <davem@davemloft.net>

> Cc: 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>

> ---

>   drivers/ide/ide-io.c | 2 +-

>   drivers/ide/ide-pm.c | 2 +-

>   2 files changed, 2 insertions(+), 2 deletions(-)

> 

Reviewed-by: Hannes Reinecke <hare@suse.de>


Cheers,

Hannes
-- 
Dr. Hannes Reinecke                Kernel Storage Architect
hare@suse.de                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Hannes Reinecke Dec. 2, 2020, 7:14 a.m. UTC | #8
On 11/30/20 3:46 AM, 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.

> 

> Cc: Christoph Hellwig <hch@lst.de>

> 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(-)

> Reviewed-by: Hannes Reinecke <hare@suse.de>


Cheers,

Hannes
-- 
Dr. Hannes Reinecke                Kernel Storage Architect
hare@suse.de                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Jens Axboe Dec. 6, 2020, 12:01 a.m. UTC | #9
On 12/1/20 6:51 PM, Martin K. Petersen wrote:
> 

> Jens,

> 

> Any objections to me picking this up?


No, go ahead. Looks good to me, you can add:

Reviewed-by: Jens Axboe <axboe@kernel.dk>


to the series.

-- 
Jens Axboe
Martin K. Petersen Dec. 8, 2020, 1:56 a.m. UTC | #10
Bart,

> The SCSI runtime suspend and SPI domain validation mechanisms both use

> scsi_device_quiesce(). scsi_device_quiesce() restricts

> blk_queue_enter() to BLK_MQ_REQ_PREEMPT requests. There is a conflict

> between the requirements of runtime suspend and SCSI domain

> validation: no requests must be sent to runtime suspended devices that

> are in the state RPM_SUSPENDED while BLK_MQ_REQ_PREEMPT requests must

> be processed during SCSI domain validation. This conflict is resolved

> by reworking the SCSI domain validation implementation.


Applied to 5.11/scsi-staging except for patch #5. Appreciate all that
work that went into this series!

-- 
Martin K. Petersen	Oracle Linux Engineering