lkml.org 
[lkml]   [2022]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] btrfs: send: fix a bug that sending a link command on existing file path
On Wed, Jul 06, 2022 at 09:09:03PM +0800, bingjingc wrote:
> From: BingJing Chang <bingjingc@synology.com>
>
> btrfs_ioctl_send processes recorded btrfs_keys in a defined order. (First,
> we process a btrfs_key with a samller objectid. If btrfs_keys have the same
> objectid, then we compare their types and offsets accordingly.)

That's a very convoluted way to simply say that send processes keys in the order
they are found in the btrees, from the leftmost to the rightmost.

> However,
> reference paths for an inode can be stored in either BTRFS_INODE_REF_KEY
> btrfs_keys or BTRFS_INODE_EXTREF_KEY btrfs_keys. And due to the limitation
> of the helper function - iterate_inode_ref, we can only iterate the entries
> of ONE btrfs_inode_ref or btrfs_inode_extref. That is, there must be a bug
> in processing the same reference paths, which are stored in different ways.

When you say "there must be a bug", you want to say "there is a bug", and then
explain what the bug is.

However the bug has nothing to do with the order of how keys are processed.

What happens is that when we are processing an inode we go over all references
and add all the new names to the "new_refs" list and add all the deleted names
to the "deleted_refs" list.

Then in the end, when we finish processing the inode, we iterate over all the
new names in the "new_refs" list and send link commands for those names. After
that we go over all the names in the "deleted_refs" list and send unlink commands
for those names.

The problem in this case, is that we have names duplicated in both lists.
So we try to create them before we remove them, therefore the receiver gets an
-EEXIST error when trying the link operations.

>
> Here is an exmple that btrfs_ioctl_send will send a link command on an

exmple -> example

> existing file path:
>
> $ btrfs subvolume create test
>
> # create a file and 2000 hard links to the same inode
> $ dd if=/dev/zero of=test/1M bs=1M count=1

touch test/1M

The data is completely irrelevant here, all we care about are the
hard links of the file. Making the reproducer the minimum necessary
to trigger a bug, makes it much less distracting and easier to grasp.

> $ for i in {1..2000}; do link test/1M test/$i ; done
>
> # take a snapshot for parent snapshot
> $ btrfs sub snap -r test snap1
>
> # remove 2000 hard links and re-create the last 1000 links
> $ for i in {1..2000}; do rm test/$i; done;
> $ for i in {1001..2000}; do link test/1M test/$i; done
>
> # take another one for sned snapshot

sned -> send

> $ btrfs sub snap -r test snap2
>
> $ mkdir tmp
> $ btrfs send -e snap2 -p snap1 | btrfs receive tmp/

The -e is not necessary.

> At subvol snap2
> link 1238 -> 1M
> ERROR: link 1238 -> 1M failed: File exists
>
> In the parent snapshot snap1, reference paths 1 - 1237 are stored in a
> INODE_REF item and the rest ones are stored in other INODE_EXTREF items.
> But in the send snapshot snap2, all reference paths can be stored within a
> INODE_REF item. During the send process, btrfs_ioctl_send will process the
> INODE_REF item first. Then it found that reference paths 1 - 1000 were
> gone in the send snapshot, so it recorded them in sctx->deleted_refs for
> unlink. And it found that reference paths 1238 - 2000 were new paths in
> the send snapshot, so it recorded them in sctx->new_refs for link. Since
> we do not load all contents of its INODE_EXTREF items to make comparison,
> afterwards, btrfs_ioctl_send may make a mistake sending a link command on
> an existing file path.

So this explanation is not correct, it's neither about the names being stored
in an INODE_REF or INODE_EXTREF item nor about processing one item before or
after the other. As mentioned before, it's because we always process the
"new_refs" list before the "deleted_refs" list, and in this case we have the
same names (paths) in both lists.

>
> To fix the bug, we can either remove the duplicated items both in
> sctx->new_refs and sctx->deleted_refs before generating link/unlink
> commands or prevent them from being added into list. Both of them require
> efficient data structures like C++ sets to look up duplicated items.

There's a much more obvious alternative, which is processing first the
"deleted_refs" list before the "new_refs" list.

It's inefficient because we do a bunch of unlinks followed by links for
the same paths. On the other hand, it does not require maintaining two
new rbtrees and allocating memory for records in these rbtrees.

Plus this type of scenario should be very rare. It requires having at least
hundreds of hard links in an inode in order to trigger the creation of extended
references, and then removing and recreating a bunch of those hard links in the
send snapshot. How common is that?

Is this a case you got into in some user workload, or was it found by reading
and inspecting the code?

I would like to have in the changelog this alternative mentioned, and if it's
not good, then explain why it is not, and why we must follow a different solution.

It's probably not easy, because at process_recorded_refs() when we unlink we
need to know if any ancestor was orphanized before, which we figure out when
we iterate over the "new_refs" list. So it would likely need some reshuffling
in the logic of how we do things there.

