]> www.infradead.org Git - users/hch/xfs.git/commitdiff
xfs: wire up realtime refcount btree cursors
authorDarrick J. Wong <djwong@kernel.org>
Tue, 15 Oct 2024 19:40:22 +0000 (12:40 -0700)
committerDarrick J. Wong <djwong@kernel.org>
Tue, 5 Nov 2024 21:36:30 +0000 (13:36 -0800)
Wire up realtime refcount btree cursors wherever they're needed
throughout the code base.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
fs/xfs/libxfs/xfs_btree.h
fs/xfs/libxfs/xfs_refcount.c
fs/xfs/libxfs/xfs_rtgroup.c
fs/xfs/libxfs/xfs_rtgroup.h
fs/xfs/xfs_fsmap.c
fs/xfs/xfs_reflink.c

index 99624cd8bab933510c6b0ca5e1564c5131e028b6..e14ffd514b0ef4ca0e6bed2c559628b1427ec818 100644 (file)
@@ -297,7 +297,7 @@ struct xfs_btree_cur
                struct {
                        unsigned int    nr_ops;         /* # record updates */
                        unsigned int    shape_changes;  /* # of extent splits */
-               } bc_refc;      /* refcountbt */
+               } bc_refc;      /* refcountbt/rtrefcountbt */
        };
 
        /* Must be at the end of the struct! */
index 8007d15856252beb33917b0bee5cd316d11ac362..11bff098db2dbb008c8a267aaa026aa6e666c4f0 100644 (file)
@@ -27,6 +27,7 @@
 #include "xfs_refcount_item.h"
 #include "xfs_rtgroup.h"
 #include "xfs_rtalloc.h"
+#include "xfs_rtrefcount_btree.h"
 
 struct kmem_cache      *xfs_refcount_intent_cache;
 
@@ -1462,6 +1463,32 @@ xfs_refcount_finish_one(
        return error;
 }
 
