xfs: remove xarray mark for reclaimable zones

We can easily check if there are any reclaimble zones by just looking
at the used counters in the reclaim buckets, so do that to free up the
xarray mark we currently use for this purpose.

Signed-off-by: Hans Holmberg <hans.holmberg@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_rtgroup.h b/fs/xfs/libxfs/xfs_rtgroup.h
index a94e925ae67cb69bc3682b5f3ab91c91f53ac0d6..03f1e2493334f393a401a5d80fc807e437634e6f 100644 (file)
--- a/fs/xfs/libxfs/xfs_rtgroup.h
+++ b/fs/xfs/libxfs/xfs_rtgroup.h
@@ -64,12 +64,6 @@ struct xfs_rtgroup {
  */
 #define XFS_RTG_FREE                   XA_MARK_0
 
-/*
- * For zoned RT devices this is set on groups that are fully written and that
- * have unused blocks.  Used by the garbage collection to pick targets.
- */
-#define XFS_RTG_RECLAIMABLE            XA_MARK_1
-
 static inline struct xfs_rtgroup *to_rtg(struct xfs_group *xg)
 {
        return container_of(xg, struct xfs_rtgroup, rtg_group);

diff --git a/fs/xfs/xfs_zone_alloc.c b/fs/xfs/xfs_zone_alloc.c
index ef7a931ebde5a0276110ecc8e7acd66c2ded72ff..0a118376c57c362e354d6dfd5a12757da94a5e6a 100644 (file)
--- a/fs/xfs/xfs_zone_alloc.c
+++ b/fs/xfs/xfs_zone_alloc.c
@@ -103,9 +103,6 @@ xfs_zone_account_reclaimable(
                 */
                trace_xfs_zone_emptied(rtg);
 
-               if (!was_full)
-                       xfs_group_clear_mark(xg, XFS_RTG_RECLAIMABLE);
-
                spin_lock(&zi->zi_used_buckets_lock);
                if (!was_full)
                        xfs_zone_remove_from_bucket(zi, rgno, from_bucket);
@@ -127,7 +124,6 @@ xfs_zone_account_reclaimable(
                xfs_zone_add_to_bucket(zi, rgno, to_bucket);
                spin_unlock(&zi->zi_used_buckets_lock);
 
-               xfs_group_set_mark(xg, XFS_RTG_RECLAIMABLE);
                if (zi->zi_gc_thread && xfs_zoned_need_gc(mp))
                        wake_up_process(zi->zi_gc_thread);
        } else if (to_bucket != from_bucket) {
@@ -142,6 +138,28 @@ xfs_zone_account_reclaimable(
        }
 }
 
+/*
+ * Check if we have any zones that can be reclaimed by looking at the entry
+ * counters for the zone buckets.
+ */
+bool
+xfs_zoned_have_reclaimable(
+       struct xfs_zone_info    *zi)
+{
+       int i;
+
+       spin_lock(&zi->zi_used_buckets_lock);
+       for (i = 0; i < XFS_ZONE_USED_BUCKETS; i++) {
+               if (zi->zi_used_bucket_entries[i]) {
+                       spin_unlock(&zi->zi_used_buckets_lock);
+                       return true;
+               }
+       }
+       spin_unlock(&zi->zi_used_buckets_lock);
+
+       return false;
+}
+
 static void
 xfs_open_zone_mark_full(
        struct xfs_open_zone    *oz)

diff --git a/fs/xfs/xfs_zone_gc.c b/fs/xfs/xfs_zone_gc.c
index a98939aba7b9605318fa8ec2248fb54c9f43d430..d786162ada1c8542b07c2ca037d1e40481d70406 100644 (file)
--- a/fs/xfs/xfs_zone_gc.c
+++ b/fs/xfs/xfs_zone_gc.c
@@ -175,7 +175,7 @@ xfs_zoned_need_gc(
        s64                     available, free, threshold;
        s32                     remainder;
 
-       if (!xfs_group_marked(mp, XG_TYPE_RTG, XFS_RTG_RECLAIMABLE))
+       if (!xfs_zoned_have_reclaimable(mp->m_zone_info))
                return false;
 
        available = xfs_estimate_freecounter(mp, XC_FREE_RTAVAILABLE);

diff --git a/fs/xfs/xfs_zone_priv.h b/fs/xfs/xfs_zone_priv.h
index 4322e26dd99a1a9c6092c7c0a0605c109be62b53..ce7f0e2f459898afe8914ea189b5bf5c4faee067 100644 (file)
--- a/fs/xfs/xfs_zone_priv.h
+++ b/fs/xfs/xfs_zone_priv.h
@@ -113,6 +113,7 @@ struct xfs_open_zone *xfs_open_zone(struct xfs_mount *mp,
 
 int xfs_zone_gc_reset_sync(struct xfs_rtgroup *rtg);
 bool xfs_zoned_need_gc(struct xfs_mount *mp);
+bool xfs_zoned_have_reclaimable(struct xfs_zone_info *zi);
 int xfs_zone_gc_mount(struct xfs_mount *mp);
 void xfs_zone_gc_unmount(struct xfs_mount *mp);
 

diff --git a/fs/xfs/xfs_zone_space_resv.c b/fs/xfs/xfs_zone_space_resv.c
index 0e54e557a585e3b608bacfaf26417cd2ac4e26d1..fc1a4d1ce10c2f2067b20c8a5bc28c2210a52d92 100644 (file)
--- a/fs/xfs/xfs_zone_space_resv.c
+++ b/fs/xfs/xfs_zone_space_resv.c
@@ -172,7 +172,7 @@ xfs_zoned_reserve_available(
                 * processing a pending GC request give up as we're fully out
                 * of space.
                 */
-               if (!xfs_group_marked(mp, XG_TYPE_RTG, XFS_RTG_RECLAIMABLE) &&
+               if (!xfs_zoned_have_reclaimable(mp->m_zone_info) &&
                    !xfs_is_zonegc_running(mp))
                        break;