public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Wang Yugui <wangyugui@e16-tech.com>
To: fdmanana@kernel.org
Cc: linux-btrfs@vger.kernel.org, git@vladimir.panteleev.md,
	Filipe Manana <fdmanana@suse.com>,
	stable@vger.kernel.org
Subject: Re: [PATCH] btrfs: fix backref walking not returning all inode refs
Date: Thu, 04 May 2023 17:41:20 +0800	[thread overview]
Message-ID: <20230504174118.4D5F.409509F4@e16-tech.com> (raw)
In-Reply-To: <77994dd9ede2084d45dd0a36938c67de70d8e859.1683123587.git.fdmanana@suse.com>

Hi,

> From: Filipe Manana <fdmanana@suse.com>
> 
> When using the logical to ino ioctl v2, if the flag to ignore offsets of
> file extent items (BTRFS_LOGICAL_INO_ARGS_IGNORE_OFFSET) is given, the
> backref walking code ends up not returning references for all file offsets
> of an inode that point to the given logical bytenr. This happens since
> kernel 6.2, commit 6ce6ba534418 ("btrfs: use a single argument for extent
> offset in backref walking functions"), as it mistakenly skipped the search
> for file extent items in a leaf that point to the target extent if that
> flag is given. Instead it should only skip the filtering done by
> check_extent_in_eb() - that is, it should not avoid the calls to that
> function.
> 
> So fix this by always calling check_extent_in_eb() and have this function
> do the filtering only if an extent offset is given and the flag to ignore
> offsets is not set.
> Fixes: 6ce6ba534418 ("btrfs: use a single argument for extent offset in backref walking functions")
> Reported-by: Vladimir Panteleev <git@vladimir.panteleev.md>
> Link: https://lore.kernel.org/linux-btrfs/CAHhfkvwo=nmzrJSqZ2qMfF-rZB-ab6ahHnCD_sq9h4o8v+M7QQ@mail.gmail.com/
> Tested-by: Vladimir Panteleev <git@vladimir.panteleev.md>
> CC: stable@vger.kernel.org # 6.2+
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

fstests(btrfs/299) will fail with this patch.

Best Regards
Wang Yugui (wangyugui@e16-tech.com)
2023/05/04

> ---
>  fs/btrfs/backref.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
> index e54f0884802a..8e61be3fe9a8 100644
> --- a/fs/btrfs/backref.c
> +++ b/fs/btrfs/backref.c
> @@ -45,7 +45,9 @@ static int check_extent_in_eb(struct btrfs_backref_walk_ctx *ctx,
>  	int root_count;
>  	bool cached;
>  
> -	if (!btrfs_file_extent_compression(eb, fi) &&
> +	if (!ctx->ignore_extent_item_pos &&
> +	    ctx->extent_item_pos > 0 &&
> +	    !btrfs_file_extent_compression(eb, fi) &&
>  	    !btrfs_file_extent_encryption(eb, fi) &&
>  	    !btrfs_file_extent_other_encoding(eb, fi)) {
>  		u64 data_offset;
> @@ -552,13 +554,10 @@ static int add_all_parents(struct btrfs_backref_walk_ctx *ctx,
>  				count++;
>  			else
>  				goto next;
> -			if (!ctx->ignore_extent_item_pos) {
> -				ret = check_extent_in_eb(ctx, &key, eb, fi, &eie);
> -				if (ret == BTRFS_ITERATE_EXTENT_INODES_STOP ||
> -				    ret < 0)
> -					break;
> -			}
> -			if (ret > 0)
> +			ret = check_extent_in_eb(ctx, &key, eb, fi, &eie);
> +			if (ret == BTRFS_ITERATE_EXTENT_INODES_STOP || ret < 0)
> +				break;
> +			else if (ret > 0)
>  				goto next;
>  			ret = ulist_add_merge_ptr(parents, eb->start,
>  						  eie, (void **)&old, GFP_NOFS);
> -- 
> 2.35.1



  reply	other threads:[~2023-05-04  9:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-03 14:27 [PATCH] btrfs: fix backref walking not returning all inode refs fdmanana
2023-05-04  9:41 ` Wang Yugui [this message]
2023-05-04 10:13   ` Filipe Manana
2023-05-04 10:12 ` [PATCH v2] " fdmanana
2023-05-05 10:03   ` David Sterba
2023-05-08 19:51     ` Filipe Manana
2023-05-09 10:47       ` David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230504174118.4D5F.409509F4@e16-tech.com \
    --to=wangyugui@e16-tech.com \
    --cc=fdmanana@kernel.org \
    --cc=fdmanana@suse.com \
    --cc=git@vladimir.panteleev.md \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox