leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: block: pm: Always set request queue runtime active in blk_post_runtime_resume()

Browse Source 
John Garry reported a deadlock that occurs when trying to access a
runtime-suspended SATA device.  For obscure reasons, the rescan procedure
causes the link to be hard-reset, which disconnects the device.

The rescan tries to carry out a runtime resume when accessing the device.
scsi_rescan_device() holds the SCSI device lock and won't release it until
it can put commands onto the device's block queue.  This can't happen until
the queue is successfully runtime-resumed or the device is unregistered.
But the runtime resume fails because the device is disconnected, and
__scsi_remove_device() can't do the unregistration because it can't get the
device lock.

The best way to resolve this deadlock appears to be to allow the block
queue to start running again even after an unsuccessful runtime resume.
The idea is that the driver or the SCSI error handler will need to be able
to use the queue to resolve the runtime resume failure.

This patch removes the err argument to blk_post_runtime_resume() and makes
the routine act as though the resume was successful always.  This fixes the
deadlock.

Link: https://lore.kernel.org/r/1639999298-244569-4-git-send-email-chenxiang66@hisilicon.com
Fixes: e27829dc92 ("scsi: serialize ->rescan against ->remove")
Reported-and-tested-by: John Garry <john.garry@huawei.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Alan Stern 2021-12-20 19:21:26 +08:00 committed by Martin K. Petersen
parent 6cc7390877
commit 6e1fcab00a
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
block/blk-pm.c
View File

@ -163,27 +163,19 @@ EXPORT_SYMBOL(blk_pre_runtime_resume);
/** /**
* blk_post_runtime_resume - Post runtime resume processing * blk_post_runtime_resume - Post runtime resume processing
* @q: the queue of the device * @q: the queue of the device
* @err: return value of the device's runtime_resume function
* *
* Description: * Description:
* Update the queue's runtime status according to the return value of the * For historical reasons, this routine merely calls blk_set_runtime_active()
* device's runtime_resume function. If the resume was successful, call * to do the real work of restarting the queue. It does this regardless of
* blk_set_runtime_active() to do the real work of restarting the queue. * whether the device's runtime-resume succeeded; even if it failed the
* driver or error handler will need to communicate with the device.
* *
* This function should be called near the end of the device's * This function should be called near the end of the device's
* runtime_resume callback. * runtime_resume callback.
*/ */
void blk_post_runtime_resume(struct request_queue *q, int err) void blk_post_runtime_resume(struct request_queue *q)
{ {
if (!q->dev) blk_set_runtime_active(q);
return;
if (!err) {
blk_set_runtime_active(q);
} else {
spin_lock_irq(&q->queue_lock);
q->rpm_status = RPM_SUSPENDED;
spin_unlock_irq(&q->queue_lock);
}
} }
EXPORT_SYMBOL(blk_post_runtime_resume); EXPORT_SYMBOL(blk_post_runtime_resume);
@ -201,7 +193,7 @@ EXPORT_SYMBOL(blk_post_runtime_resume);
* runtime PM status and re-enable peeking requests from the queue. It * runtime PM status and re-enable peeking requests from the queue. It
* should be called before first request is added to the queue. * should be called before first request is added to the queue.
* *
* This function is also called by blk_post_runtime_resume() for successful * This function is also called by blk_post_runtime_resume() for
* runtime resumes. It does everything necessary to restart the queue. * runtime resumes. It does everything necessary to restart the queue.
*/ */
void blk_set_runtime_active(struct request_queue *q) void blk_set_runtime_active(struct request_queue *q)

2
drivers/scsi/scsi_pm.c
View File

@ -180,7 +180,7 @@ static int sdev_runtime_resume(struct device *dev)
blk_pre_runtime_resume(sdev->request_queue); blk_pre_runtime_resume(sdev->request_queue);
if (pm && pm->runtime_resume) if (pm && pm->runtime_resume)
err = pm->runtime_resume(dev); err = pm->runtime_resume(dev);
blk_post_runtime_resume(sdev->request_queue, err); blk_post_runtime_resume(sdev->request_queue);
return err; return err;
} }

2
include/linux/blk-pm.h
View File

@ -14,7 +14,7 @@ extern void blk_pm_runtime_init(struct request_queue *q, struct device *dev);
extern int blk_pre_runtime_suspend(struct request_queue *q); extern int blk_pre_runtime_suspend(struct request_queue *q);
extern void blk_post_runtime_suspend(struct request_queue *q, int err); extern void blk_post_runtime_suspend(struct request_queue *q, int err);
extern void blk_pre_runtime_resume(struct request_queue *q); extern void blk_pre_runtime_resume(struct request_queue *q);
extern void blk_post_runtime_resume(struct request_queue *q, int err); extern void blk_post_runtime_resume(struct request_queue *q);
extern void blk_set_runtime_active(struct request_queue *q); extern void blk_set_runtime_active(struct request_queue *q);
#else #else
static inline void blk_pm_runtime_init(struct request_queue *q, static inline void blk_pm_runtime_init(struct request_queue *q,