Skip to contentSkip to conversation

btrfs-progs: check: add the ability to reset btrfs_dev_item::bytes_used

PATCH In review Qu Wenruo 2 participants 3 messages Jun 9, 2021 – Jun 11, 2021 Btrfs file system

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH 1/2 btrfs-progs: check: add the ability to reset btrfs_dev_item::bytes_used

There is a report from the mail list that one user got its filesystem with device item bytes_used mismatch.

This problem leaves the device item with some ghost bytes_used, meaning even if we delete all device extents of that device, the bytes_used still won't be 0.

This itself is not a big deal, but when the user used up all its unallocated space, write time tree-checker can be triggered and make the fs RO, as the new device::bytes_used can be larger than device::total_bytes.

Thus we need to fix the problem in btrfs-check to avoid above write-time tree check warning.

This patch will add the ability to reset a device's bytes_used to both original mode and lowmem mode.

---
 check/main.c        |  8 ++++++-
 check/mode-common.c | 57 +++++++++++++++++++++++++++++++++++++++++++++
 check/mode-common.h |  2 ++
 check/mode-lowmem.c | 14 +++++++++--
 4 files changed, 78 insertions(+), 3 deletions(-)
check/main.c +7 -1
index ee6cf793251c..6cf96b1a9b3b 100644
@@ -8397,11 +8397,17 @@ static int check_device_used(struct device_record *dev_rec,
 	}
 
 	if (total_byte != dev_rec->byte_used) {
+		int ret = -1;
+
 		fprintf(stderr,
 			"Dev extent's total-byte(%llu) is not equal to byte-used(%llu) in dev[%llu, %u, %llu]\n",
 			total_byte, dev_rec->byte_used,	dev_rec->objectid,
 			dev_rec->type, dev_rec->offset);
-		return -1;
+		if (repair) {
+			ret = repair_dev_item_bytes_used(gfs_info,
+					dev_rec->devid, total_byte);
+		}
+		return ret;
 	} else {
 		return 0;
 	}
check/mode-common.c +57 -0

66 lines not on this page · raw message

check/mode-common.h +2 -0
index 3ba29ecab6cd..711eced3acf0 100644
@@ -192,4 +192,6 @@ static inline void btrfs_check_subpage_eb_alignment(u64 start, u32 len)
 			start, start + len);
 }
 
+int repair_dev_item_bytes_used(struct btrfs_fs_info *fs_info,
+			       u64 devid, u64 bytes_used_expected);
 #endif
check/mode-lowmem.c +12 -2
index 2f736712bc7f..64f09e68516c 100644
@@ -4454,7 +4454,8 @@ out:
 /*
  * Check if the used space is correct with the dev item
  */
-static int check_dev_item(struct extent_buffer *eb, int slot)
+static int check_dev_item(struct extent_buffer *eb, int slot,
+			  u64 *bytes_used_expected)
 {
 	struct btrfs_root *dev_root = gfs_info->dev_root;
 	struct btrfs_dev_item *dev_item;
@@ -4543,6 +4544,7 @@ next:
 	}
 	btrfs_release_path(&path);
 
