xfs: add metadata reservations for realtime rmap btrees

Reserve some free blocks so that we will always have enough free blocks
in the data volume to handle expansion of the realtime rmap btree.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_metafile.c b/fs/xfs/libxfs/xfs_metafile.c
index f3d3e7ade50931f9a5f7f3920b7eec34c739473f..45f194170ca99ed4982179c7a075a1d78ef7040e 100644 (file)
--- a/fs/xfs/libxfs/xfs_metafile.c
+++ b/fs/xfs/libxfs/xfs_metafile.c
@@ -204,7 +204,11 @@ void
 xfs_metafile_resv_free(
        struct xfs_inode        *ip)
 {
-       if (!ip)
+       /*
+        * We can end up here for the rt bitmap/summary inodes that don't have
+        * reservations.  Just exist early in that case.
+        */
+       if (!ip || !ip->i_delayed_blks)
                return;
 
        ASSERT(xfs_is_metadir_inode(ip));

diff --git a/fs/xfs/libxfs/xfs_rtrmap_btree.c b/fs/xfs/libxfs/xfs_rtrmap_btree.c
index 972fa1f96beac696ff122e31a1413dd12e178c6e..9481cc69a717218d310f722e8c59ca6f7dea3eb9 100644 (file)
--- a/fs/xfs/libxfs/xfs_rtrmap_btree.c
+++ b/fs/xfs/libxfs/xfs_rtrmap_btree.c
@@ -540,3 +540,44 @@ xfs_rtrmapbt_compute_maxlevels(
        /* Add one level to handle the inode root level. */
        mp->m_rtrmap_maxlevels = min(d_maxlevels, r_maxlevels) + 1;
 }
+
+/* Calculate the rtrmap btree size for some records. */
+static unsigned long long
+xfs_rtrmapbt_calc_size(
+       struct xfs_mount        *mp,
+       unsigned long long      len)
+{
+       return xfs_btree_calc_size(mp->m_rtrmap_mnr, len);
+}
+
+/*
+ * Calculate the maximum rmap btree size.
+ */
+static unsigned long long
+xfs_rtrmapbt_max_size(
+       struct xfs_mount        *mp,
+       xfs_rtblock_t           rtblocks)
+{
+       /* Bail out if we're uninitialized, which can happen in mkfs. */
+       if (mp->m_rtrmap_mxr[0] == 0)
+               return 0;
+
+       return xfs_rtrmapbt_calc_size(mp, rtblocks);
+}
+
+/*
+ * Figure out how many blocks to reserve and how many are used by this btree.
+ */
+xfs_filblks_t
+xfs_rtrmapbt_calc_reserves(
+       struct xfs_mount        *mp)
+{
+       uint32_t                blocks = mp->m_groups[XG_TYPE_RTG].blocks;
+
+       if (!xfs_has_rtrmapbt(mp))
+               return 0;
+
+       /* 1/64th (~1.5%) of the space, and enough for 1 record per block. */
+       return max_t(xfs_filblks_t, blocks >> 6,
+                       xfs_rtrmapbt_max_size(mp, blocks));
+}

diff --git a/fs/xfs/libxfs/xfs_rtrmap_btree.h b/fs/xfs/libxfs/xfs_rtrmap_btree.h
index 63aabae2e09db1eb6e733f2e3b3deec614e39e3e..ad5cb1078bc1a002e8d903f23484af9202b62869 100644 (file)
--- a/fs/xfs/libxfs/xfs_rtrmap_btree.h
+++ b/fs/xfs/libxfs/xfs_rtrmap_btree.h
@@ -79,4 +79,6 @@ unsigned int xfs_rtrmapbt_maxlevels_ondisk(void);
 int __init xfs_rtrmapbt_init_cur_cache(void);
 void xfs_rtrmapbt_destroy_cur_cache(void);
 
+xfs_filblks_t xfs_rtrmapbt_calc_reserves(struct xfs_mount *mp);
+
 #endif /* __XFS_RTRMAP_BTREE_H__ */

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 47f0f1bcbc5e145f5a6d6831e12ab2262df83a0d..0fa3f6f240a754b406e2c0e265c1819b8e1f2171 100644 (file)
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -22,6 +22,7 @@
 #include "xfs_rtalloc.h"
 #include "xfs_sb.h"
 #include "xfs_rtbitmap.h"
+#include "xfs_rtrmap_btree.h"
 #include "xfs_quota.h"
 #include "xfs_log_priv.h"
 #include "xfs_health.h"
@@ -1492,6 +1493,13 @@ void
 xfs_rt_resv_free(
        struct xfs_mount        *mp)
 {
+       struct xfs_rtgroup      *rtg = NULL;
+       unsigned int            i;
+
+       while ((rtg = xfs_rtgroup_next(mp, rtg))) {
+               for (i = 0; i < XFS_RTGI_MAX; i++)
+                       xfs_metafile_resv_free(rtg->rtg_inodes[i]);
+       }
 }
 
 /* Reserve space for rt metadata inodes' space expansion. */
@@ -1499,7 +1507,21 @@ int
 xfs_rt_resv_init(
        struct xfs_mount        *mp)
 {
-       return 0;
+       struct xfs_rtgroup      *rtg = NULL;
+       xfs_filblks_t           ask;
+       int                     error = 0;
+
+       while ((rtg = xfs_rtgroup_next(mp, rtg))) {
+               int             err2;
+
+               ask = xfs_rtrmapbt_calc_reserves(mp);
+               err2 = xfs_metafile_resv_init(rtg->rtg_inodes[XFS_RTGI_RMAP],
+                               ask);
+               if (err2 && !error)
+                       error = err2;
+       }
+
+       return error;
 }
 
 /*