From nobody Sat Oct 4 19:16:47 2025 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1709258CF6; Thu, 14 Aug 2025 03:43:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755142995; cv=none; b=r4U+gMhgUJef1gVqESDuEnQUYvxG/7fBCLaxhK5KA3hd3Z+HwT3HHpAh5SwqUjAiob08aVfGleNYJ3MTMcj7Ro6GVRRG3J0bOhN8GDmYPAkGuIxPmt2PbDNbGwABqZ5BMIefYrN419Jzbo7hwUpHGQsD8qjAs8D9jsbklqw59L4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755142995; c=relaxed/simple; bh=YPDyAuwKKOPXX/Tm4QMGe7PRqZNCYTsJRqSGPk1MFhA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MiGF7jnVikUv7ztph01oGoGvpGYza7D4aEmKeTh2ED2F07Guylf9Ka7RvwMO1+s+qMoTypL4glstC8NY2JT4OmVyVw3hdgnaYz5FaLlyrtpWpojnF453m1IM4dYlc2u8ayaMsrnVhUlH2KswyO9nlWNAl11eFsnaZSwHglpLVyc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4c2WKr356dzKHMSx; Thu, 14 Aug 2025 11:43:12 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id B07411A0CF1; Thu, 14 Aug 2025 11:43:11 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgCnIxRKW51ogs93Dg--.15627S11; Thu, 14 Aug 2025 11:43:11 +0800 (CST) From: Yu Kuai To: axboe@kernel.dk, yukuai3@huawei.com, bvanassche@acm.org, nilay@linux.ibm.com, hare@suse.de, ming.lei@redhat.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com, johnny.chenyi@huawei.com Subject: [PATCH 07/16] blk-mq: split bitmap grow and resize case in blk_mq_update_nr_requests() Date: Thu, 14 Aug 2025 11:35:13 +0800 Message-Id: <20250814033522.770575-8-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250814033522.770575-1-yukuai1@huaweicloud.com> References: <20250814033522.770575-1-yukuai1@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgCnIxRKW51ogs93Dg--.15627S11 X-Coremail-Antispam: 1UD129KBjvJXoW7ZrWkXF18Ww1rZr17tFykGrg_yoW8XryrpF Waga17K34Fqr1FvFWIqw4UX3WFgFsaqF1xtFs3tFyFgr1jgr4Sgr4Sgry5XFy8Jrs3CayS 9r4DtryUAr17XrUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUma14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2 kIc2xKxwCY1x0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkE bVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67 AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI 42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCw CI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsG vfC2KfnxnUUI43ZEXa7VUbPC7UUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ Content-Type: text/plain; charset="utf-8" From: Yu Kuai No functional changes are intended, make code cleaner and prepare to fix the grow case in the next patch. Signed-off-by: Yu Kuai --- block/blk-mq.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index c29f98ec283d..a7d6a20c1524 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -4931,6 +4931,14 @@ int blk_mq_update_nr_requests(struct request_queue *= q, unsigned int nr) blk_mq_tag_update_sched_shared_tags(q); else blk_mq_tag_resize_shared_tags(set, nr); + } else if (!q->elevator) { + queue_for_each_hw_ctx(q, hctx, i) + sbitmap_queue_resize(&hctx->tags->bitmap_tags, + nr - hctx->tags->nr_reserved_tags); + } else if (nr <=3D q->elevator->et->nr_requests) { + queue_for_each_hw_ctx(q, hctx, i) + sbitmap_queue_resize(&hctx->sched_tags->bitmap_tags, + nr - hctx->sched_tags->nr_reserved_tags); } else { queue_for_each_hw_ctx(q, hctx, i) { /* @@ -4938,13 +4946,8 @@ int blk_mq_update_nr_requests(struct request_queue *= q, unsigned int nr) * scheduler queue depth. This is similar to what the * old code would do. */ - if (hctx->sched_tags) - ret =3D blk_mq_tag_update_depth(hctx, - &hctx->sched_tags, nr); - else - ret =3D blk_mq_tag_update_depth(hctx, - &hctx->tags, nr); - + ret =3D blk_mq_tag_update_depth(hctx, + &hctx->sched_tags, nr); if (ret) goto out; } --=20 2.39.2