@@ -1648,6 +1648,7 @@ struct btrfs_fs_info {
atomic_t mutually_exclusive_operation_running;
struct completion uuid_tree_rescan_completion;
+ unsigned int update_uuid_tree_gen:1;
};
/*
@@ -3453,6 +3454,9 @@ void btrfs_update_root_times(struct btrfs_trans_handle *trans,
struct btrfs_root *root);
/* uuid-tree.c */
+int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info,
+ int (*check_func)(struct btrfs_fs_info *, u8 *, u16,
+ u64));
int btrfs_lookup_uuid_subvol_item(struct btrfs_root *uuid_root, u8 *uuid,
u64 *subvol_id);
int btrfs_insert_uuid_subvol_item(struct btrfs_trans_handle *trans,
@@ -2112,7 +2112,8 @@ int open_ctree(struct super_block *sb,
int err = -EINVAL;
int num_backups_tried = 0;
int backup_index = 0;
- bool create_uuid_tree = false;
+ bool create_uuid_tree;
+ bool check_uuid_tree;
tree_root = fs_info->tree_root = btrfs_alloc_root(fs_info);
chunk_root = fs_info->chunk_root = btrfs_alloc_root(fs_info);
@@ -2714,9 +2715,13 @@ retry_root_backup:
if (ret != -ENOENT)
goto recovery_tree_root;
create_uuid_tree = true;
+ check_uuid_tree = false;
} else {
uuid_root->track_dirty = 1;
fs_info->uuid_root = uuid_root;
+ create_uuid_tree = false;
+ check_uuid_tree =
+ generation != btrfs_super_uuid_tree_generation(disk_super);
}
fs_info->generation = generation;
@@ -2914,7 +2919,17 @@ retry_root_backup:
close_ctree(tree_root);
return ret;
}
+ } else if (check_uuid_tree) {
+ pr_info("btrfs: checking UUID tree\n");
+ ret = btrfs_check_uuid_tree(fs_info);
+ if (ret) {
+ pr_warn("btrfs: failed to check the UUID tree %d\n",
+ ret);
+ close_ctree(tree_root);
+ return ret;
+ }
} else {
+ fs_info->update_uuid_tree_gen = 1;
complete_all(&fs_info->uuid_tree_rescan_completion);
}
@@ -1370,7 +1370,8 @@ static void update_super_roots(struct btrfs_root *root)
super->root_level = root_item->level;
if (btrfs_test_opt(root, SPACE_CACHE))
super->cache_generation = root_item->generation;
- super->uuid_tree_generation = root_item->generation;
+ if (root->fs_info->update_uuid_tree_gen)
+ super->uuid_tree_generation = root_item->generation;
}
int btrfs_transaction_in_commit(struct btrfs_fs_info *info)
@@ -415,6 +415,162 @@ out:
return ret;
}
+static int btrfs_uuid_iter_rem(struct btrfs_root *uuid_root, u8 *uuid,
+ u16 sub_item_type, u64 subid)
+{
+ struct btrfs_trans_handle *trans;
+ int ret;
+
+ /* 1 - for the uuid item */
+ trans = btrfs_start_transaction(uuid_root, 1);
+ if (IS_ERR(trans)) {
+ ret = PTR_ERR(trans);
+ goto out;
+ }
+
+ ret = btrfs_uuid_tree_rem(trans, uuid_root, uuid,
+ sub_item_type, subid);
+ btrfs_end_transaction(trans, uuid_root);
+
+out:
+ return ret;
+}
+
+int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info,
+ int (*check_func)(struct btrfs_fs_info *, u8 *, u16,
+ u64))
+{
+ struct btrfs_root *root = fs_info->uuid_root;
+ struct btrfs_key key;
+ struct btrfs_key max_key;
+ struct btrfs_path *path = NULL;
+ int ret = 0;
+ struct extent_buffer *eb;
+ int slot;
+ u32 item_size;
+ struct btrfs_uuid_item *ptr;
+ u64 subid;
+ unsigned long offset;
+
+ path = btrfs_alloc_path();
+ if (!path) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ key.objectid = 0;
+ key.type = BTRFS_UUID_KEY;
+ key.offset = 0;
+
+ max_key.objectid = (u64)-1;
+ max_key.type = BTRFS_UUID_KEY;
+ max_key.offset = (u64)-1;
+
+ path->keep_locks = 1;
+
+ while (1) {
+again:
+ cond_resched();
+ ret = btrfs_search_forward(root, &key, &max_key, path, 0);
+ if (ret) {
+ if (ret > 0)
+ ret = 0;
+ break;
+ }
+
+ if (key.type != BTRFS_UUID_KEY)
+ goto skip;
+
+ eb = path->nodes[0];
+ slot = path->slots[0];
+ ptr = btrfs_item_ptr(eb, slot, struct btrfs_uuid_item);
+ item_size = btrfs_item_size_nr(eb, slot);
+ do {
+ u16 sub_item_type;
+ u64 sub_item_len;
+
+ if (item_size < sizeof(*ptr)) {
+ pr_warn("btrfs: uuid item too short (%lu < %d)!\n",
+ (unsigned long)item_size,
+ (int)sizeof(*ptr));
+ goto skip; /* is this an old kernel? */
+ }
+ sub_item_type = btrfs_uuid_type(eb, ptr);
+ sub_item_len = btrfs_uuid_len(eb, ptr);
+ ptr++;
+ item_size -= sizeof(*ptr);
+ if (sub_item_len * sizeof(u64) > item_size) {
+ pr_warn("btrfs: uuid item too short (%llu > %lu)!\n",
+ (unsigned long long)(sub_item_len *
+ sizeof(u64)),
+ (unsigned long)item_size);
+ goto skip;
+ }
+ offset = (unsigned long)ptr;
+ ptr = (struct btrfs_uuid_item *)
+ (((char *)ptr) + sub_item_len * sizeof(u64));
+ item_size -= sub_item_len * sizeof(u64);
+ while (sub_item_len) {
+ u8 uuid[BTRFS_UUID_SIZE];
+
+ put_unaligned_le64(key.objectid, uuid);
+ put_unaligned_le64(key.offset,
+ uuid + sizeof(u64));
+ read_extent_buffer(eb, &subid, offset,
+ sizeof(subid));
+ subid = le64_to_cpu(subid);
+ ret = check_func(fs_info, uuid,
+ sub_item_type, subid);
+ if (ret < 0)
+ goto out;
+ if (ret > 0) {
+ btrfs_release_path(path);
+ ret = btrfs_uuid_iter_rem(
+ fs_info->uuid_root, uuid,
+ sub_item_type, subid);
+ if (ret == 0) {
+ /*
+ * this might look inefficient,
+ * but the justification is that
+ * it is an exception that
+ * check_func returns 1, and
+ * that in the regular case only
+ * one or two entries per UUID
+ * exist.
+ */
+ goto again;
+ }
+ if (ret < 0 && ret != -ENOENT)
+ goto out;
+ }
+ sub_item_len--;
+ offset += sizeof(u64);
+ }
+ } while (item_size);
+
+skip:
+ btrfs_release_path(path);
+ if (key.offset < (u64)-1) {
+ key.offset++;
+ } else if (key.type < BTRFS_UUID_KEY) {
+ key.offset = 0;
+ key.type = BTRFS_UUID_KEY;
+ } else if (key.objectid < (u64)-1) {
+ key.offset = 0;
+ key.type = 0;
+ key.objectid++;
+ } else {
+ break;
+ }
+ }
+
+out:
+ btrfs_free_path(path);
+ if (ret)
+ pr_warn("btrfs: btrfs_uuid_tree_iterate failed %d\n", ret);
+ return 0;
+}
+
int btrfs_lookup_uuid_subvol_item(struct btrfs_root *uuid_root, u8 *uuid,
u64 *subvol_id)
{
@@ -3539,10 +3539,76 @@ out:
btrfs_free_path(path);
if (ret)
pr_warn("btrfs: btrfs_uuid_scan_kthread failed %d\n", ret);
+ else
+ fs_info->update_uuid_tree_gen = 1;
complete_all(&fs_info->uuid_tree_rescan_completion);
return 0;
}
+/*
+ * Callback for btrfs_uuid_tree_iterate().
+ * returns:
+ * 0 check succeeded, the entry is not outdated.
+ * < 0 if an error occured.
+ * > 0 if the check failed, which means the caller shall remove the entry.
+ */
+static int btrfs_check_uuid_tree_entry(struct btrfs_fs_info *fs_info,
+ u8 *uuid, u16 type, u64 subid)
+{
+ struct btrfs_key key;
+ int ret = 0;
+ struct btrfs_root *subvol_root;
+
+ if (type != BTRFS_UUID_ITEM_TYPE_SUBVOL &&
+ type != BTRFS_UUID_ITEM_TYPE_RECEIVED_SUBVOL)
+ goto out;
+
+ key.objectid = subid;
+ key.type = BTRFS_ROOT_ITEM_KEY;
+ key.offset = (u64)-1;
+ subvol_root = btrfs_read_fs_root_no_name(fs_info, &key);
+ if (IS_ERR(subvol_root)) {
+ ret = PTR_ERR(subvol_root);
+ if (ret == -ENOENT)
+ ret = 1;
+ goto out;
+ }
+
+ switch (type) {
+ case BTRFS_UUID_ITEM_TYPE_SUBVOL:
+ if (memcmp(uuid, subvol_root->root_item.uuid, BTRFS_UUID_SIZE))
+ ret = 1;
+ break;
+ case BTRFS_UUID_ITEM_TYPE_RECEIVED_SUBVOL:
+ if (memcmp(uuid, subvol_root->root_item.received_uuid,
+ BTRFS_UUID_SIZE))
+ ret = 1;
+ break;
+ }
+
+out:
+ return ret;
+}
+
+static int btrfs_uuid_rescan_kthread(void *data)
+{
+ struct btrfs_fs_info *fs_info = (struct btrfs_fs_info *)data;
+ int ret;
+
+ /*
+ * 1st step is to iterate through the existing UUID tree and
+ * to delete all entries that contain outdated data.
+ * 2nd step is to add all missing entries to the UUID tree.
+ */
+ ret = btrfs_uuid_tree_iterate(fs_info, btrfs_check_uuid_tree_entry);
+ if (ret < 0) {
+ pr_warn("btrfs: iterating uuid_tree failed %d\n", ret);
+ complete_all(&fs_info->uuid_tree_rescan_completion);
+ return ret;
+ }
+ return btrfs_uuid_scan_kthread(data);
+}
+
int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)
{
struct btrfs_trans_handle *trans;
@@ -3575,6 +3641,7 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)
task = kthread_run(btrfs_uuid_scan_kthread, fs_info, "btrfs-uuid");
if (IS_ERR(task)) {
+ /* fs_info->update_uuid_tree_gen remains 0 in all error case */
pr_warn("btrfs: failed to start uuid_scan task\n");
complete_all(&fs_info->uuid_tree_rescan_completion);
return PTR_ERR(task);
@@ -3583,6 +3650,21 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)
return 0;
}
+int btrfs_check_uuid_tree(struct btrfs_fs_info *fs_info)
+{
+ struct task_struct *task;
+
+ task = kthread_run(btrfs_uuid_rescan_kthread, fs_info, "btrfs-uuid");
+ if (IS_ERR(task)) {
+ /* fs_info->update_uuid_tree_gen remains 0 in all error case */
+ pr_warn("btrfs: failed to start uuid_rescan task\n");
+ complete_all(&fs_info->uuid_tree_rescan_completion);
+ return PTR_ERR(task);
+ }
+
+ return 0;
+}
+
/*
* shrinking a device means finding all of the device extents past
* the new size, and then following the back refs to the chunks.
@@ -316,6 +316,7 @@ int btrfs_recover_balance(struct btrfs_fs_info *fs_info);
int btrfs_pause_balance(struct btrfs_fs_info *fs_info);
int btrfs_cancel_balance(struct btrfs_fs_info *fs_info);
int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info);
+int btrfs_check_uuid_tree(struct btrfs_fs_info *fs_info);
int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset);
int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes,
u64 *start, u64 *max_avail);
If the filesystem was mounted with an old kernel that was not aware of the UUID tree, this is detected by looking at the uuid_tree_generation field of the superblock (similar to how the free space cache is doing it). If a mismatch is detected at mount time, a thread is started that does two things: 1. Iterate through the UUID tree, check each entry, delete those entries that are not valid anymore (i.e., the subvol does not exist anymore or the value changed). 2. Iterate through the root tree, for each found subvolume, add the UUID tree entries for the subvolume (if they are not already there). This mechanism is also used to handle and repair errors that happened during the initial creation and filling of the tree. The update of the uuid_tree_generation field (which indicates that the state of the UUID tree is up to date) is blocked until all create and repair operations are successfully completed. Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de> --- fs/btrfs/ctree.h | 4 ++ fs/btrfs/disk-io.c | 17 +++++- fs/btrfs/transaction.c | 3 +- fs/btrfs/uuid-tree.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/volumes.c | 82 ++++++++++++++++++++++++++ fs/btrfs/volumes.h | 1 + 6 files changed, 261 insertions(+), 2 deletions(-)