From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 19/41] xfs: scrub inodes
Date: Fri, 04 Nov 2016 17:21:06 -0700 [thread overview]
Message-ID: <147830526600.2155.16582110516346949006.stgit@birch.djwong.org> (raw)
In-Reply-To: <147830514302.2155.3920703176812208304.stgit@birch.djwong.org>
Scrub the fields within an inode.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/libxfs/xfs_fs.h | 3 +
fs/xfs/xfs_itable.c | 2 -
fs/xfs/xfs_itable.h | 5 ++
fs/xfs/xfs_scrub.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++-
fs/xfs/xfs_trace.h | 3 +
5 files changed, 152 insertions(+), 5 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
index 559ee76..251db32 100644
--- a/fs/xfs/libxfs/xfs_fs.h
+++ b/fs/xfs/libxfs/xfs_fs.h
@@ -585,7 +585,8 @@ struct xfs_scrub_metadata {
#define XFS_SCRUB_TYPE_FINOBT 8 /* free inode btree */
#define XFS_SCRUB_TYPE_RMAPBT 9 /* reverse mapping btree */
#define XFS_SCRUB_TYPE_REFCNTBT 10 /* reference count btree */
-#define XFS_SCRUB_TYPE_MAX 10
+#define XFS_SCRUB_TYPE_INODE 11 /* inode record */
+#define XFS_SCRUB_TYPE_MAX 11
#define XFS_SCRUB_FLAG_REPAIR 0x1 /* i: repair this metadata */
#define XFS_SCRUB_FLAG_CORRUPT 0x2 /* o: needs repair */
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 66e8817..4fd5fe1 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -31,7 +31,7 @@
#include "xfs_trace.h"
#include "xfs_icache.h"
-STATIC int
+int
xfs_internal_inum(
xfs_mount_t *mp,
xfs_ino_t ino)
diff --git a/fs/xfs/xfs_itable.h b/fs/xfs/xfs_itable.h
index 6ea8b39..dd2427b 100644
--- a/fs/xfs/xfs_itable.h
+++ b/fs/xfs/xfs_itable.h
@@ -96,4 +96,9 @@ xfs_inumbers(
void __user *buffer, /* buffer with inode info */
inumbers_fmt_pf formatter);
+int
+xfs_internal_inum(
+ xfs_mount_t *mp,
+ xfs_ino_t ino);
+
#endif /* __XFS_ITABLE_H__ */
diff --git a/fs/xfs/xfs_scrub.c b/fs/xfs/xfs_scrub.c
index ab92ea4..3723c06 100644
--- a/fs/xfs/xfs_scrub.c
+++ b/fs/xfs/xfs_scrub.c
@@ -45,6 +45,8 @@
#include "xfs_rtalloc.h"
#include "xfs_log.h"
#include "xfs_trans_priv.h"
+#include "xfs_icache.h"
+#include "xfs_itable.h"
/*
* Online Scrub and Repair
@@ -1276,6 +1278,7 @@ xfs_scrub_dummy(
STATIC int
xfs_scrub_teardown(
struct xfs_scrub_context *sc,
+ struct xfs_inode *ip_in,
int error)
{
xfs_scrub_ag_free(&sc->sa);
@@ -1284,6 +1287,14 @@ xfs_scrub_teardown(
sc->ag_lock.agmask = NULL;
xfs_trans_cancel(sc->tp);
sc->tp = NULL;
+ if (sc->ip != NULL) {
+ xfs_iunlock(sc->ip, XFS_ILOCK_EXCL);
+ xfs_iunlock(sc->ip, XFS_IOLOCK_EXCL);
+ xfs_iunlock(sc->ip, XFS_MMAPLOCK_EXCL);
+ if (sc->ip != ip_in)
+ IRELE(sc->ip);
+ sc->ip = NULL;
+ }
return error;
}
@@ -1339,6 +1350,82 @@ xfs_scrub_setup_ag_header(
return error;
}
+/*
+ * Given an inode and the scrub control structure, return either the
+ * inode referenced in the control structure or the inode passed in.
+ * The inode is not locked.
+ */
+STATIC struct xfs_inode *
+xfs_scrub_get_inode(
+ struct xfs_scrub_context *sc,
+ struct xfs_inode *ip)
+{
+ struct xfs_inode *ips = NULL;
+ int error;
+
+ if (sc->sm->sm_gen && !sc->sm->sm_ino)
+ return ERR_PTR(-EINVAL);
+
+ if (sc->sm->sm_ino && sc->sm->sm_ino != ip->i_ino) {
+ if (xfs_internal_inum(ip->i_mount, sc->sm->sm_ino))
+ return ERR_PTR(-ENOENT);
+ error = xfs_iget(ip->i_mount, NULL, sc->sm->sm_ino,
+ XFS_IGET_UNTRUSTED | XFS_IGET_DONTCACHE,
+ 0, &ips);
+ XFS_SCRUB_OP_ERROR_GOTO(sc,
+ XFS_INO_TO_AGNO(ip->i_mount, sc->sm->sm_ino),
+ XFS_INO_TO_AGBNO(ip->i_mount, sc->sm->sm_ino),
+ "inode", &error, out_err);
+ if (VFS_I(ips)->i_generation != sc->sm->sm_gen) {
+ IRELE(ips);
+ return ERR_PTR(-ENOENT);
+ }
+
+ return ips;
+ }
+
+ return ip;
+out_err:
+ return ERR_PTR(error);
+}
+
+/* Set us up with an inode. */
+STATIC int
+xfs_scrub_setup_inode(
+ struct xfs_scrub_context *sc,
+ struct xfs_inode *ip,
+ struct xfs_scrub_metadata *sm,
+ bool retry_deadlocked)
+{
+ struct xfs_mount *mp = ip->i_mount;
+ int error;
+
+ memset(sc, 0, sizeof(*sc));
+ sc->sm = sm;
+ sc->ip = xfs_scrub_get_inode(sc, ip);
+ if (IS_ERR(sc->ip))
+ return PTR_ERR(sc->ip);
+ else if (sc->ip == NULL)
+ return -ENOENT;
+
+ xfs_ilock(sc->ip, XFS_IOLOCK_EXCL);
+ xfs_ilock(sc->ip, XFS_MMAPLOCK_EXCL);
+ error = xfs_scrub_trans_alloc(sm, mp, &M_RES(mp)->tr_itruncate,
+ 0, 0, 0, &sc->tp);
+ if (error)
+ goto out_unlock;
+ xfs_ilock(sc->ip, XFS_ILOCK_EXCL);
+
+ xfs_scrub_ag_lock_init(mp, &sc->ag_lock);
+ return error;
+out_unlock:
+ xfs_iunlock(sc->ip, XFS_IOLOCK_EXCL);
+ xfs_iunlock(sc->ip, XFS_MMAPLOCK_EXCL);
+ if (sc->ip != ip)
+ IRELE(sc->ip);
+ return error;
+}
+
/* Metadata scrubbers */
#define XFS_SCRUB_SB_CHECK(fs_ok) \
@@ -2022,6 +2109,58 @@ xfs_scrub_refcountbt(
&oinfo, NULL);
}
+#define XFS_SCRUB_INODE_CHECK(fs_ok) \
+ XFS_SCRUB_INO_CHECK(sc, NULL, "inode", fs_ok);
+#define XFS_SCRUB_INODE_GOTO(fs_ok, label) \
+ XFS_SCRUB_INO_GOTO(sc, NULL, "inode", fs_ok, label);
+/* Scrub an inode. */
+STATIC int
+xfs_scrub_inode(
+ struct xfs_scrub_context *sc)
+{
+ struct xfs_inode *ip = sc->ip;
+ struct xfs_mount *mp = ip->i_mount;
+ struct xfs_ifork *ifp;
+ int error = 0;
+
+ /* Look for funny values in the fields. */
+ XFS_SCRUB_INODE_CHECK(ip->i_d.di_projid_hi == 0 ||
+ xfs_sb_version_hasprojid32bit(&mp->m_sb));
+
+ if (ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE) {
+ XFS_SCRUB_INODE_CHECK(ip->i_d.di_extsize > 0);
+ XFS_SCRUB_INODE_CHECK(ip->i_d.di_extsize <= MAXEXTLEN);
+ XFS_SCRUB_INODE_CHECK(XFS_IS_REALTIME_INODE(ip) ||
+ ip->i_d.di_extsize <=
+ mp->m_sb.sb_agblocks / 2);
+ }
+ XFS_SCRUB_INODE_CHECK(!(ip->i_d.di_flags & XFS_DIFLAG_IMMUTABLE) ||
+ !(ip->i_d.di_flags & XFS_DIFLAG_APPEND));
+
+ if (ip->i_d.di_version == 3 &&
+ ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) {
+ XFS_SCRUB_INODE_CHECK(xfs_sb_version_hasreflink(&mp->m_sb));
+ XFS_SCRUB_INODE_CHECK(ip->i_d.di_cowextsize > 0);
+ XFS_SCRUB_INODE_CHECK(ip->i_d.di_cowextsize <= MAXEXTLEN);
+ XFS_SCRUB_INODE_CHECK(ip->i_d.di_cowextsize <=
+ mp->m_sb.sb_agblocks / 2);
+ }
+
+ /*
+ * If this is a reflink inode with no CoW in progress, maybe we
+ * can turn off the reflink flag?
+ */
+ if (xfs_is_reflink_inode(ip)) {
+ ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
+ if (ifp->if_bytes == 0)
+ sc->sm->sm_flags |= XFS_SCRUB_FLAG_PREEN;
+ }
+
+ return error;
+}
+#undef XFS_SCRUB_INODE_GOTO
+#undef XFS_SCRUB_INODE_CHECK
+
/* Scrubbing dispatch. */
struct xfs_scrub_meta_fns {
@@ -2044,6 +2183,7 @@ static const struct xfs_scrub_meta_fns meta_scrub_fns[] = {
{xfs_scrub_setup_ag_header, xfs_scrub_finobt, NULL, xfs_sb_version_hasfinobt},
{xfs_scrub_setup_ag_header, xfs_scrub_rmapbt, NULL, xfs_sb_version_hasrmapbt},
{xfs_scrub_setup_ag_header, xfs_scrub_refcountbt, NULL, xfs_sb_version_hasreflink},
+ {xfs_scrub_setup_inode, xfs_scrub_inode, NULL, NULL},
};
/* Dispatch metadata scrubbing. */
@@ -2107,7 +2247,7 @@ xfs_scrub_metadata(
error = fns->scrub(&sc);
if (!deadlocked && error == -EDEADLOCK) {
deadlocked = true;
- error = xfs_scrub_teardown(&sc, error);
+ error = xfs_scrub_teardown(&sc, ip, error);
if (error != -EDEADLOCK)
goto out;
goto retry_op;
@@ -2118,7 +2258,7 @@ xfs_scrub_metadata(
xfs_alert_ratelimited(mp, "Corruption detected during scrub.");
out_teardown:
- error = xfs_scrub_teardown(&sc, error);
+ error = xfs_scrub_teardown(&sc, ip, error);
out:
trace_xfs_scrub_done(ip, sm->sm_type, sm->sm_agno, sm->sm_ino,
sm->sm_gen, sm->sm_flags, error);
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 039ef32..e37c8bc 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -3472,7 +3472,8 @@ DEFINE_GETFSMAP_EVENT(xfs_getfsmap_mapping);
{ XFS_SCRUB_TYPE_INOBT, "inobt" }, \
{ XFS_SCRUB_TYPE_FINOBT, "finobt" }, \
{ XFS_SCRUB_TYPE_RMAPBT, "rmapbt" }, \
- { XFS_SCRUB_TYPE_REFCNTBT, "refcountbt" }
+ { XFS_SCRUB_TYPE_REFCNTBT, "refcountbt" }, \
+ { XFS_SCRUB_TYPE_INODE, "inode" }
DECLARE_EVENT_CLASS(xfs_scrub_class,
TP_PROTO(struct xfs_inode *ip, int type, xfs_agnumber_t agno,
xfs_ino_t inum, unsigned int gen, unsigned int flags,
next prev parent reply other threads:[~2016-11-05 0:21 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-05 0:19 [PATCH v2 00/41] xfs: online scrub/repair support Darrick J. Wong
2016-11-05 0:19 ` [PATCH 01/41] xfs: plumb in needed functions for range querying of the freespace btrees Darrick J. Wong
2016-11-05 0:19 ` [PATCH 02/41] xfs: provide a query_range function for " Darrick J. Wong
2016-11-05 0:19 ` [PATCH 03/41] xfs: create a function to query all records in a btree Darrick J. Wong
2016-11-05 0:19 ` [PATCH 04/41] xfs: introduce the XFS_IOC_GETFSMAP ioctl Darrick J. Wong
2016-11-05 0:19 ` [PATCH 05/41] xfs: report shared extents in getfsmapx Darrick J. Wong
2016-11-05 0:19 ` [PATCH 06/41] xfs: have getfsmap fall back to the freesp btrees when rmap is not present Darrick J. Wong
2016-11-05 0:19 ` [PATCH 07/41] xfs: getfsmap should fall back to rtbitmap when rtrmapbt " Darrick J. Wong
2016-11-05 0:19 ` [PATCH 08/41] xfs: use GPF_NOFS when allocating btree cursors Darrick J. Wong
2016-11-05 0:20 ` [PATCH 09/41] xfs: add scrub tracepoints Darrick J. Wong
2016-11-05 0:20 ` [PATCH 10/41] xfs: create an ioctl to scrub AG metadata Darrick J. Wong
2016-11-05 0:20 ` [PATCH 11/41] xfs: generic functions to scrub metadata and btrees Darrick J. Wong
2016-11-05 0:20 ` [PATCH 12/41] xfs: scrub the backup superblocks Darrick J. Wong
2016-11-05 0:20 ` [PATCH 13/41] xfs: scrub AGF and AGFL Darrick J. Wong
2016-11-05 0:20 ` [PATCH 14/41] xfs: scrub the AGI Darrick J. Wong
2016-11-05 0:20 ` [PATCH 15/41] xfs: support scrubbing free space btrees Darrick J. Wong
2016-11-05 0:20 ` [PATCH 16/41] xfs: support scrubbing inode btrees Darrick J. Wong
2016-11-05 0:20 ` [PATCH 17/41] xfs: support scrubbing rmap btree Darrick J. Wong
2016-11-05 0:20 ` [PATCH 18/41] xfs: support scrubbing refcount btree Darrick J. Wong
2016-11-05 0:21 ` Darrick J. Wong [this message]
2016-11-05 0:21 ` [PATCH 20/41] xfs: scrub inode block mappings Darrick J. Wong
2016-11-05 0:21 ` [PATCH 21/41] xfs: scrub directory/attribute btrees Darrick J. Wong
2016-11-05 0:21 ` [PATCH 22/41] xfs: scrub directory metadata Darrick J. Wong
2016-11-05 0:21 ` [PATCH 23/41] xfs: scrub extended attributes Darrick J. Wong
2016-11-05 0:21 ` [PATCH 24/41] xfs: scrub symbolic links Darrick J. Wong
2016-11-05 0:21 ` [PATCH 25/41] xfs: scrub realtime bitmap/summary Darrick J. Wong
2016-11-05 0:21 ` [PATCH 26/41] xfs: scrub should cross-reference with the bnobt Darrick J. Wong
2016-11-05 0:21 ` [PATCH 27/41] xfs: cross-reference bnobt records with cntbt Darrick J. Wong
2016-11-05 0:22 ` [PATCH 28/41] xfs: cross-reference extents with AG header Darrick J. Wong
2016-11-05 0:22 ` [PATCH 29/41] xfs: cross-reference inode btrees during scrub Darrick J. Wong
2016-11-05 0:22 ` [PATCH 30/41] xfs: cross-reference reverse-mapping btree Darrick J. Wong
2016-11-05 0:22 ` [PATCH 31/41] xfs: cross-reference refcount btree during scrub Darrick J. Wong
2016-11-05 0:22 ` [PATCH 32/41] xfs: scrub should cross-reference the realtime bitmap Darrick J. Wong
2016-11-05 0:22 ` [PATCH 33/41] xfs: implement the metadata repair ioctl flag Darrick J. Wong
2016-11-05 0:22 ` [PATCH 34/41] xfs: add helper routines for the repair code Darrick J. Wong
2016-11-05 0:22 ` [PATCH 35/41] xfs: repair free space btrees Darrick J. Wong
2016-11-05 0:22 ` [PATCH 36/41] xfs: repair inode btrees Darrick J. Wong
2016-11-05 0:23 ` [PATCH 37/41] xfs: rebuild the rmapbt Darrick J. Wong
2016-11-05 0:23 ` [PATCH 38/41] xfs: repair refcount btrees Darrick J. Wong
2016-11-05 0:23 ` [PATCH 39/41] xfs: online repair of inodes Darrick J. Wong
2016-11-05 0:23 ` [PATCH 40/41] xfs: repair inode block maps Darrick J. Wong
2016-11-05 0:23 ` [PATCH 41/41] xfs: query the per-AG reservation counters Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=147830526600.2155.16582110516346949006.stgit@birch.djwong.org \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.