+/*
+ * Set up a continuation a deferred rtrefcount operation by updating the
+ * intent.  Checks to make sure we're not going to run off the end of the
+ * rtgroup.
+ */
+static inline int
+xfs_rtrefcount_continue_op(
+       struct xfs_btree_cur            *cur,
+       struct xfs_refcount_intent      *ri,
+       xfs_agblock_t                   new_agbno)
+{
+       struct xfs_mount                *mp = cur->bc_mp;
+       struct xfs_rtgroup              *rtg = to_rtg(ri->ri_group);
+
+       if (XFS_IS_CORRUPT(mp, !xfs_verify_rgbext(rtg, new_agbno,
+                                       ri->ri_blockcount))) {
+               xfs_btree_mark_sick(cur);
+               return -EFSCORRUPTED;
+       }
+
+       ri->ri_startblock = xfs_rgbno_to_rtb(rtg, new_agbno);
+
+       ASSERT(xfs_verify_rtbext(mp, ri->ri_startblock, ri->ri_blockcount));
+       return 0;
+}
+
 /*
  * Process one of the deferred realtime refcount operations.  We pass back the
  * btree cursor to maintain our lock on the btree between calls.
@@ -1472,8 +1499,77 @@ xfs_rtrefcount_finish_one(
        struct xfs_refcount_intent      *ri,
        struct xfs_btree_cur            **pcur)
 {
-       ASSERT(0);
-       return -EFSCORRUPTED;
+       struct xfs_mount                *mp = tp->t_mountp;
+       struct xfs_rtgroup              *rtg = to_rtg(ri->ri_group);
+       struct xfs_btree_cur            *rcur = *pcur;
+       int                             error = 0;
+       xfs_rgblock_t                   bno;
+       unsigned long                   nr_ops = 0;
+       int                             shape_changes = 0;
+
+       bno = xfs_rtb_to_rgbno(mp, ri->ri_startblock);
+
+       trace_xfs_refcount_deferred(mp, ri);
+
+       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_REFCOUNT_FINISH_ONE))
+               return -EIO;
+
+       /*
+        * If we haven't gotten a cursor or the cursor AG doesn't match
+        * the startblock, get one now.
+        */
+       if (rcur != NULL && rcur->bc_group != ri->ri_group) {
+               nr_ops = rcur->bc_refc.nr_ops;
+               shape_changes = rcur->bc_refc.shape_changes;
+               xfs_btree_del_cursor(rcur, 0);
+               rcur = NULL;
+               *pcur = NULL;
+       }
+       if (rcur == NULL) {
+               xfs_rtgroup_lock(rtg, XFS_RTGLOCK_REFCOUNT);
+               xfs_rtgroup_trans_join(tp, rtg, XFS_RTGLOCK_REFCOUNT);
+               *pcur = rcur = xfs_rtrefcountbt_init_cursor(tp, rtg);
+
+               rcur->bc_refc.nr_ops = nr_ops;
+               rcur->bc_refc.shape_changes = shape_changes;
+       }
+
+       switch (ri->ri_type) {
+       case XFS_REFCOUNT_INCREASE:
+               error = xfs_refcount_adjust(rcur, &bno, &ri->ri_blockcount,
+                               XFS_REFCOUNT_ADJUST_INCREASE);
+               if (error)
+                       return error;
+               if (ri->ri_blockcount > 0)
+                       error = xfs_rtrefcount_continue_op(rcur, ri, bno);
+               break;
+       case XFS_REFCOUNT_DECREASE:
+               error = xfs_refcount_adjust(rcur, &bno, &ri->ri_blockcount,
+                               XFS_REFCOUNT_ADJUST_DECREASE);
+               if (error)
+                       return error;
+               if (ri->ri_blockcount > 0)
+                       error = xfs_rtrefcount_continue_op(rcur, ri, bno);
+               break;
+       case XFS_REFCOUNT_ALLOC_COW:
+               error = __xfs_refcount_cow_alloc(rcur, bno, ri->ri_blockcount);
+               if (error)
+                       return error;
+               ri->ri_blockcount = 0;
+               break;
+       case XFS_REFCOUNT_FREE_COW:
+               error = __xfs_refcount_cow_free(rcur, bno, ri->ri_blockcount);
+               if (error)
+                       return error;
+               ri->ri_blockcount = 0;
+               break;
+       default:
+               ASSERT(0);
+               return -EFSCORRUPTED;
+       }
+       if (!error && ri->ri_blockcount > 0)
+               trace_xfs_refcount_finish_one_leftover(mp, ri);
+       return error;
 }
 
 /*
index 8f523209c1eeadde74134eb5ee03af7a964ef475..fce34851e0e29c76b0196d3ae4db520bfde0d7d5 100644 (file)
@@ -207,6 +207,10 @@ xfs_rtgroup_lock(
        if ((rtglock_flags & XFS_RTGLOCK_RMAP) &&
            rtg->rtg_inodes[XFS_RTGI_RMAP] != NULL)
                xfs_ilock(rtg->rtg_inodes[XFS_RTGI_RMAP], XFS_ILOCK_EXCL);
+
+       if ((rtglock_flags & XFS_RTGLOCK_REFCOUNT) &&
+           rtg->rtg_inodes[XFS_RTGI_REFCOUNT] != NULL)
+               xfs_ilock(rtg->rtg_inodes[XFS_RTGI_REFCOUNT], XFS_ILOCK_EXCL);
 }
 
 /* Unlock metadata inodes associated with this rt group. */
@@ -219,6 +223,10 @@ xfs_rtgroup_unlock(
        ASSERT(!(rtglock_flags & XFS_RTGLOCK_BITMAP_SHARED) ||
               !(rtglock_flags & XFS_RTGLOCK_BITMAP));
 
+       if ((rtglock_flags & XFS_RTGLOCK_REFCOUNT) &&
+                       rtg->rtg_inodes[XFS_RTGI_REFCOUNT])
+               xfs_iunlock(rtg->rtg_inodes[XFS_RTGI_REFCOUNT], XFS_ILOCK_EXCL);
+
        if ((rtglock_flags & XFS_RTGLOCK_RMAP) && rtg->rtg_inodes[XFS_RTGI_RMAP])
                xfs_iunlock(rtg->rtg_inodes[XFS_RTGI_RMAP], XFS_ILOCK_EXCL);
 
@@ -254,6 +262,11 @@ xfs_rtgroup_trans_join(
            rtg->rtg_inodes[XFS_RTGI_RMAP] != NULL)
                xfs_trans_ijoin(tp, rtg->rtg_inodes[XFS_RTGI_RMAP],
                                XFS_ILOCK_EXCL);
+
+       if ((rtglock_flags & XFS_RTGLOCK_REFCOUNT) &&
+           rtg->rtg_inodes[XFS_RTGI_REFCOUNT] != NULL)
+               xfs_trans_ijoin(tp, rtg->rtg_inodes[XFS_RTGI_REFCOUNT],
+                               XFS_ILOCK_EXCL);
 }
 
 /* Retrieve rt group geometry. */
