]> www.infradead.org Git - users/hch/xfsprogs.git/commitdiff
xfs: define the format of rt groups
authorDarrick J. Wong <djwong@kernel.org>
Mon, 5 Aug 2024 17:42:44 +0000 (10:42 -0700)
committerChristoph Hellwig <hch@lst.de>
Tue, 6 Aug 2024 12:53:49 +0000 (05:53 -0700)
Source kernel commit: f13677b8a76a61cbb1c937d250a3bd45019748e8

Define the ondisk format of realtime group metadata, and a superblock
for realtime volumes.  rt supers are protected by a separate rocompat
bit so that we can leave them off if the rt device is zoned.

Add a xfs_sb_version_hasrtgroups so that xfs_repair knows how to zero
the tail of superblocks.

For rt group enabled file systems there is a separate bitmap and summary
file for each group and thus the number of bitmap and summary blocks
needs to be calculated differently.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
libxfs/xfs_format.h
libxfs/xfs_ondisk.h
libxfs/xfs_rtbitmap.c
libxfs/xfs_rtgroup.c
libxfs/xfs_sb.c
libxfs/xfs_shared.h

index 20b04241d3c956309979a68fd3f36b3c0ee827ec..a0d3258fac3cb58cf1929453c80a179f8eefa9fb 100644 (file)
@@ -265,8 +265,15 @@ struct xfs_dsb {
        uuid_t          sb_meta_uuid;   /* metadata file system unique id */
 
        __be64          sb_metadirino;  /* metadata directory tree root */
+       __be32          sb_rgcount;     /* # of realtime groups */
+       __be32          sb_rgextents;   /* size of rtgroup in rtx */
 
-       /* must be padded to 64 bit alignment */
+       /*
+        * The size of this structure must be padded to 64 bit alignment.
+        *
+        * NOTE: Don't forget to update secondary_sb_whack in xfs_repair when
+        * adding new fields here.
+        */
 };
 
 #define XFS_SB_CRC_OFF         offsetof(struct xfs_dsb, sb_crc)
@@ -355,10 +362,11 @@ xfs_sb_has_compat_feature(
        return (sbp->sb_features_compat & feature) != 0;
 }
 
