Re: [PATCH v3 33/35] xfs: introduce health state for corrupted fsverity metadata

["Darrick J. Wong" <djwong@kernel.org>]

On Wed, Feb 18, 2026 at 12:19:33AM +0100, Andrey Albershteyn wrote:
> Report corrupted fsverity descriptor through health system.
> 
> Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>

Looks good to me, though I'll have to revisit this with a sharper eye
for what happens if/when you rebase to use fserror_*.

IIRC inconsistencies between the merkle tree and the file data are
reported as -EIO, right?  And at that point we have the file range
information, so we could actually use fserror_report_data_lost.

I forget, what do we do for inconsistencies between an internal node of
the merkle tree and the next level down?  That sounds like something
that should set XFS_SICK_INO_FSVERITY, right?

For this bit involving just the fsverity descriptor,
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  fs/xfs/libxfs/xfs_fs.h     |  1 +
>  fs/xfs/libxfs/xfs_health.h |  4 +++-
>  fs/xfs/xfs_fsverity.c      | 13 ++++++++++---
>  fs/xfs/xfs_health.c        |  1 +
>  4 files changed, 15 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
> index 36a87276f0b7..d8be7fe93382 100644
> --- a/fs/xfs/libxfs/xfs_fs.h
> +++ b/fs/xfs/libxfs/xfs_fs.h
> @@ -423,6 +423,7 @@ struct xfs_bulkstat {
>  #define XFS_BS_SICK_PARENT	(1 << 7)  /* parent pointers */
>  #define XFS_BS_SICK_DIRTREE	(1 << 8)  /* directory tree structure */
>  #define XFS_BS_SICK_DATA	(1 << 9)  /* file data */
> +#define XFS_BS_SICK_FSVERITY	(1 << 10) /* fsverity metadata */
>  
>  /*
>   * Project quota id helpers (previously projid was 16bit only
> diff --git a/fs/xfs/libxfs/xfs_health.h b/fs/xfs/libxfs/xfs_health.h
> index fa91916ad072..c534aacf3199 100644
> --- a/fs/xfs/libxfs/xfs_health.h
> +++ b/fs/xfs/libxfs/xfs_health.h
> @@ -105,6 +105,7 @@ struct xfs_rtgroup;
>  #define XFS_SICK_INO_FORGET	(1 << 12)
>  #define XFS_SICK_INO_DIRTREE	(1 << 13)  /* directory tree structure */
>  #define XFS_SICK_INO_DATA	(1 << 14)  /* file data */
> +#define XFS_SICK_INO_FSVERITY	(1 << 15)  /* fsverity metadata */
>  
>  /* Primary evidence of health problems in a given group. */
>  #define XFS_SICK_FS_PRIMARY	(XFS_SICK_FS_COUNTERS | \
> @@ -142,7 +143,8 @@ struct xfs_rtgroup;
>  				 XFS_SICK_INO_SYMLINK | \
>  				 XFS_SICK_INO_PARENT | \
>  				 XFS_SICK_INO_DIRTREE | \
> -				 XFS_SICK_INO_DATA)
> +				 XFS_SICK_INO_DATA | \
> +				 XFS_SICK_INO_FSVERITY)
>  
>  #define XFS_SICK_INO_ZAPPED	(XFS_SICK_INO_BMBTD_ZAPPED | \
>  				 XFS_SICK_INO_BMBTA_ZAPPED | \
> diff --git a/fs/xfs/xfs_fsverity.c b/fs/xfs/xfs_fsverity.c
> index 5a2874236c3c..d89512d59328 100644
> --- a/fs/xfs/xfs_fsverity.c
> +++ b/fs/xfs/xfs_fsverity.c
> @@ -197,16 +197,23 @@ xfs_fsverity_get_descriptor(
>  		return error;
>  
>  	desc_size = be32_to_cpu(d_desc_size);
> -	if (XFS_IS_CORRUPT(mp, desc_size > FS_VERITY_MAX_DESCRIPTOR_SIZE))
> +	if (XFS_IS_CORRUPT(mp, desc_size > FS_VERITY_MAX_DESCRIPTOR_SIZE)) {
> +		xfs_inode_mark_sick(XFS_I(inode), XFS_SICK_INO_FSVERITY);
>  		return -ERANGE;
> -	if (XFS_IS_CORRUPT(mp, desc_size > desc_size_pos))
> +	}
> +
> +	if (XFS_IS_CORRUPT(mp, desc_size > desc_size_pos)) {
> +		xfs_inode_mark_sick(XFS_I(inode), XFS_SICK_INO_FSVERITY);
>  		return -ERANGE;
> +	}
>  
>  	if (!buf_size)
>  		return desc_size;
>  
> -	if (XFS_IS_CORRUPT(mp, desc_size > buf_size))
> +	if (XFS_IS_CORRUPT(mp, desc_size > buf_size)) {
> +		xfs_inode_mark_sick(XFS_I(inode), XFS_SICK_INO_FSVERITY);
>  		return -ERANGE;
> +	}
>  
>  	desc_pos = round_down(desc_size_pos - desc_size, blocksize);
>  	error = xfs_fsverity_read(inode, buf, desc_size, desc_pos);
> diff --git a/fs/xfs/xfs_health.c b/fs/xfs/xfs_health.c
> index b851651c02b2..e52ee02f7d7c 100644
> --- a/fs/xfs/xfs_health.c
> +++ b/fs/xfs/xfs_health.c
> @@ -488,6 +488,7 @@ static const struct ioctl_sick_map ino_map[] = {
>  	{ XFS_SICK_INO_SYMLINK_ZAPPED,	XFS_BS_SICK_SYMLINK },
>  	{ XFS_SICK_INO_DIRTREE,	XFS_BS_SICK_DIRTREE },
>  	{ XFS_SICK_INO_DATA,	XFS_BS_SICK_DATA },
> +	{ XFS_SICK_INO_FSVERITY,	XFS_BS_SICK_FSVERITY },
>  };
>  
>  /* Fill out bulkstat health info. */
> -- 
> 2.51.2
> 
>