summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Lei <ming.lei@redhat.com>2019-07-23 23:48:40 -0400
committerJens Axboe <axboe@kernel.dk>2019-08-04 23:41:29 -0400
commitf9934a80f91dba8c7029ba7601459e41ea7770aa (patch)
tree46a0aff51a0f51bf585ab59302ad06bc6cda9097
parentaa306ab703e9452b1e25cc8e8f04b8df523d0bb8 (diff)
blk-mq: introduce blk_mq_tagset_wait_completed_request()
blk-mq may schedule to call queue's complete function on remote CPU via IPI, but doesn't provide any way to synchronize the request's complete fn. The current queue freeze interface can't provide the synchonization because aborted requests stay at blk-mq queues during EH. In some driver's EH(such as NVMe), hardware queue's resource may be freed & re-allocated. If the completed request's complete fn is run finally after the hardware queue's resource is released, kernel crash will be triggered. Prepare for fixing this kind of issue by introducing blk_mq_tagset_wait_completed_request(). Cc: Max Gurtovoy <maxg@mellanox.com> Cc: Sagi Grimberg <sagi@grimberg.me> Cc: Keith Busch <keith.busch@intel.com> Cc: Christoph Hellwig <hch@lst.de> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/blk-mq-tag.c32
-rw-r--r--include/linux/blk-mq.h1
2 files changed, 33 insertions, 0 deletions
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index da19f0bc8876..008388e82b5c 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -10,6 +10,7 @@
10#include <linux/module.h> 10#include <linux/module.h>
11 11
12#include <linux/blk-mq.h> 12#include <linux/blk-mq.h>
13#include <linux/delay.h>
13#include "blk.h" 14#include "blk.h"
14#include "blk-mq.h" 15#include "blk-mq.h"
15#include "blk-mq-tag.h" 16#include "blk-mq-tag.h"
@@ -354,6 +355,37 @@ void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset,
354} 355}
355EXPORT_SYMBOL(blk_mq_tagset_busy_iter); 356EXPORT_SYMBOL(blk_mq_tagset_busy_iter);
356 357
358static bool blk_mq_tagset_count_completed_rqs(struct request *rq,
359 void *data, bool reserved)
360{
361 unsigned *count = data;
362
363 if (blk_mq_request_completed(rq))
364 (*count)++;
365 return true;
366}
367
368/**
369 * blk_mq_tagset_wait_completed_request - wait until all completed req's
370 * complete funtion is run
371 * @tagset: Tag set to drain completed request
372 *
373 * Note: This function has to be run after all IO queues are shutdown
374 */
375void blk_mq_tagset_wait_completed_request(struct blk_mq_tag_set *tagset)
376{
377 while (true) {
378 unsigned count = 0;
379
380 blk_mq_tagset_busy_iter(tagset,
381 blk_mq_tagset_count_completed_rqs, &count);
382 if (!count)
383 break;
384 msleep(5);
385 }
386}
387EXPORT_SYMBOL(blk_mq_tagset_wait_completed_request);
388
357/** 389/**
358 * blk_mq_queue_tag_busy_iter - iterate over all requests with a driver tag 390 * blk_mq_queue_tag_busy_iter - iterate over all requests with a driver tag
359 * @q: Request queue to examine. 391 * @q: Request queue to examine.
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index baac2926e54a..ee0719b649b6 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -322,6 +322,7 @@ bool blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async);
322void blk_mq_run_hw_queues(struct request_queue *q, bool async); 322void blk_mq_run_hw_queues(struct request_queue *q, bool async);
323void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset, 323void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset,
324 busy_tag_iter_fn *fn, void *priv); 324 busy_tag_iter_fn *fn, void *priv);
325void blk_mq_tagset_wait_completed_request(struct blk_mq_tag_set *tagset);
325void blk_mq_freeze_queue(struct request_queue *q); 326void blk_mq_freeze_queue(struct request_queue *q);
326void blk_mq_unfreeze_queue(struct request_queue *q); 327void blk_mq_unfreeze_queue(struct request_queue *q);
327void blk_freeze_queue_start(struct request_queue *q); 328void blk_freeze_queue_start(struct request_queue *q);