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

Commit 84d42ea6 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: implement the metadata repair ioctl flag 



Plumb in the pieces necessary to make the "scrub" subfunction of
the scrub ioctl actually work.  This means that we make the IFLAG_REPAIR
flag to the scrub ioctl actually do something, and we add an errortag
knob so that xfstests can force the kernel to rebuild a metadata
structure even if there's nothing wrong with it.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 718fa74b

fs/xfs/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -85,6 +85,24 @@ config XFS_ONLINE_SCRUB 


	  If unsure, say N.



config XFS_ONLINE_REPAIR

	bool "XFS online metadata repair support"

	default n

	depends on XFS_FS && XFS_ONLINE_SCRUB

	help

	  If you say Y here you will be able to repair metadata on a

	  mounted XFS filesystem.  This feature is intended to reduce

	  filesystem downtime by fixing minor problems before they cause the

	  filesystem to go down.  However, it requires that the filesystem be

	  formatted with secondary metadata, such as reverse mappings and inode

	  parent pointers.



	  This feature is considered EXPERIMENTAL.  Use with caution!



	  See the xfs_scrub man page in section 8 for additional information.



	  If unsure, say N.



config XFS_WARN

	bool "XFS Verbose Warnings"

	depends on XFS_FS && !XFS_DEBUG

fs/xfs/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -163,4 +163,11 @@ xfs-y += $(addprefix scrub/, \ 


xfs-$(CONFIG_XFS_RT)		+= scrub/rtbitmap.o

xfs-$(CONFIG_XFS_QUOTA)		+= scrub/quota.o



# online repair

ifeq ($(CONFIG_XFS_ONLINE_REPAIR),y)

xfs-y				+= $(addprefix scrub/, \

				   repair.o \

				   )

endif

endif

fs/xfs/libxfs/xfs_errortag.h

+3 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ 
#define XFS_ERRTAG_LOG_BAD_CRC				29

#define XFS_ERRTAG_LOG_ITEM_PIN				30

#define XFS_ERRTAG_BUF_LRU_REF				31

#define XFS_ERRTAG_MAX					32

#define XFS_ERRTAG_FORCE_SCRUB_REPAIR			32

#define XFS_ERRTAG_MAX					33



/*

 * Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
@@ -102,5 +103,6 @@ 
#define XFS_RANDOM_LOG_BAD_CRC				1

#define XFS_RANDOM_LOG_ITEM_PIN				1

#define XFS_RANDOM_BUF_LRU_REF				2

#define XFS_RANDOM_FORCE_SCRUB_REPAIR			1



#endif /* __XFS_ERRORTAG_H_ */

fs/xfs/libxfs/xfs_fs.h

+8 −1
Original line number Diff line number Diff line
@@ -542,13 +542,20 @@ struct xfs_scrub_metadata { 
/* o: Metadata object looked funny but isn't corrupt. */

#define XFS_SCRUB_OFLAG_WARNING		(1 << 6)



/*

 * o: IFLAG_REPAIR was set but metadata object did not need fixing or

 *    optimization and has therefore not been altered.

 */

#define XFS_SCRUB_OFLAG_NO_REPAIR_NEEDED (1 << 7)



#define XFS_SCRUB_FLAGS_IN	(XFS_SCRUB_IFLAG_REPAIR)

#define XFS_SCRUB_FLAGS_OUT	(XFS_SCRUB_OFLAG_CORRUPT | \

				 XFS_SCRUB_OFLAG_PREEN | \

				 XFS_SCRUB_OFLAG_XFAIL | \

				 XFS_SCRUB_OFLAG_XCORRUPT | \

				 XFS_SCRUB_OFLAG_INCOMPLETE | \

				 XFS_SCRUB_OFLAG_WARNING)

				 XFS_SCRUB_OFLAG_WARNING | \

				 XFS_SCRUB_OFLAG_NO_REPAIR_NEEDED)

#define XFS_SCRUB_FLAGS_ALL	(XFS_SCRUB_FLAGS_IN | XFS_SCRUB_FLAGS_OUT)



/*

fs/xfs/scrub/repair.c

0 → 100644
+130 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 Oracle.  All Rights Reserved.

 *

 * Author: Darrick J. Wong <darrick.wong@oracle.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it would be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.

 */

#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_shared.h"

#include "xfs_format.h"

#include "xfs_trans_resv.h"

#include "xfs_mount.h"

#include "xfs_defer.h"

#include "xfs_btree.h"

#include "xfs_bit.h"

#include "xfs_log_format.h"

#include "xfs_trans.h"

#include "xfs_sb.h"

#include "xfs_inode.h"

#include "xfs_icache.h"

#include "xfs_alloc.h"

#include "xfs_alloc_btree.h"

#include "xfs_ialloc.h"

#include "xfs_ialloc_btree.h"

#include "xfs_rmap.h"

#include "xfs_rmap_btree.h"

#include "xfs_refcount.h"

#include "xfs_refcount_btree.h"

#include "xfs_extent_busy.h"

#include "xfs_ag_resv.h"

#include "xfs_trans_space.h"

#include "scrub/xfs_scrub.h"

#include "scrub/scrub.h"

#include "scrub/common.h"

#include "scrub/trace.h"

#include "scrub/repair.h"



/*

 * Attempt to repair some metadata, if the metadata is corrupt and userspace

 * told us to fix it.  This function returns -EAGAIN to mean "re-run scrub",

 * and will set *fixed to true if it thinks it repaired anything.

 */

int

xfs_repair_attempt(

	struct xfs_inode		*ip,

	struct xfs_scrub_context	*sc,

	bool				*fixed)

{

	int				error = 0;



	trace_xfs_repair_attempt(ip, sc->sm, error);



	xfs_scrub_ag_btcur_free(&sc->sa);



	/* Repair whatever's broken. */

	ASSERT(sc->ops->repair);

	error = sc->ops->repair(sc);

	trace_xfs_repair_done(ip, sc->sm, error);

	switch (error) {

	case 0:

		/*

		 * Repair succeeded.  Commit the fixes and perform a second

		 * scrub so that we can tell userspace if we fixed the problem.

		 */

		sc->sm->sm_flags &= ~XFS_SCRUB_FLAGS_OUT;

		*fixed = true;

		return -EAGAIN;

	case -EDEADLOCK:

	case -EAGAIN:

		/* Tell the caller to try again having grabbed all the locks. */

		if (!sc->try_harder) {

			sc->try_harder = true;

			return -EAGAIN;

		}

		/*

		 * We tried harder but still couldn't grab all the resources

		 * we needed to fix it.  The corruption has not been fixed,

		 * so report back to userspace.

		 */

		return -EFSCORRUPTED;

	default:

		return error;

	}

}



/*

 * Complain about unfixable problems in the filesystem.  We don't log

 * corruptions when IFLAG_REPAIR wasn't set on the assumption that the driver

 * program is xfs_scrub, which will call back with IFLAG_REPAIR set if the

 * administrator isn't running xfs_scrub in no-repairs mode.

 *

 * Use this helper function because _ratelimited silently declares a static

 * structure to track rate limiting information.

 */

void

xfs_repair_failure(

	struct xfs_mount		*mp)

{

	xfs_alert_ratelimited(mp,

"Corruption not fixed during online repair.  Unmount and run xfs_repair.");

}



/*

 * Repair probe -- userspace uses this to probe if we're willing to repair a

 * given mountpoint.

 */

int

xfs_repair_probe(

	struct xfs_scrub_context	*sc)

{

	int				error = 0;



	if (xfs_scrub_should_terminate(sc, &error))

		return error;



	return 0;

}