xfs: make xfs_rtblock_t a segmented address like xfs_fsblock_t

Source kernel commit: 7195f240c6578caa9e24202a26aa612a7e8cba26

Now that we've finished adding allocation groups to the realtime volume,
let's make the file block mapping address (xfs_rtblock_t) a segmented
value just like we do on the data device.  This means that group number
and block number conversions can be done with shifting and masking
instead of integer division.

While in theory we could continue caching the rgno shift value in
m_rgblklog, the fact that we now always use the shift value means that
we have an opportunity to increase the redundancy of the rt geometry by
storing it in the ondisk superblock and adding more sb verifier code.
Extend the sueprblock to store the rgblklog value.

Now that we have segmented addresses, set the correct values in
m_groups[XG_TYPE_RTG] so that the xfs_group helpers work correctly.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index 92c01c52e99e4a7e64430b0b62aebb824aaa2ae7..19d08cf047f2028136728ef68b5299658935a01b 100644 (file)
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -83,7 +83,6 @@ typedef struct xfs_mount {
         struct xfs_ino_geometry        m_ino_geo;      /* inode geometry */
        uint                    m_rsumlevels;   /* rt summary levels */
        xfs_filblks_t           m_rsumblocks;   /* size of rt summary, FSBs */
-       uint32_t                m_rgblocks;     /* size of rtgroup in rtblocks */
        struct xfs_inode        *m_metadirip;   /* ptr to metadata directory */
        struct xfs_inode        *m_rtdirip;     /* ptr to realtime metadir */
        struct xfs_buftarg      *m_ddev_targp;
@@ -98,7 +97,7 @@ typedef struct xfs_mount {
        uint8_t                 m_sectbb_log;   /* sectorlog - BBSHIFT */
        uint8_t                 m_agno_log;     /* log #ag's */
        int8_t                  m_rtxblklog;    /* log2 of rextsize, if possible */
-       int8_t                  m_rgblklog;     /* log2 of rt group sz if possible */
+
        uint                    m_blockmask;    /* sb_blocksize-1 */
        uint                    m_blockwsize;   /* sb_blocksize in words */
        /* number of rt extents per rt bitmap block if rtgroups enabled */
@@ -123,7 +122,6 @@ typedef struct xfs_mount {
        uint64_t                m_features;     /* active filesystem features */
        uint64_t                m_low_space[XFS_LOWSP_MAX];
        uint64_t                m_rtxblkmask;   /* rt extent block mask */
-       uint64_t                m_rgblkmask;    /* rt group block mask */
        unsigned long           m_opstate;      /* dynamic state flags */
        bool                    m_finobt_nores; /* no per-AG finobt resv. */
        uint                    m_qflags;       /* quota status flags */

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 60310d3c1074c8d7d975bef57e9684d1dd48ff88..552d292bf354122c4f7e4f56f213838215384b08 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -3146,10 +3146,8 @@ xfs_bmap_adjacent_valid(
 
        if (XFS_IS_REALTIME_INODE(ap->ip) &&
            (ap->datatype & XFS_ALLOC_USERDATA)) {
-               if (x >= mp->m_sb.sb_rblocks)
-                       return false;
                if (!xfs_has_rtgroups(mp))
-                       return true;
+                       return x < mp->m_sb.sb_rblocks;
 
                return xfs_rtb_to_rgno(mp, x) == xfs_rtb_to_rgno(mp, y) &&
                        xfs_rtb_to_rgno(mp, x) < mp->m_sb.sb_rgcount &&

diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index f56ff9f43c218f1ef94f8d1e8e640ca8ab5b7a10..d6c10855ab023b14ee031dc8b87cce0b64f62617 100644 (file)
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -179,6 +179,9 @@ typedef struct xfs_sb {
        xfs_rgnumber_t  sb_rgcount;     /* number of realtime groups */
        xfs_rtxlen_t    sb_rgextents;   /* size of a realtime group in rtx */
 
+       uint8_t         sb_rgblklog;    /* rt group number shift */
+       uint8_t         sb_pad[7];      /* zeroes */
+
        /* must be padded to 64 bit alignment */
 } xfs_sb_t;
 
@@ -268,6 +271,9 @@ struct xfs_dsb {
        __be32          sb_rgcount;     /* # of realtime groups */
        __be32          sb_rgextents;   /* size of rtgroup in rtx */
 
+       __u8            sb_rgblklog;    /* rt group number shift */
+       __u8            sb_pad[7];      /* zeroes */
+
        /*
         * The size of this structure must be padded to 64 bit alignment.
         *

diff --git a/libxfs/xfs_ondisk.h b/libxfs/xfs_ondisk.h
index 6a2bcbc392842cf1e288a13edee8c4cebd18c0e4..99eae7f67e961ba466098ed2ab285a8973dcb9a9 100644 (file)
--- a/libxfs/xfs_ondisk.h
+++ b/libxfs/xfs_ondisk.h
@@ -37,7 +37,7 @@ xfs_check_ondisk_structs(void)
        XFS_CHECK_STRUCT_SIZE(struct xfs_dinode,                176);
        XFS_CHECK_STRUCT_SIZE(struct xfs_disk_dquot,            104);
        XFS_CHECK_STRUCT_SIZE(struct xfs_dqblk,                 136);
-       XFS_CHECK_STRUCT_SIZE(struct xfs_dsb,                   280);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dsb,                   288);
        XFS_CHECK_STRUCT_SIZE(struct xfs_dsymlink_hdr,          56);
        XFS_CHECK_STRUCT_SIZE(struct xfs_inobt_key,             4);
        XFS_CHECK_STRUCT_SIZE(struct xfs_inobt_rec,             16);

diff --git a/libxfs/xfs_rtbitmap.h b/libxfs/xfs_rtbitmap.h
index e0fb36f181cc9e71ed0604c60bf9e39659bac813..16563a44bd138a4f32793498dc46bc6b364226f2 100644 (file)
--- a/libxfs/xfs_rtbitmap.h
+++ b/libxfs/xfs_rtbitmap.h
@@ -26,7 +26,7 @@ xfs_rtx_to_rtb(
        xfs_rtxnum_t            rtx)
 {
        struct xfs_mount        *mp = rtg_mount(rtg);
-       xfs_rtblock_t           start = xfs_rgno_start_rtb(mp, rtg_rgno(rtg));
+       xfs_rtblock_t           start = xfs_group_start_fsb(rtg_group(rtg));
 
        if (mp->m_rtxblklog >= 0)
                return start + (rtx << mp->m_rtxblklog);
@@ -128,11 +128,11 @@ xfs_rtb_to_rtx(
        struct xfs_mount        *mp,
        xfs_rtblock_t           rtbno)
 {
-       uint64_t                __rgbno = __xfs_rtb_to_rgbno(mp, rtbno);
-
+       /* open-coded 64-bit masking operation */
+       rtbno &= mp->m_groups[XG_TYPE_RTG].blkmask;
        if (likely(mp->m_rtxblklog >= 0))
-               return __rgbno >> mp->m_rtxblklog;
-       return div_u64(__rgbno, mp->m_sb.sb_rextsize);
+               return rtbno >> mp->m_rtxblklog;
+       return div_u64(rtbno, mp->m_sb.sb_rextsize);
 }
 
 /* Return the offset of an rt block number within an rt extent. */
@@ -141,9 +141,10 @@ xfs_rtb_to_rtxoff(
        struct xfs_mount        *mp,
        xfs_rtblock_t           rtbno)
 {
+       /* open-coded 64-bit masking operation */
+       rtbno &= mp->m_groups[XG_TYPE_RTG].blkmask;
        if (likely(mp->m_rtxblklog >= 0))
                return rtbno & mp->m_rtxblkmask;
-
        return do_div(rtbno, mp->m_sb.sb_rextsize);
 }
 

diff --git a/libxfs/xfs_rtgroup.h b/libxfs/xfs_rtgroup.h
index 2ddfac9a0182f9217c84c55d8cc1fc2ece352bd8..c15b232e1f8e772462e5ae1aa863260e7889de92 100644 (file)
--- a/libxfs/xfs_rtgroup.h
+++ b/libxfs/xfs_rtgroup.h
@@ -122,31 +122,12 @@ xfs_rtgroup_next(
        return xfs_rtgroup_next_range(mp, rtg, 0, mp->m_sb.sb_rgcount - 1);
 }
 
-static inline xfs_rtblock_t
-xfs_rgno_start_rtb(
-       struct xfs_mount        *mp,
-       xfs_rgnumber_t          rgno)
-{
-       if (mp->m_rgblklog >= 0)
-               return ((xfs_rtblock_t)rgno << mp->m_rgblklog);
-       return ((xfs_rtblock_t)rgno * mp->m_rgblocks);
-}
-
-static inline xfs_rtblock_t
-__xfs_rgbno_to_rtb(
-       struct xfs_mount        *mp,
-       xfs_rgnumber_t          rgno,
-       xfs_rgblock_t           rgbno)
-{
-       return xfs_rgno_start_rtb(mp, rgno) + rgbno;
-}
-
 static inline xfs_rtblock_t
 xfs_rgbno_to_rtb(
        struct xfs_rtgroup      *rtg,
        xfs_rgblock_t           rgbno)
 {
-       return __xfs_rgbno_to_rtb(rtg_mount(rtg), rtg_rgno(rtg), rgbno);
+       return xfs_gbno_to_fsb(rtg_group(rtg), rgbno);
 }
 
 static inline xfs_rgnumber_t
@@ -154,30 +135,7 @@ xfs_rtb_to_rgno(
        struct xfs_mount        *mp,
        xfs_rtblock_t           rtbno)
 {
-       if (!xfs_has_rtgroups(mp))
-               return 0;
-
-       if (mp->m_rgblklog >= 0)
-               return rtbno >> mp->m_rgblklog;
-
-       return div_u64(rtbno, mp->m_rgblocks);
-}
-
-static inline uint64_t
-__xfs_rtb_to_rgbno(
-       struct xfs_mount        *mp,
-       xfs_rtblock_t           rtbno)
-{
-       uint32_t                rem;
-
-       if (!xfs_has_rtgroups(mp))
-               return rtbno;
-
-       if (mp->m_rgblklog >= 0)
-               return rtbno & mp->m_rgblkmask;
-
-       div_u64_rem(rtbno, mp->m_rgblocks, &rem);
-       return rem;
+       return xfs_fsb_to_gno(mp, rtbno, XG_TYPE_RTG);
 }
 
 static inline xfs_rgblock_t
@@ -185,7 +143,7 @@ xfs_rtb_to_rgbno(
        struct xfs_mount        *mp,
        xfs_rtblock_t           rtbno)
 {
-       return __xfs_rtb_to_rgbno(mp, rtbno);
+       return xfs_fsb_to_gbno(mp, rtbno, XG_TYPE_RTG);
 }
 
 /* Is rtbno the start of a RT group? */
@@ -194,7 +152,7 @@ xfs_rtbno_is_group_start(
        struct xfs_mount        *mp,
        xfs_rtblock_t           rtbno)
 {
-       return (rtbno & mp->m_rgblkmask) == 0;
+       return (rtbno & mp->m_groups[XG_TYPE_RTG].blkmask) == 0;
 }
 
 static inline xfs_daddr_t
@@ -202,7 +160,11 @@ xfs_rtb_to_daddr(
        struct xfs_mount        *mp,
        xfs_rtblock_t           rtbno)
 {
-       return rtbno << mp->m_blkbb_log;
+       struct xfs_groups       *g = &mp->m_groups[XG_TYPE_RTG];
+       xfs_rgnumber_t          rgno = xfs_rtb_to_rgno(mp, rtbno);
+       uint64_t                start_bno = (xfs_rtblock_t)rgno * g->blocks;
+
+       return XFS_FSB_TO_BB(mp, start_bno + (rtbno & g->blkmask));
 }
 
 static inline xfs_rtblock_t
@@ -210,7 +172,18 @@ xfs_daddr_to_rtb(
        struct xfs_mount        *mp,
        xfs_daddr_t             daddr)
 {
-       return daddr >> mp->m_blkbb_log;
+       xfs_rfsblock_t          bno = XFS_BB_TO_FSBT(mp, daddr);
+
+       if (xfs_has_rtgroups(mp)) {
+               struct xfs_groups *g = &mp->m_groups[XG_TYPE_RTG];
+               xfs_rgnumber_t  rgno;
+               uint32_t        rgbno;
+
+               rgno = div_u64_rem(bno, g->blocks, &rgbno);
+               return ((xfs_rtblock_t)rgno << g->blklog) + rgbno;
+       }
+
+       return bno;
 }
 
 #ifdef CONFIG_XFS_RT

diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
index fe760d38fd7673b67ab35cebfc1f6ad57249c5f2..2ab234f1dfce70940b0357e1b9bd6f64a9d168fb 100644 (file)
--- a/libxfs/xfs_sb.c
+++ b/libxfs/xfs_sb.c
@@ -365,12 +365,23 @@ xfs_validate_sb_write(
        return 0;
 }
 
+int
+xfs_compute_rgblklog(
+       xfs_rtxlen_t    rgextents,
+       xfs_rgblock_t   rextsize)
+{
+       uint64_t        rgblocks = (uint64_t)rgextents * rextsize;
+
+       return xfs_highbit64(rgblocks - 1) + 1;
+}
+
 static int
 xfs_validate_sb_rtgroups(
        struct xfs_mount        *mp,
        struct xfs_sb           *sbp)
 {
        uint64_t                groups;
+       int                     rgblklog;
 
        if (sbp->sb_rextsize == 0) {
                xfs_warn(mp,
@@ -415,6 +426,14 @@ xfs_validate_sb_rtgroups(
                return -EINVAL;
        }
 
+       rgblklog = xfs_compute_rgblklog(sbp->sb_rgextents, sbp->sb_rextsize);
+       if (sbp->sb_rgblklog != rgblklog) {
+               xfs_warn(mp,
+"Realtime group log (%d) does not match expected value (%d).",
+                               sbp->sb_rgblklog, rgblklog);
+               return -EINVAL;
+       }
+
        return 0;
 }
 
@@ -495,6 +514,12 @@ xfs_validate_sb_common(
                }
 
                if (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR) {
+                       if (memchr_inv(sbp->sb_pad, 0, sizeof(sbp->sb_pad))) {
+                               xfs_warn(mp,
+"Metadir superblock padding fields must be zero.");
+                               return -EINVAL;
+                       }
+
                        error = xfs_validate_sb_rtgroups(mp, sbp);
                        if (error)
                                return error;
@@ -800,6 +825,8 @@ __xfs_sb_from_disk(
 
        if (to->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR) {
                to->sb_metadirino = be64_to_cpu(from->sb_metadirino);
+               to->sb_rgblklog = from->sb_rgblklog;
+               memcpy(to->sb_pad, from->sb_pad, sizeof(to->sb_pad));
                to->sb_rgcount = be32_to_cpu(from->sb_rgcount);
                to->sb_rgextents = be32_to_cpu(from->sb_rgextents);
                to->sb_rbmino = NULLFSINO;
@@ -967,6 +994,8 @@ xfs_sb_to_disk(
 
        if (from->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR) {
                to->sb_metadirino = cpu_to_be64(from->sb_metadirino);
+               to->sb_rgblklog = from->sb_rgblklog;
+               memset(to->sb_pad, 0, sizeof(to->sb_pad));
                to->sb_rgcount = cpu_to_be32(from->sb_rgcount);
                to->sb_rgextents = cpu_to_be32(from->sb_rgextents);
                to->sb_rbmino = cpu_to_be64(0);
@@ -1101,8 +1130,9 @@ const struct xfs_buf_ops xfs_sb_quiet_buf_ops = {
        .verify_write = xfs_sb_write_verify,
 };
 
+/* Compute cached rt geometry from the incore sb. */
 void
-xfs_mount_sb_set_rextsize(
+xfs_sb_mount_rextsize(
        struct xfs_mount        *mp,
        struct xfs_sb           *sbp)
 {
@@ -1111,13 +1141,32 @@ xfs_mount_sb_set_rextsize(
        mp->m_rtxblklog = log2_if_power2(sbp->sb_rextsize);
        mp->m_rtxblkmask = mask64_if_power2(sbp->sb_rextsize);
 
-       mp->m_rgblocks = sbp->sb_rgextents * sbp->sb_rextsize;
-       mp->m_rgblklog = log2_if_power2(mp->m_rgblocks);
-       mp->m_rgblkmask = mask64_if_power2(mp->m_rgblocks);
+       if (xfs_sb_is_v5(sbp) &&
+           (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR)) {
+               rgs->blocks = sbp->sb_rgextents * sbp->sb_rextsize;
+               rgs->blklog = mp->m_sb.sb_rgblklog;
+               rgs->blkmask = xfs_mask32lo(mp->m_sb.sb_rgblklog);
+       } else {
+               rgs->blocks = 0;
+               rgs->blklog = 0;
+               rgs->blkmask = (uint64_t)-1;
+       }
+}
+
+/* Update incore sb rt extent size, then recompute the cached rt geometry. */
+void
+xfs_mount_sb_set_rextsize(
+       struct xfs_mount        *mp,
+       struct xfs_sb           *sbp,
+       xfs_agblock_t           rextsize)
+{
+       sbp->sb_rextsize = rextsize;
+       if (xfs_sb_is_v5(sbp) &&
+           (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR))
+               sbp->sb_rgblklog = xfs_compute_rgblklog(sbp->sb_rgextents,
+                                                       rextsize);
 
-       rgs->blocks = 0;
-       rgs->blklog = 0;
-       rgs->blkmask = (uint64_t)-1;
+       xfs_sb_mount_rextsize(mp, sbp);
 }
 
 /*
@@ -1151,7 +1200,7 @@ xfs_sb_mount_common(
        ags->blklog = mp->m_sb.sb_agblklog;
        ags->blkmask = xfs_mask32lo(mp->m_sb.sb_agblklog);
 
-       xfs_mount_sb_set_rextsize(mp, sbp);
+       xfs_sb_mount_rextsize(mp, sbp);
 
        mp->m_alloc_mxr[0] = xfs_allocbt_maxrecs(mp, sbp->sb_blocksize, true);
        mp->m_alloc_mxr[1] = xfs_allocbt_maxrecs(mp, sbp->sb_blocksize, false);

diff --git a/libxfs/xfs_sb.h b/libxfs/xfs_sb.h
index 999dcfccdaf9602912858276d77db6dbe34ebc3c..34d0dd374e9b0be313710c225593d5437d590f2e 100644 (file)
--- a/libxfs/xfs_sb.h
+++ b/libxfs/xfs_sb.h
@@ -17,8 +17,9 @@ extern void   xfs_log_sb(struct xfs_trans *tp);
 extern int     xfs_sync_sb(struct xfs_mount *mp, bool wait);
 extern int     xfs_sync_sb_buf(struct xfs_mount *mp, bool update_rtsb);
 extern void    xfs_sb_mount_common(struct xfs_mount *mp, struct xfs_sb *sbp);
+void           xfs_sb_mount_rextsize(struct xfs_mount *mp, struct xfs_sb *sbp);
 void           xfs_mount_sb_set_rextsize(struct xfs_mount *mp,
-                       struct xfs_sb *sbp);
+                       struct xfs_sb *sbp, xfs_agblock_t rextsize);
 extern void    xfs_sb_from_disk(struct xfs_sb *to, struct xfs_dsb *from);
 extern void    xfs_sb_to_disk(struct xfs_dsb *to, struct xfs_sb *from);
 extern void    xfs_sb_quota_from_disk(struct xfs_sb *sbp);
@@ -43,5 +44,6 @@ bool  xfs_validate_stripe_geometry(struct xfs_mount *mp,
 bool   xfs_validate_rt_geometry(struct xfs_sb *sbp);
 
 uint8_t xfs_compute_rextslog(xfs_rtbxlen_t rtextents);
+int xfs_compute_rgblklog(xfs_rtxlen_t rgextents, xfs_rgblock_t rextsize);
 
 #endif /* __XFS_SB_H__ */

diff --git a/libxfs/xfs_types.c b/libxfs/xfs_types.c
index 4e366e62eb2ae8de9085a86fed3a8502c0af9534..4e24599c3693971e4d3d4a6d516d99ed06978a92 100644 (file)
--- a/libxfs/xfs_types.c
+++ b/libxfs/xfs_types.c
@@ -146,9 +146,6 @@ xfs_verify_rtbno(
        struct xfs_mount        *mp,
        xfs_rtblock_t           rtbno)
 {
-       if (rtbno >= mp->m_sb.sb_rblocks)
-               return false;
-
        if (xfs_has_rtgroups(mp)) {
                xfs_rgnumber_t  rgno = xfs_rtb_to_rgno(mp, rtbno);
                xfs_rtxnum_t    rtx = xfs_rtb_to_rtx(mp, rtbno);
@@ -159,8 +156,10 @@ xfs_verify_rtbno(
                        return false;
                if (xfs_has_rtsb(mp) && rgno == 0 && rtx == 0)
                        return false;
+               return true;
        }
-       return true;
+
+       return rtbno < mp->m_sb.sb_rblocks;
 }
 
 /*