Skip to content

L
linux
Commit 905d0f56 authored by David Sterba's avatar David Sterba Committed by Josef Bacik
Browse files
Options

btrfs: add prefix to sanity tests messages 

And change the message level to KERN_INFO.
Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 8d599ae1
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 48 deletions
fs/btrfs/free-space-cache.c
View file @ 905d0f56
...@@ -3150,6 +3150,8 @@ static int add_free_space_entry(struct btrfs_block_group_cache *cache, ...@@ -3150,6 +3150,8 @@ static int add_free_space_entry(struct btrfs_block_group_cache *cache,
return 0; return 0;
} }
#define test_msg(fmt, ...) printk(KERN_INFO "btrfs: selftest: " fmt, ##__VA_ARGS__)
/* /*
* This test just does basic sanity checking, making sure we can add an exten * This test just does basic sanity checking, making sure we can add an exten
* entry and remove space from either end and the middle, and make sure we can * entry and remove space from either end and the middle, and make sure we can
...@@ -3159,63 +3161,63 @@ static int test_extents(struct btrfs_block_group_cache *cache) ...@@ -3159,63 +3161,63 @@ static int test_extents(struct btrfs_block_group_cache *cache)
{ {
int ret = 0; int ret = 0;
printk(KERN_ERR "Running extent only tests\n"); test_msg("Running extent only tests\n");
/* First just make sure we can remove an entire entry */ /* First just make sure we can remove an entire entry */
ret = btrfs_add_free_space(cache, 0, 4 * 1024 * 1024); ret = btrfs_add_free_space(cache, 0, 4 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Error adding initial extents %d\n", ret); test_msg("Error adding initial extents %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 0, 4 * 1024 * 1024); ret = btrfs_remove_free_space(cache, 0, 4 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Error removing extent %d\n", ret); test_msg("Error removing extent %d\n", ret);
return ret; return ret;
} }
if (check_exists(cache, 0, 4 * 1024 * 1024)) { if (check_exists(cache, 0, 4 * 1024 * 1024)) {
printk(KERN_ERR "Full remove left some lingering space\n"); test_msg("Full remove left some lingering space\n");
return -1; return -1;
} }
/* Ok edge and middle cases now */ /* Ok edge and middle cases now */
ret = btrfs_add_free_space(cache, 0, 4 * 1024 * 1024); ret = btrfs_add_free_space(cache, 0, 4 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Error adding half extent %d\n", ret); test_msg("Error adding half extent %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 3 * 1024 * 1024, 1 * 1024 * 1024); ret = btrfs_remove_free_space(cache, 3 * 1024 * 1024, 1 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Error removing tail end %d\n", ret); test_msg("Error removing tail end %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 0, 1 * 1024 * 1024); ret = btrfs_remove_free_space(cache, 0, 1 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Error removing front end %d\n", ret); test_msg("Error removing front end %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096); ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096);
if (ret) { if (ret) {
printk(KERN_ERR "Error removing middle peice %d\n", ret); test_msg("Error removing middle peice %d\n", ret);
return ret; return ret;
} }
if (check_exists(cache, 0, 1 * 1024 * 1024)) { if (check_exists(cache, 0, 1 * 1024 * 1024)) {
printk(KERN_ERR "Still have space at the front\n"); test_msg("Still have space at the front\n");
return -1; return -1;
} }
if (check_exists(cache, 2 * 1024 * 1024, 4096)) { if (check_exists(cache, 2 * 1024 * 1024, 4096)) {
printk(KERN_ERR "Still have space in the middle\n"); test_msg("Still have space in the middle\n");
return -1; return -1;
} }
if (check_exists(cache, 3 * 1024 * 1024, 1 * 1024 * 1024)) { if (check_exists(cache, 3 * 1024 * 1024, 1 * 1024 * 1024)) {
printk(KERN_ERR "Still have space at the end\n"); test_msg("Still have space at the end\n");
return -1; return -1;
} }
...@@ -3230,34 +3232,34 @@ static int test_bitmaps(struct btrfs_block_group_cache *cache) ...@@ -3230,34 +3232,34 @@ static int test_bitmaps(struct btrfs_block_group_cache *cache)
u64 next_bitmap_offset; u64 next_bitmap_offset;
int ret; int ret;
printk(KERN_ERR "Running bitmap only tests\n"); test_msg("Running bitmap only tests\n");
ret = add_free_space_entry(cache, 0, 4 * 1024 * 1024, 1); ret = add_free_space_entry(cache, 0, 4 * 1024 * 1024, 1);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't create a bitmap entry %d\n", ret); test_msg("Couldn't create a bitmap entry %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 0, 4 * 1024 * 1024); ret = btrfs_remove_free_space(cache, 0, 4 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Error removing bitmap full range %d\n", ret); test_msg("Error removing bitmap full range %d\n", ret);
return ret; return ret;
} }
if (check_exists(cache, 0, 4 * 1024 * 1024)) { if (check_exists(cache, 0, 4 * 1024 * 1024)) {
printk(KERN_ERR "Left some space in bitmap\n"); test_msg("Left some space in bitmap\n");
return -1; return -1;
} }
ret = add_free_space_entry(cache, 0, 4 * 1024 * 1024, 1); ret = add_free_space_entry(cache, 0, 4 * 1024 * 1024, 1);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't add to our bitmap entry %d\n", ret); test_msg("Couldn't add to our bitmap entry %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 1 * 1024 * 1024, 2 * 1024 * 1024); ret = btrfs_remove_free_space(cache, 1 * 1024 * 1024, 2 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't remove middle chunk %d\n", ret); test_msg("Couldn't remove middle chunk %d\n", ret);
return ret; return ret;
} }
...@@ -3271,21 +3273,21 @@ static int test_bitmaps(struct btrfs_block_group_cache *cache) ...@@ -3271,21 +3273,21 @@ static int test_bitmaps(struct btrfs_block_group_cache *cache)
ret = add_free_space_entry(cache, next_bitmap_offset - ret = add_free_space_entry(cache, next_bitmap_offset -
(2 * 1024 * 1024), 4 * 1024 * 1024, 1); (2 * 1024 * 1024), 4 * 1024 * 1024, 1);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't add space that straddles two bitmaps" test_msg("Couldn't add space that straddles two bitmaps %d\n",
" %d\n", ret); ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, next_bitmap_offset - ret = btrfs_remove_free_space(cache, next_bitmap_offset -
(1 * 1024 * 1024), 2 * 1024 * 1024); (1 * 1024 * 1024), 2 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't remove overlapping space %d\n", ret); test_msg("Couldn't remove overlapping space %d\n", ret);
return ret; return ret;
} }
if (check_exists(cache, next_bitmap_offset - (1 * 1024 * 1024), if (check_exists(cache, next_bitmap_offset - (1 * 1024 * 1024),
2 * 1024 * 1024)) { 2 * 1024 * 1024)) {
printk(KERN_ERR "Left some space when removing overlapping\n"); test_msg("Left some space when removing overlapping\n");
return -1; return -1;
} }
...@@ -3300,7 +3302,7 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache) ...@@ -3300,7 +3302,7 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache)
u64 bitmap_offset = (u64)(BITS_PER_BITMAP * 4096); u64 bitmap_offset = (u64)(BITS_PER_BITMAP * 4096);
int ret; int ret;
printk(KERN_ERR "Running bitmap and extent tests\n"); test_msg("Running bitmap and extent tests\n");
/* /*
* First let's do something simple, an extent at the same offset as the * First let's do something simple, an extent at the same offset as the
...@@ -3309,42 +3311,42 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache) ...@@ -3309,42 +3311,42 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache)
*/ */
ret = add_free_space_entry(cache, 4 * 1024 * 1024, 1 * 1024 * 1024, 1); ret = add_free_space_entry(cache, 4 * 1024 * 1024, 1 * 1024 * 1024, 1);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't create bitmap entry %d\n", ret); test_msg("Couldn't create bitmap entry %d\n", ret);
return ret; return ret;
} }
ret = add_free_space_entry(cache, 0, 1 * 1024 * 1024, 0); ret = add_free_space_entry(cache, 0, 1 * 1024 * 1024, 0);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't add extent entry %d\n", ret); test_msg("Couldn't add extent entry %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 0, 1 * 1024 * 1024); ret = btrfs_remove_free_space(cache, 0, 1 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't remove extent entry %d\n", ret); test_msg("Couldn't remove extent entry %d\n", ret);
return ret; return ret;
} }
if (check_exists(cache, 0, 1 * 1024 * 1024)) { if (check_exists(cache, 0, 1 * 1024 * 1024)) {
printk(KERN_ERR "Left remnants after our remove\n"); test_msg("Left remnants after our remove\n");
return -1; return -1;
} }
/* Now to add back the extent entry and remove from the bitmap */ /* Now to add back the extent entry and remove from the bitmap */
ret = add_free_space_entry(cache, 0, 1 * 1024 * 1024, 0); ret = add_free_space_entry(cache, 0, 1 * 1024 * 1024, 0);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't re-add extent entry %d\n", ret); test_msg("Couldn't re-add extent entry %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 4 * 1024 * 1024, 1 * 1024 * 1024); ret = btrfs_remove_free_space(cache, 4 * 1024 * 1024, 1 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't remove from bitmap %d\n", ret); test_msg("Couldn't remove from bitmap %d\n", ret);
return ret; return ret;
} }
if (check_exists(cache, 4 * 1024 * 1024, 1 * 1024 * 1024)) { if (check_exists(cache, 4 * 1024 * 1024, 1 * 1024 * 1024)) {
printk(KERN_ERR "Left remnants in the bitmap\n"); test_msg("Left remnants in the bitmap\n");
return -1; return -1;
} }
...@@ -3354,19 +3356,18 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache) ...@@ -3354,19 +3356,18 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache)
*/ */
ret = add_free_space_entry(cache, 1 * 1024 * 1024, 4 * 1024 * 1024, 1); ret = add_free_space_entry(cache, 1 * 1024 * 1024, 4 * 1024 * 1024, 1);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't add to a bitmap %d\n", ret); test_msg("Couldn't add to a bitmap %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 512 * 1024, 3 * 1024 * 1024); ret = btrfs_remove_free_space(cache, 512 * 1024, 3 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't remove overlapping space %d\n", ret); test_msg("Couldn't remove overlapping space %d\n", ret);
return ret; return ret;
} }
if (check_exists(cache, 512 * 1024, 3 * 1024 * 1024)) { if (check_exists(cache, 512 * 1024, 3 * 1024 * 1024)) {
printk(KERN_ERR "Left over peices after removing " test_msg("Left over peices after removing overlapping\n");
"overlapping\n");
return -1; return -1;
} }
...@@ -3375,24 +3376,24 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache) ...@@ -3375,24 +3376,24 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache)
/* Now with the extent entry offset into the bitmap */ /* Now with the extent entry offset into the bitmap */
ret = add_free_space_entry(cache, 4 * 1024 * 1024, 4 * 1024 * 1024, 1); ret = add_free_space_entry(cache, 4 * 1024 * 1024, 4 * 1024 * 1024, 1);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't add space to the bitmap %d\n", ret); test_msg("Couldn't add space to the bitmap %d\n", ret);
return ret; return ret;
} }
ret = add_free_space_entry(cache, 2 * 1024 * 1024, 2 * 1024 * 1024, 0); ret = add_free_space_entry(cache, 2 * 1024 * 1024, 2 * 1024 * 1024, 0);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't add extent to the cache %d\n", ret); test_msg("Couldn't add extent to the cache %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 3 * 1024 * 1024, 4 * 1024 * 1024); ret = btrfs_remove_free_space(cache, 3 * 1024 * 1024, 4 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Problem removing overlapping space %d\n", ret); test_msg("Problem removing overlapping space %d\n", ret);
return ret; return ret;
} }
if (check_exists(cache, 3 * 1024 * 1024, 4 * 1024 * 1024)) { if (check_exists(cache, 3 * 1024 * 1024, 4 * 1024 * 1024)) {
printk(KERN_ERR "Left something behind when removing space"); test_msg("Left something behind when removing space");
return -1; return -1;
} }
...@@ -3410,27 +3411,27 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache) ...@@ -3410,27 +3411,27 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache)
ret = add_free_space_entry(cache, bitmap_offset + 4 * 1024 * 1024, ret = add_free_space_entry(cache, bitmap_offset + 4 * 1024 * 1024,
4 * 1024 * 1024, 1); 4 * 1024 * 1024, 1);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't add bitmap %d\n", ret); test_msg("Couldn't add bitmap %d\n", ret);
return ret; return ret;
} }
ret = add_free_space_entry(cache, bitmap_offset - 1 * 1024 * 1024, ret = add_free_space_entry(cache, bitmap_offset - 1 * 1024 * 1024,
5 * 1024 * 1024, 0); 5 * 1024 * 1024, 0);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't add extent entry %d\n", ret); test_msg("Couldn't add extent entry %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, bitmap_offset + 1 * 1024 * 1024, ret = btrfs_remove_free_space(cache, bitmap_offset + 1 * 1024 * 1024,
5 * 1024 * 1024); 5 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Failed to free our space %d\n", ret); test_msg("Failed to free our space %d\n", ret);
return ret; return ret;
} }
if (check_exists(cache, bitmap_offset + 1 * 1024 * 1024, if (check_exists(cache, bitmap_offset + 1 * 1024 * 1024,
5 * 1024 * 1024)) { 5 * 1024 * 1024)) {
printk(KERN_ERR "Left stuff over\n"); test_msg("Left stuff over\n");
return -1; return -1;
} }
...@@ -3444,20 +3445,19 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache) ...@@ -3444,20 +3445,19 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache)
*/ */
ret = add_free_space_entry(cache, 1 * 1024 * 1024, 2 * 1024 * 1024, 1); ret = add_free_space_entry(cache, 1 * 1024 * 1024, 2 * 1024 * 1024, 1);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't add bitmap entry %d\n", ret); test_msg("Couldn't add bitmap entry %d\n", ret);
return ret; return ret;
} }
ret = add_free_space_entry(cache, 3 * 1024 * 1024, 1 * 1024 * 1024, 0); ret = add_free_space_entry(cache, 3 * 1024 * 1024, 1 * 1024 * 1024, 0);
if (ret) { if (ret) {
printk(KERN_ERR "Couldn't add extent entry %d\n", ret); test_msg("Couldn't add extent entry %d\n", ret);
return ret; return ret;
} }
ret = btrfs_remove_free_space(cache, 1 * 1024 * 1024, 3 * 1024 * 1024); ret = btrfs_remove_free_space(cache, 1 * 1024 * 1024, 3 * 1024 * 1024);
if (ret) { if (ret) {
printk(KERN_ERR "Error removing bitmap and extent " test_msg("Error removing bitmap and extent overlapping %d\n", ret);
"overlapping %d\n", ret);
return ret; return ret;
} }
...@@ -3469,11 +3469,11 @@ void btrfs_test_free_space_cache(void) ...@@ -3469,11 +3469,11 @@ void btrfs_test_free_space_cache(void)
{ {
struct btrfs_block_group_cache *cache; struct btrfs_block_group_cache *cache;
printk(KERN_ERR "Running btrfs free space cache tests\n"); test_msg("Running btrfs free space cache tests\n");
cache = init_test_block_group(); cache = init_test_block_group();
if (!cache) { if (!cache) {
printk(KERN_ERR "Couldn't run the tests\n"); test_msg("Couldn't run the tests\n");
return; return;
} }
...@@ -3487,6 +3487,7 @@ void btrfs_test_free_space_cache(void) ...@@ -3487,6 +3487,7 @@ void btrfs_test_free_space_cache(void)
__btrfs_remove_free_space_cache(cache->free_space_ctl); __btrfs_remove_free_space_cache(cache->free_space_ctl);
kfree(cache->free_space_ctl); kfree(cache->free_space_ctl);
kfree(cache); kfree(cache);
printk(KERN_ERR "Free space cache tests finished\n"); test_msg("Free space cache tests finished\n");
} }
#undef test_msg
#endif /* CONFIG_BTRFS_FS_RUN_SANITY_TESTS */ #endif /* CONFIG_BTRFS_FS_RUN_SANITY_TESTS */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7