> And
> we also need to take two scenarios into consideration. One is the most
> common case that one inode has only one reference path. The other is the
> worst case that there are ten thousands of hard links of an inode.
> (BTRFS_LINK_MAX is 65536) So we'd like to introduce rbtree to store the
> computing references. (The tree depth of the worst cases is just 16. And

computing -> computed

> it takes less memory to store few entries than hash sets.) And in order
> not to occupy too much moemory, we also introduce

moemory -> memory

> __record_new_ref_if_needed() and __record_deleted_ref_if_needed() for
> changed_ref() to check and remove the duplications early.

Also, the subject:

"btrfs: send: fix a bug that sending a link command on existing file path"

sounds a bit awkward, mostly because of the "that".
Something like the following would be more concise:

"btrfs: send: fix sending link commands for existing file paths"

>
> Reviewed-by: Robbie Ko <robbieko@synology.com>
> Signed-off-by: BingJing Chang <bingjingc@synology.com>
> ---
> fs/btrfs/send.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 156 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
> index 420a86720aa2..23ae631ef23b 100644
> --- a/fs/btrfs/send.c
> +++ b/fs/btrfs/send.c
> @@ -234,6 +234,9 @@ struct send_ctx {
> * Indexed by the inode number of the directory to be deleted.
> */
> struct rb_root orphan_dirs;
> +
> + struct rb_root rbtree_new_refs;
> + struct rb_root rbtree_deleted_refs;
> };
>
> struct pending_dir_move {
> @@ -2747,6 +2750,8 @@ struct recorded_ref {
> u64 dir;
> u64 dir_gen;
> int name_len;
> + struct rb_node node;
> + struct rb_root *root;
> };
>
> static struct recorded_ref *recorded_ref_alloc(void)
> @@ -2756,6 +2761,7 @@ static struct recorded_ref *recorded_ref_alloc(void)
> ref = kzalloc(sizeof(*ref), GFP_KERNEL);
> if (!ref)
> return NULL;
> + RB_CLEAR_NODE(&ref->node);
> INIT_LIST_HEAD(&ref->list);
> return ref;
> }
> @@ -2764,6 +2770,8 @@ static void recorded_ref_free(struct recorded_ref *ref)
> {
> if (!ref)
> return;
> + if (!RB_EMPTY_NODE(&ref->node))
> + rb_erase(&ref->node, ref->root);
> list_del(&ref->list);
> fs_path_free(ref->full_path);
> kfree(ref);
> @@ -4373,12 +4381,152 @@ static int __record_deleted_ref(int num, u64 dir, int index,
> &sctx->deleted_refs);
> }
>
> +static int rbtree_ref_comp(const void *k, const struct rb_node *node)
> +{
> + const struct recorded_ref *data = k;
> + const struct recorded_ref *ref = rb_entry(node, struct recorded_ref, node);
> + int result;
> +
> + if (data->dir > ref->dir)
> + return 1;
> + if (data->dir < ref->dir)
> + return -1;
> + if (data->dir_gen > ref->dir_gen)
> + return 1;
> + if (data->dir_gen < ref->dir_gen)
> + return -1;
> + if (data->name_len > ref->name_len)
> + return 1;
> + if (data->name_len < ref->name_len)
> + return -1;
> + result = strcmp(data->name, ref->name);
> + if (result > 0)
> + return 1;
> + if (result < 0)
> + return -1;
> + return 0;
> +}
> +
> +static bool rbtree_ref_less(struct rb_node *node, const struct rb_node *parent)
> +{
> + const struct recorded_ref *entry = rb_entry(node,
> + struct recorded_ref,
> + node);
> +
> + return rbtree_ref_comp(entry, parent) < 0;
> +}
> +
> +static int record_ref2(struct rb_root *root, struct list_head *refs,

This is a terrible function name.

If we end up with this solution, please rename it to something more clear
like record_ref_in_tree() for example. Almost anything other than an existing
function name followed by a number is a better choice.

This bug is a very good finding, and has been around since forever.

Thanks.

> + struct fs_path *name, u64 dir, u64 dir_gen,
> + struct send_ctx *sctx)
> +{
> + int ret = 0;
> + struct fs_path *path = NULL;
> + struct recorded_ref *ref = NULL;
> +
> + path = fs_path_alloc();
> + if (!path) {
> + ret = -ENOMEM;
> + goto out;
> + }
> +
> + ref = recorded_ref_alloc();
> + if (!ref) {
> + ret = -ENOMEM;
> + goto out;
> + }
> +
> + ret = get_cur_path(sctx, dir, dir_gen, path);
> + if (ret < 0)
> + goto out;
> + ret = fs_path_add_path(path, name);
> + if (ret < 0)
> + goto out;
> +
> + ref->dir = dir;
> + ref->dir_gen = dir_gen;
> + set_ref_path(ref, path);
> + list_add_tail(&ref->list, refs);
> + rb_add(&ref->node, root, rbtree_ref_less);
> + ref->root = root;
> +out:
> + if (ret) {
> + if (path && (!ref || !ref->full_path))
> + fs_path_free(path);
> + recorded_ref_free(ref);
> + }
> + return ret;
> +}
> +
> +static int __record_new_ref_if_needed(int num, u64 dir, int index,
> + struct fs_path *name, void *ctx)
> +{
> + int ret = 0;
> + struct send_ctx *sctx = ctx;
> + struct rb_node *node = NULL;
> + struct recorded_ref data;
> + struct recorded_ref *ref;
> + u64 dir_gen;
> +
> + ret = get_inode_info(sctx->send_root, dir, NULL, &dir_gen, NULL,
> + NULL, NULL, NULL);
> + if (ret < 0)
> + goto out;
> +
> + data.dir = dir;
> + data.dir_gen = dir_gen;
> + set_ref_path(&data, name);
> + node = rb_find(&data, &sctx->rbtree_deleted_refs, rbtree_ref_comp);
> + if (node) {
> + ref = rb_entry(node, struct recorded_ref, node);
> + recorded_ref_free(ref);
> + } else {
> + ret = record_ref2(&sctx->rbtree_new_refs, &sctx->new_refs,
> + name, dir, dir_gen, sctx);
> + }
> +out:
> + return ret;
> +}
> +
> +static int __record_deleted_ref_if_needed(int num, u64 dir, int index,
> + struct fs_path *name,
> + void *ctx)
> +{
> + int ret = 0;
> + struct send_ctx *sctx = ctx;
> + struct rb_node *node = NULL;
> + struct recorded_ref data;
> + struct recorded_ref *ref;
> + u64 dir_gen;
> +
> + ret = get_inode_info(sctx->parent_root, dir, NULL, &dir_gen, NULL,
> + NULL, NULL, NULL);
> + if (ret < 0)
> + goto out;
> +
> + data.dir = dir;
> + data.dir_gen = dir_gen;
> + set_ref_path(&data, name);
> + node = rb_find(&data, &sctx->rbtree_new_refs, rbtree_ref_comp);
> + if (node) {
> + ref = rb_entry(node, struct recorded_ref, node);
> + recorded_ref_free(ref);
> + } else {
> + ret = record_ref2(&sctx->rbtree_deleted_refs,
> + &sctx->deleted_refs, name, dir, dir_gen,
> + sctx);
> + }
> +out:
> + return ret;
> +}
> +
> static int record_new_ref(struct send_ctx *sctx)
> {
> int ret;
>
> ret = iterate_inode_ref(sctx->send_root, sctx->left_path,
> - sctx->cmp_key, 0, __record_new_ref, sctx);
> + sctx->cmp_key, 0, __record_new_ref_if_needed,
> + sctx);
> if (ret < 0)
> goto out;
> ret = 0;
> @@ -4392,7 +4540,8 @@ static int record_deleted_ref(struct send_ctx *sctx)
> int ret;
>
> ret = iterate_inode_ref(sctx->parent_root, sctx->right_path,
> - sctx->cmp_key, 0, __record_deleted_ref, sctx);
> + sctx->cmp_key, 0,
> + __record_deleted_ref_if_needed, sctx);
> if (ret < 0)
> goto out;
> ret = 0;
> @@ -4475,7 +4624,7 @@ static int __record_changed_new_ref(int num, u64 dir, int index,
> ret = find_iref(sctx->parent_root, sctx->right_path,
> sctx->cmp_key, dir, dir_gen, name);
> if (ret == -ENOENT)
> - ret = __record_new_ref(num, dir, index, name, sctx);
> + ret = __record_new_ref_if_needed(num, dir, index, name, sctx);
> else if (ret > 0)
> ret = 0;
>
> @@ -4498,7 +4647,8 @@ static int __record_changed_deleted_ref(int num, u64 dir, int index,
> ret = find_iref(sctx->send_root, sctx->left_path, sctx->cmp_key,
> dir, dir_gen, name);
> if (ret == -ENOENT)
> - ret = __record_deleted_ref(num, dir, index, name, sctx);
> + ret = __record_deleted_ref_if_needed(num, dir, index, name,
> + sctx);
> else if (ret > 0)
> ret = 0;
>
> @@ -7576,6 +7726,8 @@ long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg)
> sctx->pending_dir_moves = RB_ROOT;
> sctx->waiting_dir_moves = RB_ROOT;
> sctx->orphan_dirs = RB_ROOT;
> + sctx->rbtree_new_refs = RB_ROOT;
> + sctx->rbtree_deleted_refs = RB_ROOT;
>
> sctx->clone_roots = kvcalloc(sizeof(*sctx->clone_roots),
> arg->clone_sources_count + 1,
> --
> 2.37.0
>

\
 
 \ /
  Last update: 2022-07-06 18:05    [W:0.050 / U:0.464 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site