[11/21] xfs: add realtime reverse map inode to superblock

Message ID	157784144907.1368137.8582010073406090393.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 11/21] xfs: add realtime reverse map inode to superblock 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:29 -0800 Message-ID: <157784144907.1368137.8582010073406090393.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_format.h b/fs/xfs/libxfs/xfs_format.h index 779b178815dd..6a42c886ecd3 100644 --- a/fs/xfs/libxfs/xfs_format.h +++ b/fs/xfs/libxfs/xfs_format.h @@ -591,6 +591,12 @@ static inline bool xfs_sb_version_hasmetadir(struct xfs_sb *sbp) (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR); } +static inline bool xfs_sb_version_hasrtrmapbt(struct xfs_sb *sbp) +{ + return xfs_sb_version_hasmetadir(sbp) && sbp->sb_rblocks > 0 && + xfs_sb_version_hasrmapbt(sbp); +} + /* * end of superblock version macros */ @@ -1020,7 +1026,8 @@ enum xfs_dinode_fmt { XFS_DINODE_FMT_LOCAL, /* bulk data */ XFS_DINODE_FMT_EXTENTS, /* struct xfs_bmbt_rec */ XFS_DINODE_FMT_BTREE, /* struct xfs_bmdr_block */ - XFS_DINODE_FMT_UUID /* added long ago, but never used */ + XFS_DINODE_FMT_UUID, /* added long ago, but never used */ + XFS_DINODE_FMT_RMAP, /* reverse mapping btree */ }; #define XFS_INODE_FORMAT_STR \ diff --git a/fs/xfs/libxfs/xfs_imeta.c b/fs/xfs/libxfs/xfs_imeta.c index 59193eb834ee..7c1faba3a741 100644 --- a/fs/xfs/libxfs/xfs_imeta.c +++ b/fs/xfs/libxfs/xfs_imeta.c @@ -57,12 +57,14 @@ /* Static metadata inode paths */ static const char *rtbitmap_path[] = {"realtime", "0.bitmap"}; static const char *rtsummary_path[] = {"realtime", "0.summary"}; +static const char *rtrmapbt_path[] = {"realtime", "0.rmap"}; static const char *usrquota_path[] = {"quota", "user"}; static const char *grpquota_path[] = {"quota", "group"}; static const char *prjquota_path[] = {"quota", "project"}; XFS_IMETA_DEFINE_PATH(XFS_IMETA_RTBITMAP, rtbitmap_path); XFS_IMETA_DEFINE_PATH(XFS_IMETA_RTSUMMARY, rtsummary_path); +XFS_IMETA_DEFINE_PATH(XFS_IMETA_RTRMAPBT, rtrmapbt_path); XFS_IMETA_DEFINE_PATH(XFS_IMETA_USRQUOTA, usrquota_path); XFS_IMETA_DEFINE_PATH(XFS_IMETA_GRPQUOTA, grpquota_path); XFS_IMETA_DEFINE_PATH(XFS_IMETA_PRJQUOTA, prjquota_path); diff --git a/fs/xfs/libxfs/xfs_imeta.h b/fs/xfs/libxfs/xfs_imeta.h index 33024889fc71..7e183f7c2db3 100644 --- a/fs/xfs/libxfs/xfs_imeta.h +++ b/fs/xfs/libxfs/xfs_imeta.h @@ -33,6 +33,7 @@ struct xfs_imeta_end { /* Lookup keys for static metadata inodes. */ extern const struct xfs_imeta_path XFS_IMETA_RTBITMAP; extern const struct xfs_imeta_path XFS_IMETA_RTSUMMARY; +extern const struct xfs_imeta_path XFS_IMETA_RTRMAPBT; extern const struct xfs_imeta_path XFS_IMETA_USRQUOTA; extern const struct xfs_imeta_path XFS_IMETA_GRPQUOTA; extern const struct xfs_imeta_path XFS_IMETA_PRJQUOTA; diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index 6823e6eeec2c..189029cf3855 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c @@ -400,6 +400,12 @@ xfs_dinode_verify_fork( return __this_address; } break; + case XFS_DINODE_FMT_RMAP: + if (!xfs_sb_version_hasrtrmapbt(&mp->m_sb)) + return __this_address; + if (!(dip->di_flags2 & cpu_to_be64(XFS_DIFLAG2_METADATA))) + return __this_address; + break; default: return __this_address; } diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c index b66d34c99787..4c99c532693c 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.c +++ b/fs/xfs/libxfs/xfs_inode_fork.c @@ -75,6 +75,11 @@ xfs_iformat_fork( case XFS_DINODE_FMT_BTREE: error = xfs_iformat_btree(ip, dip, XFS_DATA_FORK); break; + case XFS_DINODE_FMT_RMAP: + if (!xfs_sb_version_hasrtrmapbt(&ip->i_mount->m_sb)) + return -EFSCORRUPTED; + /* to be implemented later */ + break; default: xfs_inode_verifier_error(ip, -EFSCORRUPTED, __func__, dip, sizeof(*dip), __this_address); @@ -546,6 +551,10 @@ xfs_iflush_fork( } break; + case XFS_DINODE_FMT_RMAP: + /* to be implemented later */ + break; + default: ASSERT(0); break; diff --git a/fs/xfs/libxfs/xfs_rtrmap_btree.c b/fs/xfs/libxfs/xfs_rtrmap_btree.c index b6a10926359c..992ebd9ed4d0 100644 --- a/fs/xfs/libxfs/xfs_rtrmap_btree.c +++ b/fs/xfs/libxfs/xfs_rtrmap_btree.c @@ -318,6 +318,7 @@ xfs_rtrmapbt_verify( struct xfs_mount *mp = bp->b_target->bt_mount; struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); xfs_failaddr_t fa; + xfs_ino_t ino = XFS_RMAP_OWN_UNKNOWN; int level; if (block->bb_magic != cpu_to_be32(XFS_RTRMAP_CRC_MAGIC)) @@ -325,7 +326,9 @@ xfs_rtrmapbt_verify( if (!xfs_sb_version_hasrmapbt(&mp->m_sb)) return __this_address; - fa = xfs_btree_lblock_v5hdr_verify(bp, XFS_RMAP_OWN_UNKNOWN); + if (mp->m_rrmapip) + ino = mp->m_rrmapip->i_ino; + fa = xfs_btree_lblock_v5hdr_verify(bp, ino); if (fa) return fa; level = be16_to_cpu(block->bb_level); @@ -507,6 +510,7 @@ xfs_rtrmapbt_commit_staged_btree( int flags = XFS_ILOG_CORE | XFS_ILOG_DBROOT; ASSERT(cur->bc_flags & XFS_BTREE_STAGING); + ASSERT(ifake->if_format == XFS_DINODE_FMT_RMAP); ifp = XFS_IFORK_PTR(cur->bc_private.b.ip, XFS_DATA_FORK); xfs_ifork_reset(ifp); diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index b4bd82d86277..2af41d73bd8c 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2876,7 +2876,14 @@ xfs_iflush_int( __func__, ip->i_ino, be16_to_cpu(dip->di_magic), dip); goto corrupt_out; } - if (S_ISREG(VFS_I(ip)->i_mode)) { + if (ip->i_d.di_format == XFS_DINODE_FMT_RMAP) { + if (mp->m_rrmapip && mp->m_rrmapip->i_ino != ip->i_ino) { + xfs_alert_tag(mp, XFS_PTAG_IFLUSH, + "%s: Bad rt rmapbt inode %Lu, ptr "PTR_FMT, + __func__, ip->i_ino, ip); + goto corrupt_out; + } + } else if (S_ISREG(VFS_I(ip)->i_mode)) { if (XFS_TEST_ERROR( (ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS) && (ip->i_d.di_format != XFS_DINODE_FMT_BTREE), diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 168d53062fab..24c2ea2825be 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c @@ -47,6 +47,7 @@ xfs_inode_item_data_fork_size( } break; case XFS_DINODE_FMT_BTREE: + case XFS_DINODE_FMT_RMAP: if ((iip->ili_fields & XFS_ILOG_DBROOT) && ip->i_df.if_broot_bytes > 0) { *nbytes += ip->i_df.if_broot_bytes; @@ -167,6 +168,7 @@ xfs_inode_item_format_data_fork( } break; case XFS_DINODE_FMT_BTREE: + case XFS_DINODE_FMT_RMAP: iip->ili_fields &= ~(XFS_ILOG_DDATA | XFS_ILOG_DEXT | XFS_ILOG_DEV); diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index ba97c001d632..e966a7e569be 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -3028,6 +3028,7 @@ xlog_recover_inode_pass2( if (unlikely(S_ISREG(ldip->di_mode))) { if ((ldip->di_format != XFS_DINODE_FMT_EXTENTS) && + (ldip->di_format != XFS_DINODE_FMT_RMAP) && (ldip->di_format != XFS_DINODE_FMT_BTREE)) { XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(3)", XFS_ERRLEVEL_LOW, mp, ldip, diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 2879031027c5..95ee6b898d3d 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -119,6 +119,7 @@ typedef struct xfs_mount { uint8_t *m_rsum_cache; struct xfs_inode *m_rbmip; /* pointer to bitmap inode */ struct xfs_inode *m_rsumip; /* pointer to summary inode */ + struct xfs_inode *m_rrmapip; /* pointer to rmap inode */ struct xfs_inode *m_rootip; /* pointer to root directory */ struct xfs_inode *m_metadirip; /* metadata inode directory */ struct xfs_quotainfo *m_quotainfo; /* disk quota information */ diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index f0487e1c9cc1..0c5fe0c04307 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -21,6 +21,7 @@ #include "xfs_health.h" #include "xfs_da_format.h" #include "xfs_imeta.h" +#include "xfs_error.h" /* * Read and return the summary information for a given extent size, @@ -1228,12 +1229,13 @@ xfs_rtmount_init( * Get the bitmap and summary inodes and the summary cache into the mount * structure at mount time. */ -int /* error */ +int xfs_rtmount_inodes( - xfs_mount_t *mp) /* file system mount structure */ + struct xfs_mount *mp) { - int error; /* error return value */ - xfs_sb_t *sbp; + struct xfs_sb *sbp; + xfs_ino_t ino; + int error; sbp = &mp->m_sb; error = xfs_imeta_iget(mp, mp->m_sb.sb_rbmino, XFS_DIR3_FT_REG_FILE, @@ -1248,13 +1250,38 @@ xfs_rtmount_inodes( &mp->m_rsumip); if (xfs_metadata_is_sick(error)) xfs_rt_mark_sick(mp, XFS_SICK_RT_SUMMARY); - if (error) { - xfs_imeta_irele(mp->m_rbmip); - return error; - } + if (error) + goto out_rbm; ASSERT(mp->m_rsumip != NULL); + + /* If we have rmap and a realtime device, look for the rtrmapbt. */ + if (xfs_sb_version_hasrtrmapbt(&mp->m_sb)) { + error = xfs_imeta_lookup(mp, &XFS_IMETA_RTRMAPBT, &ino); + if (error) + goto out_rsum; + + error = xfs_imeta_iget(mp, ino, XFS_DIR3_FT_REG_FILE, + &mp->m_rrmapip); + if (error) + goto out_rsum; + + if (XFS_IS_CORRUPT(mp, + mp->m_rrmapip->i_d.di_format != + XFS_DINODE_FMT_RMAP)) { + error = -EFSCORRUPTED; + goto out_rrmap; + } + } + xfs_alloc_rsum_cache(mp, sbp->sb_rbmblocks); return 0; +out_rrmap: + xfs_imeta_irele(mp->m_rrmapip); +out_rsum: + xfs_imeta_irele(mp->m_rsumip); +out_rbm: + xfs_imeta_irele(mp->m_rbmip); + return error; } void @@ -1262,6 +1289,8 @@ xfs_rtunmount_inodes( struct xfs_mount *mp) { kmem_free(mp->m_rsum_cache); + if (mp->m_rrmapip) + xfs_imeta_irele(mp->m_rrmapip); if (mp->m_rbmip) xfs_imeta_irele(mp->m_rbmip); if (mp->m_rsumip)

[11/21] xfs: add realtime reverse map inode to superblock

Commit Message

Patch