blk-mq: fixes for Ming Leis V6 patchset
Subsystems (2)
cover blk-mq: fixes for Ming Leis V6 patchset
Hi Ming,
to clarify my comments to your patch to introduce dead_hctx_list here's a small patchset to address my concerns.
If you agree it would possibly be best to fold it into your patchset.
Patches are relative to the 'nvme-5.2' branch of the nvme git repository plus the 'V6' iteration of Mings patchset
'blk-mq: fix races related with freeing queue'.
Hannes Reinecke (5):
blk-mq: rename 'dead_hctx_XX' to 'unused_hctx_XX'
blk-mq: drop 'hctx_idx' argument from blk_mq_alloc_hctx()
blk-mq: remove 'nr_queue' argument in blk_mq_exit_hw_queues()
blk-mq: Set hctx pointer to NULL in blk_mq_exit_hw_queues()
blk-mq: free q->queue_hw_ctx in blk_mq_exit_queue()
block/blk-mq.c | 45 +++++++++++++++++++++++++-------------------- block/blk-mq.h | 2 +- include/linux/blkdev.h | 6 +++--- 3 files changed, 29 insertions(+), 24 deletions(-)
Signature · 1 line
2.16.4
PATCH 1/5 blk-mq: rename 'dead_hctx_XX' to 'unused_hctx_XX'
--- block/blk-mq.c | 22 +++++++++++----------- include/linux/blkdev.h | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-)
block/blk-mq.c +11 -11
@@ -2261,9 +2261,9 @@ static void blk_mq_exit_hctx(struct request_queue *q,blk_mq_remove_cpuhp (hctx); -spin_lock (&q->dead_hctx_lock); -list_add (&hctx->hctx_list, &q->dead_hctx_list); -spin_unlock (&q->dead_hctx_lock); +spin_lock (&q->unused_hctx_lock); +list_add (&hctx->hctx_list, &q->unused_hctx_list); +spin_unlock (&q->unused_hctx_lock); } static void blk_mq_exit_hw_queues(struct request_queue *q,
@@ -2669,8 +2669,8 @@ void blk_mq_release(struct request_queue *q)cancel_delayed_work_sync (&q->requeue_work); -/* all hctx are in .dead_hctx_list now */ -list_for_each_entry_safe (hctx, next, &q->dead_hctx_list, hctx_list) { +/* all hctx are in .unused_hctx_list now */ +list_for_each_entry_safe (hctx, next, &q->unused_hctx_list, hctx_list) {list_del_init (&hctx->hctx_list);kobject_put (&hctx->kobj); }
@@ -2740,9 +2740,9 @@ static struct blk_mq_hw_ctx *blk_mq_alloc_and_init_hctx( {struct blk_mq_hw_ctx *hctx =NULL , *tmp; -/* reuse dead hctx first */ -spin_lock (&q->dead_hctx_lock); -list_for_each_entry (tmp, &q->dead_hctx_list, hctx_list) { +/* reuse hctx first */ +spin_lock (&q->unused_hctx_lock); +list_for_each_entry (tmp, &q->unused_hctx_list, hctx_list) {if (tmp->numa_node == node) { hctx = tmp;break ;
@@ -2750,7 +2750,7 @@ static struct blk_mq_hw_ctx *blk_mq_alloc_and_init_hctx( }if (hctx)list_del_init (&hctx->hctx_list); -spin_unlock (&q->dead_hctx_lock); +spin_unlock (&q->unused_hctx_lock);if (!hctx) hctx =blk_mq_alloc_hctx (q, set, hctx_idx, node);
@@ -2866,8 +2866,8 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,if (!q->queue_hw_ctx) goto err_sys_init; -INIT_LIST_HEAD (&q->dead_hctx_list); -spin_lock_init (&q->dead_hctx_lock); +INIT_LIST_HEAD (&q->unused_hctx_list); +spin_lock_init (&q->unused_hctx_lock);blk_mq_realloc_hw_ctxs (set, q);if (!q->nr_hw_queues)
include/linux/blkdev.h +3 -3
@@ -536,11 +536,11 @@ struct request_queue {struct mutex sysfs_lock;/* -* for reusing dead hctx instance in case of updating +* for reusing hctx instances in case of updating * nr_hw_queues */ -struct list_head dead_hctx_list; -spinlock_t dead_hctx_lock; +struct list_head unused_hctx_list; +spinlock_t unused_hctx_lock;atomic_t mq_freeze_depth;
Signature · 1 line
2.16.4
PATCH 2/5 blk-mq: drop 'hctx_idx' argument from blk_mq_alloc_hctx()
In reply to Hannes ReineckeUnused.
--- block/blk-mq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
block/blk-mq.c +2 -3
@@ -2324,8 +2324,7 @@ static int blk_mq_init_hctx(struct request_queue *q,static struct blk_mq_hw_ctx *blk_mq_alloc_hctx (struct request_queue *q, -struct blk_mq_tag_set *set, -unsigned hctx_idx,int node) +struct blk_mq_tag_set *set,int node) {struct blk_mq_hw_ctx *hctx;
@@ -2753,7 +2752,7 @@ static struct blk_mq_hw_ctx *blk_mq_alloc_and_init_hctx(spin_unlock (&q->unused_hctx_lock);if (!hctx) - hctx =blk_mq_alloc_hctx (q, set, hctx_idx, node); + hctx =blk_mq_alloc_hctx (q, set, node);if (!hctx) goto fail;
Signature · 1 line
2.16.4
PATCH 3/5 blk-mq: remove 'nr_queue' argument in blk_mq_exit_hw_queues()
In reply to Hannes ReineckeUnused.
--- block/blk-mq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
block/blk-mq.c +2 -4
@@ -2267,14 +2267,12 @@ static void blk_mq_exit_hctx(struct request_queue *q, }static void blk_mq_exit_hw_queues (struct request_queue *q, -struct blk_mq_tag_set *set,int nr_queue) +struct blk_mq_tag_set *set) {struct blk_mq_hw_ctx *hctx;unsigned int i;queue_for_each_hw_ctx (q, hctx, i) { -if (i == nr_queue) -break ;blk_mq_debugfs_unregister_hctx (hctx);blk_mq_exit_hctx (q, set, hctx, i); }
@@ -2930,7 +2928,7 @@ void blk_mq_exit_queue(struct request_queue *q)struct blk_mq_tag_set *set = q->tag_set;blk_mq_del_queue_tag_set (q); -blk_mq_exit_hw_queues (q, set, set->nr_hw_queues); +blk_mq_exit_hw_queues (q, set); }static int __blk_mq_alloc_rq_maps (struct blk_mq_tag_set *set)
Signature · 1 line
2.16.4
PATCH 4/5 blk-mq: Set hctx pointer to NULL in blk_mq_exit_hw_queues()
In reply to Hannes ReineckeWhen clearing the hardware context we should be setting the pointer to NULL, too, to avoid accesses to invalid hctx entries.
--- block/blk-mq.c | 1 + 1 file changed, 1 insertion(+)
block/blk-mq.c +1 -0
@@ -2275,6 +2275,7 @@ static void blk_mq_exit_hw_queues(struct request_queue *q,queue_for_each_hw_ctx (q, hctx, i) {blk_mq_debugfs_unregister_hctx (hctx);blk_mq_exit_hctx (q, set, hctx, i); + q->queue_hw_ctx[i] =NULL ; } }
Signature · 1 line
2.16.4
PATCH 5/5 blk-mq: free q->queue_hw_ctx in blk_mq_exit_queue()
In reply to Hannes Reineckeblk_mq_exit_queue() already frees up all hardware contexts, so it should be freeing up the holding array, too.
--- block/blk-mq.c | 11 +++++++++-- block/blk-mq.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-)
block/blk-mq.c +9 -2
@@ -462,7 +462,8 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q,* Check if the hardware context is actually mapped to anything. * If not tell the caller that it should skip this queue. */ - alloc_data.hctx = q->queue_hw_ctx[hctx_idx]; +if (q->queue_hw_ctx) + alloc_data.hctx = q->queue_hw_ctx[hctx_idx];if (!blk_mq_hw_queue_mapped (alloc_data.hctx)) {blk_queue_exit (q);return ERR_PTR (-EXDEV );
@@ -2673,7 +2674,8 @@ void blk_mq_release(struct request_queue *q)kobject_put (&hctx->kobj); } -kfree (q->queue_hw_ctx); +/* Ensure that blk_mq_exit_queue() has been called */ +WARN_ON (q->queue_hw_ctx);/* * release .mq_kobj and sw queue's kobject now because
@@ -2930,6 +2932,8 @@ void blk_mq_exit_queue(struct request_queue *q)blk_mq_del_queue_tag_set (q);blk_mq_exit_hw_queues (q, set); +kfree (q->queue_hw_ctx); + q->queue_hw_ctx =NULL ; }static int __blk_mq_alloc_rq_maps (struct blk_mq_tag_set *set)
@@ -3477,6 +3481,9 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin)if (current->plug)blk_flush_plug_list (current->plug, false); +if (!q->queue_hw_ctx) +return 0 ; + hctx = q->queue_hw_ctx[blk_qc_t_to_queue_num (cookie)];/*
block/blk-mq.h +1 -1
@@ -188,7 +188,7 @@ static inline bool blk_mq_hctx_stopped(struct blk_mq_hw_ctx *hctx)static inline bool blk_mq_hw_queue_mapped (struct blk_mq_hw_ctx *hctx) { -return hctx->nr_ctx && hctx->tags; +return hctx && hctx->nr_ctx && hctx->tags; }unsigned int blk_mq_in_flight (struct request_queue *q,struct hd_struct *part);
Signature · 1 line
2.16.4