+	*bytes_used_expected = total;
 	if (used != total) {
 		btrfs_item_key_to_cpu(eb, &key, slot);
 		error(
@@ -4744,6 +4746,7 @@ static int repair_chunk_item(struct btrfs_root *chunk_root,
 static int check_leaf_items(struct btrfs_root *root, struct btrfs_path *path,
 			    struct node_refs *nrefs, int account_bytes)
 {
+	u64 bytes_used_expected = (u64)-1;
 	struct btrfs_key key;
 	struct extent_buffer *eb;
 	int slot;
@@ -4782,7 +4785,14 @@ again:
 		err |= ret;
 		break;
 	case BTRFS_DEV_ITEM_KEY:
-		ret = check_dev_item(eb, slot);
+		ret = check_dev_item(eb, slot, &bytes_used_expected);
+		if (repair && ret & ACCOUNTING_MISMATCH &&
+		    bytes_used_expected != (u64)-1) {
+			ret = repair_dev_item_bytes_used(root->fs_info,
+					key.offset, bytes_used_expected);
+			if (ret < 0)
+				ret = ACCOUNTING_MISMATCH;
+		}
 		err |= ret;
 		break;
 	case BTRFS_CHUNK_ITEM_KEY:
Signature · 1 line
2.32.0
author
#1 lore raw

PATCH 2/2 btrfs-progs: tests/fsck: add test case to make sure btrfs check can reset btrfs_dev_item::bytes_used

The test image is manually crafted with 1MiB offset in the device item of devid 1.

---
 .../047-dev-bytes-used/.lowmem_repairable        |   0
 .../047-dev-bytes-used/default_case.img.xz       | Bin 0 -> 1896 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/fsck-tests/047-dev-bytes-used/.lowmem_repairable
 create mode 100644 tests/fsck-tests/047-dev-bytes-used/default_case.img.xz
tests/fsck-tests/047-dev-bytes-used/.lowmem_repairable new file +0 -0
new file mode 100644
index 000000000000..e69de29bb2d1
tests/fsck-tests/047-dev-bytes-used/default_case.img.xz new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..28100c185cb6f6f3ec342434e9605b6faea135af
GIT binary patch
Signature · 1 line
2.32.0
#2 lore raw
In reply to Qu Wenruo
Quoted 12 lines · Qu Wenruo

There is a report from the mail list that one user got its filesystem with device item bytes_used mismatch.

This problem leaves the device item with some ghost bytes_used, meaning even if we delete all device extents of that device, the bytes_used still won't be 0.

This itself is not a big deal, but when the user used up all its unallocated space, write time tree-checker can be triggered and make the fs RO, as the new device::bytes_used can be larger than device::total_bytes.

Quoted 7 lines

Thus we need to fix the problem in btrfs-check to avoid above write-time tree check warning.

This patch will add the ability to reset a device's bytes_used to both original mode and lowmem mode.

Added to devel, with some fixups, thanks.

Quoted 65 lines
---
 check/main.c        |  8 ++++++-
 check/mode-common.c | 57 +++++++++++++++++++++++++++++++++++++++++++++
 check/mode-common.h |  2 ++
 check/mode-lowmem.c | 14 +++++++++--
 4 files changed, 78 insertions(+), 3 deletions(-)
check/main.c +7 -1
index ee6cf793251c..6cf96b1a9b3b 100644
@@ -8397,11 +8397,17 @@ static int check_device_used(struct device_record *dev_rec,
 	}
 
 	if (total_byte != dev_rec->byte_used) {
+		int ret = -1;
+
 		fprintf(stderr,
 			"Dev extent's total-byte(%llu) is not equal to byte-used(%llu) in dev[%llu, %u, %llu]\n",
 			total_byte, dev_rec->byte_used,	dev_rec->objectid,
 			dev_rec->type, dev_rec->offset);
-		return -1;
+		if (repair) {
+			ret = repair_dev_item_bytes_used(gfs_info,
+					dev_rec->devid, total_byte);
+		}
+		return ret;
 	} else {
 		return 0;
 	}
check/mode-common.c +20 -0
index cb22f3233c00..5764bf6ee54c 100644
@@ -21,6 +21,7 @@
 #include "kernel-shared/transaction.h"
 #include "common/utils.h"
 #include "kernel-shared/disk-io.h"
+#include "kernel-shared/volumes.h"
 #include "common/repair.h"
 #include "check/mode-common.h"
 
@@ -1243,3 +1244,59 @@ out:
 	btrfs_release_path(&path);
 	return ret;
 }
+
+int repair_dev_item_bytes_used(struct btrfs_fs_info *fs_info,
+			       u64 devid, u64 bytes_used_expected)
+{
+	struct btrfs_trans_handle *trans;
+	struct btrfs_device *device;
+	int ret;
+
+	device = btrfs_find_device_by_devid(fs_info->fs_devices, devid, 0);
+	if (!device) {
+		error("failed to find device with devid %llu", devid);
+		return -ENOENT;
+	}
+
+	/* Bytes_used matches, not what we can repair */
+	if (device->bytes_used == bytes_used_expected)
+		return -ENOTSUP;
+
+	/*

check/mode-common.c out: · line 1275

Quoted 10 lines
check/mode-common.c +10 -0
+	 * We have to set the device bytes used right now, before
+	 * starting a new transaction, as it may allocate new chunk and
+	 * modify device->bytes_used.
+	 */
+	device->bytes_used = bytes_used_expected;
+	trans = btrfs_start_transaction(fs_info->chunk_root, 1);
+	if (IS_ERR(trans)) {
+		ret = PTR_ERR(trans);
+		errno = -ret;
+		error("failed to start transaction: %d (\"%m\")", ret);

It's enough to print just %m.

Quoted 9 lines
check/mode-common.c +9 -0
+		return ret;
+	}
+
+	/* Manually update the device item in chunk tree */
+	ret = btrfs_update_device(trans, device);
+	if (ret < 0) {
+		error(
+		"failed to update device item for devid %llu: %d (\"%m\")",
+		      devid, ret);

check/mode-common.c out: · line 1294

Quoted 10 lines
check/mode-common.c +10 -0
+		goto error;
+	}
+
+	/*
+	 * Commit transaction not only to save above change but also update
+	 * the device item in super block.
+	 */
+	ret = btrfs_commit_transaction(trans, fs_info->chunk_root);
+	if (ret < 0)
+		error("failed to commit transaction: %d (\"%m\")", ret);

But when %m is used, errno must be set li

		errno = -ret;
		error("... %m");
Quoted 67 lines
check/mode-common.c +8 -0
+	else
+		printf("reset devid %llu bytes_used to %llu\n", devid,
+		       device->bytes_used);
+	return ret;
+error:
+	btrfs_abort_transaction(trans, ret);
+	return ret;
+}
check/mode-common.h +2 -0
index 3ba29ecab6cd..711eced3acf0 100644
@@ -192,4 +192,6 @@ static inline void btrfs_check_subpage_eb_alignment(u64 start, u32 len)
 			start, start + len);
 }
 
+int repair_dev_item_bytes_used(struct btrfs_fs_info *fs_info,
+			       u64 devid, u64 bytes_used_expected);
 #endif
check/mode-lowmem.c +12 -2
index 2f736712bc7f..64f09e68516c 100644
@@ -4454,7 +4454,8 @@ out:
 /*
  * Check if the used space is correct with the dev item
  */
-static int check_dev_item(struct extent_buffer *eb, int slot)
+static int check_dev_item(struct extent_buffer *eb, int slot,
+			  u64 *bytes_used_expected)
 {
 	struct btrfs_root *dev_root = gfs_info->dev_root;
 	struct btrfs_dev_item *dev_item;
@@ -4543,6 +4544,7 @@ next:
 	}
 	btrfs_release_path(&path);
 
+	*bytes_used_expected = total;
 	if (used != total) {
 		btrfs_item_key_to_cpu(eb, &key, slot);
 		error(
@@ -4744,6 +4746,7 @@ static int repair_chunk_item(struct btrfs_root *chunk_root,
 static int check_leaf_items(struct btrfs_root *root, struct btrfs_path *path,
 			    struct node_refs *nrefs, int account_bytes)
 {
+	u64 bytes_used_expected = (u64)-1;
 	struct btrfs_key key;
 	struct extent_buffer *eb;
 	int slot;
@@ -4782,7 +4785,14 @@ again:
 		err |= ret;
 		break;
 	case BTRFS_DEV_ITEM_KEY:
-		ret = check_dev_item(eb, slot);
+		ret = check_dev_item(eb, slot, &bytes_used_expected);
+		if (repair && ret & ACCOUNTING_MISMATCH &&
+		    bytes_used_expected != (u64)-1) {
+			ret = repair_dev_item_bytes_used(root->fs_info,
+					key.offset, bytes_used_expected);
+			if (ret < 0)
+				ret = ACCOUNTING_MISMATCH;
+		}
 		err |= ret;
 		break;
 	case BTRFS_CHUNK_ITEM_KEY:
Signature · 1 line
2.32.0