[09/21] xfs: add a realtime flag to the rmap update log redo items

Message ID	157784143622.1368137.8626042257765831402.stgit@magnolia (mailing list archive)
State	Superseded, archived
Headers	show Return-Path: <SRS0=v9Pv=2W=vger.kernel.org=linux-xfs-owner@kernel.org> Subject: [PATCH 09/21] xfs: add a realtime flag to the rmap update log redo items From: "Darrick J. Wong" <darrick.wong@oracle.com> To: darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Tue, 31 Dec 2019 17:17:16 -0800 Message-ID: <157784143622.1368137.8626042257765831402.stgit@magnolia> In-Reply-To: <157784137939.1368137.1149711841610071256.stgit@magnolia> References: <157784137939.1368137.1149711841610071256.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: realtime reverse-mapping support \| expand [v11,00/21] xfs: realtime reverse-mapping support [01/21] xfs: make iroot_realloc a btree function [02/21] xfs: support storing records in the inode core root [03/21] xfs: widen xfs_rmap_irec fields to handle realtime rmapbt [04/21] xfs: introduce realtime rmap btree definitions [05/21] xfs: define the on-disk realtime rmap btree format [06/21] xfs: realtime rmap btree transaction reservations [07/21] xfs: add realtime rmap btree operations [08/21] xfs: prepare rmap functions to deal with rtrmapbt [09/21] xfs: add a realtime flag to the rmap update log redo items [10/21] xfs: add realtime rmap btree block detection to log recovery [11/21] xfs: add realtime reverse map inode to superblock [12/21] xfs: wire up a new inode fork type for the realtime rmap [13/21] xfs: wire up rmap map and unmap to the realtime rmapbt [14/21] xfs: create routine to allocate and initialize a realtime rmap btree inode [15/21] xfs: dynamically create the realtime rmapbt inode when attaching rtdev [16/21] xfs: enable realtime rmap btree [17/21] xfs: wire up getfsmap to the realtime reverse mapping btree [18/21] xfs: scrub the realtime rmapbt [19/21] xfs: cross-reference realtime bitmap to realtime rmapbt scrubber [20/21] xfs: cross-reference the realtime rmapbt [21/21] xfs: report realtime rmap btree corruption errors to the health system

diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h index 17789cf130e3..0f2f500309f2 100644 --- a/fs/xfs/libxfs/xfs_log_format.h +++ b/fs/xfs/libxfs/xfs_log_format.h @@ -642,11 +642,13 @@ struct xfs_map_extent { #define XFS_RMAP_EXTENT_ATTR_FORK (1U << 31) #define XFS_RMAP_EXTENT_BMBT_BLOCK (1U << 30) #define XFS_RMAP_EXTENT_UNWRITTEN (1U << 29) +#define XFS_RMAP_EXTENT_REALTIME (1U << 28) #define XFS_RMAP_EXTENT_FLAGS (XFS_RMAP_EXTENT_TYPE_MASK | \ XFS_RMAP_EXTENT_ATTR_FORK | \ XFS_RMAP_EXTENT_BMBT_BLOCK | \ - XFS_RMAP_EXTENT_UNWRITTEN) + XFS_RMAP_EXTENT_UNWRITTEN | \ + XFS_RMAP_EXTENT_REALTIME) /* * This is the structure used to lay out an rui log item in the diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c index e761b796170e..a2433e6e092a 100644 --- a/fs/xfs/libxfs/xfs_refcount.c +++ b/fs/xfs/libxfs/xfs_refcount.c @@ -1663,7 +1663,7 @@ xfs_refcount_alloc_cow_extent( __xfs_refcount_add(tp, XFS_REFCOUNT_ALLOC_COW, fsb, len); /* Add rmap entry */ - xfs_rmap_alloc_extent(tp, fsb, len, XFS_RMAP_OWN_COW); + xfs_rmap_alloc_extent(tp, fsb, len, XFS_RMAP_OWN_COW, false); } /* Forget a CoW staging event in the refcount btree. */ @@ -1679,7 +1679,7 @@ xfs_refcount_free_cow_extent( return; /* Remove rmap entry */ - xfs_rmap_free_extent(tp, fsb, len, XFS_RMAP_OWN_COW); + xfs_rmap_free_extent(tp, fsb, len, XFS_RMAP_OWN_COW, false); __xfs_refcount_add(tp, XFS_REFCOUNT_FREE_COW, fsb, len); } diff --git a/fs/xfs/libxfs/xfs_rmap.c b/fs/xfs/libxfs/xfs_rmap.c index 15518f624396..3e625ba057e6 100644 --- a/fs/xfs/libxfs/xfs_rmap.c +++ b/fs/xfs/libxfs/xfs_rmap.c @@ -2600,11 +2600,12 @@ __xfs_rmap_add( enum xfs_rmap_intent_type type, uint64_t owner, int whichfork, - struct xfs_bmbt_irec *bmap) + struct xfs_bmbt_irec *bmap, + bool realtime) { struct xfs_rmap_intent *ri; - trace_xfs_rmap_defer(tp->t_mountp, + trace_xfs_rmap_defer(tp->t_mountp, realtime ? NULLAGNUMBER : XFS_FSB_TO_AGNO(tp->t_mountp, bmap->br_startblock), type, XFS_FSB_TO_AGBNO(tp->t_mountp, bmap->br_startblock), @@ -2619,6 +2620,7 @@ __xfs_rmap_add( ri->ri_owner = owner; ri->ri_whichfork = whichfork; ri->ri_bmap = *bmap; + ri->ri_realtime = realtime; xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_RMAP, &ri->ri_list); } @@ -2636,7 +2638,7 @@ xfs_rmap_map_extent( __xfs_rmap_add(tp, xfs_is_reflink_inode(ip) ? XFS_RMAP_MAP_SHARED : XFS_RMAP_MAP, ip->i_ino, - whichfork, PREV); + whichfork, PREV, XFS_IS_REALTIME_INODE(ip)); } /* Unmap an extent out of a file. */ @@ -2652,7 +2654,7 @@ xfs_rmap_unmap_extent( __xfs_rmap_add(tp, xfs_is_reflink_inode(ip) ? XFS_RMAP_UNMAP_SHARED : XFS_RMAP_UNMAP, ip->i_ino, - whichfork, PREV); + whichfork, PREV, XFS_IS_REALTIME_INODE(ip)); } /* @@ -2674,7 +2676,7 @@ xfs_rmap_convert_extent( __xfs_rmap_add(tp, xfs_is_reflink_inode(ip) ? XFS_RMAP_CONVERT_SHARED : XFS_RMAP_CONVERT, ip->i_ino, - whichfork, PREV); + whichfork, PREV, XFS_IS_REALTIME_INODE(ip)); } /* Schedule the creation of an rmap for non-file data. */ @@ -2683,7 +2685,8 @@ xfs_rmap_alloc_extent( struct xfs_trans *tp, xfs_fsblock_t fsbno, xfs_filblks_t len, - uint64_t owner) + uint64_t owner, + bool isrt) { struct xfs_bmbt_irec bmap; @@ -2695,7 +2698,7 @@ xfs_rmap_alloc_extent( bmap.br_startoff = 0; bmap.br_state = XFS_EXT_NORM; - __xfs_rmap_add(tp, XFS_RMAP_ALLOC, owner, XFS_DATA_FORK, &bmap); + __xfs_rmap_add(tp, XFS_RMAP_ALLOC, owner, XFS_DATA_FORK, &bmap, isrt); } /* Schedule the deletion of an rmap for non-file data. */ @@ -2704,7 +2707,8 @@ xfs_rmap_free_extent( struct xfs_trans *tp, xfs_fsblock_t fsbno, xfs_filblks_t len, - uint64_t owner) + uint64_t owner, + bool isrt) { struct xfs_bmbt_irec bmap; @@ -2716,7 +2720,7 @@ xfs_rmap_free_extent( bmap.br_startoff = 0; bmap.br_state = XFS_EXT_NORM; - __xfs_rmap_add(tp, XFS_RMAP_FREE, owner, XFS_DATA_FORK, &bmap); + __xfs_rmap_add(tp, XFS_RMAP_FREE, owner, XFS_DATA_FORK, &bmap, isrt); } /* Compare rmap records. Returns -1 if a < b, 1 if a > b, and 0 if equal. */ diff --git a/fs/xfs/libxfs/xfs_rmap.h b/fs/xfs/libxfs/xfs_rmap.h index c187f1a678dd..2d4badc4a531 100644 --- a/fs/xfs/libxfs/xfs_rmap.h +++ b/fs/xfs/libxfs/xfs_rmap.h @@ -159,6 +159,7 @@ struct xfs_rmap_intent { uint64_t ri_owner; int ri_whichfork; struct xfs_bmbt_irec ri_bmap; + bool ri_realtime; }; /* functions for updating the rmapbt based on bmbt map/unmap operations */ @@ -170,9 +171,9 @@ void xfs_rmap_convert_extent(struct xfs_mount *mp, struct xfs_trans *tp, struct xfs_inode *ip, int whichfork, struct xfs_bmbt_irec *imap); void xfs_rmap_alloc_extent(struct xfs_trans *tp, xfs_fsblock_t fsbno, - xfs_filblks_t len, uint64_t owner); + xfs_filblks_t len, uint64_t owner, bool isrt); void xfs_rmap_free_extent(struct xfs_trans *tp, xfs_fsblock_t fsbno, - xfs_filblks_t len, uint64_t owner); + xfs_filblks_t len, uint64_t owner, bool isrt); void xfs_rmap_finish_one_cleanup(struct xfs_trans *tp, struct xfs_btree_cur *rcur, int error); diff --git a/fs/xfs/scrub/alloc_repair.c b/fs/xfs/scrub/alloc_repair.c index ec04bbe14120..b4692ef4573e 100644 --- a/fs/xfs/scrub/alloc_repair.c +++ b/fs/xfs/scrub/alloc_repair.c @@ -408,7 +408,7 @@ xrep_abt_dispose_reservations( /* Add a deferred rmap for each extent we used. */ if (resv->used > 0) xfs_rmap_alloc_extent(sc->tp, resv->fsbno, resv->used, - XFS_RMAP_OWN_AG); + XFS_RMAP_OWN_AG, false); /* * Add a deferred free for each block we didn't use and now diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c index 4911b68f95dd..c7a55011972f 100644 --- a/fs/xfs/xfs_rmap_item.c +++ b/fs/xfs/xfs_rmap_item.c @@ -262,13 +262,16 @@ xfs_trans_set_rmap_flags( struct xfs_map_extent *rmap, enum xfs_rmap_intent_type type, int whichfork, - xfs_exntst_t state) + xfs_exntst_t state, + bool rt) { rmap->me_flags = 0; if (state == XFS_EXT_UNWRITTEN) rmap->me_flags |= XFS_RMAP_EXTENT_UNWRITTEN; if (whichfork == XFS_ATTR_FORK) rmap->me_flags |= XFS_RMAP_EXTENT_ATTR_FORK; + if (rt) + rmap->me_flags |= XFS_RMAP_EXTENT_REALTIME; switch (type) { case XFS_RMAP_MAP: rmap->me_flags |= XFS_RMAP_EXTENT_MAP; @@ -315,6 +318,7 @@ xfs_trans_log_finish_rmap_update( xfs_fsblock_t startblock, xfs_filblks_t blockcount, xfs_exntst_t state, + bool rt, struct xfs_btree_cur **pcur) { int error; @@ -403,7 +407,7 @@ xfs_rmap_update_log_item( map->me_startoff = rmap->ri_bmap.br_startoff; map->me_len = rmap->ri_bmap.br_blockcount; xfs_trans_set_rmap_flags(map, rmap->ri_type, rmap->ri_whichfork, - rmap->ri_bmap.br_state); + rmap->ri_bmap.br_state, rmap->ri_realtime); } /* Get an RUD so we can process all the deferred rmap updates. */ @@ -435,6 +439,7 @@ xfs_rmap_update_finish_item( rmap->ri_bmap.br_startblock, rmap->ri_bmap.br_blockcount, rmap->ri_bmap.br_state, + rmap->ri_realtime, (struct xfs_btree_cur **)state); kmem_free(rmap); return error; @@ -503,6 +508,7 @@ xfs_rui_recover( xfs_exntst_t state; struct xfs_trans *tp; struct xfs_btree_cur *rcur = NULL; + bool rt; ASSERT(!test_bit(XFS_RUI_RECOVERED, &ruip->rui_flags)); @@ -557,6 +563,7 @@ xfs_rui_recover( XFS_EXT_UNWRITTEN : XFS_EXT_NORM; whichfork = (rmap->me_flags & XFS_RMAP_EXTENT_ATTR_FORK) ? XFS_ATTR_FORK : XFS_DATA_FORK; + rt = !!(rmap->me_flags & XFS_RMAP_EXTENT_REALTIME); switch (rmap->me_flags & XFS_RMAP_EXTENT_TYPE_MASK) { case XFS_RMAP_EXTENT_MAP: type = XFS_RMAP_MAP; @@ -590,7 +597,7 @@ xfs_rui_recover( error = xfs_trans_log_finish_rmap_update(tp, rudp, type, rmap->me_owner, whichfork, rmap->me_startoff, rmap->me_startblock, - rmap->me_len, state, &rcur); + rmap->me_len, state, rt, &rcur); if (error) goto abort_error;

[09/21] xfs: add a realtime flag to the rmap update log redo items

Commit Message

Patch