forked from luck/tmp_suning_uos_patched
d55d15a332
[ Upstream commit 52abca64fd9410ea6c9a3a74eab25663b403d7da ] blk_queue_enter() accepts BLK_MQ_REQ_PM requests independent of the runtime power management state. Now that SCSI domain validation no longer depends on this behavior, modify the behavior of blk_queue_enter() as follows: - Do not accept any requests while suspended. - Only process power management requests while suspending or resuming. Submitting BLK_MQ_REQ_PM requests to a device that is runtime suspended causes runtime-suspended devices not to resume as they should. The request which should cause a runtime resume instead gets issued directly, without resuming the device first. Of course the device can't handle it properly, the I/O fails, and the device remains suspended. The problem is fixed by checking that the queue's runtime-PM status isn't RPM_SUSPENDED before allowing a request to be issued, and queuing a runtime-resume request if it is. In particular, the inline blk_pm_request_resume() routine is renamed blk_pm_resume_queue() and the code is unified by merging the surrounding checks into the routine. If the queue isn't set up for runtime PM, or there currently is no restriction on allowed requests, the request is allowed. Likewise if the BLK_MQ_REQ_PM flag is set and the status isn't RPM_SUSPENDED. Otherwise a runtime resume is queued and the request is blocked until conditions are more suitable. [ bvanassche: modified commit message and removed Cc: stable because without the previous patches from this series this patch would break parallel SCSI domain validation + introduced queue_rpm_status() ] Link: https://lore.kernel.org/r/20201209052951.16136-9-bvanassche@acm.org Cc: Jens Axboe <axboe@kernel.dk> Cc: Christoph Hellwig <hch@lst.de> Cc: Hannes Reinecke <hare@suse.de> 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> Reported-and-tested-by: Martin Kepplinger <martin.kepplinger@puri.sm> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Can Guo <cang@codeaurora.org> Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
74 lines
1.5 KiB
C
74 lines
1.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
|
|
#ifndef _BLOCK_BLK_PM_H_
|
|
#define _BLOCK_BLK_PM_H_
|
|
|
|
#include <linux/pm_runtime.h>
|
|
|
|
#ifdef CONFIG_PM
|
|
static inline int blk_pm_resume_queue(const bool pm, struct request_queue *q)
|
|
{
|
|
if (!q->dev || !blk_queue_pm_only(q))
|
|
return 1; /* Nothing to do */
|
|
if (pm && q->rpm_status != RPM_SUSPENDED)
|
|
return 1; /* Request allowed */
|
|
pm_request_resume(q->dev);
|
|
return 0;
|
|
}
|
|
|
|
static inline void blk_pm_mark_last_busy(struct request *rq)
|
|
{
|
|
if (rq->q->dev && !(rq->rq_flags & RQF_PM))
|
|
pm_runtime_mark_last_busy(rq->q->dev);
|
|
}
|
|
|
|
static inline void blk_pm_requeue_request(struct request *rq)
|
|
{
|
|
lockdep_assert_held(&rq->q->queue_lock);
|
|
|
|
if (rq->q->dev && !(rq->rq_flags & RQF_PM))
|
|
rq->q->nr_pending--;
|
|
}
|
|
|
|
static inline void blk_pm_add_request(struct request_queue *q,
|
|
struct request *rq)
|
|
{
|
|
lockdep_assert_held(&q->queue_lock);
|
|
|
|
if (q->dev && !(rq->rq_flags & RQF_PM))
|
|
q->nr_pending++;
|
|
}
|
|
|
|
static inline void blk_pm_put_request(struct request *rq)
|
|
{
|
|
lockdep_assert_held(&rq->q->queue_lock);
|
|
|
|
if (rq->q->dev && !(rq->rq_flags & RQF_PM))
|
|
--rq->q->nr_pending;
|
|
}
|
|
#else
|
|
static inline int blk_pm_resume_queue(const bool pm, struct request_queue *q)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static inline void blk_pm_mark_last_busy(struct request *rq)
|
|
{
|
|
}
|
|
|
|
static inline void blk_pm_requeue_request(struct request *rq)
|
|
{
|
|
}
|
|
|
|
static inline void blk_pm_add_request(struct request_queue *q,
|
|
struct request *rq)
|
|
{
|
|
}
|
|
|
|
static inline void blk_pm_put_request(struct request *rq)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#endif /* _BLOCK_BLK_PM_H_ */
|