index 40cea572c504162c20fd32829aa7c92281be87c0..06f93b97d396c43b269c4fa520acf0aadf490cab 100644 (file)
@@ -253,10 +253,13 @@ int xfs_update_last_rtgroup_size(struct xfs_mount *mp,
 #define XFS_RTGLOCK_BITMAP_SHARED      (1U << 1)
 /* Lock the rt rmap inode in exclusive mode */
 #define XFS_RTGLOCK_RMAP               (1U << 2)
+/* Lock the rt refcount inode in exclusive mode */
+#define XFS_RTGLOCK_REFCOUNT           (1U << 3)
 
 #define XFS_RTGLOCK_ALL_FLAGS  (XFS_RTGLOCK_BITMAP | \
                                 XFS_RTGLOCK_BITMAP_SHARED | \
-                                XFS_RTGLOCK_RMAP)
+                                XFS_RTGLOCK_RMAP | \
+                                XFS_RTGLOCK_REFCOUNT)
 
 void xfs_rtgroup_lock(struct xfs_rtgroup *rtg, unsigned int rtglock_flags);
 void xfs_rtgroup_unlock(struct xfs_rtgroup *rtg, unsigned int rtglock_flags);
index 23fa1aa02e061870c4f597d39893874818de25b7..f6d20da34aba1d6bc97b87bfda059bcd2bb17c0a 100644 (file)
@@ -27,6 +27,7 @@
 #include "xfs_ag.h"
 #include "xfs_rtgroup.h"
 #include "xfs_rtrmap_btree.h"
+#include "xfs_rtrefcount_btree.h"
 
 /* Convert an xfs_fsmap to an fsmap. */
 static void
