From nobody Tue Feb 10 17:31:02 2026 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (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 AFC1926056C; Wed, 17 Dec 2025 12:11:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765973475; cv=none; b=K0AH0oaoE6bxN6E2fS2IgulgnYpl/D10c2Y/RVsqNgFdDnt12dyB4ltb201SqXMELl2uCT7FxgTm7bmMEvt9iX8BI+s5ZjwuUuY8xOdJ6MzUuhAwFGIBsgpUfmUDdWWstp98Lp6KpHFVDjt2ggw0/P5be/uXCDzsBg+Q3ZfvBtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765973475; c=relaxed/simple; bh=LElKwJXGVrz7yf90h6WhX2NYtZf9k6hwgGDS8UuMQsM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PQxoaaFIhQA7rAAcGL8TxbEjhhM1/oQv53kwvXKa+PxBrC9IiFOH63Sn9KOiHZvzSM1DqoB5k2QI6TCjTPt4uHWAzELBclv/gASbLyC6M1J3OkZKoKUWplCrpliiHw2i1r56WFSDcgImGjE28HeILLpD3rWgd0JfTy4wqNtj/h8= 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.51 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.198]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4dWXgl5fTTzYQvJh; Wed, 17 Dec 2025 20:10:43 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 9E74340576; Wed, 17 Dec 2025 20:11:10 +0800 (CST) Received: from huaweicloud.com (unknown [10.50.87.129]) by APP4 (Coremail) with SMTP id gCh0CgAXd_fdnUJp6F0JAg--.52527S11; Wed, 17 Dec 2025 20:11:10 +0800 (CST) From: linan666@huaweicloud.com To: song@kernel.org, yukuai@fnnas.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, xni@redhat.com, linan666@huaweicloud.com, yangerkun@huawei.com, yi.zhang@huawei.com Subject: [PATCH 07/15] md: Clean up folio sync support related code Date: Wed, 17 Dec 2025 20:00:05 +0800 Message-Id: <20251217120013.2616531-8-linan666@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20251217120013.2616531-1-linan666@huaweicloud.com> References: <20251217120013.2616531-1-linan666@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: gCh0CgAXd_fdnUJp6F0JAg--.52527S11 X-Coremail-Antispam: 1UD129KBjvJXoWxAF4rJr18CryUKr18uFWfKrg_yoW5urWkpa 9rGrySvayrKF45ZF4Dtw4UAa1Fk34Yga4UCF4fua93uF13ZFyDKF4jqa48Xr1DZF95Ca4F qF93Ja1UuF45tF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQ014x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAac4AC62xK8xCEY4vEwIxC4wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Gr1j6F4U JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7M4kE6xkIj40Ew7xC0wCY1x0262kKe7AKxVWUAVWUtwCF04k20xvY0x0EwIxGrwCF x2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14 v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY 67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI 8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v2 6r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUYVyIDUUUU X-CM-SenderInfo: polqt0awwwqx5xdzvxpfor3voofrz/ Content-Type: text/plain; charset="utf-8" From: Li Nan 1. Remove resync_get_all_folio() and invoke folio_get() directly instead. 2. Clean up redundant while(0) loop in md_bio_reset_resync_folio(). 3. Clean up bio variable by directly referencing r10_bio->devs[j].bio instead in r1buf_pool_alloc() and r10buf_pool_alloc(). 4. Clean up RESYNC_PAGES. Signed-off-by: Li Nan Reviewed-by: Xiao Ni --- drivers/md/raid1-10.c | 22 ++++++---------------- drivers/md/raid1.c | 6 ++---- drivers/md/raid10.c | 6 ++---- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/drivers/md/raid1-10.c b/drivers/md/raid1-10.c index b8f2cc32606f..568ab002691f 100644 --- a/drivers/md/raid1-10.c +++ b/drivers/md/raid1-10.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* Maximum size of each resync request */ #define RESYNC_BLOCK_SIZE (64*1024) -#define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE) #define RESYNC_SECTORS (RESYNC_BLOCK_SIZE >> 9) =20 /* @@ -56,11 +55,6 @@ static inline void resync_free_folio(struct resync_folio= *rf) folio_put(rf->folio); } =20 -static inline void resync_get_all_folio(struct resync_folio *rf) -{ - folio_get(rf->folio); -} - static inline struct folio *resync_fetch_folio(struct resync_folio *rf) { return rf->folio; @@ -80,16 +74,12 @@ static void md_bio_reset_resync_folio(struct bio *bio, = struct resync_folio *rf, int size) { /* initialize bvec table again */ - do { - struct folio *folio =3D resync_fetch_folio(rf); - int len =3D min_t(int, size, RESYNC_BLOCK_SIZE); - - if (WARN_ON(!bio_add_folio(bio, folio, len, 0))) { - bio->bi_status =3D BLK_STS_RESOURCE; - bio_endio(bio); - return; - } - } while (0); + if (WARN_ON(!bio_add_folio(bio, resync_fetch_folio(rf), + min_t(int, size, RESYNC_BLOCK_SIZE), + 0))) { + bio->bi_status =3D BLK_STS_RESOURCE; + bio_endio(bio); + } } =20 =20 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 370bdecf5487..f01bab41da95 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -181,18 +181,16 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void = *data) for (j =3D 0; j < conf->raid_disks * 2; j++) { struct resync_folio *rf =3D &rfs[j]; =20 - bio =3D r1_bio->bios[j]; - if (j < need_folio) { if (resync_alloc_folio(rf, gfp_flags)) goto out_free_folio; } else { memcpy(rf, &rfs[0], sizeof(*rf)); - resync_get_all_folio(rf); + folio_get(rf->folio); } =20 rf->raid_bio =3D r1_bio; - bio->bi_private =3D rf; + r1_bio->bios[j]->bi_private =3D rf; } =20 r1_bio->master_bio =3D NULL; diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index c93706806358..a03afa9a6a5b 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -183,19 +183,17 @@ static void * r10buf_pool_alloc(gfp_t gfp_flags, void= *data) if (rbio) rf_repl =3D &rfs[nalloc + j]; =20 - bio =3D r10_bio->devs[j].bio; - if (!j || test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery)) { if (resync_alloc_folio(rf, gfp_flags)) goto out_free_pages; } else { memcpy(rf, &rfs[0], sizeof(*rf)); - resync_get_all_folio(rf); + folio_get(rf->folio); } =20 rf->raid_bio =3D r10_bio; - bio->bi_private =3D rf; + r10_bio->devs[j].bio->bi_private =3D rf; if (rbio) { memcpy(rf_repl, rf, sizeof(*rf)); rbio->bi_private =3D rf_repl; --=20 2.39.2