leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blk-mq: use percpu_ref for mq usage count

Browse Source 
Currently, blk-mq uses a percpu_counter to keep track of how many
usages are in flight.  The percpu_counter is drained while freezing to
ensure that no usage is left in-flight after freezing is complete.
blk_mq_queue_enter/exit() and blk_mq_[un]freeze_queue() implement this
per-cpu gating mechanism.

This type of code has relatively high chance of subtle bugs which are
extremely difficult to trigger and it's way too hairy to be open coded
in blk-mq.  percpu_ref can serve the same purpose after the recent
changes.  This patch replaces the open-coded per-cpu usage counting
and draining mechanism with percpu_ref.

blk_mq_queue_enter() performs tryget_live on the ref and exit()
performs put.  blk_mq_freeze_queue() kills the ref and waits until the
reference count reaches zero.  blk_mq_unfreeze_queue() revives the ref
and wakes up the waiters.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Nicholas A. Bellinger <nab@linux-iscsi.org>
Cc: Kent Overstreet <kmo@daterainc.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Tejun Heo 2014-07-01 10:34:38 -06:00 committed by Jens Axboe
parent 72d6f02a8d
commit add703fda9
2 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
block/blk-mq.c
View File

@ -78,34 +78,32 @@ static void blk_mq_hctx_clear_pending(struct blk_mq_hw_ctx *hctx,
static int blk_mq_queue_enter(struct request_queue *q) static int blk_mq_queue_enter(struct request_queue *q)
{ {
int ret; while (true) {
int ret;
__percpu_counter_add(&q->mq_usage_counter, 1, 1000000); if (percpu_ref_tryget_live(&q->mq_usage_counter))
smp_mb(); return 0;
/* we have problems freezing the queue if it's initializing */ ret = wait_event_interruptible(q->mq_freeze_wq,
if (!q->mq_freeze_depth) !q->mq_freeze_depth || blk_queue_dying(q));
return 0; if (blk_queue_dying(q))
return -ENODEV;
__percpu_counter_add(&q->mq_usage_counter, -1, 1000000); if (ret)
return ret;
spin_lock_irq(q->queue_lock); }
ret = wait_event_interruptible_lock_irq(q->mq_freeze_wq,
!q->mq_freeze_depth || blk_queue_dying(q),
*q->queue_lock);
/* inc usage with lock hold to avoid freeze_queue runs here */
if (!ret && !blk_queue_dying(q))
__percpu_counter_add(&q->mq_usage_counter, 1, 1000000);
else if (blk_queue_dying(q))
ret = -ENODEV;
spin_unlock_irq(q->queue_lock);
return ret;
} }
static void blk_mq_queue_exit(struct request_queue *q) static void blk_mq_queue_exit(struct request_queue *q)
{ {
__percpu_counter_add(&q->mq_usage_counter, -1, 1000000); percpu_ref_put(&q->mq_usage_counter);
}
static void blk_mq_usage_counter_release(struct percpu_ref *ref)
{
struct request_queue *q =
container_of(ref, struct request_queue, mq_usage_counter);
wake_up_all(&q->mq_freeze_wq);
} }
/* /*
@ -118,18 +116,9 @@ void blk_mq_freeze_queue(struct request_queue *q)
q->mq_freeze_depth++; q->mq_freeze_depth++;
spin_unlock_irq(q->queue_lock); spin_unlock_irq(q->queue_lock);
while (true) { percpu_ref_kill(&q->mq_usage_counter);
s64 count; blk_mq_run_queues(q, false);
wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->mq_usage_counter));
spin_lock_irq(q->queue_lock);
count = percpu_counter_sum(&q->mq_usage_counter);
spin_unlock_irq(q->queue_lock);
if (count == 0)
break;
blk_mq_start_hw_queues(q);
msleep(10);
}
} }
static void blk_mq_unfreeze_queue(struct request_queue *q) static void blk_mq_unfreeze_queue(struct request_queue *q)
@ -140,8 +129,10 @@ static void blk_mq_unfreeze_queue(struct request_queue *q)
wake = !--q->mq_freeze_depth; wake = !--q->mq_freeze_depth;
WARN_ON_ONCE(q->mq_freeze_depth < 0); WARN_ON_ONCE(q->mq_freeze_depth < 0);
spin_unlock_irq(q->queue_lock); spin_unlock_irq(q->queue_lock);
if (wake) if (wake) {
percpu_ref_reinit(&q->mq_usage_counter);
wake_up_all(&q->mq_freeze_wq); wake_up_all(&q->mq_freeze_wq);
}
} }
bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx) bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx)
@ -1785,7 +1776,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set)
if (!q) if (!q)
goto err_hctxs; goto err_hctxs;
if (percpu_counter_init(&q->mq_usage_counter, 0)) if (percpu_ref_init(&q->mq_usage_counter, blk_mq_usage_counter_release))
goto err_map; goto err_map;
setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q); setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q);
@ -1878,7 +1869,7 @@ void blk_mq_free_queue(struct request_queue *q)
blk_mq_exit_hw_queues(q, set, set->nr_hw_queues); blk_mq_exit_hw_queues(q, set, set->nr_hw_queues);
blk_mq_free_hw_queues(q, set); blk_mq_free_hw_queues(q, set);
percpu_counter_destroy(&q->mq_usage_counter); percpu_ref_exit(&q->mq_usage_counter);
free_percpu(q->queue_ctx); free_percpu(q->queue_ctx);
kfree(q->queue_hw_ctx); kfree(q->queue_hw_ctx);
@ -2037,8 +2028,7 @@ static int __init blk_mq_init(void)
{ {
blk_mq_cpu_init(); blk_mq_cpu_init();
/* Must be called after percpu_counter_hotcpu_callback() */ hotcpu_notifier(blk_mq_queue_reinit_notify, 0);
hotcpu_notifier(blk_mq_queue_reinit_notify, -10);
return 0; return 0;
} }

3
include/linux/blkdev.h
View File

@ -21,6 +21,7 @@
#include <linux/bsg.h> #include <linux/bsg.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/percpu-refcount.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
@ -484,7 +485,7 @@ struct request_queue {
#endif #endif
struct rcu_head rcu_head; struct rcu_head rcu_head;
wait_queue_head_t mq_freeze_wq; wait_queue_head_t mq_freeze_wq;
struct percpu_counter mq_usage_counter; struct percpu_ref mq_usage_counter;
struct list_head all_q_node; struct list_head all_q_node;
struct blk_mq_tag_set *tag_set; struct blk_mq_tag_set *tag_set;