[20/20] xfs: cross-reference the realtime rmapbt

Message ID	154630959024.8108.12561990911859728755.stgit@magnolia (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-xfs-owner@kernel.org> Subject: [PATCH 20/20] xfs: cross-reference the realtime rmapbt From: "Darrick J. Wong" <darrick.wong@oracle.com> To: darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Mon, 31 Dec 2018 18:26:30 -0800 Message-ID: <154630959024.8108.12561990911859728755.stgit@magnolia> In-Reply-To: <154630945466.8108.16578904812191021263.stgit@magnolia> References: <154630945466.8108.16578904812191021263.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk
Series	xfs: add realtime reverse-mapping support \| expand [v10,00/20] xfs: add realtime reverse-mapping support [01/20] xfs: make iroot_realloc a btree function [02/20] xfs: support storing records in the inode core root [03/20] xfs: widen xfs_rmap_irec fields to handle realtime rmapbt [04/20] xfs: introduce realtime rmap btree definitions [05/20] xfs: define the on-disk realtime rmap btree format [06/20] xfs: realtime rmap btree transaction reservations [07/20] xfs: add realtime rmap btree operations [08/20] xfs: prepare rmap functions to deal with rtrmapbt [09/20] xfs: add a realtime flag to the rmap update log redo items [10/20] xfs: add realtime rmap btree block detection to log recovery [11/20] xfs: add realtime reverse map inode to superblock [12/20] xfs: wire up a new inode fork type for the realtime rmap [13/20] xfs: wire up rmap map and unmap to the realtime rmapbt [14/20] xfs: create routine to allocate and initialize a realtime rmap btree inode [15/20] xfs: dynamically create the realtime rmapbt inode when attaching rtdev [16/20] xfs: enable realtime rmap btree [17/20] xfs: wire up getfsmap to the realtime reverse mapping btree [18/20] xfs: scrub the realtime rmapbt [19/20] xfs: cross-reference realtime bitmap to realtime rmapbt scrubber [20/20] xfs: cross-reference the realtime rmapbt

diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c index 799a8c9731af..840d0bb70d45 100644 --- a/fs/xfs/scrub/bmap.c +++ b/fs/xfs/scrub/bmap.c @@ -249,11 +249,27 @@ xchk_bmap_rt_extent_xref( struct xfs_btree_cur *cur, struct xfs_bmbt_irec *irec) { + int error; + if (info->sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT) return; + xfs_ilock(info->sc->mp->m_rbmip, XFS_ILOCK_EXCL | XFS_ILOCK_RTBITMAP); + xfs_ilock(info->sc->mp->m_rrmapip, XFS_ILOCK_EXCL | XFS_ILOCK_RTSUM); + + error = xchk_rt_init(info->sc, &info->sc->sa); + if (!xchk_fblock_process_error(info->sc, info->whichfork, + irec->br_startoff, &error)) + goto out_unlock; + xchk_xref_is_used_rt_space(info->sc, irec->br_startblock, irec->br_blockcount); + xchk_bmap_xref_rmap(info, irec, irec->br_startblock); + + xchk_ag_free(info->sc, &info->sc->sa); +out_unlock: + xfs_iunlock(info->sc->mp->m_rrmapip, XFS_ILOCK_EXCL); + xfs_iunlock(info->sc->mp->m_rbmip, XFS_ILOCK_EXCL); } /* Cross-reference a single datadev extent record. */ diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c index c5cbe245082c..3277c21bc914 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -32,6 +32,7 @@ #include "xfs_trans_priv.h" #include "xfs_attr.h" #include "xfs_reflink.h" +#include "xfs_rtrmap_btree.h" #include "scrub/xfs_scrub.h" #include "scrub/scrub.h" #include "scrub/common.h" @@ -574,6 +575,27 @@ xchk_perag_get( sa->pag = xfs_perag_get(mp, sa->agno); } +/* + * For scrubbing a realtime file, grab the rtrmapt. We follow the same + * resource release rules as xfs_scrub_ag_init. + */ +int +xchk_rt_init( + struct xfs_scrub *sc, + struct xchk_ag *sa) +{ + memset(sa, 0, sizeof(*sa)); + sa->agno = NULLAGNUMBER; + if (xfs_sb_version_hasrmapbt(&sc->mp->m_sb)) { + ASSERT(xfs_isilocked(sc->mp->m_rrmapip, + XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)); + sa->rmap_cur = xfs_rtrmapbt_init_cursor(sc->mp, sc->tp, + sc->mp->m_rrmapip); + } + + return 0; +} + /* Per-scrubber setup functions */ /* diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h index 9a62bdaa58f1..3d8a55b13dcc 100644 --- a/fs/xfs/scrub/common.h +++ b/fs/xfs/scrub/common.h @@ -113,6 +113,7 @@ xchk_setup_quota(struct xfs_scrub *sc, struct xfs_inode *ip) #endif int xchk_setup_fscounters(struct xfs_scrub *sc, struct xfs_inode *ip); +int xchk_rt_init(struct xfs_scrub *sc, struct xchk_ag *sa); void xchk_ag_free(struct xfs_scrub *sc, struct xchk_ag *sa); int xchk_ag_init(struct xfs_scrub *sc, xfs_agnumber_t agno, struct xchk_ag *sa); diff --git a/fs/xfs/scrub/rmap.c b/fs/xfs/scrub/rmap.c index 753c8078ee80..4254a4ad78f3 100644 --- a/fs/xfs/scrub/rmap.c +++ b/fs/xfs/scrub/rmap.c @@ -186,8 +186,8 @@ xchk_rmapbt( static inline void xchk_xref_check_owner( struct xfs_scrub *sc, - xfs_agblock_t bno, - xfs_extlen_t len, + xfs_fsblock_t bno, + xfs_filblks_t len, const struct xfs_owner_info *oinfo, bool should_have_rmap) { @@ -209,8 +209,8 @@ xchk_xref_check_owner( void xchk_xref_is_owned_by( struct xfs_scrub *sc, - xfs_agblock_t bno, - xfs_extlen_t len, + xfs_fsblock_t bno, + xfs_filblks_t len, const struct xfs_owner_info *oinfo) { xchk_xref_check_owner(sc, bno, len, oinfo, true); @@ -220,8 +220,8 @@ xchk_xref_is_owned_by( void xchk_xref_is_not_owned_by( struct xfs_scrub *sc, - xfs_agblock_t bno, - xfs_extlen_t len, + xfs_fsblock_t bno, + xfs_filblks_t len, const struct xfs_owner_info *oinfo) { xchk_xref_check_owner(sc, bno, len, oinfo, false); @@ -231,8 +231,8 @@ xchk_xref_is_not_owned_by( void xchk_xref_has_no_owner( struct xfs_scrub *sc, - xfs_agblock_t bno, - xfs_extlen_t len) + xfs_fsblock_t bno, + xfs_filblks_t len) { bool has_rmap; int error; diff --git a/fs/xfs/scrub/rtbitmap.c b/fs/xfs/scrub/rtbitmap.c index 35c243a404e7..ebe4dad901ad 100644 --- a/fs/xfs/scrub/rtbitmap.c +++ b/fs/xfs/scrub/rtbitmap.c @@ -15,12 +15,16 @@ #include "xfs_log_format.h" #include "xfs_trans.h" #include "xfs_sb.h" +#include "xfs_inode.h" #include "xfs_alloc.h" #include "xfs_rtalloc.h" #include "xfs_inode.h" +#include "xfs_rmap.h" +#include "xfs_rtrmap_btree.h" #include "scrub/xfs_scrub.h" #include "scrub/scrub.h" #include "scrub/common.h" +#include "scrub/btree.h" #include "scrub/trace.h" /* Set us up with the realtime metadata locked. */ @@ -39,11 +43,31 @@ xchk_setup_rt( sc->ip = sc->mp->m_rbmip; xfs_ilock(sc->ip, sc->ilock_flags); + if (xfs_sb_version_hasrmapbt(&sc->mp->m_sb)) { + unsigned int lockmode = XFS_ILOCK_EXCL; + + xfs_ilock(sc->mp->m_rrmapip, lockmode); + xfs_trans_ijoin(sc->tp, sc->mp->m_rrmapip, lockmode); + } + return 0; } /* Realtime bitmap. */ +/* Cross-reference rtbitmap entries with other metadata. */ +STATIC void +xchk_rtbitmap_xref( + struct xfs_scrub *sc, + xfs_rtblock_t startblock, + xfs_rtblock_t blockcount) +{ + if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT) + return; + + xchk_xref_has_no_owner(sc, startblock, blockcount); +} + /* Scrub a free extent record from the realtime bitmap. */ STATIC int xchk_rtbitmap_rec( @@ -62,6 +86,8 @@ xchk_rtbitmap_rec( !xfs_verify_rtbno(sc->mp, startblock) || !xfs_verify_rtbno(sc->mp, startblock + blockcount - 1)) xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, 0); + + xchk_rtbitmap_xref(sc, startblock, blockcount); return 0; } @@ -77,6 +103,10 @@ xchk_rtbitmap( if (error || (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)) return error; + error = xchk_rt_init(sc, &sc->sa); + if (error) + return error; + error = xfs_rtalloc_query_all(sc->tp, xchk_rtbitmap_rec, sc); if (!xchk_fblock_process_error(sc, XFS_DATA_FORK, 0, &error)) goto out; diff --git a/fs/xfs/scrub/scrub.h b/fs/xfs/scrub/scrub.h index 312f4a56e1b9..50ce5fbeb7ab 100644 --- a/fs/xfs/scrub/scrub.h +++ b/fs/xfs/scrub/scrub.h @@ -135,12 +135,12 @@ void xchk_xref_is_not_inode_chunk(struct xfs_scrub *sc, xfs_agblock_t agbno, xfs_extlen_t len); void xchk_xref_is_inode_chunk(struct xfs_scrub *sc, xfs_agblock_t agbno, xfs_extlen_t len); -void xchk_xref_is_owned_by(struct xfs_scrub *sc, xfs_agblock_t agbno, - xfs_extlen_t len, const struct xfs_owner_info *oinfo); -void xchk_xref_is_not_owned_by(struct xfs_scrub *sc, xfs_agblock_t agbno, - xfs_extlen_t len, const struct xfs_owner_info *oinfo); -void xchk_xref_has_no_owner(struct xfs_scrub *sc, xfs_agblock_t agbno, - xfs_extlen_t len); +void xchk_xref_is_owned_by(struct xfs_scrub *sc, xfs_fsblock_t bno, + xfs_filblks_t len, const struct xfs_owner_info *oinfo); +void xchk_xref_is_not_owned_by(struct xfs_scrub *sc, xfs_fsblock_t bno, + xfs_filblks_t len, const struct xfs_owner_info *oinfo); +void xchk_xref_has_no_owner(struct xfs_scrub *sc, xfs_fsblock_t bno, + xfs_filblks_t len); void xchk_xref_is_cow_staging(struct xfs_scrub *sc, xfs_agblock_t bno, xfs_extlen_t len); void xchk_xref_is_not_shared(struct xfs_scrub *sc, xfs_agblock_t bno,

[20/20] xfs: cross-reference the realtime rmapbt

Commit Message

Patch