btrfs: tests: remove invalid extent-io test

In extent-io-test, there are two invalid tests:

- Invalid nodesize for test_eb_bitmaps()
  Instead of the sectorsize and nodesize combination passed in, we're
  always using hand-crafted nodesize, e.g:

	len = (sectorsize < BTRFS_MAX_METADATA_BLOCKSIZE)
		? sectorsize * 4 : sectorsize;

  In above case, if we have 32K page size, then we will get a length of
  128K, which is beyond max node size, and obviously invalid.

  The common page size goes up to 64K so we haven't hit that

- Invalid extent buffer bytenr
  For 64K page size, the only combination we're going to test is
  sectorsize = nodesize = 64K.
  However, in that case we will try to test an eb which bytenr is not
  sectorsize aligned:

	/* Do it over again with an extent buffer which isn't page-aligned. */
	eb = __alloc_dummy_extent_buffer(fs_info, nodesize / 2, len);

  Sector alignment is a hard requirement for any sector size.
  The only exception is superblock. But anything else should follow
  sector size alignment.

  This is definitely an invalid test case.

This patch will fix both problems by:

- Honor the sectorsize/nodesize combination
  Now we won't bother to hand-craft the length and use it as nodesize.

- Use sectorsize as the 2nd run extent buffer start
  This would test the case where extent buffer is aligned to sectorsize
  but not always aligned to nodesize.

Please note that, later subpage related cleanup will reduce
extent_buffer::pages[] to exactly what we need, making the sector
unaligned extent buffer operations cause problems.

Since only extent_io self tests utilize this, this patch is required for
all later cleanup/refactoring.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index df7ce874a74b90d57550a2bee0d4b125c2916dc6..73e96d505f4f7d5d8f203fe5938593e77e47971c 100644 (file)
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -379,54 +379,50 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb,
 static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)
 {
        struct btrfs_fs_info *fs_info;
-       unsigned long len;
        unsigned long *bitmap = NULL;
        struct extent_buffer *eb = NULL;
        int ret;
 
        test_msg("running extent buffer bitmap tests");
 
-       /*
-        * In ppc64, sectorsize can be 64K, thus 4 * 64K will be larger than
-        * BTRFS_MAX_METADATA_BLOCKSIZE.
-        */
-       len = (sectorsize < BTRFS_MAX_METADATA_BLOCKSIZE)
-               ? sectorsize * 4 : sectorsize;
-
-       fs_info = btrfs_alloc_dummy_fs_info(len, len);
+       fs_info = btrfs_alloc_dummy_fs_info(nodesize, sectorsize);
        if (!fs_info) {
                test_std_err(TEST_ALLOC_FS_INFO);
                return -ENOMEM;
        }
 
-       bitmap = kmalloc(len, GFP_KERNEL);
+       bitmap = kmalloc(nodesize, GFP_KERNEL);
        if (!bitmap) {
                test_err("couldn't allocate test bitmap");
                ret = -ENOMEM;
                goto out;
        }
 
-       eb = __alloc_dummy_extent_buffer(fs_info, 0, len);
+       eb = __alloc_dummy_extent_buffer(fs_info, 0, nodesize);
        if (!eb) {
                test_std_err(TEST_ALLOC_ROOT);
                ret = -ENOMEM;
                goto out;
        }
 
-       ret = __test_eb_bitmaps(bitmap, eb, len);
+       ret = __test_eb_bitmaps(bitmap, eb, nodesize);
        if (ret)
                goto out;
 
-       /* Do it over again with an extent buffer which isn't page-aligned. */
        free_extent_buffer(eb);
-       eb = __alloc_dummy_extent_buffer(fs_info, nodesize / 2, len);
+
+       /*
+        * Test again for case where the tree block is sectorsize aligned but
+        * not nodesize aligned.
+        */
+       eb = __alloc_dummy_extent_buffer(fs_info, sectorsize, nodesize);
        if (!eb) {
                test_std_err(TEST_ALLOC_ROOT);
                ret = -ENOMEM;
                goto out;
        }
 
-       ret = __test_eb_bitmaps(bitmap, eb, len);
+       ret = __test_eb_bitmaps(bitmap, eb, nodesize);
 out:
        free_extent_buffer(eb);
        kfree(bitmap);