| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAL3q7H5+4v+0aLDC+JrnAKUbYFcWPuXh8Rtif5vGS2URNSe-dQ@mail.gmail.com>
Date: Fri, 12 May 2023 10:24:07 +0100
From: Filipe Manana <fdmanana@...nel.org>
To: samho <samho@...ology.com>
Cc: clm@...com, josef@...icpanda.com, dsterba@...e.com,
linux-btrfs@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] btrfs: check extent type while finding extent clone source
On Fri, May 12, 2023 at 4:26 AM samho <samho@...ology.com> wrote:
>
> For btrfs incremental backup:
> `btrfs send -p /vol/subvol_835 /vol/subvol_846 | btrfs receive /vol/`
>
> The following pattern will result in the data inconsistency between
> the received subvol and the subvol to be sent.
>
> (66755 EXTENT_DATA 2121728) is supposed to be regular extent data,
> while `find_extent_clone()` may find the extent item in tree 835
> which is prealloc data.
>
> DS:server[~]# btrfs-debug-tree -t 835 /dev/dev_1
> item 129 key (58924 EXTENT_DATA 2412544) itemoff 7891 itemsize 53
> prealloc data disk byte 6599543226368 nr 389120
> prealloc data offset 0 nr 389120
> DS:server[~]# btrfs-debug-tree -t 846 /dev/dev_1
> item 42 key (66755 EXTENT_DATA 2109440) itemoff 9964 itemsize 53
> prealloc data disk byte 6599543226368 nr 389120
> prealloc data offset 0 nr 12288
> item 43 key (66755 EXTENT_DATA 2121728) itemoff 9911 itemsize 53
> extent data disk byte 6599543226368 nr 389120
> extent data offset 12288 nr 4096 ram 389120
> extent compression(none)
> item 44 key (66755 EXTENT_DATA 2125824) itemoff 9858 itemsize 53
> prealloc data disk byte 6599543226368 nr 389120
> prealloc data offset 16384 nr 159744
> DS:server[~]#
So, I'm reading this and I can't understand anything at all.
You mention a data inconsistency between the received subvolume and
the original subvolume.
What is that inconsistency exactly? Does reading the file in the
received subvolume returns different data from the same file in the
original subvolume?
Or something else? Something that for example, "btrfs check" complains about?
There's a dumping of part of the trees, the send and parent roots,
used for the send operation, but that doesn't explain anything at all.
You say "(66755 EXTENT_DATA 2121728) is supposed to be regular extent data".
Why?
This is a dump of the original trees, which are not affected by the
send operation - that would only make sense for the tree of the
received subvolume - which may get a different extent layout, as we
don't (and can't) guarantee the receiver will get the same extent
layout.
Do you have a reproducer for this?
Not only would it help understand better the problem, but it would
also serve to create a test case for fstests to prevent regressions in
the future.
Please provide a detailed changelog, I can't understand what the
problem is, and I doubt anyone else can.
Also, some minor comments inlined below.
>
> Signed-off-by: samho <samho@...ology.com>
> ---
> fs/btrfs/backref.c | 10 +++++++---
> fs/btrfs/backref.h | 2 +-
> fs/btrfs/scrub.c | 2 +-
> fs/btrfs/send.c | 12 ++++++++++--
> 4 files changed, 19 insertions(+), 7 deletions(-)
>
> diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
> index e54f0884802a..e446ca35b96c 100644
> --- a/fs/btrfs/backref.c
> +++ b/fs/btrfs/backref.c
> @@ -29,6 +29,7 @@ struct extent_inode_elem {
> u64 inum;
> u64 offset;
> u64 num_bytes;
> + int extent_type;
> struct extent_inode_elem *next;
> };
>
> @@ -40,6 +41,7 @@ static int check_extent_in_eb(struct btrfs_backref_walk_ctx *ctx,
> {
> const u64 data_len = btrfs_file_extent_num_bytes(eb, fi);
> u64 offset = key->offset;
> + const int extent_type = btrfs_file_extent_type(eb, fi);
> struct extent_inode_elem *e;
> const u64 *root_ids;
> int root_count;
> @@ -70,7 +72,7 @@ static int check_extent_in_eb(struct btrfs_backref_walk_ctx *ctx,
> int ret;
>
> ret = ctx->indirect_ref_iterator(key->objectid, offset,
> - data_len, root_ids[i],
> + data_len, extent_type, root_ids[i],
> ctx->user_ctx);
> if (ret)
> return ret;
> @@ -85,6 +87,7 @@ static int check_extent_in_eb(struct btrfs_backref_walk_ctx *ctx,
> e->inum = key->objectid;
> e->offset = offset;
> e->num_bytes = data_len;
> + e->extent_type = btrfs_file_extent_type(eb, fi);
> *eie = e;
>
> return 0;
> @@ -2388,7 +2391,7 @@ static int iterate_leaf_refs(struct btrfs_fs_info *fs_info,
> "ref for %llu resolved, key (%llu EXTEND_DATA %llu), root %llu",
> extent_item_objectid, eie->inum,
> eie->offset, root);
> - ret = iterate(eie->inum, eie->offset, eie->num_bytes, root, ctx);
> + ret = iterate(eie->inum, eie->offset, eie->num_bytes, eie->extent_type, root, ctx);
> if (ret) {
> btrfs_debug(fs_info,
> "stopping iteration for %llu due to ret=%d",
> @@ -2526,7 +2529,8 @@ int iterate_extent_inodes(struct btrfs_backref_walk_ctx *ctx,
> return ret;
> }
>
> -static int build_ino_list(u64 inum, u64 offset, u64 num_bytes, u64 root, void *ctx)
> +static int build_ino_list(u64 inum, u64 offset, u64 num_bytes, int extent_type,
> + u64 root, void *ctx)
> {
> struct btrfs_data_container *inodes = ctx;
> const size_t c = 3 * sizeof(u64);
> diff --git a/fs/btrfs/backref.h b/fs/btrfs/backref.h
> index ef6bbea3f456..bcbea7baefc5 100644
> --- a/fs/btrfs/backref.h
> +++ b/fs/btrfs/backref.h
> @@ -28,7 +28,7 @@
> * value to immediately stop iteration and possibly signal an error back to
> * the caller.
> */
> -typedef int (iterate_extent_inodes_t)(u64 inum, u64 offset, u64 num_bytes,
> +typedef int (iterate_extent_inodes_t)(u64 inum, u64 offset, u64 num_bytes, int extent_type,
> u64 root, void *ctx);
>
> /*
> diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
> index 836725a19661..904051bebe0d 100644
> --- a/fs/btrfs/scrub.c
> +++ b/fs/btrfs/scrub.c
> @@ -374,7 +374,7 @@ static noinline_for_stack struct scrub_ctx *scrub_setup_ctx(
> return ERR_PTR(-ENOMEM);
> }
>
> -static int scrub_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,
> +static int scrub_print_warning_inode(u64 inum, u64 offset, u64 num_bytes, int extent_type,
> u64 root, void *warn_ctx)
> {
> u32 nlink;
> diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
> index af2e153543a5..77b4b5db11be 100644
> --- a/fs/btrfs/send.c
> +++ b/fs/btrfs/send.c
> @@ -1297,6 +1297,9 @@ struct backref_ctx {
> u64 backref_owner;
> /* The offset of the data backref for the current extent. */
> u64 backref_offset;
> +
> + /* used for extent iteration to check if the type is matched */
Please follow the existing comment style.
Capitalize the first word in the sentence and add punctuation at the end.
> + int extent_type;
> };
>
> static int __clone_root_cmp_bsearch(const void *key, const void *elt)
> @@ -1327,8 +1330,8 @@ static int __clone_root_cmp_sort(const void *e1, const void *e2)
> * Called for every backref that is found for the current extent.
> * Results are collected in sctx->clone_roots->ino/offset.
> */
> -static int iterate_backrefs(u64 ino, u64 offset, u64 num_bytes, u64 root_id,
> - void *ctx_)
> +static int iterate_backrefs(u64 ino, u64 offset, u64 num_bytes, int extent_type,
> + u64 root_id, void *ctx_)
> {
> struct backref_ctx *bctx = ctx_;
> struct clone_root *clone_root;
> @@ -1341,6 +1344,10 @@ static int iterate_backrefs(u64 ino, u64 offset, u64 num_bytes, u64 root_id,
> if (!clone_root)
> return 0;
>
> + /* Type is not matched */
This comment is useless. Looking at the variable and member names
below, it's perfectly clear we are comparing
extent types, and it's also perfectly clear we are testing for a mismatch.
Comments should be used for non-obvious things, otherwise they just distract.
Also, since this seems to be a send specific issue (though not clear
given the changelog above), the
subject should be like: "btrfs: send: ...."
Thanks.
> + if (extent_type != bctx->extent_type)
> + return 0;
> +
> /* This is our own reference, bail out as we can't clone from it. */
> if (clone_root->root == bctx->sctx->send_root &&
> ino == bctx->cur_objectid &&
> @@ -1599,6 +1606,7 @@ static int find_extent_clone(struct send_ctx *sctx,
> extent_type = btrfs_file_extent_type(eb, fi);
> if (extent_type == BTRFS_FILE_EXTENT_INLINE)
> return -ENOENT;
> + backref_ctx.extent_type = extent_type;
>
> disk_byte = btrfs_file_extent_disk_bytenr(eb, fi);
> if (disk_byte == 0)
> --
> 2.34.1
>
Powered by blists - more mailing lists