From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, Ming Lei <ming.lei@redhat.com>,
Dongli Zhang <dongli.zhang@oracle.com>,
James Smart <james.smart@broadcom.com>,
Bart Van Assche <bart.vanassche@wdc.com>,
linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Christoph Hellwig <hch@lst.de>,
"James E . J . Bottomley" <jejb@linux.vnet.ibm.com>,
jianchao wang <jianchao.w.wang@oracle.com>
Subject: [PATCH V4 1/7] blk-mq: grab .q_usage_counter when queuing request from plug code path
Date: Thu, 4 Apr 2019 16:43:14 +0800 [thread overview]
Message-ID: <20190404084320.24681-2-ming.lei@redhat.com> (raw)
In-Reply-To: <20190404084320.24681-1-ming.lei@redhat.com>
Just like aio/io_uring, we need to grab 2 refcount for queuing one
request, one is for submission, another is for completion.
If the request isn't queued from plug code path, the refcount grabbed
in generic_make_request() serves for submission. In theroy, this
refcount should have been released after the sumission(async run queue)
is done. blk_freeze_queue() works with blk_sync_queue() together
for avoiding race between cleanup queue and IO submission, given async
run queue activities are canceled because hctx->run_work is scheduled with
the refcount held, so it is fine to not hold the refcount when
running the run queue work function for dispatch IO.
However, if request is staggered into plug list, and finally queued
from plug code path, the refcount in submission side is actually missed.
And we may start to run queue after queue is removed because the queue's
kobject refcount isn't guaranteed to be grabbed in flushing plug list
context, then kernel oops is triggered, see the following race:
blk_mq_flush_plug_list():
blk_mq_sched_insert_requests()
insert requests to sw queue or scheduler queue
blk_mq_run_hw_queue
Because of concurrent run queue, all requests inserted above may be
completed before calling the above blk_mq_run_hw_queue. Then queue can
be freed during the above blk_mq_run_hw_queue().
Fixes the issue by grab .q_usage_counter before calling
blk_mq_sched_insert_requests() in blk_mq_flush_plug_list(). This way is
safe because the queue is absolutely alive before inserting request.
Cc: Dongli Zhang <dongli.zhang@oracle.com>
Cc: James Smart <james.smart@broadcom.com>
Cc: Bart Van Assche <bart.vanassche@wdc.com>
Cc: linux-scsi@vger.kernel.org,
Cc: Martin K . Petersen <martin.petersen@oracle.com>,
Cc: Christoph Hellwig <hch@lst.de>,
Cc: James E . J . Bottomley <jejb@linux.vnet.ibm.com>,
Cc: jianchao wang <jianchao.w.wang@oracle.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
block/blk-mq.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 3ff3d7b49969..5b586affee09 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1728,9 +1728,12 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)
if (rq->mq_hctx != this_hctx || rq->mq_ctx != this_ctx) {
if (this_hctx) {
trace_block_unplug(this_q, depth, !from_schedule);
+
+ percpu_ref_get(&this_q->q_usage_counter);
blk_mq_sched_insert_requests(this_hctx, this_ctx,
&rq_list,
from_schedule);
+ percpu_ref_put(&this_q->q_usage_counter);
}
this_q = rq->q;
@@ -1749,8 +1752,11 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)
*/
if (this_hctx) {
trace_block_unplug(this_q, depth, !from_schedule);
+
+ percpu_ref_get(&this_q->q_usage_counter);
blk_mq_sched_insert_requests(this_hctx, this_ctx, &rq_list,
from_schedule);
+ percpu_ref_put(&this_q->q_usage_counter);
}
}
--
2.9.5
next prev parent reply other threads:[~2019-04-04 8:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-04 8:43 [PATCH V4 0/7] blk-mq: fix races related with freeing queue Ming Lei
2019-04-04 8:43 ` Ming Lei [this message]
2019-04-04 15:58 ` [PATCH V4 1/7] blk-mq: grab .q_usage_counter when queuing request from plug code path Bart Van Assche
2019-04-04 20:45 ` Ming Lei
2019-04-04 21:30 ` Bart Van Assche
2019-04-05 9:26 ` Dongli Zhang
2019-04-05 13:52 ` Ming Lei
2019-04-04 8:43 ` [PATCH V4 2/7] blk-mq: move cancel of requeue_work into blk_mq_release Ming Lei
2019-04-04 8:43 ` [PATCH V4 3/7] blk-mq: quiesce queue before updating nr_hw_queues Ming Lei
2019-04-04 15:57 ` Bart Van Assche
2019-04-04 20:55 ` Ming Lei
2019-04-08 3:16 ` jianchao.wang
2019-04-08 9:01 ` Ming Lei
2019-04-04 8:43 ` [PATCH V4 4/7] blk-mq: free hw queue's resource in hctx's release handler Ming Lei
2019-04-04 8:43 ` [PATCH V4 5/7] blk-mq: move cancel of hctx->run_work into blk_mq_hw_sysfs_release Ming Lei
2019-04-04 8:43 ` [PATCH V4 6/7] block: don't drain in-progress dispatch in blk_cleanup_queue() Ming Lei
2019-04-04 8:43 ` [PATCH V4 7/7] SCSI: don't hold device refcount in IO path Ming Lei
2019-04-04 17:14 ` 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=20190404084320.24681-2-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=bart.vanassche@wdc.com \
--cc=dongli.zhang@oracle.com \
--cc=hch@lst.de \
--cc=james.smart@broadcom.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=jianchao.w.wang@oracle.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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