From nobody Wed Dec 17 15:36:58 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61AF0C61D9D for ; Sat, 25 Nov 2023 07:43:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231764AbjKYHnR (ORCPT ); Sat, 25 Nov 2023 02:43:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231740AbjKYHnA (ORCPT ); Sat, 25 Nov 2023 02:43:00 -0500 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 190D21702; Fri, 24 Nov 2023 23:42:58 -0800 (PST) Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4SckND3q9lz4f3l6r; Sat, 25 Nov 2023 15:42:52 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 4FDC41A0C7F; Sat, 25 Nov 2023 15:42:54 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgCX7Ut8pWFlk8TCBw--.12413S4; Sat, 25 Nov 2023 15:42:54 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] ext4: Add unit test of ext4_mb_generate_buddy Date: Sat, 25 Nov 2023 23:41:41 +0800 Message-Id: <20231125154144.3943442-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20231125154144.3943442-1-shikemeng@huaweicloud.com> References: <20231125154144.3943442-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgCX7Ut8pWFlk8TCBw--.12413S4 X-Coremail-Antispam: 1UD129KBjvJXoWxtryUCrWUJFy3GrWDtr1xuFg_yoW3KFWrpa s0kF1F9r4UCr4kWw47GrWkZ3WS9w4v9rWrKryxWF15ArWSyas5A3Z5GFyYyFsYyFWxXFs3 Z3Wjga47CrW2k37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUsmiiDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add unit test of ext4_mb_generate_buddy Signed-off-by: Kemeng Shi --- fs/ext4/mballoc-test.c | 207 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+) diff --git a/fs/ext4/mballoc-test.c b/fs/ext4/mballoc-test.c index 3aac42ea6..6964974fa 100644 --- a/fs/ext4/mballoc-test.c +++ b/fs/ext4/mballoc-test.c @@ -28,6 +28,50 @@ struct mbt_ext4_super_block { #define MBT_CTX(_sb) (&(container_of((_sb), struct mbt_ext4_super_block, s= b)->mbt_ctx)) #define MBT_GRP_CTX(_sb, _group) (&MBT_CTX(_sb)->grp_ctx[_group]) =20 +static const struct super_operations mbt_sops =3D { +}; + +static int mbt_mb_init(struct super_block *sb) +{ + int ret; + + /* needed by ext4_mb_init->bdev_nonrot(sb->s_bdev) */ + sb->s_bdev =3D kzalloc(sizeof(*sb->s_bdev), GFP_KERNEL); + if (sb->s_bdev =3D=3D NULL) + return -ENOMEM; + + sb->s_bdev->bd_queue =3D kzalloc(sizeof(struct request_queue), GFP_KERNEL= ); + if (sb->s_bdev->bd_queue =3D=3D NULL) { + kfree(sb->s_bdev); + return -ENOMEM; + } + + /* + * needed by ext4_mb_init->ext4_mb_init_backend-> sbi->s_buddy_cache =3D + * new_inode(sb); + */ + INIT_LIST_HEAD(&sb->s_inodes); + sb->s_op =3D &mbt_sops; + + ret =3D ext4_mb_init(sb); + if (ret !=3D 0) + goto err_out; + + return 0; + +err_out: + kfree(sb->s_bdev->bd_queue); + kfree(sb->s_bdev); + return ret; +} + +static void mbt_mb_release(struct super_block *sb) +{ + ext4_mb_release(sb); + kfree(sb->s_bdev->bd_queue); + kfree(sb->s_bdev); +} + static struct super_block *mbt_ext4_alloc_super_block(void) { struct ext4_super_block *es =3D kzalloc(sizeof(*es), GFP_KERNEL); @@ -37,8 +81,16 @@ static struct super_block *mbt_ext4_alloc_super_block(vo= id) if (fsb =3D=3D NULL || sbi =3D=3D NULL || es =3D=3D NULL) goto out; =20 + sbi->s_blockgroup_lock =3D + kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL); + if (!sbi->s_blockgroup_lock) + goto out; + + bgl_lock_init(sbi->s_blockgroup_lock); + sbi->s_es =3D es; fsb->sb.s_fs_info =3D sbi; + return &fsb->sb; =20 out: @@ -54,6 +106,7 @@ static void mbt_ext4_free_super_block(struct super_block= *sb) container_of(sb, struct mbt_ext4_super_block, sb); struct ext4_sb_info *sbi =3D EXT4_SB(sb); =20 + kfree(sbi->s_blockgroup_lock); kfree(sbi->s_es); kfree(sbi); kfree(fsb); @@ -83,6 +136,9 @@ static void mbt_init_sb_layout(struct super_block *sb, sbi->s_clusters_per_group =3D layout->blocks_per_group >> layout->cluster_bits; sbi->s_desc_size =3D layout->desc_size; + sbi->s_desc_per_block_bits =3D + sb->s_blocksize_bits - (fls(layout->desc_size) - 1); + sbi->s_desc_per_block =3D 1 << sbi->s_desc_per_block_bits; =20 es->s_first_data_block =3D cpu_to_le32(0); es->s_blocks_count_lo =3D cpu_to_le32(layout->blocks_per_group * @@ -240,6 +296,14 @@ static int mbt_kunit_init(struct kunit *test) kunit_activate_static_stub(test, ext4_mb_mark_context, ext4_mb_mark_context_stub); + + /* stub function will be called in mt_mb_init->ext4_mb_init */ + if (mbt_mb_init(sb) !=3D 0) { + mbt_ctx_release(sb); + mbt_ext4_free_super_block(sb); + return -ENOMEM; + } + return 0; } =20 @@ -247,6 +311,7 @@ static void mbt_kunit_exit(struct kunit *test) { struct super_block *sb =3D (struct super_block *)test->priv; =20 + mbt_mb_release(sb); mbt_ctx_release(sb); mbt_ext4_free_super_block(sb); } @@ -392,6 +457,147 @@ static void test_free_blocks_simple(struct kunit *tes= t) ranges[i].start, ranges[i].len); } =20 +static void mbt_generate_buddy(struct super_block *sb, void *buddy, + void *bitmap, struct ext4_group_info *grp) +{ + struct ext4_sb_info *sbi =3D EXT4_SB(sb); + uint32_t order, off; + void *bb, *bb_h; + int max; + + memset(buddy, 0xff, sb->s_blocksize); + memset(grp, 0, offsetof(struct ext4_group_info, + bb_counters[MB_NUM_ORDERS(sb)])); + + bb =3D bitmap; + max =3D EXT4_CLUSTERS_PER_GROUP(sb); + bb_h =3D buddy + sbi->s_mb_offsets[1]; + + off =3D mb_find_next_zero_bit(bb, max, 0); + grp->bb_first_free =3D off; + while (off < max) { + grp->bb_counters[0]++; + grp->bb_free++; + + if (!(off & 1) && !mb_test_bit(off + 1, bb)) { + grp->bb_free++; + grp->bb_counters[0]--; + mb_clear_bit(off >> 1, bb_h); + grp->bb_counters[1]++; + grp->bb_largest_free_order =3D 1; + off++; + } + + off =3D mb_find_next_zero_bit(bb, max, off + 1); + } + + for (order =3D 1; order < MB_NUM_ORDERS(sb) - 1; order++) { + bb =3D buddy + sbi->s_mb_offsets[order]; + bb_h =3D buddy + sbi->s_mb_offsets[order + 1]; + max =3D max >> 1; + off =3D mb_find_next_zero_bit(bb, max, 0); + + while (off < max) { + if (!(off & 1) && !mb_test_bit(off + 1, bb)) { + mb_set_bits(bb, off, 2); + grp->bb_counters[order] -=3D 2; + mb_clear_bit(off >> 1, bb_h); + grp->bb_counters[order + 1]++; + grp->bb_largest_free_order =3D order + 1; + off++; + } + + off =3D mb_find_next_zero_bit(bb, max, off + 1); + } + } + + max =3D EXT4_CLUSTERS_PER_GROUP(sb); + off =3D mb_find_next_zero_bit(bitmap, max, 0); + while (off < max) { + grp->bb_fragments++; + + off =3D mb_find_next_bit(bitmap, max, off + 1); + if (off + 1 >=3D max) + break; + + off =3D mb_find_next_zero_bit(bitmap, max, off + 1); + } +} + +static void +mbt_validate_group_info(struct kunit *test, struct ext4_group_info *grp1, + struct ext4_group_info *grp2) +{ + struct super_block *sb =3D (struct super_block *)test->priv; + int i; + + KUNIT_ASSERT_EQ(test, grp1->bb_first_free, + grp2->bb_first_free); + KUNIT_ASSERT_EQ(test, grp1->bb_fragments, + grp2->bb_fragments); + KUNIT_ASSERT_EQ(test, grp1->bb_free, grp2->bb_free); + KUNIT_ASSERT_EQ(test, grp1->bb_largest_free_order, + grp2->bb_largest_free_order); + + for (i =3D 1; i < MB_NUM_ORDERS(sb); i++) { + KUNIT_ASSERT_EQ_MSG(test, grp1->bb_counters[i], + grp2->bb_counters[i], + "bb_counters[%d] diffs, expected %d, generated %d", + i, grp1->bb_counters[i], + grp2->bb_counters[i]); + } +} + +static void +do_test_generate_buddy(struct kunit *test, struct super_block *sb, void *b= itmap, + void *mbt_buddy, struct ext4_group_info *mbt_grp, + void *ext4_buddy, struct ext4_group_info *ext4_grp) +{ + int i; + + mbt_generate_buddy(sb, mbt_buddy, bitmap, mbt_grp); + + for (i =3D 0; i < MB_NUM_ORDERS(sb); i++) + ext4_grp->bb_counters[i] =3D 0; + /* needed by validation in ext4_mb_generate_buddy */ + ext4_grp->bb_free =3D mbt_grp->bb_free; + memset(ext4_buddy, 0xff, sb->s_blocksize); + ext4_mb_generate_buddy(sb, ext4_buddy, bitmap, TEST_GOAL_GROUP, + ext4_grp); + + KUNIT_ASSERT_EQ(test, memcmp(mbt_buddy, ext4_buddy, sb->s_blocksize), + 0); + mbt_validate_group_info(test, mbt_grp, ext4_grp); +} + +static void test_mb_generate_buddy(struct kunit *test) +{ + struct super_block *sb =3D (struct super_block *)test->priv; + void *bitmap, *expected_bb, *generate_bb; + struct ext4_group_info *expected_grp, *generate_grp; + struct test_range ranges[TEST_RANGE_COUNT]; + int i; + + bitmap =3D kunit_kzalloc(test, sb->s_blocksize, GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bitmap); + expected_bb =3D kunit_kzalloc(test, sb->s_blocksize, GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, expected_bb); + generate_bb =3D kunit_kzalloc(test, sb->s_blocksize, GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, generate_bb); + expected_grp =3D kunit_kzalloc(test, offsetof(struct ext4_group_info, + bb_counters[MB_NUM_ORDERS(sb)]), GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, expected_grp); + generate_grp =3D ext4_get_group_info(sb, TEST_GOAL_GROUP); + KUNIT_ASSERT_NOT_NULL(test, generate_grp); + + mbt_generate_test_ranges(sb, ranges, TEST_RANGE_COUNT); + for (i =3D 0; i < TEST_RANGE_COUNT; i++) { + mb_set_bits(bitmap, ranges[i].start, ranges[i].len); + do_test_generate_buddy(test, sb, bitmap, expected_bb, + expected_grp, generate_bb, generate_grp); + } +} + static const struct mbt_ext4_block_layout mbt_test_layouts[] =3D { { .blocksize_bits =3D 10, @@ -430,6 +636,7 @@ KUNIT_ARRAY_PARAM(mbt_layouts, mbt_test_layouts, mbt_sh= ow_layout); static struct kunit_case mbt_test_cases[] =3D { KUNIT_CASE_PARAM(test_new_blocks_simple, mbt_layouts_gen_params), KUNIT_CASE_PARAM(test_free_blocks_simple, mbt_layouts_gen_params), + KUNIT_CASE_PARAM(test_mb_generate_buddy, mbt_layouts_gen_params), {} }; =20 --=20 2.30.0