Commit b233f127 authored Jul 30, 2018 by Ming Lei Committed by Jens Axboe Aug 02, 2018

block: really disable runtime-pm for blk-mq



Runtime PM isn't ready for blk-mq yet, and commit 765e40b6 ("block:
disable runtime-pm for blk-mq") tried to disable it. Unfortunately,
it can't take effect in that way since user space still can switch
it on via 'echo auto > /sys/block/sdN/device/power/control'.

This patch disables runtime-pm for blk-mq really by pm_runtime_disable()
and fixes all kinds of PM related kernel crash.

Cc: Tomas Janousek <tomi@nomi.cz>
Cc: Przemek Socha <soprwa@gmail.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: <stable@vger.kernel.org>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 99972f17

block/blk-core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -3770,9 +3770,11 @@ EXPORT_SYMBOL(blk_finish_plug);
		*/
		void blk_pm_runtime_init(struct request_queue q, struct device dev)
		{
		/* not support for RQF_PM and ->rpm_status in blk-mq yet */
		if (q->mq_ops)
		/* Don't enable runtime PM for blk-mq until it is ready */
		if (q->mq_ops) {
		pm_runtime_disable(dev);
		return;
		}

		q->dev = dev;
		q->rpm_status = RPM_ACTIVE;

Admin message