All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 25/41] xfs: scrub realtime bitmap/summary
Date: Fri, 04 Nov 2016 17:21:44 -0700	[thread overview]
Message-ID: <147830530405.2155.13114379905461726715.stgit@birch.djwong.org> (raw)
In-Reply-To: <147830514302.2155.3920703176812208304.stgit@birch.djwong.org>

Perform simple tests of the realtime bitmap and summary.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 fs/xfs/libxfs/xfs_format.h   |    5 ++
 fs/xfs/libxfs/xfs_fs.h       |    4 +-
 fs/xfs/libxfs/xfs_rtbitmap.c |    2 -
 fs/xfs/xfs_rtalloc.h         |    3 +
 fs/xfs/xfs_scrub.c           |   98 ++++++++++++++++++++++++++++++++++++++++++
 fs/xfs/xfs_trace.h           |    4 +-
 6 files changed, 113 insertions(+), 3 deletions(-)


diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index 301effc..cb00017 100644
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -315,6 +315,11 @@ static inline bool xfs_sb_good_version(struct xfs_sb *sbp)
 	return false;
 }
 
+static inline bool xfs_sb_version_hasrealtime(struct xfs_sb *sbp)
+{
+	return sbp->sb_rblocks > 0;
+}
+
 /*
  * Detect a mismatched features2 field.  Older kernels read/wrote
  * this into the wrong slot, so to be safe we keep them in sync.
diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
index 93a983c..122c31f 100644
--- a/fs/xfs/libxfs/xfs_fs.h
+++ b/fs/xfs/libxfs/xfs_fs.h
@@ -592,7 +592,9 @@ struct xfs_scrub_metadata {
 #define XFS_SCRUB_TYPE_DIR	15	/* directory */
 #define XFS_SCRUB_TYPE_XATTR	16	/* extended attribute */
 #define XFS_SCRUB_TYPE_SYMLINK	17	/* symbolic link */
-#define XFS_SCRUB_TYPE_MAX	17
+#define XFS_SCRUB_TYPE_RTBITMAP	18	/* realtime bitmap */
+#define XFS_SCRUB_TYPE_RTSUM	19	/* realtime summary */
+#define XFS_SCRUB_TYPE_MAX	19
 
 #define XFS_SCRUB_FLAG_REPAIR	0x1	/* i: repair this metadata */
 #define XFS_SCRUB_FLAG_CORRUPT	0x2	/* o: needs repair */
diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
index ea45584..f4b68c0 100644
--- a/fs/xfs/libxfs/xfs_rtbitmap.c
+++ b/fs/xfs/libxfs/xfs_rtbitmap.c
@@ -70,7 +70,7 @@ const struct xfs_buf_ops xfs_rtbuf_ops = {
  * Get a buffer for the bitmap or summary file block specified.
  * The buffer is returned read and locked.
  */
-static int
+int
 xfs_rtbuf_get(
 	xfs_mount_t	*mp,		/* file system mount structure */
 	xfs_trans_t	*tp,		/* transaction pointer */
diff --git a/fs/xfs/xfs_rtalloc.h b/fs/xfs/xfs_rtalloc.h
index f798a3e..3036349 100644
--- a/fs/xfs/xfs_rtalloc.h
+++ b/fs/xfs/xfs_rtalloc.h
@@ -98,6 +98,8 @@ xfs_growfs_rt(
 /*
  * From xfs_rtbitmap.c
  */
+int xfs_rtbuf_get(struct xfs_mount *mp, struct xfs_trans *tp,
+		  xfs_rtblock_t block, int issum, struct xfs_buf **bpp);
 int xfs_rtcheck_range(struct xfs_mount *mp, struct xfs_trans *tp,
 		      xfs_rtblock_t start, xfs_extlen_t len, int val,
 		      xfs_rtblock_t *new, int *stat);
@@ -128,6 +130,7 @@ int xfs_rtfree_range(struct xfs_mount *mp, struct xfs_trans *tp,
 # define xfs_growfs_rt(mp,in)                           (ENOSYS)
 # define xfs_rtcheck_range(...)                         (ENOSYS)
 # define xfs_rtfind_forw(...)                           (ENOSYS)
+# define xfs_rtbuf_get(m,t,b,i,p)                       (ENOSYS)
 static inline int		/* error */
 xfs_rtmount_init(
 	xfs_mount_t	*mp)	/* file system mount structure */
diff --git a/fs/xfs/xfs_scrub.c b/fs/xfs/xfs_scrub.c
index 6f6b5a8..eabf61a 100644
--- a/fs/xfs/xfs_scrub.c
+++ b/fs/xfs/xfs_scrub.c
@@ -1513,6 +1513,32 @@ xfs_scrub_setup_inode_symlink(
 	return 0;
 }
 
+/* Set us up with the realtime metadata locked. */
+STATIC int
+xfs_scrub_setup_rt(
+	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				lockmode;
+	int				error = 0;
+
+	if (sm->sm_agno || sm->sm_ino || sm->sm_gen)
+		return -EINVAL;
+
+	error = xfs_scrub_setup(sc, ip, sm, retry_deadlocked);
+	if (error)
+		return error;
+
+	lockmode = XFS_ILOCK_EXCL | XFS_ILOCK_RTBITMAP;
+	xfs_ilock(mp->m_rbmip, lockmode);
+	xfs_trans_ijoin(sc->tp, mp->m_rbmip, lockmode);
+
+	return 0;
+}
+
 /* Metadata scrubbers */
 
 #define XFS_SCRUB_SB_CHECK(fs_ok) \
@@ -1583,6 +1609,7 @@ xfs_scrub_superblock(
         XFS_SCRUB_SB_FEAT(metauuid);
         XFS_SCRUB_SB_FEAT(rmapbt);
         XFS_SCRUB_SB_FEAT(reflink);
+        XFS_SCRUB_SB_FEAT(realtime);
 #undef XFS_SCRUB_SB_FEAT
 
 out:
@@ -3386,6 +3413,75 @@ xfs_scrub_symlink(
 }
 #undef XFS_SCRUB_SYMLINK_CHECK
 
+/* Realtime bitmap. */
+
+#define XFS_SCRUB_RTBITMAP_CHECK(fs_ok) \
+	XFS_SCRUB_CHECK(sc, bp, "rtbitmap", fs_ok);
+#define XFS_SCRUB_RTBITMAP_OP_ERROR_GOTO(error, label) \
+	XFS_SCRUB_OP_ERROR_GOTO(sc, 0, 0, "rtbitmap", error, label)
+/* Scrub the realtime bitmap. */
+STATIC int
+xfs_scrub_rtbitmap(
+	struct xfs_scrub_context	*sc)
+{
+	struct xfs_mount		*mp = sc->tp->t_mountp;
+	struct xfs_buf			*bp = NULL;
+	xfs_rtblock_t			rtstart;
+	xfs_rtblock_t			rtend;
+	xfs_rtblock_t			block;
+	xfs_rtblock_t			rem;
+	int				is_free;
+	int				error = 0;
+	int				err2 = 0;
+
+	/* Iterate the bitmap, looking for discrepancies. */
+	rtstart = 0;
+	rem = mp->m_sb.sb_rblocks;
+	while (rem) {
+		if (xfs_scrub_should_terminate(&error))
+			break;
+
+		/* Is the first block free? */
+		err2 = xfs_rtcheck_range(mp, sc->tp, rtstart, 1, 1, &rtend,
+				&is_free);
+		XFS_SCRUB_RTBITMAP_OP_ERROR_GOTO(&err2, out);
+
+		/* How long does the extent go for? */
+		err2 = xfs_rtfind_forw(mp, sc->tp, rtstart,
+				mp->m_sb.sb_rblocks - 1, &rtend);
+		XFS_SCRUB_RTBITMAP_OP_ERROR_GOTO(&err2, out);
+
+		/* Find the buffer for error reporting. */
+		block = XFS_BITTOBLOCK(mp, rtstart);
+		err2 = xfs_rtbuf_get(mp, sc->tp, block, 0, &bp);
+		XFS_SCRUB_RTBITMAP_OP_ERROR_GOTO(&err2, out);
+		XFS_SCRUB_RTBITMAP_CHECK(rtend >= rtstart);
+
+		xfs_trans_brelse(sc->tp, bp);
+		bp = NULL;
+		rem -= rtend - rtstart + 1;
+		rtstart = rtend + 1;
+	}
+
+out:
+	if (bp)
+		xfs_trans_brelse(sc->tp, bp);
+	if (!error && err2)
+		error = err2;
+	return error;
+}
+#undef XFS_SCRUB_RTBITMAP_OP_ERROR_GOTO
+#undef XFS_SCRUB_RTBITMAP_CHECK
+
+/* Scrub the realtime summary. */
+STATIC int
+xfs_scrub_rtsummary(
+	struct xfs_scrub_context	*sc)
+{
+	/* XXX: implement this some day */
+	return -ENOENT;
+}
+
 /* Scrubbing dispatch. */
 
 struct xfs_scrub_meta_fns {
@@ -3415,6 +3511,8 @@ static const struct xfs_scrub_meta_fns meta_scrub_fns[] = {
 	{xfs_scrub_setup_inode, xfs_scrub_directory, NULL, NULL},
 	{xfs_scrub_setup_inode_xattr, xfs_scrub_xattr, NULL, NULL},
 	{xfs_scrub_setup_inode_symlink, xfs_scrub_symlink, NULL, NULL},
+	{xfs_scrub_setup_rt, xfs_scrub_rtbitmap, NULL, xfs_sb_version_hasrealtime},
+	{xfs_scrub_setup_rt, xfs_scrub_rtsummary, NULL, xfs_sb_version_hasrealtime},
 };
 
 /* Dispatch metadata scrubbing. */
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 386ad26..21e4fceb 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -3479,7 +3479,9 @@ DEFINE_GETFSMAP_EVENT(xfs_getfsmap_mapping);
 	{ XFS_SCRUB_TYPE_BMBTC,		"bmapbtc" }, \
 	{ XFS_SCRUB_TYPE_DIR,		"dir" }, \
 	{ XFS_SCRUB_TYPE_XATTR,		"xattr" }, \
-	{ XFS_SCRUB_TYPE_SYMLINK,	"symlink" }
+	{ XFS_SCRUB_TYPE_SYMLINK,	"symlink" }, \
+	{ XFS_SCRUB_TYPE_RTBITMAP,	"rtbitmap" }, \
+	{ XFS_SCRUB_TYPE_RTSUM,		"rtsummary" }
 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,


  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 ` [PATCH 19/41] xfs: scrub inodes Darrick J. Wong
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 ` Darrick J. Wong [this message]
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=147830530405.2155.13114379905461726715.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.