Skip to contentSkip to conversation

Fix btrfs check handling of missing file extents

PATCH Superseded Josef Bacik 2 participants 5 messages Jan 30, 2020 – Mar 5, 2020 Btrfs file system

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Fix btrfs check handling of missing file extents

While adding an xfstest for the missing file extent problem I fixed with the series

btrfs: fix hole corruption issue with !NO_HOLES

I was failing to fail my test without my patches, despite the file system being actually wrong.

It turns out because the normal check mode sets its expected start to the first file extent it finds, instead of 0. This means it misses any gaps between 0 and the first file extent item in the inode.

The lowmem check does not have this issue, instead it doesn't take into account the isize of the inode, so improperly fails when we have a gap but that is outside of the isize. I fixed this as well.

With these patches we're able to properly find another set of corruptions, and now my xfstest acts sanely. Thanks,

Josef

#1 lore raw

PATCH 1/2 btrfs-progs: fix check to catch gaps at the start of the file

When writing my test for the i_size patches, I noticed that I was not actually failing without my patches as I should have been. This is because we assume the first extent we find is the first valid spot, so we don't actually add a hole entry if there is no extent at offset 0. Fix this by setting our extent_start and extent_end to 0 so we can properly catch the corruption.

---
 check/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
check/main.c +2 -2
index 4115049a..4ce5a63c 100644
@@ -1553,8 +1553,8 @@ static int process_file_extent(struct btrfs_root *root,
 	rec->found_file_extent = 1;
 
 	if (rec->extent_start == (u64)-1) {
-		rec->extent_start = key->offset;
-		rec->extent_end = key->offset;
+		rec->extent_start = 0;
+		rec->extent_end = 0;
 	}
 
 	if (rec->extent_end > key->offset)
Signature · 1 line
2.24.1
#2 lore raw

Re: [PATCH 1/2] btrfs-progs: fix check to catch gaps at the start of the file

Quoted 8 lines · Josef Bacik

When writing my test for the i_size patches, I noticed that I was not actually failing without my patches as I should have been. This is because we assume the first extent we find is the first valid spot, so we don't actually add a hole entry if there is no extent at offset 0. Fix this by setting our extent_start and extent_end to 0 so we can properly catch the corruption.

This patch does not pass tests:

    [TEST/fsck]   020-extent-ref-cases                                                                   

failed: /labs/dsterba/gits/btrfs-progs/btrfs check ./keyed_data_ref_with_shared_leaf.img.restored test failed for case 020-extent-ref-cases

#3 lore raw

PATCH 2/2 btrfs-progs: fix lowmem check's handling of holes

In reply to Josef Bacik

Lowmem check had the opposite problem of normal check, it caught gaps that started at 0, but would still fail with my fixes in place. This is because lowmem check doesn't take into account the isize of the inode. Address this by making sure we do not complain about gaps that are after isize. This makes lowmem pass with my fixes applied, and still fail without my fixes.

---
 check/mode-lowmem.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
check/mode-lowmem.c +6 -4
index 2f76d634..fd503aa6 100644
@@ -2029,7 +2029,8 @@ static int check_file_extent_inline(struct btrfs_root *root,
  * Return 0 if no error occurred.
  */
 static int check_file_extent(struct btrfs_root *root, struct btrfs_path *path,
-			     unsigned int nodatasum, u64 *size, u64 *end)
+			     unsigned int nodatasum, u64 isize, u64 *size,
+			     u64 *end)
 {
 	struct btrfs_file_extent_item *fi;
 	struct btrfs_key fkey;
@@ -2152,7 +2153,7 @@ static int check_file_extent(struct btrfs_root *root, struct btrfs_path *path,
 	}
 
 	/* Check EXTENT_DATA hole */
-	if (!no_holes && *end != fkey.offset) {
+	if (!no_holes && (fkey.offset < isize) && (*end != fkey.offset)) {
 		if (repair)
 			ret = punch_extent_hole(root, path, fkey.objectid,
 						*end, fkey.offset - *end);
@@ -2165,7 +2166,8 @@ static int check_file_extent(struct btrfs_root *root, struct btrfs_path *path,
 		}
 	}
 
-	*end = fkey.offset + extent_num_bytes;
+	if (fkey.offset + extent_num_bytes < isize)
+		*end = fkey.offset + extent_num_bytes;
 	if (!is_hole)
 		*size += extent_num_bytes;
 
@@ -2726,7 +2728,7 @@ static int check_inode_item(struct btrfs_root *root, struct btrfs_path *path)
 					root->objectid, inode_id, key.objectid,
 					key.offset);
 			}
-			ret = check_file_extent(root, path, nodatasum,
+			ret = check_file_extent(root, path, nodatasum, isize,
 						&extent_size, &extent_end);
 			err |= ret;
 			break;
Signature · 1 line
2.24.1
#4 lore raw
In reply to Josef Bacik
Quoted 12 lines · Josef Bacik

While adding an xfstest for the missing file extent problem I fixed with the series

btrfs: fix hole corruption issue with !NO_HOLES

I was failing to fail my test without my patches, despite the file system being actually wrong.

It turns out because the normal check mode sets its expected start to the first file extent it finds, instead of 0. This means it misses any gaps between 0 and the first file extent item in the inode.

Quoted 6 lines

The lowmem check does not have this issue, instead it doesn't take into account the isize of the inode, so improperly fails when we have a gap but that is outside of the isize. I fixed this as well.

With these patches we're able to properly find another set of corruptions, and now my xfstest acts sanely. Thanks,

Added to devel, thanks.