-#define XFS_SB_FEAT_RO_COMPAT_FINOBT   (1 << 0)                /* free inode btree */
-#define XFS_SB_FEAT_RO_COMPAT_RMAPBT   (1 << 1)                /* reverse map btree */
-#define XFS_SB_FEAT_RO_COMPAT_REFLINK  (1 << 2)                /* reflinked files */
-#define XFS_SB_FEAT_RO_COMPAT_INOBTCNT (1 << 3)                /* inobt block counts */
+#define XFS_SB_FEAT_RO_COMPAT_FINOBT   (1 << 0)        /* free inode btree */
+#define XFS_SB_FEAT_RO_COMPAT_RMAPBT   (1 << 1)        /* reverse map btree */
+#define XFS_SB_FEAT_RO_COMPAT_REFLINK  (1 << 2)        /* reflinked files */
+#define XFS_SB_FEAT_RO_COMPAT_INOBTCNT (1 << 3)        /* inobt block counts */
+#define XFS_SB_FEAT_RO_COMPAT_RTSB     (1U << 30)      /* realtime superblock */
 #define XFS_SB_FEAT_RO_COMPAT_ALL \
                (XFS_SB_FEAT_RO_COMPAT_FINOBT | \
                 XFS_SB_FEAT_RO_COMPAT_RMAPBT | \
@@ -381,6 +389,7 @@ xfs_sb_has_ro_compat_feature(
 #define XFS_SB_FEAT_INCOMPAT_NREXT64   (1 << 5)  /* large extent counters */
 #define XFS_SB_FEAT_INCOMPAT_EXCHRANGE (1 << 6)  /* exchangerange supported */
 #define XFS_SB_FEAT_INCOMPAT_PARENT    (1 << 7)  /* parent pointers */
+#define XFS_SB_FEAT_INCOMPAT_RTGROUPS  (1U << 30)      /* realtime groups */
 #define XFS_SB_FEAT_INCOMPAT_METADIR   (1U << 31)      /* metadata dir tree */
 #define XFS_SB_FEAT_INCOMPAT_ALL \
                (XFS_SB_FEAT_INCOMPAT_FTYPE | \
@@ -441,6 +450,12 @@ static inline bool xfs_sb_version_hasmetadir(const struct xfs_sb *sbp)
                (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR);
 }
 
+static inline bool xfs_sb_version_hasrtgroups(const struct xfs_sb *sbp)
+{
+       return (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5) &&
+               (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_RTGROUPS);
+}
+
 static inline bool
 xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino)
 {
@@ -723,6 +738,39 @@ union xfs_suminfo_raw {
        __u32           old;
 };
 
+/*
+ * Realtime allocation groups break the rt section into multiple pieces that
+ * could be locked independently.  Realtime block group numbers are 32-bit
+ * quantities.  Block numbers within a group are also 32-bit quantities, but
+ * the upper bit must never be set.  rtgroup 0 might have a superblock in it,
+ * so the minimum size of an rtgroup is 2 rtx.
+ */
+#define XFS_MAX_RGBLOCKS       ((xfs_rgblock_t)(1U << 31) - 1)
+#define XFS_MIN_RGEXTENTS      ((xfs_rtxlen_t)2)
+#define XFS_MAX_RGNUMBER       ((xfs_rgnumber_t)(-1U))
+
+#define XFS_RTSB_MAGIC 0x46726F67      /* 'Frog' */
+
+/*
+ * Realtime superblock - on disk version.  Must be padded to 64 bit alignment.
+ * The first block of the realtime volume contains this superblock.
+ */
+struct xfs_rtsb {
+       __be32          rsb_magicnum;   /* magic number == XFS_RTSB_MAGIC */
+       __le32          rsb_crc;        /* superblock crc */
+
+       __be32          rsb_pad;        /* zero */
+       unsigned char   rsb_fname[XFSLABEL_MAX]; /* file system name */
+
+       uuid_t          rsb_uuid;       /* user-visible file system unique id */
+       uuid_t          rsb_meta_uuid;  /* metadata file system unique id */
+
+       /* must be padded to 64 bit alignment */
+};
+
+#define XFS_RTSB_CRC_OFF       offsetof(struct xfs_rtsb, rsb_crc)
+#define XFS_RTSB_DADDR         ((xfs_daddr_t)0) /* daddr in rt section */
+
 /*
  * XFS Timestamps
  * ==============
index 8bca86e350fdc11980a00cf52a492fc9b7504496..38b314113d8f247b68643f999fac8ab891adf94a 100644 (file)
@@ -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,                   272);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dsb,                   280);
        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);
@@ -53,6 +53,7 @@ xfs_check_ondisk_structs(void)
        XFS_CHECK_STRUCT_SIZE(xfs_inobt_ptr_t,                  4);
        XFS_CHECK_STRUCT_SIZE(xfs_refcount_ptr_t,               4);
        XFS_CHECK_STRUCT_SIZE(xfs_rmap_ptr_t,                   4);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_rtsb,                  56);
 
        /* dir/attr trees */
        XFS_CHECK_STRUCT_SIZE(struct xfs_attr3_leaf_hdr,        80);
index 7bc943593cea750dce245a6f1337a8287ecd1706..5eeda55e42e84fbf232cfa72e038eaf87098fb82 100644 (file)
@@ -1162,7 +1162,9 @@ xfs_filblks_t
 xfs_rtbitmap_blockcount(
        struct xfs_mount        *mp)
 {
-       return xfs_rtbitmap_blockcount_len(mp, mp->m_sb.sb_rextents);
+       if (!xfs_has_rtgroups(mp))
+               return xfs_rtbitmap_blockcount_len(mp, mp->m_sb.sb_rextents);
+       return xfs_rtbitmap_blockcount_len(mp, mp->m_sb.sb_rgextents);
 }
 
 /*
@@ -1176,7 +1178,10 @@ xfs_rtsummary_blockcount(
 {
        unsigned long long      rsumwords;
 
-       *rsumlevels = xfs_compute_rextslog(mp->m_sb.sb_rextents) + 1;
+       if (xfs_has_rtgroups(mp))
+               *rsumlevels = xfs_compute_rextslog(mp->m_sb.sb_rgextents) + 1;
+       else
+               *rsumlevels = xfs_compute_rextslog(mp->m_sb.sb_rextents) + 1;
 
        rsumwords = xfs_rtbitmap_blockcount(mp) * (*rsumlevels);
        return XFS_B_TO_FSB(mp, rsumwords << XFS_WORDLOG);
index 92f52bd4875f1960da2626cf74cf509eec351ae3..0d8826862d3fb58ba8c15e9cc4283d0464b52b2d 100644 (file)
@@ -500,3 +500,84 @@ xfs_rtginode_load_parent(
        return xfs_metadir_load(tp, mp->m_metadirip, "rtgroups", S_IFDIR,
                        &mp->m_rtdirip);
 }
+
+/* Check superblock fields for a read or a write. */
+static xfs_failaddr_t
+xfs_rtsb_verify_common(
+       struct xfs_buf          *bp)
+{
+       struct xfs_rtsb         *rsb = bp->b_addr;
+
+       if (!xfs_verify_magic(bp, rsb->rsb_magicnum))
+               return __this_address;
+       if (rsb->rsb_pad)
+               return __this_address;
+
+       /* Everything to the end of the fs block must be zero */
+       if (memchr_inv(rsb + 1, 0, BBTOB(bp->b_length) - sizeof(*rsb)))
+               return __this_address;
+
+       return NULL;
+}
+
+/* Check superblock fields for a read or revalidation. */
+static inline xfs_failaddr_t
+xfs_rtsb_verify_all(
+       struct xfs_buf          *bp)
+{
+       struct xfs_rtsb         *rsb = bp->b_addr;
+       struct xfs_mount        *mp = bp->b_mount;
+       xfs_failaddr_t          fa;
+
+       fa = xfs_rtsb_verify_common(bp);
+       if (fa)
+               return fa;
+
+       if (memcmp(&rsb->rsb_fname, &mp->m_sb.sb_fname, XFSLABEL_MAX))
+               return __this_address;
+       if (!uuid_equal(&rsb->rsb_uuid, &mp->m_sb.sb_uuid))
+               return __this_address;
+       if (!uuid_equal(&rsb->rsb_meta_uuid, &mp->m_sb.sb_meta_uuid))
+               return  __this_address;
+
+       return NULL;
+}
+
+static void
+xfs_rtsb_read_verify(
+       struct xfs_buf          *bp)
+{
+       xfs_failaddr_t          fa;
+
+       if (!xfs_buf_verify_cksum(bp, XFS_RTSB_CRC_OFF)) {
+               xfs_verifier_error(bp, -EFSBADCRC, __this_address);
+               return;
+       }
+
+       fa = xfs_rtsb_verify_all(bp);
+       if (fa)
+               xfs_verifier_error(bp, -EFSCORRUPTED, fa);
+}
+
+static void
+xfs_rtsb_write_verify(
+       struct xfs_buf          *bp)
+{
+       xfs_failaddr_t          fa;
+
+       fa = xfs_rtsb_verify_common(bp);
+       if (fa) {
+               xfs_verifier_error(bp, -EFSCORRUPTED, fa);
+               return;
+       }
+
+       xfs_buf_update_cksum(bp, XFS_RTSB_CRC_OFF);
+}
+
+const struct xfs_buf_ops xfs_rtsb_buf_ops = {
+       .name           = "xfs_rtsb",
+       .magic          = { 0, cpu_to_be32(XFS_RTSB_MAGIC) },
+       .verify_read    = xfs_rtsb_read_verify,
+       .verify_write   = xfs_rtsb_write_verify,
+       .verify_struct  = xfs_rtsb_verify_all,
+};
index 153e9accbd874493c72a94e56a8259a507c82b33..44c4923020a3353b56f187ba89107d465af3318e 100644 (file)
@@ -179,6 +179,10 @@ xfs_sb_version_to_features(
                features |= XFS_FEAT_PARENT;
        if (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR)
                features |= XFS_FEAT_METADIR;
+       if (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_RTGROUPS)
+               features |= XFS_FEAT_RTGROUPS;
+       if (sbp->sb_features_ro_compat & XFS_SB_FEAT_RO_COMPAT_RTSB)
+               features |= XFS_FEAT_RTSB;
 
        return features;
 }
@@ -231,11 +235,21 @@ xfs_validate_sb_read(
        return 0;
 }
 
+/* Return the number of extents covered by a single rt bitmap file */
+static xfs_rtbxlen_t
+xfs_extents_per_rbm(
+       struct xfs_sb           *sbp)
+{
+       if (xfs_sb_version_hasrtgroups(sbp))
+               return sbp->sb_rgextents;
+       return sbp->sb_rextents;
+}
+
 static uint64_t
-xfs_sb_calc_rbmblocks(
+xfs_expected_rbmblocks(
        struct xfs_sb           *sbp)
 {
-       return howmany_64(sbp->sb_rextents, NBBY * sbp->sb_blocksize);
+       return howmany_64(xfs_extents_per_rbm(sbp), NBBY * sbp->sb_blocksize);
 }
 
 /* Validate the realtime geometry */
@@ -257,7 +271,7 @@ xfs_validate_rt_geometry(
        if (sbp->sb_rextents == 0 ||
            sbp->sb_rextents != div_u64(sbp->sb_rblocks, sbp->sb_rextsize) ||
            sbp->sb_rextslog != xfs_compute_rextslog(sbp->sb_rextents) ||
-           sbp->sb_rbmblocks != xfs_sb_calc_rbmblocks(sbp))
+           sbp->sb_rbmblocks != xfs_expected_rbmblocks(sbp))
                return false;
 
        return true;
@@ -338,6 +352,65 @@ xfs_validate_sb_write(
        return 0;
 }
 
+static int
+xfs_validate_sb_rtgroups(
+       struct xfs_mount        *mp,
+       struct xfs_sb           *sbp)
+{
+       uint64_t                groups;
+
+       if (!(sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR)) {
+               xfs_warn(mp,
+"Realtime groups require metadata directory tree.");
+               return -EINVAL;
+       }
+
+       if (sbp->sb_rextsize == 0) {
+               xfs_warn(mp,
+"Realtime extent size must not be zero.");
+               return -EINVAL;
+       }
+
+       if (sbp->sb_rgextents > XFS_MAX_RGBLOCKS / sbp->sb_rextsize) {
+               xfs_warn(mp,
+"Realtime group size (%u) must be less than %u rt extents.",
+                               sbp->sb_rgextents,
+                               XFS_MAX_RGBLOCKS / sbp->sb_rextsize);
+               return -EINVAL;
+       }
+
+       if (sbp->sb_rgextents < XFS_MIN_RGEXTENTS) {
+               xfs_warn(mp,
+"Realtime group size (%u) must be at least %u rt extents.",
+                               sbp->sb_rgextents, XFS_MIN_RGEXTENTS);
+               return -EINVAL;
+       }
+
+       if (sbp->sb_rgcount > XFS_MAX_RGNUMBER) {
+               xfs_warn(mp,
+"Realtime groups (%u) must be less than %u.",
+                               sbp->sb_rgcount, XFS_MAX_RGNUMBER);
+               return -EINVAL;
+       }
+
+       groups = howmany_64(sbp->sb_rextents, sbp->sb_rgextents);
+       if (groups != sbp->sb_rgcount) {
+               xfs_warn(mp,
+"Realtime groups (%u) do not cover the entire rt section; need (%llu) groups.",
+                               sbp->sb_rgcount, groups);
+               return -EINVAL;
+       }
+
+       /* Exchange-range is required for fsr to work on realtime files */
+       if (!(sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_EXCHRANGE)) {
+               xfs_warn(mp,
+"Realtime groups feature requires exchange-range support.");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
 /* Check the validity of the SB. */
 STATIC int
 xfs_validate_sb_common(
@@ -349,6 +422,7 @@ xfs_validate_sb_common(
        uint32_t                agcount = 0;
        uint32_t                rem;
        bool                    has_dalign;
+       int                     error;
 
        if (!xfs_verify_magic(bp, dsb->sb_magicnum)) {
                xfs_warn(mp,
@@ -398,6 +472,22 @@ xfs_validate_sb_common(
                                return -EINVAL;
                        }
                }
+
+               if (sbp->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_RTGROUPS) {
+                       error = xfs_validate_sb_rtgroups(mp, sbp);
+                       if (error)
+                               return error;
+               }
+
+               if (sbp->sb_features_ro_compat &
+                                       XFS_SB_FEAT_RO_COMPAT_RTSB) {
+                       if (!(sbp->sb_features_incompat &
+                                       XFS_SB_FEAT_INCOMPAT_RTGROUPS)) {
+                               xfs_warn(mp,
+"Realtime superblock feature requires realtime groups feature.");
+                               return -EINVAL;
+                       }
+               }
        } else if (sbp->sb_qflags & (XFS_PQUOTA_ENFD | XFS_GQUOTA_ENFD |
                                XFS_PQUOTA_CHKD | XFS_GQUOTA_CHKD)) {
                        xfs_notice(mp,
@@ -694,8 +784,13 @@ __xfs_sb_from_disk(
        else
                to->sb_metadirino = NULLFSINO;
 
-       to->sb_rgcount = 1;
-       to->sb_rgextents = 0;
+       if (to->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_RTGROUPS) {
+               to->sb_rgcount = be32_to_cpu(from->sb_rgcount);
+               to->sb_rgextents = be32_to_cpu(from->sb_rgextents);
+       } else {
+               to->sb_rgcount = 1;
+               to->sb_rgextents = 0;
+       }
 }
 
 void
@@ -846,6 +941,11 @@ xfs_sb_to_disk(
 
        if (from->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_METADIR)
                to->sb_metadirino = cpu_to_be64(from->sb_metadirino);
+
+       if (from->sb_features_incompat & XFS_SB_FEAT_INCOMPAT_RTGROUPS) {
+               to->sb_rgcount = cpu_to_be32(from->sb_rgcount);
+               to->sb_rgextents = cpu_to_be32(from->sb_rgextents);
+       }
 }
 
 /*
@@ -983,9 +1083,9 @@ 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 = 0;
-       mp->m_rgblklog = 0;
-       mp->m_rgblkmask = 0;
+       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);
 }
 
 /*
index 2f7413afbf46cdfafb93ea15daa7d3b9013a5275..0343926d2a6b4f9210b39e799cc25ddb55051be5 100644 (file)
@@ -39,6 +39,7 @@ extern const struct xfs_buf_ops xfs_inode_buf_ra_ops;
 extern const struct xfs_buf_ops xfs_refcountbt_buf_ops;
 extern const struct xfs_buf_ops xfs_rmapbt_buf_ops;
 extern const struct xfs_buf_ops xfs_rtbuf_ops;
+extern const struct xfs_buf_ops xfs_rtsb_buf_ops;
 extern const struct xfs_buf_ops xfs_sb_buf_ops;
 extern const struct xfs_buf_ops xfs_sb_quiet_buf_ops;
 extern const struct xfs_buf_ops xfs_symlink_buf_ops;