From: Stanley Chu <stanley.chu@mediatek.com>
To: <linux-scsi@vger.kernel.org>, <linux-block@vger.kernel.org>,
<martin.petersen@oracle.com>, <axboe@kernel.dk>,
<jejb@linux.ibm.com>, <matthias.bgg@gmail.com>
Cc: <linux-mediatek@lists.infradead.org>,
<linux-arm-kernel@lists.infradead.org>,
<kuohong.wang@mediatek.com>, <peter.wang@mediatek.com>,
<chun-hung.wu@mediatek.com>, <andy.teng@mediatek.com>,
Stanley Chu <stanley.chu@mediatek.com>
Subject: [PATCH v2 1/2] block: bypass blk_set_runtime_active for uninitialized q->dev
Date: Thu, 12 Sep 2019 16:35:27 +0800 [thread overview]
Message-ID: <1568277328-4597-2-git-send-email-stanley.chu@mediatek.com> (raw)
In-Reply-To: <1568277328-4597-1-git-send-email-stanley.chu@mediatek.com>
Some devices may skip blk_pm_runtime_init() and have null pointer
in its request_queue->dev. For example, SCSI devices of UFS Well-Known
LUNs.
Currently the null pointer is checked by the user of
blk_set_runtime_active(), i.e., scsi_dev_type_resume(). It is better to
check it by blk_set_runtime_active() itself instead of by its users.
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
---
block/blk-pm.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/block/blk-pm.c b/block/blk-pm.c
index 0a028c189897..1adc1cd748b4 100644
--- a/block/blk-pm.c
+++ b/block/blk-pm.c
@@ -207,10 +207,12 @@ EXPORT_SYMBOL(blk_post_runtime_resume);
*/
void blk_set_runtime_active(struct request_queue *q)
{
- spin_lock_irq(&q->queue_lock);
- q->rpm_status = RPM_ACTIVE;
- pm_runtime_mark_last_busy(q->dev);
- pm_request_autosuspend(q->dev);
- spin_unlock_irq(&q->queue_lock);
+ if (q->dev) {
+ spin_lock_irq(&q->queue_lock);
+ q->rpm_status = RPM_ACTIVE;
+ pm_runtime_mark_last_busy(q->dev);
+ pm_request_autosuspend(q->dev);
+ spin_unlock_irq(&q->queue_lock);
+ }
}
EXPORT_SYMBOL(blk_set_runtime_active);
--
2.18.0
next prev parent reply other threads:[~2019-09-12 8:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 8:35 [PATCH v2] fixup null q->dev checking in both block and scsi layer Stanley Chu
2019-09-12 8:35 ` Stanley Chu [this message]
2019-09-12 8:35 ` [PATCH v2 2/2] scsi: core: remove dummy q->dev check Stanley Chu
2019-09-12 13:12 ` [PATCH v2] fixup null q->dev checking in both block and scsi layer Jens Axboe
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=1568277328-4597-2-git-send-email-stanley.chu@mediatek.com \
--to=stanley.chu@mediatek.com \
--cc=andy.teng@mediatek.com \
--cc=axboe@kernel.dk \
--cc=chun-hung.wu@mediatek.com \
--cc=jejb@linux.ibm.com \
--cc=kuohong.wang@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=matthias.bgg@gmail.com \
--cc=peter.wang@mediatek.com \
/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).