FAILED: patch "[PATCH] btrfs: don't skip remaining extrefs if dir not found during" failed to apply to 6.6-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 24e066ded45b8147b79c7455ac43a5bff7b5f378
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025081818-rimless-financial-6942@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 24e066ded45b8147b79c7455ac43a5bff7b5f378 Mon Sep 17 00:00:00 2001
From: Filipe Manana <[email protected]>
Date: Fri, 11 Jul 2025 20:48:23 +0100
Subject: [PATCH] btrfs: don't skip remaining extrefs if dir not found during
log replay
During log replay, at add_inode_ref(), if we have an extref item that contains multiple extrefs and one of them points to a directory that does not exist in the subvolume tree, we are supposed to ignore it and process the remaining extrefs encoded in the extref item, since each extref can point to a different parent inode. However when that happens we just return from the function and ignore the remaining extrefs.
The problem has been around since extrefs were introduced, in commit f186373fef00 ("btrfs: extended inode refs"), but it's hard to hit in practice because getting extref items encoding multiple extref requires getting a hash collision when computing the offset of the extref's key. The offset if computed like this:
key.offset = btrfs_extref_hash(dir_ino, name->name, name->len);
and btrfs_extref_hash() is just a wrapper around crc32c().
Fix this by moving to next iteration of the loop when we don't find the parent directory that an extref points to.
fs/btrfs/tree-log.c +14 -4
@@ -1433,6 +1433,8 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,if (log_ref_ver) { ret =extref_get_fields (eb, ref_ptr, &name, &ref_index, &parent_objectid); +if (ret) + goto out;/* * parent object can change from one array * item to another.
@@ -1449,16 +1451,23 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,* the loop when getting the first * parent dir. */ -if (ret == -ENOENT ) +if (ret == -ENOENT ) { +/* +* The next extref may refer to +* another parent dir that +* exists, so continue. +*/ ret =0 ; + goto next; + } goto out; } } }else { ret =ref_get_fields (eb, ref_ptr, &name, &ref_index); +if (ret) + goto out; } -if (ret) - goto out; ret =inode_in_dir (root, path,btrfs_ino (dir),btrfs_ino (inode), ref_index, &name);
@@ -1492,10 +1501,11 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans, }/* Else, ret == 1, we already have a perfect match, we're done. */ +next: ref_ptr = (unsigned long )(ref_ptr + ref_struct_size) + name.len;kfree (name.name); name.name =NULL ; -if (log_ref_ver) { +if (log_ref_ver && dir) {iput (&dir->vfs_inode); dir =NULL ; }
Sasha Levin
maintainerPATCH 1/1 btrfs: don't skip remaining extrefs if dir not found during log replay
From: Filipe Manana <[email protected]>
[ Upstream commit 24e066ded45b8147b79c7455ac43a5bff7b5f378 ]
During log replay, at add_inode_ref(), if we have an extref item that contains multiple extrefs and one of them points to a directory that does not exist in the subvolume tree, we are supposed to ignore it and process the remaining extrefs encoded in the extref item, since each extref can point to a different parent inode. However when that happens we just return from the function and ignore the remaining extrefs.
The problem has been around since extrefs were introduced, in commit f186373fef00 ("btrfs: extended inode refs"), but it's hard to hit in practice because getting extref items encoding multiple extref requires getting a hash collision when computing the offset of the extref's key. The offset if computed like this:
key.offset = btrfs_extref_hash(dir_ino, name->name, name->len);
and btrfs_extref_hash() is just a wrapper around crc32c().
Fix this by moving to next iteration of the loop when we don't find the parent directory that an extref points to.
--- fs/btrfs/tree-log.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
fs/btrfs/tree-log.c +22 -3
@@ -1445,6 +1445,8 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,if (log_ref_ver) { ret =extref_get_fields (eb, ref_ptr, &name, &ref_index, &parent_objectid); +if (ret) + goto out;/* * parent object can change from one array * item to another.
@@ -1456,15 +1458,31 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,if (IS_ERR (btrfs_dir)) { ret =PTR_ERR (btrfs_dir); dir =NULL ; +/* +* A new parent dir may have not been +* logged and not exist in the subvolume +* tree, see the comment above before +* the loop when getting the first +* parent dir. +*/ +if (ret == -ENOENT ) { +/* +* The next extref may refer to +* another parent dir that +* exists, so continue. +*/ + ret =0 ; + goto next; + } goto out; } dir = &btrfs_dir->vfs_inode; } }else { ret =ref_get_fields (eb, ref_ptr, &name, &ref_index); +if (ret) + goto out; } -if (ret) - goto out; ret =inode_in_dir (root, path,btrfs_ino (BTRFS_I (dir)),btrfs_ino (BTRFS_I (inode)), ref_index, &name);
@@ -1500,10 +1518,11 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans, }/* Else, ret == 1, we already have a perfect match, we're done. */ +next: ref_ptr = (unsigned long )(ref_ptr + ref_struct_size) + name.len;kfree (name.name); name.name =NULL ; -if (log_ref_ver) { +if (log_ref_ver && dir) {iput (dir); dir =NULL ; }
Signature · 1 line
2.50.1
Greg KH
maintainerRe: [PATCH 6.6.y] btrfs: don't skip remaining extrefs if dir not found during log replay
Quoted 30 lines · Sasha Levin
From: Filipe Manana <[email protected]>
[ Upstream commit
24e066ded45b8147b79c7455ac43a5bff7b5f378]During log replay, at
add_inode_ref(), if we have an extref item that contains multiple extrefs and one of them points to a directory that does not exist in the subvolume tree, we are supposed to ignore it and process the remaining extrefs encoded in the extref item, since each extref can point to a different parent inode. However when that happens we just return from the function and ignore the remaining extrefs.The problem has been around since extrefs were introduced, in commit
f186373fef00("btrfs: extended inode refs"), but it's hard to hit in practice because getting extref items encoding multiple extref requires getting a hash collision when computing the offset of the extref's key. The offset if computed like this:key.offset = btrfs_extref_hash(dir_ino, name->name, name->len);and
btrfs_extref_hash()is just a wrapper aroundcrc32c().Fix this by moving to next iteration of the loop when we don't find the parent directory that an extref points to.
Fixes f186373fef00 ("btrfs: extended inode refs")CC [email protected] # 6.1+Reviewed-by Boris Burkov <[email protected]>Signed-off-by Filipe Manana <[email protected]>Signed-off-by David Sterba <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 3 lines
--- fs/btrfs/tree-log.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
This isn't applying to the 6.6.y queue right now:
patching file fs/btrfs/tree-log.c
Hunk #1 succeeded at 1446 (offset 1 line).
Hunk #2 FAILED at 1458.
Hunk #3 succeeded at 1512 (offset 10 lines).
1 out of 3 hunks FAILED -- rejects in file fs/btrfs/tree-log.c
Can you rebase and resend?
thanks,
greg k-h