| Message ID | 9ca5d0de8c4ebd1e6267f1fbae9238753d14cf50.1733989299.git.jth@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | btrfs: more RST delete fixes | expand |
On Thu, Dec 12, 2024 at 7:56 AM Johannes Thumshirn <jth@kernel.org> wrote: > > From: Johannes Thumshirn <johannes.thumshirn@wdc.com> > > Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Missing a change log. > --- > fs/btrfs/tests/raid-stripe-tree-tests.c | 183 ++++++++++++++++++++++++ > 1 file changed, 183 insertions(+) > > diff --git a/fs/btrfs/tests/raid-stripe-tree-tests.c b/fs/btrfs/tests/raid-stripe-tree-tests.c > index 37b87ccb5858..8d74e95a8a75 100644 > --- a/fs/btrfs/tests/raid-stripe-tree-tests.c > +++ b/fs/btrfs/tests/raid-stripe-tree-tests.c > @@ -31,6 +31,188 @@ static struct btrfs_device *btrfs_device_by_devid(struct btrfs_fs_devices *fs_de > return NULL; > } > > +/* > + * Test creating a range of three extents and then punch a hole in the middle, > + * deleting all of the middle extents and partially deleting the "book ends" > + */ > +static int test_punch_hole_3extents(struct btrfs_trans_handle *trans) > +{ > + struct btrfs_fs_info *fs_info = trans->fs_info; > + struct btrfs_io_context *bioc; > + struct btrfs_io_stripe io_stripe = { 0 }; > + u64 map_type = RST_TEST_RAID1_TYPE; > + u64 logical1 = SZ_1M; > + u64 len1 = SZ_1M; > + u64 logical2 = logical1 + len1; > + u64 len2 = SZ_1M; > + u64 logical3 = logical2 + len2; > + u64 len3 = SZ_1M; > + u64 hole_start = logical1 + SZ_256K; > + u64 hole_len = SZ_2M; > + int ret; > + > + bioc = alloc_btrfs_io_context(fs_info, logical1, RST_TEST_NUM_DEVICES); > + if (!bioc) { > + test_std_err(TEST_ALLOC_IO_CONTEXT); > + ret = -ENOMEM; > + goto out; > + } > + > + io_stripe.dev = btrfs_device_by_devid(fs_info->fs_devices, 0); > + > + /* prepare for the test, 1st create 3 x 1M extents */ Our preferred style is to capitalize the first word and end with punctuation. Same goes for 2 other comments below. Other than that and the empty changelog, it looks good. So at least after adding a changelog: Reviewed-by: Filipe Manana <fdmanana@suse.com> Thanks. > + bioc->map_type = map_type; > + bioc->size = len1; > + > + for (int i = 0; i < RST_TEST_NUM_DEVICES; i++) { > + struct btrfs_io_stripe *stripe = &bioc->stripes[i]; > + > + stripe->dev = btrfs_device_by_devid(fs_info->fs_devices, i); > + if (!stripe->dev) { > + test_err("cannot find device with devid %d", i); > + ret = -EINVAL; > + goto out; > + } > + > + stripe->physical = logical1 + i * SZ_1G; > + } > + > + ret = btrfs_insert_one_raid_extent(trans, bioc); > + if (ret) { > + test_err("inserting RAID extent failed: %d", ret); > + goto out; > + } > + > + bioc->logical = logical2; > + bioc->size = len2; > + for (int i = 0; i < RST_TEST_NUM_DEVICES; i++) { > + struct btrfs_io_stripe *stripe = &bioc->stripes[i]; > + > + stripe->dev = btrfs_device_by_devid(fs_info->fs_devices, i); > + if (!stripe->dev) { > + test_err("cannot find device with devid %d", i); > + ret = -EINVAL; > + goto out; > + } > + > + stripe->physical = logical2 + i * SZ_1G; > + } > + > + ret = btrfs_insert_one_raid_extent(trans, bioc); > + if (ret) { > + test_err("inserting RAID extent failed: %d", ret); > + goto out; > + } > + > + bioc->logical = logical3; > + bioc->size = len3; > + for (int i = 0; i < RST_TEST_NUM_DEVICES; i++) { > + struct btrfs_io_stripe *stripe = &bioc->stripes[i]; > + > + stripe->dev = btrfs_device_by_devid(fs_info->fs_devices, i); > + if (!stripe->dev) { > + test_err("cannot find device with devid %d", i); > + ret = -EINVAL; > + goto out; > + } > + > + stripe->physical = logical3 + i * SZ_1G; > + } > + > + ret = btrfs_insert_one_raid_extent(trans, bioc); > + if (ret) { > + test_err("inserting RAID extent failed: %d", ret); > + goto out; > + } > + > + /* > + * Delete a range starting at logical1 + 256K and 2M in length. Extent > + * 1 is truncated to 256k length, extent 2 is completely dropped and > + * extent 3 is moved 256K to the right. > + */ > + ret = btrfs_delete_raid_extent(trans, hole_start, hole_len); > + if (ret) { > + test_err("deleting RAID extent [%llu, %llu] failed", > + hole_start, hole_start + hole_len); > + goto out; > + } > + > + /* get the first extent and check its size */ > + ret = btrfs_get_raid_extent_offset(fs_info, logical1, &len1, map_type, > + 0, &io_stripe); > + if (ret) { > + test_err("lookup of RAID extent [%llu, %llu] failed", > + logical1, logical1 + len1); > + goto out; > + } > + > + if (io_stripe.physical != logical1) { > + test_err("invalid physical address, expected %llu, got %llu", > + logical1, io_stripe.physical); > + ret = -EINVAL; > + goto out; > + } > + > + if (len1 != SZ_256K) { > + test_err("invalid stripe length, expected %llu, got %llu", > + (u64)SZ_256K, len1); > + ret = -EINVAL; > + goto out; > + } > + > + /* get the second extent and check it's absent */ > + ret = btrfs_get_raid_extent_offset(fs_info, logical2, &len2, map_type, > + 0, &io_stripe); > + if (ret != -ENODATA) { > + test_err("lookup of RAID extent [%llu, %llu] succeeded should fail", > + logical2, logical2 + len2); > + ret = -EINVAL; > + goto out; > + } > + > + /* get the third extent and check its size */ > + logical3 += SZ_256K; > + ret = btrfs_get_raid_extent_offset(fs_info, logical3, &len3, map_type, > + 0, &io_stripe); > + if (ret) { > + test_err("lookup of RAID extent [%llu, %llu] failed", > + logical3, logical3 + len3); > + goto out; > + } > + > + if (io_stripe.physical != logical3) { > + test_err("invalid physical address, expected %llu, got %llu", > + logical3 + SZ_256K, io_stripe.physical); > + ret = -EINVAL; > + goto out; > + } > + > + if (len3 != SZ_1M - SZ_256K) { > + test_err("invalid stripe length, expected %llu, got %llu", > + (u64)SZ_1M - SZ_256K, len3); > + ret = -EINVAL; > + goto out; > + } > + > + ret = btrfs_delete_raid_extent(trans, logical1, len1); > + if (ret) { > + test_err("deleting RAID extent [%llu, %llu] failed", > + logical1, logical1 + len1); > + goto out; > + } > + > + ret = btrfs_delete_raid_extent(trans, logical3, len3); > + if (ret) { > + test_err("deleting RAID extent [%llu, %llu] failed", > + logical1, logical1 + len1); > + goto out; > + } > + > +out: > + btrfs_put_bioc(bioc); > + return ret; > +} > + > /* Test punching a hole into a single RAID stripe-extent. */ > static int test_punch_hole(struct btrfs_trans_handle *trans) > { > @@ -745,6 +927,7 @@ static const test_func_t tests[] = { > test_front_delete, > test_front_delete_prev_item, > test_punch_hole, > + test_punch_hole_3extents, > }; > > static int run_test(test_func_t test, u32 sectorsize, u32 nodesize) > -- > 2.43.0 > >
diff --git a/fs/btrfs/tests/raid-stripe-tree-tests.c b/fs/btrfs/tests/raid-stripe-tree-tests.c index 37b87ccb5858..8d74e95a8a75 100644 --- a/fs/btrfs/tests/raid-stripe-tree-tests.c +++ b/fs/btrfs/tests/raid-stripe-tree-tests.c @@ -31,6 +31,188 @@ static struct btrfs_device *btrfs_device_by_devid(struct btrfs_fs_devices *fs_de return NULL; } +/* + * Test creating a range of three extents and then punch a hole in the middle, + * deleting all of the middle extents and partially deleting the "book ends" + */ +static int test_punch_hole_3extents(struct btrfs_trans_handle *trans) +{ + struct btrfs_fs_info *fs_info = trans->fs_info; + struct btrfs_io_context *bioc; + struct btrfs_io_stripe io_stripe = { 0 }; + u64 map_type = RST_TEST_RAID1_TYPE; + u64 logical1 = SZ_1M; + u64 len1 = SZ_1M; + u64 logical2 = logical1 + len1; + u64 len2 = SZ_1M; + u64 logical3 = logical2 + len2; + u64 len3 = SZ_1M; + u64 hole_start = logical1 + SZ_256K; + u64 hole_len = SZ_2M; + int ret; + + bioc = alloc_btrfs_io_context(fs_info, logical1, RST_TEST_NUM_DEVICES); + if (!bioc) { + test_std_err(TEST_ALLOC_IO_CONTEXT); + ret = -ENOMEM; + goto out; + } + + io_stripe.dev = btrfs_device_by_devid(fs_info->fs_devices, 0); + + /* prepare for the test, 1st create 3 x 1M extents */ + bioc->map_type = map_type; + bioc->size = len1; + + for (int i = 0; i < RST_TEST_NUM_DEVICES; i++) { + struct btrfs_io_stripe *stripe = &bioc->stripes[i]; + + stripe->dev = btrfs_device_by_devid(fs_info->fs_devices, i); + if (!stripe->dev) { + test_err("cannot find device with devid %d", i); + ret = -EINVAL; + goto out; + } + + stripe->physical = logical1 + i * SZ_1G; + } + + ret = btrfs_insert_one_raid_extent(trans, bioc); + if (ret) { + test_err("inserting RAID extent failed: %d", ret); + goto out; + } + + bioc->logical = logical2; + bioc->size = len2; + for (int i = 0; i < RST_TEST_NUM_DEVICES; i++) { + struct btrfs_io_stripe *stripe = &bioc->stripes[i]; + + stripe->dev = btrfs_device_by_devid(fs_info->fs_devices, i); + if (!stripe->dev) { + test_err("cannot find device with devid %d", i); + ret = -EINVAL; + goto out; + } + + stripe->physical = logical2 + i * SZ_1G; + } + + ret = btrfs_insert_one_raid_extent(trans, bioc); + if (ret) { + test_err("inserting RAID extent failed: %d", ret); + goto out; + } + + bioc->logical = logical3; + bioc->size = len3; + for (int i = 0; i < RST_TEST_NUM_DEVICES; i++) { + struct btrfs_io_stripe *stripe = &bioc->stripes[i]; + + stripe->dev = btrfs_device_by_devid(fs_info->fs_devices, i); + if (!stripe->dev) { + test_err("cannot find device with devid %d", i); + ret = -EINVAL; + goto out; + } + + stripe->physical = logical3 + i * SZ_1G; + } + + ret = btrfs_insert_one_raid_extent(trans, bioc); + if (ret) { + test_err("inserting RAID extent failed: %d", ret); + goto out; + } + + /* + * Delete a range starting at logical1 + 256K and 2M in length. Extent + * 1 is truncated to 256k length, extent 2 is completely dropped and + * extent 3 is moved 256K to the right. + */ + ret = btrfs_delete_raid_extent(trans, hole_start, hole_len); + if (ret) { + test_err("deleting RAID extent [%llu, %llu] failed", + hole_start, hole_start + hole_len); + goto out; + } + + /* get the first extent and check its size */ + ret = btrfs_get_raid_extent_offset(fs_info, logical1, &len1, map_type, + 0, &io_stripe); + if (ret) { + test_err("lookup of RAID extent [%llu, %llu] failed", + logical1, logical1 + len1); + goto out; + } + + if (io_stripe.physical != logical1) { + test_err("invalid physical address, expected %llu, got %llu", + logical1, io_stripe.physical); + ret = -EINVAL; + goto out; + } + + if (len1 != SZ_256K) { + test_err("invalid stripe length, expected %llu, got %llu", + (u64)SZ_256K, len1); + ret = -EINVAL; + goto out; + } + + /* get the second extent and check it's absent */ + ret = btrfs_get_raid_extent_offset(fs_info, logical2, &len2, map_type, + 0, &io_stripe); + if (ret != -ENODATA) { + test_err("lookup of RAID extent [%llu, %llu] succeeded should fail", + logical2, logical2 + len2); + ret = -EINVAL; + goto out; + } + + /* get the third extent and check its size */ + logical3 += SZ_256K; + ret = btrfs_get_raid_extent_offset(fs_info, logical3, &len3, map_type, + 0, &io_stripe); + if (ret) { + test_err("lookup of RAID extent [%llu, %llu] failed", + logical3, logical3 + len3); + goto out; + } + + if (io_stripe.physical != logical3) { + test_err("invalid physical address, expected %llu, got %llu", + logical3 + SZ_256K, io_stripe.physical); + ret = -EINVAL; + goto out; + } + + if (len3 != SZ_1M - SZ_256K) { + test_err("invalid stripe length, expected %llu, got %llu", + (u64)SZ_1M - SZ_256K, len3); + ret = -EINVAL; + goto out; + } + + ret = btrfs_delete_raid_extent(trans, logical1, len1); + if (ret) { + test_err("deleting RAID extent [%llu, %llu] failed", + logical1, logical1 + len1); + goto out; + } + + ret = btrfs_delete_raid_extent(trans, logical3, len3); + if (ret) { + test_err("deleting RAID extent [%llu, %llu] failed", + logical1, logical1 + len1); + goto out; + } + +out: + btrfs_put_bioc(bioc); + return ret; +} + /* Test punching a hole into a single RAID stripe-extent. */ static int test_punch_hole(struct btrfs_trans_handle *trans) { @@ -745,6 +927,7 @@ static const test_func_t tests[] = { test_front_delete, test_front_delete_prev_item, test_punch_hole, + test_punch_hole_3extents, }; static int run_test(test_func_t test, u32 sectorsize, u32 nodesize)