Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d2936f4 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: only allocate/free mq_usage_counter in blk-mq 



The percpu counter is only used for blk-mq, so move
its allocation and free inside blk-mq, and don't
allocate it for legacy queue device.

Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 624dbe47

block/blk-core.c

+1 −6
Original line number Diff line number Diff line
@@ -576,12 +576,9 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) 
	if (!q)

		return NULL;



	if (percpu_counter_init(&q->mq_usage_counter, 0))

		goto fail_q;



	q->id = ida_simple_get(&blk_queue_ida, 0, 0, gfp_mask);

	if (q->id < 0)

		goto fail_c;

		goto fail_q;



	q->backing_dev_info.ra_pages =

			(VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
@@ -639,8 +636,6 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) 
	bdi_destroy(&q->backing_dev_info);

fail_id:

	ida_simple_remove(&blk_queue_ida, q->id);

fail_c:

	percpu_counter_destroy(&q->mq_usage_counter);

fail_q:

	kmem_cache_free(blk_requestq_cachep, q);

	return NULL;

block/blk-mq.c

+5 −0
Original line number Diff line number Diff line
@@ -1781,6 +1781,9 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) 
	if (!q)

		goto err_hctxs;



	if (percpu_counter_init(&q->mq_usage_counter, 0))

		goto err_map;



	q->mq_map = blk_mq_make_queue_map(set);

	if (!q->mq_map)

		goto err_map;
@@ -1867,6 +1870,8 @@ void blk_mq_free_queue(struct request_queue *q) 
	blk_mq_exit_hw_queues(q, set, set->nr_hw_queues);

	blk_mq_free_hw_queues(q, set);



	percpu_counter_destroy(&q->mq_usage_counter);



	free_percpu(q->queue_ctx);

	kfree(q->queue_hw_ctx);

	kfree(q->mq_map);

block/blk-sysfs.c

+0 −2
Original line number Diff line number Diff line
@@ -517,8 +517,6 @@ static void blk_release_queue(struct kobject *kobj) 
	if (q->queue_tags)

		__blk_queue_free_tags(q);



	percpu_counter_destroy(&q->mq_usage_counter);



	if (q->mq_ops)

		blk_mq_free_queue(q);