From: Jianchao Wang <jianchao.w.wang@oracle.com>
To: axboe@kernel.dk
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] blk-mq-fs: invoke queue_for_each_hw_ctx under sysfs_lock
Date: Mon, 25 Jun 2018 14:21:39 +0800 [thread overview]
Message-ID: <1529907699-2054-1-git-send-email-jianchao.w.wang@oracle.com> (raw)
blk_mq_run_hw_queues and blk_mq_start_stopped_hw_queues in
queue_state_write will invoke queue_for_each_hw_ctx. It will race
with blk_mq_realloc_hw_ctxs and incur NULL pointer reference. Put
them under sysfs_lock to serialize the accessing to queue_hw_ctx
and nr_hw_queues.
Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
---
block/blk-mq-debugfs.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index ffa6223..2e0c444 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -151,6 +151,7 @@ static ssize_t queue_state_write(void *data, const char __user *buf,
{
struct request_queue *q = data;
char opbuf[16] = { }, *op;
+ int res;
/*
* The "state" attribute is removed after blk_cleanup_queue() has called
@@ -169,9 +170,17 @@ static ssize_t queue_state_write(void *data, const char __user *buf,
return -EFAULT;
op = strstrip(opbuf);
if (strcmp(op, "run") == 0) {
+ res = mutex_lock_interruptible(&q->sysfs_lock);
+ if (res)
+ goto out;
blk_mq_run_hw_queues(q, true);
+ mutex_unlock(&q->sysfs_lock);
} else if (strcmp(op, "start") == 0) {
+ res = mutex_lock_interruptible(&q->sysfs_lock);
+ if (res)
+ goto out;
blk_mq_start_stopped_hw_queues(q, true);
+ mutex_unlock(&q->sysfs_lock);
} else if (strcmp(op, "kick") == 0) {
blk_mq_kick_requeue_list(q);
} else {
@@ -180,6 +189,7 @@ static ssize_t queue_state_write(void *data, const char __user *buf,
pr_err("%s: use 'run', 'start' or 'kick'\n", __func__);
return -EINVAL;
}
+out:
return count;
}
--
2.7.4
next reply other threads:[~2018-06-25 6:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 6:21 Jianchao Wang [this message]
2018-06-26 15:29 ` [PATCH] blk-mq-fs: invoke queue_for_each_hw_ctx under sysfs_lock Bart Van Assche
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=1529907699-2054-1-git-send-email-jianchao.w.wang@oracle.com \
--to=jianchao.w.wang@oracle.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).