Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22431bf3 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: refactor inode verifier corruption error printing 



Refactor inode verifier error reporting into a non-libxfs function so
that we aren't encoding the message format in libxfs.  This also
changes the kernel dmesg output to resemble buffer verifier errors
more closely.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 67a3f6d0

fs/xfs/libxfs/xfs_inode_buf.c

+2 −4
Original line number Diff line number Diff line
@@ -578,10 +578,8 @@ xfs_iread( 
	/* even unallocated inodes are verified */

	fa = xfs_dinode_verify(mp, ip->i_ino, dip);

	if (fa) {

		xfs_alert(mp, "%s: validation failed for inode %lld at %pS",

				__func__, ip->i_ino, fa);



		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, dip);

		xfs_inode_verifier_error(ip, -EFSCORRUPTED, "dinode", dip,

				sizeof(*dip), fa);

		error = -EFSCORRUPTED;

		goto out_brelse;

	}

fs/xfs/xfs_error.c

+37 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "xfs_errortag.h"

#include "xfs_error.h"

#include "xfs_sysfs.h"

#include "xfs_inode.h"



#ifdef DEBUG
@@ -372,3 +373,39 @@ xfs_verifier_error( 
	if (xfs_error_level >= XFS_ERRLEVEL_HIGH)

		xfs_stack_trace();

}



/*

 * Warnings for inode corruption problems.  Don't bother with the stack

 * trace unless the error level is turned up high.

 */

void

xfs_inode_verifier_error(

	struct xfs_inode	*ip,

	int			error,

	const char		*name,

	void			*buf,

	size_t			bufsz,

	xfs_failaddr_t		failaddr)

{

	struct xfs_mount	*mp = ip->i_mount;

	xfs_failaddr_t		fa;

	int			sz;



	fa = failaddr ? failaddr : __return_address;



	xfs_alert(mp, "Metadata %s detected at %pS, inode 0x%llx %s",

		  error == -EFSBADCRC ? "CRC error" : "corruption",

		  fa, ip->i_ino, name);



	xfs_alert(mp, "Unmount and run xfs_repair");



	if (buf && xfs_error_level >= XFS_ERRLEVEL_LOW) {

		sz = min_t(size_t, XFS_CORRUPTION_DUMP_LEN, bufsz);

		xfs_alert(mp, "First %d bytes of corrupted metadata buffer:",

				sz);

		xfs_hex_dump(buf, sz);

	}



	if (xfs_error_level >= XFS_ERRLEVEL_HIGH)

		xfs_stack_trace();

}

fs/xfs/xfs_error.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ extern void xfs_corruption_error(const char *tag, int level, 
			int linenum, xfs_failaddr_t failaddr);

extern void xfs_verifier_error(struct xfs_buf *bp, int error,

			xfs_failaddr_t failaddr);

extern void xfs_inode_verifier_error(struct xfs_inode *ip, int error,

			const char *name, void *buf, size_t bufsz,

			xfs_failaddr_t failaddr);



#define	XFS_ERROR_REPORT(e, lvl, mp)	\

	xfs_error_report(e, lvl, mp, __FILE__, __LINE__, __return_address)

fs/xfs/xfs_inode.c

+8 −6
Original line number Diff line number Diff line
@@ -3486,21 +3486,23 @@ bool 
xfs_inode_verify_forks(

	struct xfs_inode	*ip)

{

	struct xfs_ifork	*ifp;

	xfs_failaddr_t		fa;



	fa = xfs_ifork_verify_data(ip, &xfs_default_ifork_ops);

	if (fa) {

		xfs_alert(ip->i_mount,

				"%s: bad inode %llu inline data fork at %pS",

				__func__, ip->i_ino, fa);

		ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);

		xfs_inode_verifier_error(ip, -EFSCORRUPTED, "data fork",

				ifp->if_u1.if_data, ifp->if_bytes, fa);

		return false;

	}



	fa = xfs_ifork_verify_attr(ip, &xfs_default_ifork_ops);

	if (fa) {

		xfs_alert(ip->i_mount,

				"%s: bad inode %llu inline attr fork at %pS",

				__func__, ip->i_ino, fa);

		ifp = XFS_IFORK_PTR(ip, XFS_ATTR_FORK);

		xfs_inode_verifier_error(ip, -EFSCORRUPTED, "attr fork",

				ifp ? ifp->if_u1.if_data : NULL,

				ifp ? ifp->if_bytes : 0, fa);

		return false;

	}

	return true;