btrfs: fix false alert caused by legacy btrfs root item
PATCH 1/1 btrfs: fix false alert caused by legacy btrfs root item
Commit 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check") introduced btrfs root item size check, however btrfs root item has two format, the legacy one which just ends before generation_v2 member, is smaller than current btrfs root item size.
This caused btrfs kernel to reject valid but old tree root leaves.
Fix this problem by also allowing legacy root item, since kernel can already handle them pretty well and upgrade to newer root item format when needed.
--- fs/btrfs/tree-checker.c | 17 ++++++++++++----- include/uapi/linux/btrfs_tree.h | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-)
fs/btrfs/tree-checker.c +12 -5
@@ -1035,7 +1035,7 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, int slot) {struct btrfs_fs_info *fs_info = leaf->fs_info; -struct btrfs_root_item ri; +struct btrfs_root_item ri = {0 };const u64 valid_root_flags =BTRFS_ROOT_SUBVOL_RDONLY |BTRFS_ROOT_SUBVOL_DEAD ;int ret;
@@ -1044,14 +1044,21 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,if (ret <0 )return ret; -if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri)) { +if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri) && +btrfs_item_size_nr (leaf, slot) !=btrfs_legacy_root_item_size ()) {generic_err (leaf, slot, -"invalid root item size, have %u expect %zu" , -btrfs_item_size_nr (leaf, slot),sizeof (ri)); +"invalid root item size, have %u expect %zu or %zu" , +btrfs_item_size_nr (leaf, slot),sizeof (ri), +btrfs_legacy_root_item_size ()); } +/* +* For legacy root item, the members starting at generation_v2 will be +* all filled with 0. +* And since we allow geneartion_v2 as 0, it will still pass the check. +*/ read_extent_buffer (leaf, &ri,btrfs_item_ptr_offset (leaf, slot), -sizeof (ri)); +btrfs_item_size_nr (leaf, slot));/* Generation related */ if (btrfs_root_generation(&ri) >
include/uapi/linux/btrfs_tree.h +9 -0
@@ -644,6 +644,15 @@ struct btrfs_root_item {__le64 reserved[8 ];/* for future */ } __attribute__ ((__packed__)); +/* +* Btrfs root item used to be smaller than current size. +* The old format ends at where member generation_v2 is. +*/ +static inline size_t btrfs_legacy_root_item_size (void ) +{ +return offsetof(struct btrfs_root_item , generation_v2); +} +/* * this is used for both forward and backward root refs */
Signature · 1 line
2.28.0
Hi Qu.
Instead of the tool, can I also patch my kernel with the patch below to have it automatically fix it?
If so, which approach would you prefer for testing?
I can apply the patch as I compile kernels myself.
Thanks,
Martin
Qu Wenruo - 22.09.20, 04:37:01 CEST:
Quoted 33 lines
Commit
259ee7754b67("btrfs: tree-checker: AddROOT_ITEMcheck") introduced btrfs root item size check, however btrfs root item has two format, the legacy one which just ends beforegeneration_v2member, is smaller than current btrfs root item size.This caused btrfs kernel to reject valid but old tree root leaves.
Fix this problem by also allowing legacy root item, since kernel can already handle them pretty well and upgrade to newer root item format when needed.
Reported-by Martin Steigerwald <[email protected]>Fixes 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")Signed-off-by Qu Wenruo <[email protected]>--- fs/btrfs/tree-checker.c | 17 ++++++++++++----- include/uapi/linux/btrfs_tree.h | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-)fs/btrfs/tree-checker.c +1
-1@@ -1035,7 +1035,7 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, int slot) {struct btrfs_fs_info *fs_info = leaf->fs_info; -struct btrfs_root_item ri; +struct btrfs_root_item ri = {0 };const u64 valid_root_flags =BTRFS_ROOT_SUBVOL_RDONLY |BTRFS_ROOT_SUBVOL_DEAD ;int ret;
fs/btrfs/tree-checker.c static int check_root_item(struct · line 1048
Quoted 6 lines
fs/btrfs/tree-checker.c +2
-1@@ -1044,14 +1044,21 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, if (ret < 0) return ret; -if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri)) { +if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri) && + btrfs_item_size_nr(leaf, slot) !=
btrfs_legacy_root_item_size())
fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 4 lines
fs/btrfs/tree-checker.c +1
-2{ generic_err(leaf, slot, -"invalid root item size, have %u expect %zu" , -btrfs_item_size_nr (leaf, slot),sizeof (ri)); + "invalid root item size, have %u expect %zu or
%zu",
fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 6 lines
fs/btrfs/tree-checker.c +4
-0+btrfs_item_size_nr (leaf, slot),sizeof (ri), + btrfs_legacy_root_item_size()); } +/* +* For legacy root item, the members starting at generation_v2
will
Quoted 30 lines
be + * all filled with 0.
fs/btrfs/tree-checker.c +1
-0+* And since we allow geneartion_v2 as 0, it will still pass the check. + */
fs/btrfs/tree-checker.c +1
-1read_extent_buffer (leaf, &ri,btrfs_item_ptr_offset (leaf, slot), -sizeof (ri)); +btrfs_item_size_nr (leaf, slot));/* Generation related */ if (btrfs_root_generation(&ri) >(quoted diff) +0
-0
b/include/uapi/linux/btrfs_tree.hindex9ba64ca6b4ac..464095a28b18100644include/uapi/linux/btrfs_tree.h +9
-0@@ -644,6 +644,15 @@ struct btrfs_root_item {__le64 reserved[8 ];/* for future */ } __attribute__ ((__packed__)); +/* +* Btrfs root item used to be smaller than current size. +* The old format ends at where member generation_v2 is. +*/ +static inline size_t btrfs_legacy_root_item_size (void ) +{ +return offsetof(struct btrfs_root_item , generation_v2); +} +/* * this is used for both forward and backward root refs */
Signature · 1 line
Martin
Quoted 4 lines · Martin Steigerwald
Hi Qu.
Instead of the tool, can I also patch my kernel with the patch below to have it automatically fix it?
Sure, this one is a little safer than the tool.
Quoted 4 lines
If so, which approach would you prefer for testing?
I can apply the patch as I compile kernels myself.
That's great.
That should solve the problem.
And if you don't like the legacy root item, just do a balance (no matter data or metadata), and that legacy root item will be converted to current one, and even affected kernel won't report any error any more.
Thanks,
Qu
Quoted 89 lines
Thanks,
MartinQu Wenruo - 22.09.20, 04:37:01 CEST:
Quoted 33 lines
Commit
259ee7754b67("btrfs: tree-checker: AddROOT_ITEMcheck") introduced btrfs root item size check, however btrfs root item has two format, the legacy one which just ends beforegeneration_v2member, is smaller than current btrfs root item size.This caused btrfs kernel to reject valid but old tree root leaves.
Fix this problem by also allowing legacy root item, since kernel can already handle them pretty well and upgrade to newer root item format when needed.
Reported-by Martin Steigerwald <[email protected]>Fixes 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")Signed-off-by Qu Wenruo <[email protected]>--- fs/btrfs/tree-checker.c | 17 ++++++++++++----- include/uapi/linux/btrfs_tree.h | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-)fs/btrfs/tree-checker.c +1
-1@@ -1035,7 +1035,7 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, int slot) {struct btrfs_fs_info *fs_info = leaf->fs_info; -struct btrfs_root_item ri; +struct btrfs_root_item ri = {0 };const u64 valid_root_flags =BTRFS_ROOT_SUBVOL_RDONLY |BTRFS_ROOT_SUBVOL_DEAD ;int ret;fs/btrfs/tree-checker.c static int check_root_item(struct · line 1048
Quoted 6 lines
fs/btrfs/tree-checker.c +2
-1@@ -1044,14 +1044,21 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, if (ret < 0) return ret; -if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri)) { +if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri) && + btrfs_item_size_nr(leaf, slot) !=
btrfs_legacy_root_item_size())fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 4 lines
fs/btrfs/tree-checker.c +1
-2{ generic_err(leaf, slot, -"invalid root item size, have %u expect %zu" , -btrfs_item_size_nr (leaf, slot),sizeof (ri)); + "invalid root item size, have %u expect %zu or%zu",
fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 6 lines
fs/btrfs/tree-checker.c +4
-0+btrfs_item_size_nr (leaf, slot),sizeof (ri), + btrfs_legacy_root_item_size()); } +/* +* For legacy root item, the members starting at generation_v2 will
Quoted 30 lines
be + * all filled with 0.
fs/btrfs/tree-checker.c +1
-0+* And since we allow geneartion_v2 as 0, it will still pass the check. + */
fs/btrfs/tree-checker.c +1
-1read_extent_buffer (leaf, &ri,btrfs_item_ptr_offset (leaf, slot), -sizeof (ri)); +btrfs_item_size_nr (leaf, slot));/* Generation related */ if (btrfs_root_generation(&ri) >(quoted diff) +0
-0
b/include/uapi/linux/btrfs_tree.hindex9ba64ca6b4ac..464095a28b18100644include/uapi/linux/btrfs_tree.h +9
-0@@ -644,6 +644,15 @@ struct btrfs_root_item {__le64 reserved[8 ];/* for future */ } __attribute__ ((__packed__)); +/* +* Btrfs root item used to be smaller than current size. +* The old format ends at where member generation_v2 is. +*/ +static inline size_t btrfs_legacy_root_item_size (void ) +{ +return offsetof(struct btrfs_root_item , generation_v2); +} +/* * this is used for both forward and backward root refs */
Qu Wenruo - 22.09.20, 12:34:18 CEST:
Quoted 5 lines · Martin Steigerwald
Quoted 2 lines
Instead of the tool, can I also patch my kernel with the patch below to have it automatically fix it?
Sure, this one is a little safer than the tool.
Thanks.
Quoted 4 lines
Quoted 3 lines
If so, which approach would you prefer for testing?
I can apply the patch as I compile kernels myself.
Quoted 8 lines
That's great.
That should solve the problem.
And if you don't like the legacy root item, just do a balance (no matter data or metadata), and that legacy root item will be converted to current one, and even affected kernel won't report any error any more.
Can I get away with a minimal balance? Or does it need to be a full one?
Best,
Martin
Quoted 109 lines
Quoted 109 lines
Qu Wenruo - 22.09.20, 04:37:01 CEST:
Quoted 44 lines
Commit
259ee7754b67("btrfs: tree-checker: AddROOT_ITEMcheck") introduced btrfs root item size check, however btrfs root item has two format, the legacy one which just ends beforegeneration_v2member, is smaller than current btrfs root item size.This caused btrfs kernel to reject valid but old tree root leaves.
Fix this problem by also allowing legacy root item, since kernel can
already handle them pretty well and upgrade to newer root item format
when needed.Reported-by Martin Steigerwald <[email protected]>Fixes 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")Signed-off-by Qu Wenruo <[email protected]>---
fs/btrfs/tree-checker.c | 17 ++++++++++++----- include/uapi/linux/btrfs_tree.h | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-)fs/btrfs/tree-checker.c +0
-0@@ -1035,7 +1035,7 @@ static int check_root_item(struct
extent_buffer
*leaf, structbtrfs_key*key, int slot){
fs/btrfs/tree-checker.c +1
-1struct btrfs_fs_info *fs_info = leaf->fs_info; -struct btrfs_root_item ri; +struct btrfs_root_item ri = {0 };const u64 valid_root_flags =BTRFS_ROOT_SUBVOL_RDONLY |BTRFS_ROOT_SUBVOL_DEAD ;int ret;fs/btrfs/tree-checker.c static int check_root_item(struct · line 1049
Quoted 7 lines
fs/btrfs/tree-checker.c +2
-1@@ -1044,14 +1044,21 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, if (ret < 0) return ret; -if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri)) { +if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri) && + btrfs_item_size_nr(leaf, slot) !=
btrfs_legacy_root_item_size())fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 4 lines
fs/btrfs/tree-checker.c +1
-2{ generic_err(leaf, slot, -"invalid root item size, have %u expect %zu" , -btrfs_item_size_nr (leaf, slot),sizeof (ri)); + "invalid root item size, have %u expect %zu or%zu",
fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 7 lines
fs/btrfs/tree-checker.c +4
-0+btrfs_item_size_nr (leaf, slot),sizeof (ri), + btrfs_legacy_root_item_size()); } +/* +* For legacy root item, the members starting at generation_v2 will
Quoted 37 lines
be + * all filled with 0.
fs/btrfs/tree-checker.c +1
-0+* And since we allow geneartion_v2 as 0, it will still pass the check. + */
fs/btrfs/tree-checker.c +1
-1read_extent_buffer (leaf, &ri,btrfs_item_ptr_offset (leaf, slot), -sizeof (ri)); +btrfs_item_size_nr (leaf, slot));/* Generation related */ if (btrfs_root_generation(&ri) >(quoted diff) +0
-0
b/include/uapi/linux/btrfs_tree.hindex9ba64ca6b4ac..464095a28b18100644include/uapi/linux/btrfs_tree.h +9
-0@@ -644,6 +644,15 @@ struct btrfs_root_item {__le64 reserved[8 ];/* for future */ } __attribute__ ((__packed__)); +/* +* Btrfs root item used to be smaller than current size. +* The old format ends at where member generation_v2 is. +*/ +static inline size_t btrfs_legacy_root_item_size (void ) +{ +return offsetof(struct btrfs_root_item , generation_v2); +} +/*
* this is used for both forward and backward root refs */
Signature · 1 line
Martin
Quoted 15 lines · Martin Steigerwald
Qu Wenruo - 22.09.20, 12:34:18 CEST:
Quoted 5 lines · Martin Steigerwald
Quoted 2 lines
Instead of the tool, can I also patch my kernel with the patch below to have it automatically fix it?
Sure, this one is a little safer than the tool.
Thanks.
Quoted 6 lines
Quoted 3 lines
If so, which approach would you prefer for testing?
I can apply the patch as I compile kernels myself.
That's great.
Quoted 8 lines
Quoted 6 lines
That should solve the problem.
And if you don't like the legacy root item, just do a balance (no matter data or metadata), and that legacy root item will be converted to current one, and even affected kernel won't report any error any more.
Can I get away with a minimal balance? Or does it need to be a full one?
Minimal is enough.
You just need to balance one chunk.
You can confirm it with "btrfs ins dump-tree -t root <device>". If DATA_RELOC_TREE item size is still 249, it's legacy one. If it's 429, then it's the current one.
Thanks,
Qu
Quoted 115 lines
Best,
MartinQuoted 109 lines
Quoted 109 lines
Qu Wenruo - 22.09.20, 04:37:01 CEST:
Quoted 44 lines
Commit
259ee7754b67("btrfs: tree-checker: AddROOT_ITEMcheck") introduced btrfs root item size check, however btrfs root item has two format, the legacy one which just ends beforegeneration_v2member, is smaller than current btrfs root item size.This caused btrfs kernel to reject valid but old tree root leaves.
Fix this problem by also allowing legacy root item, since kernel can
already handle them pretty well and upgrade to newer root item format
when needed.Reported-by Martin Steigerwald <[email protected]>Fixes 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")Signed-off-by Qu Wenruo <[email protected]>---
fs/btrfs/tree-checker.c | 17 ++++++++++++----- include/uapi/linux/btrfs_tree.h | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-)fs/btrfs/tree-checker.c +0
-0@@ -1035,7 +1035,7 @@ static int check_root_item(struct
extent_buffer
*leaf, structbtrfs_key*key, int slot){
fs/btrfs/tree-checker.c +1
-1struct btrfs_fs_info *fs_info = leaf->fs_info; -struct btrfs_root_item ri; +struct btrfs_root_item ri = {0 };const u64 valid_root_flags =BTRFS_ROOT_SUBVOL_RDONLY |BTRFS_ROOT_SUBVOL_DEAD ;int ret;fs/btrfs/tree-checker.c static int check_root_item(struct · line 1049
Quoted 7 lines
fs/btrfs/tree-checker.c +2
-1@@ -1044,14 +1044,21 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, if (ret < 0) return ret; -if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri)) { +if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri) && + btrfs_item_size_nr(leaf, slot) !=
btrfs_legacy_root_item_size())fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 4 lines
fs/btrfs/tree-checker.c +1
-2{ generic_err(leaf, slot, -"invalid root item size, have %u expect %zu" , -btrfs_item_size_nr (leaf, slot),sizeof (ri)); + "invalid root item size, have %u expect %zu or%zu",
fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 7 lines
fs/btrfs/tree-checker.c +4
-0+btrfs_item_size_nr (leaf, slot),sizeof (ri), + btrfs_legacy_root_item_size()); } +/* +* For legacy root item, the members starting at generation_v2 will
Quoted 37 lines
be + * all filled with 0.
fs/btrfs/tree-checker.c +1
-0+* And since we allow geneartion_v2 as 0, it will still pass the check. + */
fs/btrfs/tree-checker.c +1
-1read_extent_buffer (leaf, &ri,btrfs_item_ptr_offset (leaf, slot), -sizeof (ri)); +btrfs_item_size_nr (leaf, slot));/* Generation related */ if (btrfs_root_generation(&ri) >(quoted diff) +0
-0
b/include/uapi/linux/btrfs_tree.hindex9ba64ca6b4ac..464095a28b18100644include/uapi/linux/btrfs_tree.h +9
-0@@ -644,6 +644,15 @@ struct btrfs_root_item {__le64 reserved[8 ];/* for future */ } __attribute__ ((__packed__)); +/* +* Btrfs root item used to be smaller than current size. +* The old format ends at where member generation_v2 is. +*/ +static inline size_t btrfs_legacy_root_item_size (void ) +{ +return offsetof(struct btrfs_root_item , generation_v2); +} +/*
* this is used for both forward and backward root refs */
Qu Wenruo - 23.09.20, 01:17:01 CEST:
Quoted 8 lines · Martin Steigerwald
Quoted 7 lines
Qu Wenruo - 22.09.20, 12:34:18 CEST:
Quoted 6 lines · Martin Steigerwald
Quoted 3 lines
Instead of the tool, can I also patch my kernel with the patch below
to have it automatically fix it?Sure, this one is a little safer than the tool.
[…]
Quoted 12 lines
Quoted 12 lines
Quoted 11 lines
Quoted 2 lines
If so, which approach would you prefer for testing? I can apply the patch as I compile kernels myself.
That's great.
That should solve the problem.
And if you don't like the legacy root item, just do a balance (no matter data or metadata), and that legacy root item will be converted to current one, and even affected kernel won't report any error any more.
Quoted 8 lines
Quoted 2 lines
Can I get away with a minimal balance? Or does it need to be a full one?
Minimal is enough.
You just need to balance one chunk.You can confirm it with "btrfs ins dump-tree -t root <device>". If
DATA_RELOC_TREEitem size is still 249, it's legacy one. If it's 429, then it's the current one.
Hmmm its 439. So is that good as well?
item 178 key (DATA_RELOC_TREE ROOT_ITEM 0) itemoff 8546 itemsize 439
generation 13246 root_dirid 256 bytenr 896876544 level 0 refs 1 lastsnap 0 byte_limit 0 bytes_used 16384 flags 0x0(none) uuid […]
drop key (0 UNKNOWN.0 0) level 0
What is this tree used for by the way?
If you like I can test with unpatched kernel whether warning goes away, but I bet it may not be needed.
[…]
Signature · 1 line
Martin
Quoted 24 lines · Martin Steigerwald
Qu Wenruo - 23.09.20, 01:17:01 CEST:
Quoted 8 lines · Martin Steigerwald
Quoted 7 lines
Qu Wenruo - 22.09.20, 12:34:18 CEST:
Quoted 6 lines · Martin Steigerwald
Quoted 3 lines
Instead of the tool, can I also patch my kernel with the patch below
to have it automatically fix it?Sure, this one is a little safer than the tool.
[…]
Quoted 14 lines
Quoted 14 lines
Quoted 11 lines
Quoted 2 lines
If so, which approach would you prefer for testing? I can apply the patch as I compile kernels myself.
That's great.
That should solve the problem.
And if you don't like the legacy root item, just do a balance (no matter data or metadata), and that legacy root item will be converted to current one, and even affected kernel won't report any error any more.
Can I get away with a minimal balance? Or does it need to be a full one?
Quoted 8 lines
Quoted 6 lines
Minimal is enough.
You just need to balance one chunk.You can confirm it with "btrfs ins dump-tree -t root <device>". If
DATA_RELOC_TREEitem size is still 249, it's legacy one. If it's 429, then it's the current one.Hmmm its 439. So is that good as well?
Sorry, 439 is the correct size.
Quoted 8 lines
item 178 key (
DATA_RELOC_TREEROOT_ITEM0) itemoff 8546 itemsize 439
generation 13246root_dirid256 bytenr 896876544 level 0 refs 1 lastsnap 0byte_limit0bytes_used16384 flags 0x0(none) uuid […]
drop key (0 UNKNOWN.0 0) level 0What is this tree used for by the way?
Used as a tree storing the new relocated chunk data.
Quoted 3 lines
If you like I can test with unpatched kernel whether warning goes away, but I bet it may not be needed.
It should be safe now.
Thanks,
Qu
Quoted 3 lines
[…]
Qu Wenruo - 24.09.20, 02:07:01 CEST:
Quoted 4 lines
Quoted 2 lines
If you like I can test with unpatched kernel whether warning goes away, but I bet it may not be needed.
It should be safe now.
Thanks!
Signature · 1 line
Martin
Martin Steigerwald
Tested-byQu Wenruo - 22.09.20, 12:34:18 CEST:
Quoted 10 lines · Martin Steigerwald
Quoted 2 lines
Instead of the tool, can I also patch my kernel with the patch below to have it automatically fix it?
Sure, this one is a little safer than the tool.
Quoted 3 lines
If so, which approach would you prefer for testing?
I can apply the patch as I compile kernels myself.
Quoted 8 lines
That's great.
That should solve the problem.
And if you don't like the legacy root item, just do a balance (no matter data or metadata), and that legacy root item will be converted to current one, and even affected kernel won't report any error any more.
Tested with patch. No error message :)
Will do balance once I know whether a minimal one is enough. Can test with old unpatched kernel then as well. Both 5.9-rc5, as 5.9-rc6 didn't compile for some reason.
Thanks,
Martin
Quoted 109 lines
Quoted 109 lines
Qu Wenruo - 22.09.20, 04:37:01 CEST:
Quoted 44 lines
Commit
259ee7754b67("btrfs: tree-checker: AddROOT_ITEMcheck") introduced btrfs root item size check, however btrfs root item has two format, the legacy one which just ends beforegeneration_v2member, is smaller than current btrfs root item size.This caused btrfs kernel to reject valid but old tree root leaves.
Fix this problem by also allowing legacy root item, since kernel can
already handle them pretty well and upgrade to newer root item format
when needed.Reported-by Martin Steigerwald <[email protected]>Fixes 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")Signed-off-by Qu Wenruo <[email protected]>---
fs/btrfs/tree-checker.c | 17 ++++++++++++----- include/uapi/linux/btrfs_tree.h | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-)fs/btrfs/tree-checker.c +0
-0@@ -1035,7 +1035,7 @@ static int check_root_item(struct
extent_buffer
*leaf, structbtrfs_key*key, int slot){
fs/btrfs/tree-checker.c +1
-1struct btrfs_fs_info *fs_info = leaf->fs_info; -struct btrfs_root_item ri; +struct btrfs_root_item ri = {0 };const u64 valid_root_flags =BTRFS_ROOT_SUBVOL_RDONLY |BTRFS_ROOT_SUBVOL_DEAD ;int ret;fs/btrfs/tree-checker.c static int check_root_item(struct · line 1049
Quoted 7 lines
fs/btrfs/tree-checker.c +2
-1@@ -1044,14 +1044,21 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, if (ret < 0) return ret; -if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri)) { +if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri) && + btrfs_item_size_nr(leaf, slot) !=
btrfs_legacy_root_item_size())fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 4 lines
fs/btrfs/tree-checker.c +1
-2{ generic_err(leaf, slot, -"invalid root item size, have %u expect %zu" , -btrfs_item_size_nr (leaf, slot),sizeof (ri)); + "invalid root item size, have %u expect %zu or%zu",
fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 7 lines
fs/btrfs/tree-checker.c +4
-0+btrfs_item_size_nr (leaf, slot),sizeof (ri), + btrfs_legacy_root_item_size()); } +/* +* For legacy root item, the members starting at generation_v2 will
Quoted 37 lines
be + * all filled with 0.
fs/btrfs/tree-checker.c +1
-0+* And since we allow geneartion_v2 as 0, it will still pass the check. + */
fs/btrfs/tree-checker.c +1
-1read_extent_buffer (leaf, &ri,btrfs_item_ptr_offset (leaf, slot), -sizeof (ri)); +btrfs_item_size_nr (leaf, slot));/* Generation related */ if (btrfs_root_generation(&ri) >(quoted diff) +0
-0
b/include/uapi/linux/btrfs_tree.hindex9ba64ca6b4ac..464095a28b18100644include/uapi/linux/btrfs_tree.h +9
-0@@ -644,6 +644,15 @@ struct btrfs_root_item {__le64 reserved[8 ];/* for future */ } __attribute__ ((__packed__)); +/* +* Btrfs root item used to be smaller than current size. +* The old format ends at where member generation_v2 is. +*/ +static inline size_t btrfs_legacy_root_item_size (void ) +{ +return offsetof(struct btrfs_root_item , generation_v2); +} +/*
* this is used for both forward and backward root refs */
Signature · 1 line
Martin
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Qu,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on kdave/for-next]
[also build test ERROR on v5.9-rc6 next-20200921]
[cannot apply to btrfs/next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Qu-Wenruo/btrfs-fix-false-alert-caused-by-legacy-btrfs-root-item/20200922-103827 base: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next config: x86_64-randconfig-s021-20200920 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.2-201-g24bdaac6-dirty # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from <command-line>:32:
>> ./usr/include/linux/btrfs_tree.h:651:19: error: unknown type name 'size_t'
651 | static __inline__ size_t btrfs_legacy_root_item_size(void)
| ^~~~~~
./usr/include/linux/btrfs_tree.h: In function 'btrfs_legacy_root_item_size':
>> ./usr/include/linux/btrfs_tree.h:653:9: error: implicit declaration of function 'offsetof' [-Werror=implicit-function-declaration]
653 | return offsetof(struct btrfs_root_item, generation_v2);
| ^~~~~~~~
./usr/include/linux/btrfs_tree.h:6:1: note: 'offsetof' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'?
5 | #include <linux/btrfs.h>
+++ |+#include <stddef.h>
6 | #include <linux/types.h>
>> ./usr/include/linux/btrfs_tree.h:653:18: error: expected expression before 'struct'
653 | return offsetof(struct btrfs_root_item, generation_v2);
| ^~~~~~cc1: some warnings being treated as errors
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Quoted 11 lines · kernel test robot
Hi Qu,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on kdave/for-next]
[also build test ERROR on v5.9-rc6 next-20200921]
[cannot apply to btrfs/next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
Quoted 9 lines
url: https://github.com/0day-ci/linux/commits/Qu-Wenruo/btrfs-fix-false-alert-caused-by-legacy-btrfs-root-item/20200922-103827 base: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next config: x86_64-randconfig-s021-20200920 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.2-201-g24bdaac6-dirty # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64
Well, with my gcc-10.2.0 and C=1, my sparse just segfault on volumes.c...
And no such offsetof() related reports before it crashes.
I'm wondering if this sparse warning really makes any sense, especially gcc is not complaining by itself.
Thanks,
Qu
Quoted 27 lines
If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All errors (new ones prefixed by >>):
In file included from <command-line>:32:
Quoted 1 line
Quoted 1 line
./usr/include/linux/btrfs_tree.h:651:19: error: unknown type name 'size_t'651 | static
__inline__size_tbtrfs_legacy_root_item_size(void)
| ^~~~~~
./usr/include/linux/btrfs_tree.h: In function 'btrfs_legacy_root_item_size':Quoted 1 line
Quoted 1 line
./usr/include/linux/btrfs_tree.h:653:9: error: implicit declaration of function 'offsetof' [-Werror=implicit-function-declaration]653 | return offsetof(struct btrfs_root_item, generation_v2); | ^~~~~~~~ ./usr/include/linux/btrfs_tree.h:6:1: note: 'offsetof' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'? 5 | #include <linux/btrfs.h> +++ |+#include <stddef.h> 6 | #include <linux/types.h>Quoted 1 line
Quoted 1 line
./usr/include/linux/btrfs_tree.h:653:18: error: expected expression before 'struct'653 | return offsetof(struct btrfs_root_item, generation_v2); | ^~~~~~cc1: some warnings being treated as errors
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Quoted 7 lines · Qu Wenruo
Commit
259ee7754b67("btrfs: tree-checker: AddROOT_ITEMcheck") introduced btrfs root item size check, however btrfs root item has two format, the legacy one which just ends beforegeneration_v2member, is smaller than current btrfs root item size.This caused btrfs kernel to reject valid but old tree root leaves.
Quoted 7 lines
Fix this problem by also allowing legacy root item, since kernel can already handle them pretty well and upgrade to newer root item format when needed.
Reported-by Martin Steigerwald <[email protected]>Fixes 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")Signed-off-by Qu Wenruo <[email protected]>
Thanks,
Josef
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Qu,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on kdave/for-next]
[also build test ERROR on v5.9-rc6 next-20200922]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Qu-Wenruo/btrfs-fix-false-alert-caused-by-legacy-btrfs-root-item/20200922-103827 base: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next config: x86_64-randconfig-a014-20200920 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 6a6b06f5262bb96523eceef4a42fe8e60ae2a630)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from <built-in>:1:
>> ./usr/include/linux/btrfs_tree.h:651:19: error: unknown type name 'size_t'
static __inline__ size_t btrfs_legacy_root_item_size(void)
^
>> ./usr/include/linux/btrfs_tree.h:653:9: error: implicit declaration of function 'offsetof' [-Werror,-Wimplicit-function-declaration]
return offsetof(struct btrfs_root_item, generation_v2);
^
>> ./usr/include/linux/btrfs_tree.h:653:18: error: expected expression
return offsetof(struct btrfs_root_item, generation_v2);
^
>> ./usr/include/linux/btrfs_tree.h:653:42: error: use of undeclared identifier 'generation_v2'
return offsetof(struct btrfs_root_item, generation_v2);
^4 errors generated.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Quoted 23 lines · kernel test robot
Hi Qu,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on kdave/for-next]
[also build test ERROR on v5.9-rc6 next-20200922]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]url: https://github.com/0day-ci/linux/commits/Qu-Wenruo/btrfs-fix-false-alert-caused-by-legacy-btrfs-root-item/20200922-103827 base: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next config: x86_64-randconfig-a014-20200920 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 6a6b06f5262bb96523eceef4a42fe8e60ae2a630)reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# installx86_64cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64If you fix the issue, kindly add following tag as appropriate
Quoted 8 lines
Reported-by kernel test robot <[email protected]>All errors (new ones prefixed by >>):
In file included from <built-in>:1:
Quoted 1 line
Quoted 1 line
./usr/include/linux/btrfs_tree.h:651:19: error: unknown type name 'size_t'static
__inline__size_tbtrfs_legacy_root_item_size(void)^
u32 should be fine here, we use it for all the other item helpers.
Quoted 26 lines · David Sterba
Quoted 25 lines · kernel test robot
Hi Qu,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on kdave/for-next]
[also build test ERROR on v5.9-rc6 next-20200922]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]url: https://github.com/0day-ci/linux/commits/Qu-Wenruo/btrfs-fix-false-alert-caused-by-legacy-btrfs-root-item/20200922-103827 base: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next config: x86_64-randconfig-a014-20200920 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 6a6b06f5262bb96523eceef4a42fe8e60ae2a630)reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# installx86_64cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>
Quoted 9 lines
Quoted 6 lines
All errors (new ones prefixed by >>):
In file included from <built-in>:1:
Quoted 1 line
Quoted 1 line
./usr/include/linux/btrfs_tree.h:651:19: error: unknown type name 'size_t'static
__inline__size_tbtrfs_legacy_root_item_size(void)^u32 should be fine here, we use it for all the other item helpers.
Sure, but I'm a little interested in why it passes in gcc v10.20...
Thanks,
Qu
Quoted 29 lines · Qu Wenruo
Quoted 28 lines · David Sterba
Quoted 27 lines · kernel test robot
Hi Qu,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on kdave/for-next]
[also build test ERROR on v5.9-rc6 next-20200922]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]url: https://github.com/0day-ci/linux/commits/Qu-Wenruo/btrfs-fix-false-alert-caused-by-legacy-btrfs-root-item/20200922-103827 base: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next config: x86_64-randconfig-a014-20200920 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 6a6b06f5262bb96523eceef4a42fe8e60ae2a630)reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# installx86_64cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All errors (new ones prefixed by >>):
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
In file included from <built-in>:1:
Quoted 1 line
Quoted 1 line
./usr/include/linux/btrfs_tree.h:651:19: error: unknown type name 'size_t'static
__inline__size_tbtrfs_legacy_root_item_size(void)^u32 should be fine here, we use it for all the other item helpers.
Sure, but I'm a little interested in why it passes in gcc v10.20...
It depends on the config options. It passed for me too, but Josef noticed it does not build and pointed to the CONFIG_UAPI_HEADER_TEST and CONFIG_HEADERS_INSTALL options.
This is a valid report and needs to be fixed, I looked around to the UAPI headers that use offset of how this is solved and it's enough to include linux/stddef.h (or stddef.h for non-kernel build). Updated misc-next pushed. Thanks.
Quoted 7 lines · Qu Wenruo
Commit
259ee7754b67("btrfs: tree-checker: AddROOT_ITEMcheck") introduced btrfs root item size check, however btrfs root item has two format, the legacy one which just ends beforegeneration_v2member, is smaller than current btrfs root item size.This caused btrfs kernel to reject valid but old tree root leaves.
Quoted 7 lines
Fix this problem by also allowing legacy root item, since kernel can already handle them pretty well and upgrade to newer root item format when needed.
Reported-by Martin Steigerwald <[email protected]>Fixes 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")Signed-off-by Qu Wenruo <[email protected]>
Added to misc-next, thanks.
Hi Qu!
Qu Wenruo - 22.09.20, 04:37:01 CEST:
Quoted 10 lines
Commit
259ee7754b67("btrfs: tree-checker: AddROOT_ITEMcheck") introduced btrfs root item size check, however btrfs root item has two format, the legacy one which just ends beforegeneration_v2member, is smaller than current btrfs root item size.This caused btrfs kernel to reject valid but old tree root leaves.
Fix this problem by also allowing legacy root item, since kernel can already handle them pretty well and upgrade to newer root item format when needed.
Is this going into 5.9? Asking cause it is not in 5.9-rc8.
Of course I can keep the patch and as the external disk has been fixed, I would not even need it anymore.
Best,
Martin
Quoted 22 lines
Reported-by Martin Steigerwald <[email protected]>Fixes 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")Signed-off-by Qu Wenruo <[email protected]>--- fs/btrfs/tree-checker.c | 17 ++++++++++++----- include/uapi/linux/btrfs_tree.h | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-)fs/btrfs/tree-checker.c +1
-1@@ -1035,7 +1035,7 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, int slot) {struct btrfs_fs_info *fs_info = leaf->fs_info; -struct btrfs_root_item ri; +struct btrfs_root_item ri = {0 };const u64 valid_root_flags =BTRFS_ROOT_SUBVOL_RDONLY |BTRFS_ROOT_SUBVOL_DEAD ;int ret;
fs/btrfs/tree-checker.c static int check_root_item(struct · line 1048
Quoted 6 lines
fs/btrfs/tree-checker.c +2
-1@@ -1044,14 +1044,21 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, if (ret < 0) return ret; -if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri)) { +if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri) && + btrfs_item_size_nr(leaf, slot) !=
btrfs_legacy_root_item_size())
fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 4 lines
fs/btrfs/tree-checker.c +1
-2{ generic_err(leaf, slot, -"invalid root item size, have %u expect %zu" , -btrfs_item_size_nr (leaf, slot),sizeof (ri)); + "invalid root item size, have %u expect %zu or
%zu",
fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 6 lines
fs/btrfs/tree-checker.c +4
-0+btrfs_item_size_nr (leaf, slot),sizeof (ri), + btrfs_legacy_root_item_size()); } +/* +* For legacy root item, the members starting at generation_v2
will
Quoted 30 lines
be + * all filled with 0.
fs/btrfs/tree-checker.c +1
-0+* And since we allow geneartion_v2 as 0, it will still pass the check. + */
fs/btrfs/tree-checker.c +1
-1read_extent_buffer (leaf, &ri,btrfs_item_ptr_offset (leaf, slot), -sizeof (ri)); +btrfs_item_size_nr (leaf, slot));/* Generation related */ if (btrfs_root_generation(&ri) >(quoted diff) +0
-0
b/include/uapi/linux/btrfs_tree.hindex9ba64ca6b4ac..464095a28b18100644include/uapi/linux/btrfs_tree.h +9
-0@@ -644,6 +644,15 @@ struct btrfs_root_item {__le64 reserved[8 ];/* for future */ } __attribute__ ((__packed__)); +/* +* Btrfs root item used to be smaller than current size. +* The old format ends at where member generation_v2 is. +*/ +static inline size_t btrfs_legacy_root_item_size (void ) +{ +return offsetof(struct btrfs_root_item , generation_v2); +} +/* * this is used for both forward and backward root refs */
Signature · 1 line
Martin
Quoted 8 lines · Martin Steigerwald
Hi Qu!
Qu Wenruo - 22.09.20, 04:37:01 CEST:
Quoted 5 lines
Commit
259ee7754b67("btrfs: tree-checker: AddROOT_ITEMcheck") introduced btrfs root item size check, however btrfs root item has two format, the legacy one which just ends beforegeneration_v2member, is smaller than current btrfs root item size.
Quoted 7 lines
Quoted 5 lines
This caused btrfs kernel to reject valid but old tree root leaves.
Fix this problem by also allowing legacy root item, since kernel can already handle them pretty well and upgrade to newer root item format when needed.
Is this going into 5.9? Asking cause it is not in 5.9-rc8.
David has the final say on whether to go into a late rc.
But it's already in David's misc-next branch, which means v5.10 would have it at least.
Quoted 3 lines
Of course I can keep the patch and as the external disk has been fixed, I would not even need it anymore.
That's true, so you don't need to bother the problem any more.
Thanks,
Qu
Quoted 77 lines
Best,
MartinQuoted 22 lines
Reported-by Martin Steigerwald <[email protected]>Fixes 259ee7754b67 ("btrfs: tree-checker: Add ROOT_ITEM check")Signed-off-by Qu Wenruo <[email protected]>--- fs/btrfs/tree-checker.c | 17 ++++++++++++----- include/uapi/linux/btrfs_tree.h | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-)fs/btrfs/tree-checker.c +1
-1@@ -1035,7 +1035,7 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, int slot) {struct btrfs_fs_info *fs_info = leaf->fs_info; -struct btrfs_root_item ri; +struct btrfs_root_item ri = {0 };const u64 valid_root_flags =BTRFS_ROOT_SUBVOL_RDONLY |BTRFS_ROOT_SUBVOL_DEAD ;int ret;fs/btrfs/tree-checker.c static int check_root_item(struct · line 1048
Quoted 6 lines
fs/btrfs/tree-checker.c +2
-1@@ -1044,14 +1044,21 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, if (ret < 0) return ret; -if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri)) { +if (btrfs_item_size_nr (leaf, slot) !=sizeof (ri) && + btrfs_item_size_nr(leaf, slot) !=
btrfs_legacy_root_item_size())fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 4 lines
fs/btrfs/tree-checker.c +1
-2{ generic_err(leaf, slot, -"invalid root item size, have %u expect %zu" , -btrfs_item_size_nr (leaf, slot),sizeof (ri)); + "invalid root item size, have %u expect %zu or%zu",
fs/btrfs/tree-checker.c static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,
Quoted 6 lines
fs/btrfs/tree-checker.c +4
-0+btrfs_item_size_nr (leaf, slot),sizeof (ri), + btrfs_legacy_root_item_size()); } +/* +* For legacy root item, the members starting at generation_v2 will
Quoted 30 lines
be + * all filled with 0.
fs/btrfs/tree-checker.c +1
-0+* And since we allow geneartion_v2 as 0, it will still pass the check. + */
fs/btrfs/tree-checker.c +1
-1read_extent_buffer (leaf, &ri,btrfs_item_ptr_offset (leaf, slot), -sizeof (ri)); +btrfs_item_size_nr (leaf, slot));/* Generation related */ if (btrfs_root_generation(&ri) >(quoted diff) +0
-0
b/include/uapi/linux/btrfs_tree.hindex9ba64ca6b4ac..464095a28b18100644include/uapi/linux/btrfs_tree.h +9
-0@@ -644,6 +644,15 @@ struct btrfs_root_item {__le64 reserved[8 ];/* for future */ } __attribute__ ((__packed__)); +/* +* Btrfs root item used to be smaller than current size. +* The old format ends at where member generation_v2 is. +*/ +static inline size_t btrfs_legacy_root_item_size (void ) +{ +return offsetof(struct btrfs_root_item , generation_v2); +} +/* * this is used for both forward and backward root refs */