Commit 9ad8e5af authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

blk-mq: Pass tag_set to blk_mq_free_rq_map/tags 



To prepare for converting the tag->rqs freeing to be SRCU-based, the
tag_set is needed in the freeing helper functions.

This patch adds 'struct blk_mq_tag_set *' as the first parameter to
blk_mq_free_rq_map() and blk_mq_free_tags(), and updates all their call
sites.

This allows access to the tag_set's SRCU structure in the next step,
which will be used to free the tag maps after a grace period.

No functional change is intended in this patch.

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent aba19ee7

block/blk-mq-tag.c

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ struct blk_mq_tags *blk_mq_init_tags(unsigned int total_tags, 
	return NULL;

}



void blk_mq_free_tags(struct blk_mq_tags *tags)

void blk_mq_free_tags(struct blk_mq_tag_set *set, struct blk_mq_tags *tags)

{

	sbitmap_queue_free(&tags->bitmap_tags);

	sbitmap_queue_free(&tags->breserved_tags);

block/blk-mq.c

+5 −5
Original line number Diff line number Diff line
@@ -3491,14 +3491,14 @@ void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags, 
	}

}



void blk_mq_free_rq_map(struct blk_mq_tags *tags)

void blk_mq_free_rq_map(struct blk_mq_tag_set *set, struct blk_mq_tags *tags)

{

	kfree(tags->rqs);

	tags->rqs = NULL;

	kfree(tags->static_rqs);

	tags->static_rqs = NULL;



	blk_mq_free_tags(tags);

	blk_mq_free_tags(set, tags);

}



static enum hctx_type hctx_idx_to_type(struct blk_mq_tag_set *set,
@@ -3560,7 +3560,7 @@ static struct blk_mq_tags *blk_mq_alloc_rq_map(struct blk_mq_tag_set *set, 
err_free_rqs:

	kfree(tags->rqs);

err_free_tags:

	blk_mq_free_tags(tags);

	blk_mq_free_tags(set, tags);

	return NULL;

}
@@ -4107,7 +4107,7 @@ struct blk_mq_tags *blk_mq_alloc_map_and_rqs(struct blk_mq_tag_set *set, 


	ret = blk_mq_alloc_rqs(set, tags, hctx_idx, depth);

	if (ret) {

		blk_mq_free_rq_map(tags);

		blk_mq_free_rq_map(set, tags);

		return NULL;

	}
@@ -4135,7 +4135,7 @@ void blk_mq_free_map_and_rqs(struct blk_mq_tag_set *set, 
{

	if (tags) {

		blk_mq_free_rqs(set, tags, hctx_idx);

		blk_mq_free_rq_map(tags);

		blk_mq_free_rq_map(set, tags);

	}

}

block/blk-mq.h

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ void blk_mq_put_rq_ref(struct request *rq); 
 */

void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,

		     unsigned int hctx_idx);

void blk_mq_free_rq_map(struct blk_mq_tags *tags);

void blk_mq_free_rq_map(struct blk_mq_tag_set *set, struct blk_mq_tags *tags);

struct blk_mq_tags *blk_mq_alloc_map_and_rqs(struct blk_mq_tag_set *set,

				unsigned int hctx_idx, unsigned int depth);

void blk_mq_free_map_and_rqs(struct blk_mq_tag_set *set,
@@ -162,7 +162,7 @@ struct blk_mq_alloc_data { 


struct blk_mq_tags *blk_mq_init_tags(unsigned int nr_tags,

		unsigned int reserved_tags, unsigned int flags, int node);

void blk_mq_free_tags(struct blk_mq_tags *tags);

void blk_mq_free_tags(struct blk_mq_tag_set *set, struct blk_mq_tags *tags);



unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data);

unsigned long blk_mq_get_tags(struct blk_mq_alloc_data *data, int nr_tags,