Re: [PATCH] btrfs-progs: check: recognize verity item keys in original mode

[Qu Wenruo <quwenruo.btrfs@gmx.com>]

在 2026/3/25 05:22, Leo Martins 写道:
> Commit 4e88bb6e ("btrfs-progs: enhance detection on unknown inode keys")
> added stricter validation for inode keys in the original mode checker,
> flagging unknown key types as errors. However, it did not add cases for
> BTRFS_VERITY_DESC_ITEM_KEY (36) and BTRFS_VERITY_MERKLE_ITEM_KEY (37),
> causing any filesystem with fs-verity enabled files to fail the check
> with:
> 
>    ERROR: unknown key (257 36 0) found in leaf 30621696
> 
> Add the missing switch cases so that verity metadata items are
> recognized and silently skipped during the check, matching the behavior
> of lowmem mode which already handles them.

Unfortunately I noticed that, lowmem mode doesn't have such handling either.

As I created a test case with verity items, and CI failed due to false 
alerts from CI.

I'll send out a small fix for the lowmem mode, along with the test case.

Thanks,
Qu

> 
> Signed-off-by: Leo Martins <loemra.dev@gmail.com>
> ---
>   check/main.c | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/check/main.c b/check/main.c
> index c96969fd..4fdd8867 100644
> --- a/check/main.c
> +++ b/check/main.c
> @@ -1895,6 +1895,9 @@ static int process_one_leaf(struct btrfs_root *root, struct extent_buffer *eb,
>   		case BTRFS_XATTR_ITEM_KEY:
>   			ret = process_xattr_item(eb, i, &key, active_node);
>   			break;
> +		case BTRFS_VERITY_DESC_ITEM_KEY:
> +		case BTRFS_VERITY_MERKLE_ITEM_KEY:
> +			break;
>   		default:
>   			error("unknown key (%llu %u %llu) found in leaf %llu",
>   			      key.objectid, key.type, key.offset, eb->start);