xfs: standardize ondisk to incore conversion for rmap btrees

Source kernel commit: c4e34172da26cb57f56c471728853d3a428ec832

Create a xfs_rmap_check_irec function to detect corruption in btree
records.  Fix all xfs_rmap_btrec_to_irec callsites to call the new
helper and bubble up corruption reports.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
index 2afe027d578a336f676ee1e6cf0d9959c81692eb..5ac2ca509a594b6fa5da792abb3379e8bcc42b87 100644 (file)
--- a/libxfs/xfs_rmap.c
+++ b/libxfs/xfs_rmap.c
@@ -204,6 +204,36 @@ xfs_rmap_btrec_to_irec(
                        irec);
 }
 
+/* Simple checks for rmap records. */
+xfs_failaddr_t
+xfs_rmap_check_irec(
+       struct xfs_btree_cur            *cur,
+       const struct xfs_rmap_irec      *irec)
+{
+       struct xfs_mount                *mp = cur->bc_mp;
+
+       if (irec->rm_blockcount == 0)
+               return __this_address;
+       if (irec->rm_startblock <= XFS_AGFL_BLOCK(mp)) {
+               if (irec->rm_owner != XFS_RMAP_OWN_FS)
+                       return __this_address;
+               if (irec->rm_blockcount != XFS_AGFL_BLOCK(mp) + 1)
+                       return __this_address;
+       } else {
+               /* check for valid extent range, including overflow */
+               if (!xfs_verify_agbext(cur->bc_ag.pag, irec->rm_startblock,
+                                                      irec->rm_blockcount))
+                       return __this_address;
+       }
+
+       if (!(xfs_verify_ino(mp, irec->rm_owner) ||
+             (irec->rm_owner <= XFS_RMAP_OWN_FS &&
+              irec->rm_owner >= XFS_RMAP_OWN_MIN)))
+               return __this_address;
+
+       return NULL;
+}
+
 /*
  * Get the data from the pointed-to record.
  */
@@ -216,39 +246,24 @@ xfs_rmap_get_rec(
        struct xfs_mount        *mp = cur->bc_mp;
        struct xfs_perag        *pag = cur->bc_ag.pag;
        union xfs_btree_rec     *rec;
+       xfs_failaddr_t          fa;
        int                     error;
 
        error = xfs_btree_get_rec(cur, &rec, stat);
        if (error || !*stat)
                return error;
 
-       if (xfs_rmap_btrec_to_irec(rec, irec))
-               goto out_bad_rec;
-
-       if (irec->rm_blockcount == 0)
-               goto out_bad_rec;
-       if (irec->rm_startblock <= XFS_AGFL_BLOCK(mp)) {
-               if (irec->rm_owner != XFS_RMAP_OWN_FS)
-                       goto out_bad_rec;
-               if (irec->rm_blockcount != XFS_AGFL_BLOCK(mp) + 1)
-                       goto out_bad_rec;
-       } else {
-               /* check for valid extent range, including overflow */
-               if (!xfs_verify_agbext(pag, irec->rm_startblock,
-                                           irec->rm_blockcount))
-                       goto out_bad_rec;
-       }
-
-       if (!(xfs_verify_ino(mp, irec->rm_owner) ||
-             (irec->rm_owner <= XFS_RMAP_OWN_FS &&
-              irec->rm_owner >= XFS_RMAP_OWN_MIN)))
+       fa = xfs_rmap_btrec_to_irec(rec, irec);
+       if (!fa)
+               fa = xfs_rmap_check_irec(cur, irec);
+       if (fa)
                goto out_bad_rec;
 
        return 0;
 out_bad_rec:
        xfs_warn(mp,
-               "Reverse Mapping BTree record corruption in AG %d detected!",
-               pag->pag_agno);
+               "Reverse Mapping BTree record corruption in AG %d detected at %pS!",
+               pag->pag_agno, fa);
        xfs_warn(mp,
                "Owner 0x%llx, flags 0x%x, start block 0x%x block count 0x%x",
                irec->rm_owner, irec->rm_flags, irec->rm_startblock,
@@ -2320,7 +2335,8 @@ xfs_rmap_query_range_helper(
        struct xfs_rmap_query_range_info        *query = priv;
        struct xfs_rmap_irec                    irec;
 
-       if (xfs_rmap_btrec_to_irec(rec, &irec) != NULL)
+       if (xfs_rmap_btrec_to_irec(rec, &irec) != NULL ||
+           xfs_rmap_check_irec(cur, &irec) != NULL)
                return -EFSCORRUPTED;
 
        return query->fn(cur, &irec, query->priv);

diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h
index 6a08c403e8b77179504a6a62275766cbe4493c4a..7fb298bcc15f4492dcdbd73ccb6a89c76681cf73 100644 (file)
--- a/libxfs/xfs_rmap.h
+++ b/libxfs/xfs_rmap.h
@@ -195,6 +195,9 @@ int xfs_rmap_compare(const struct xfs_rmap_irec *a,
 union xfs_btree_rec;
 xfs_failaddr_t xfs_rmap_btrec_to_irec(const union xfs_btree_rec *rec,
                struct xfs_rmap_irec *irec);
+xfs_failaddr_t xfs_rmap_check_irec(struct xfs_btree_cur *cur,
+               const struct xfs_rmap_irec *irec);
+
 int xfs_rmap_has_record(struct xfs_btree_cur *cur, xfs_agblock_t bno,
                xfs_extlen_t len, bool *exists);
 int xfs_rmap_record_exists(struct xfs_btree_cur *cur, xfs_agblock_t bno,