superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Hannes Reinecke <hare@suse.de>
Reviewed-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1354/merge
Ming Lei 2025-08-30 10:18:20 +08:00 committed by Jens Axboe
parent aba19ee71c
commit 9ad8e5af32
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-mq-tag.c
View File

@ -576,7 +576,7 @@ out_free_tags:
return NULL; 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->bitmap_tags);
sbitmap_queue_free(&tags->breserved_tags); sbitmap_queue_free(&tags->breserved_tags);

10
block/blk-mq.c
View File

@ -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); kfree(tags->rqs);
tags->rqs = NULL; tags->rqs = NULL;
kfree(tags->static_rqs); kfree(tags->static_rqs);
tags->static_rqs = NULL; 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, 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: err_free_rqs:
kfree(tags->rqs); kfree(tags->rqs);
err_free_tags: err_free_tags:
blk_mq_free_tags(tags); blk_mq_free_tags(set, tags);
return NULL; 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); ret = blk_mq_alloc_rqs(set, tags, hctx_idx, depth);
if (ret) { if (ret) {
blk_mq_free_rq_map(tags); blk_mq_free_rq_map(set, tags);
return NULL; return NULL;
} }
@ -4135,7 +4135,7 @@ void blk_mq_free_map_and_rqs(struct blk_mq_tag_set *set,
{ {
if (tags) { if (tags) {
blk_mq_free_rqs(set, tags, hctx_idx); blk_mq_free_rqs(set, tags, hctx_idx);
blk_mq_free_rq_map(tags); blk_mq_free_rq_map(set, tags);
} }
} }

4
block/blk-mq.h
View File

@ -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, void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,
unsigned int hctx_idx); 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, struct blk_mq_tags *blk_mq_alloc_map_and_rqs(struct blk_mq_tag_set *set,
unsigned int hctx_idx, unsigned int depth); unsigned int hctx_idx, unsigned int depth);
void blk_mq_free_map_and_rqs(struct blk_mq_tag_set *set, 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, struct blk_mq_tags *blk_mq_init_tags(unsigned int nr_tags,
unsigned int reserved_tags, unsigned int flags, int node); 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 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, unsigned long blk_mq_get_tags(struct blk_mq_alloc_data *data, int nr_tags,