public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Chengming Zhou <zhouchengming@bytedance.com>,
	Ming Lei <ming.lei@redhat.com>, Jens Axboe <axboe@kernel.dk>,
	Sasha Levin <sashal@kernel.org>,
	linux-block@vger.kernel.org
Subject: [PATCH AUTOSEL 6.4 29/31] blk-mq: fix tags leak when shrink nr_hw_queues
Date: Fri,  8 Sep 2023 15:31:58 -0400	[thread overview]
Message-ID: <20230908193201.3462957-29-sashal@kernel.org> (raw)
In-Reply-To: <20230908193201.3462957-1-sashal@kernel.org>

From: Chengming Zhou <zhouchengming@bytedance.com>

[ Upstream commit e1dd7bc93029024af5688253b0c05181d6e01f8e ]

Although we don't need to realloc set->tags[] when shrink nr_hw_queues,
we need to free them. Or these tags will be leaked.

How to reproduce:
1. mount -t configfs configfs /mnt
2. modprobe null_blk nr_devices=0 submit_queues=8
3. mkdir /mnt/nullb/nullb0
4. echo 1 > /mnt/nullb/nullb0/power
5. echo 4 > /mnt/nullb/nullb0/submit_queues
6. rmdir /mnt/nullb/nullb0

In step 4, will alloc 9 tags (8 submit queues and 1 poll queue), then
in step 5, new_nr_hw_queues = 5 (4 submit queues and 1 poll queue).
At last in step 6, only these 5 tags are freed, the other 4 tags leaked.

Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20230821095602.70742-1-chengming.zhou@linux.dev
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 block/blk-mq.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 58bf41e8e66c7..d539b73a6be4a 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -4385,9 +4385,13 @@ static int blk_mq_realloc_tag_set_tags(struct blk_mq_tag_set *set,
 				       int new_nr_hw_queues)
 {
 	struct blk_mq_tags **new_tags;
+	int i;
 
-	if (set->nr_hw_queues >= new_nr_hw_queues)
+	if (set->nr_hw_queues >= new_nr_hw_queues) {
+		for (i = new_nr_hw_queues; i < set->nr_hw_queues; i++)
+			__blk_mq_free_map_and_rqs(set, i);
 		goto done;
+	}
 
 	new_tags = kcalloc_node(new_nr_hw_queues, sizeof(struct blk_mq_tags *),
 				GFP_KERNEL, set->numa_node);
-- 
2.40.1


  parent reply	other threads:[~2023-09-08 19:34 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-08 19:31 [PATCH AUTOSEL 6.4 01/31] drm/bridge: tc358762: Instruct DSI host to generate HSE packets Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 02/31] drm/edid: Add quirk for OSVR HDK 2.0 Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 03/31] drm: bridge: samsung-dsim: Drain command transfer FIFO before transfer Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 04/31] ASoC: amd: vangogh: Use dmi_first_match() for DMI quirk handling Sasha Levin
2023-09-08 23:20   ` Mark Brown
2023-09-18 21:29     ` Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 05/31] arm64: dts: qcom: sm6125-pdx201: correct ramoops pmsg-size Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 06/31] arm64: dts: qcom: sm6125-sprout: " Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 07/31] arm64: dts: qcom: sm6350: " Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 08/31] arm64: dts: qcom: sm8150-kumano: " Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 09/31] arm64: dts: qcom: sm8250-edo: " Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 10/31] drm/amd/display: Add stream overhead in BW calculations for 128b/132b Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 11/31] samples/hw_breakpoint: Fix kernel BUG 'invalid opcode: 0000' Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 12/31] drm/amd/display: Read down-spread percentage from lut to adjust dprefclk Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 13/31] drm/amd/display: Fix underflow issue on 175hz timing Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 14/31] drm/vkms: Fix race-condition between the hrtimer and the atomic commit Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 15/31] ASoC: SOF: topology: simplify code to prevent static analysis warnings Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 16/31] ASoC: Intel: sof_sdw: Update BT offload config for soundwire config Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 17/31] ALSA: hda: intel-dsp-cfg: add LunarLake support Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 18/31] drm/amd/display: Use DTBCLK as refclk instead of DPREFCLK Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 19/31] drm/amd/display: Blocking invalid 420 modes on HDMI TMDS for DCN31 Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 20/31] drm/amd/display: Blocking invalid 420 modes on HDMI TMDS for DCN314 Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 21/31] drm/exynos: fix a possible null-pointer dereference due to data race in exynos_drm_crtc_atomic_disable() Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 22/31] io_uring: annotate the struct io_kiocb slab for appropriate user copy Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 23/31] drm/mediatek: dp: Change logging to dev for mtk_dp_aux_transfer() Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 24/31] bus: ti-sysc: Configure uart quirks for k3 SoC Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 25/31] arm64: dts: qcom: sc8280xp-x13s: Add camera activity LED Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 26/31] block: Allow bio_iov_iter_get_pages() with bio->bi_bdev unset Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 27/31] md: raid1: fix potential OOB in raid1_remove_disk() Sasha Levin
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 28/31] ext2: fix datatype of block number in ext2_xattr_set2() Sasha Levin
2023-09-08 19:31 ` Sasha Levin [this message]
2023-09-08 19:31 ` [PATCH AUTOSEL 6.4 30/31] ASoC: SOF: amd: clear panic mask status when panic occurs Sasha Levin
2023-09-08 19:32 ` [PATCH AUTOSEL 6.4 31/31] x86: bring back rep movsq for user access on CPUs without ERMS Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230908193201.3462957-29-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ming.lei@redhat.com \
    --cc=stable@vger.kernel.org \
    --cc=zhouchengming@bytedance.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox