| Message ID | 20221122084917.2034220-1-shinichiro.kawasaki@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [for-next] block: fix missing nr_hw_queues update in blk_mq_realloc_tag_set_tags | expand |
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
On Tue, 22 Nov 2022 17:49:17 +0900, Shin'ichiro Kawasaki wrote: > The commit ee9d55210c2f ("blk-mq: simplify blk_mq_realloc_tag_set_tags") > cleaned up the function blk_mq_realloc_tag_set_tags. After this change, > the function does not update nr_hw_queues of struct blk_mq_tag_set when > new nr_hw_queues value is smaller than original. This results in failure > of queue number change of block devices. To avoid the failure, add the > missing nr_hw_queues update. > > [...] Applied, thanks! [1/1] block: fix missing nr_hw_queues update in blk_mq_realloc_tag_set_tags commit: d4b2e0d433769cb7c87e4c93dc048733388d1c46 Best regards,
diff --git a/block/blk-mq.c b/block/blk-mq.c index a3a5fb4d4ef6..f72164429446 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -4385,7 +4385,7 @@ static int blk_mq_realloc_tag_set_tags(struct blk_mq_tag_set *set, struct blk_mq_tags **new_tags; if (set->nr_hw_queues >= new_nr_hw_queues) - return 0; + goto done; new_tags = kcalloc_node(new_nr_hw_queues, sizeof(struct blk_mq_tags *), GFP_KERNEL, set->numa_node); @@ -4397,8 +4397,8 @@ static int blk_mq_realloc_tag_set_tags(struct blk_mq_tag_set *set, sizeof(*set->tags)); kfree(set->tags); set->tags = new_tags; +done: set->nr_hw_queues = new_nr_hw_queues; - return 0; }
The commit ee9d55210c2f ("blk-mq: simplify blk_mq_realloc_tag_set_tags") cleaned up the function blk_mq_realloc_tag_set_tags. After this change, the function does not update nr_hw_queues of struct blk_mq_tag_set when new nr_hw_queues value is smaller than original. This results in failure of queue number change of block devices. To avoid the failure, add the missing nr_hw_queues update. Fixes: ee9d55210c2f ("blk-mq: simplify blk_mq_realloc_tag_set_tags") Reported-by: Chaitanya Kulkarni <chaitanyak@nvidia.com> Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> Link: https://lore.kernel.org/linux-block/20221118140640.featvt3fxktfquwh@shindev/ --- block/blk-mq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)