Skip to content

Commit 392b1d6

Browse files
YuKuai-huaweigregkh
authored andcommitted
blk-mq: fix blk_mq_tags double free while nr_requests grown
commit ba28afbd9eff2a6370f23ef4e6a036ab0cfda409 upstream. In the case user trigger tags grow by queue sysfs attribute nr_requests, hctx->sched_tags will be freed directly and replaced with a new allocated tags, see blk_mq_tag_update_depth(). The problem is that hctx->sched_tags is from elevator->et->tags, while et->tags is still the freed tags, hence later elevator exit will try to free the tags again, causing kernel panic. Fix this problem by replacing et->tags with new allocated tags as well. Noted there are still some long term problems that will require some refactor to be fixed thoroughly[1]. [1] https://lore.kernel.org/all/[email protected]/ Fixes: f5a6604 ("block: fix lockdep warning caused by lock dependency in elv_iosched_store") Signed-off-by: Yu Kuai <[email protected]> Reviewed-by: Ming Lei <[email protected]> Reviewed-by: Nilay Shroff <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Reviewed-by: Li Nan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e5f0a69 commit 392b1d6

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

block/blk-mq-tag.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,7 @@ int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx,
622622
return -ENOMEM;
623623

624624
blk_mq_free_map_and_rqs(set, *tagsptr, hctx->queue_num);
625+
hctx->queue->elevator->et->tags[hctx->queue_num] = new;
625626
*tagsptr = new;
626627
} else {
627628
/*

0 commit comments

Comments
 (0)