@@ -211,21 +212,20 @@ xfs_getfsmap_is_shared(
        struct xfs_mount                *mp = tp->t_mountp;
        struct xfs_btree_cur            *cur;
        xfs_agblock_t                   fbno;
-       xfs_extlen_t                    flen;
+       xfs_extlen_t                    flen = 0;
        int                             error;
 
        *stat = false;
-       if (!xfs_has_reflink(mp))
-               return 0;
-       /* rt files will have no perag structure */
-       if (!info->group)
+       if (!xfs_has_reflink(mp) || !info->group)
                return 0;
 
-       /* Are there any shared blocks here? */
-       flen = 0;
-       cur = xfs_refcountbt_init_cursor(mp, tp, info->agf_bp,
-                       to_perag(info->group));
+       if (info->group->xg_type == XG_TYPE_RTG)
+               cur = xfs_rtrefcountbt_init_cursor(tp, to_rtg(info->group));
+       else
+               cur = xfs_refcountbt_init_cursor(mp, tp, info->agf_bp,
+                               to_perag(info->group));
 
+       /* Are there any shared blocks here? */
        error = xfs_refcount_find_shared(cur, frec->rec_key,
                        XFS_BB_TO_FSBT(mp, frec->len_daddr), &fbno, &flen,
                        false);
@@ -868,7 +868,7 @@ xfs_getfsmap_rtdev_rmapbt_query(
                                info);
 
        /* Query the rtrmapbt */
-       xfs_rtgroup_lock(rtg, XFS_RTGLOCK_RMAP);
+       xfs_rtgroup_lock(rtg, XFS_RTGLOCK_RMAP | XFS_RTGLOCK_REFCOUNT);
        *curpp = xfs_rtrmapbt_init_cursor(tp, rtg);
        return xfs_rmap_query_range(*curpp, &info->low, &info->high,
                        xfs_getfsmap_rtdev_rmapbt_helper, info);
@@ -955,7 +955,8 @@ xfs_getfsmap_rtdev_rmapbt(
 
                if (bt_cur) {
                        xfs_rtgroup_unlock(to_rtg(bt_cur->bc_group),
-                                       XFS_RTGLOCK_RMAP);
+                                       XFS_RTGLOCK_RMAP |
+                                       XFS_RTGLOCK_REFCOUNT);
                        xfs_btree_del_cursor(bt_cur, XFS_BTREE_NOERROR);
                        bt_cur = NULL;
                }
@@ -993,7 +994,7 @@ xfs_getfsmap_rtdev_rmapbt(
 
        if (bt_cur) {
                xfs_rtgroup_unlock(to_rtg(bt_cur->bc_group),
-                               XFS_RTGLOCK_RMAP);
+                               XFS_RTGLOCK_RMAP | XFS_RTGLOCK_REFCOUNT);
                xfs_btree_del_cursor(bt_cur, error < 0 ? XFS_BTREE_ERROR :
                                                         XFS_BTREE_NOERROR);
        }
index 71b4743ffb7741316bfdb1ab33cb4c964f532d18..66ce29101462cde0399b30dbc73657b73e7c49d9 100644 (file)
@@ -30,6 +30,9 @@
 #include "xfs_ag.h"
 #include "xfs_ag_resv.h"
 #include "xfs_health.h"
+#include "xfs_rtrefcount_btree.h"
+#include "xfs_rtalloc.h"
+#include "xfs_rtgroup.h"
 
 /*
  * Copy on Write of Shared Blocks
@@ -163,6 +166,53 @@ out:
        return error;
 }
 
+/*
+ * Given a file mapping for the rt device, find the lowest-numbered run of
+ * shared blocks within that mapping and return it in shared_offset/shared_len.
+ * The offset is relative to the start of irec.
+ *
+ * If find_end_of_shared is true, return the longest contiguous extent of shared
+ * blocks.  If there are no shared extents, shared_offset and shared_len will be
+ * set to 0;
+ */
+static int
+xfs_reflink_find_rtshared(
+       struct xfs_mount        *mp,
+       struct xfs_trans        *tp,
+       const struct xfs_bmbt_irec *irec,
+       xfs_extlen_t            *shared_offset,
+       xfs_extlen_t            *shared_len,
+       bool                    find_end_of_shared)
+{
+       struct xfs_rtgroup      *rtg;
+       struct xfs_btree_cur    *cur;
+       xfs_rgblock_t           orig_bno;
+       xfs_agblock_t           found_bno;
+       int                     error;
+
+       BUILD_BUG_ON(NULLRGBLOCK != NULLAGBLOCK);
+
+       /*
+        * Note: this uses the not quite correct xfs_agblock_t type because
+        * xfs_refcount_find_shared is shared between the RT and data device
+        * refcount code.
+        */
+       orig_bno = xfs_rtb_to_rgbno(mp, irec->br_startblock);
+       rtg = xfs_rtgroup_get(mp, xfs_rtb_to_rgno(mp, irec->br_startblock));
+
+       xfs_rtgroup_lock(rtg, XFS_RTGLOCK_REFCOUNT);
+       cur = xfs_rtrefcountbt_init_cursor(tp, rtg);
+       error = xfs_refcount_find_shared(cur, orig_bno, irec->br_blockcount,
+                       &found_bno, shared_len, find_end_of_shared);
+       xfs_btree_del_cursor(cur, error);
+       xfs_rtgroup_unlock(rtg, XFS_RTGLOCK_REFCOUNT);
+       xfs_rtgroup_put(rtg);
+
+       if (!error && *shared_len)
+               *shared_offset = found_bno - orig_bno;
+       return error;
+}
+
 /*
  * Trim the mapping to the next block where there's a change in the
  * shared/unshared status.  More specifically, this means that we
@@ -191,8 +241,12 @@ xfs_reflink_trim_around_shared(
 
        trace_xfs_reflink_trim_around_shared(ip, irec);
 
-       error = xfs_reflink_find_shared(mp, NULL, irec, &shared_offset,
-                       &shared_len, true);
+       if (XFS_IS_REALTIME_INODE(ip))
+               error = xfs_reflink_find_rtshared(mp, NULL, irec,
+                               &shared_offset, &shared_len, true);
+       else
+               error = xfs_reflink_find_shared(mp, NULL, irec,
+                               &shared_offset, &shared_len, true);
        if (error)
                return error;
 
@@ -1554,8 +1608,12 @@ xfs_reflink_inode_has_shared_extents(
                    got.br_state != XFS_EXT_NORM)
                        goto next;
 
-               error = xfs_reflink_find_shared(mp, tp, &got, &shared_offset,
-                               &shared_len, false);
+               if (XFS_IS_REALTIME_INODE(ip))
+                       error = xfs_reflink_find_rtshared(mp, tp, &got,
+                                       &shared_offset, &shared_len, false);
+               else
+                       error = xfs_reflink_find_shared(mp, tp, &got,
+                                       &shared_offset, &shared_len, false);
                if (error)
                        return error;