bcachefs: Switch gc bucket array to a genradix

A user with a 30 tb device is overflowing the INT_MAX limit on vmalloc
allocations...

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
index a4773b034f912019c75a62032e5145b72a9dede6..ad4df0ad26eb957e4f1a02bd8123d98fa9f9c804 100644 (file)
--- a/fs/bcachefs/bcachefs.h
+++ b/fs/bcachefs/bcachefs.h
@@ -542,7 +542,7 @@ struct bch_dev {
         * gc_gens_lock, for device resize - holding any is sufficient for
         * access: Or rcu_read_lock(), but only for dev_ptr_stale():
         */
-       struct bucket_array __rcu *buckets_gc;
+       GENRADIX(struct bucket) buckets_gc;
        struct bucket_gens __rcu *bucket_gens;
        u8                      *oldest_gen;
        unsigned long           *buckets_nouse;

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index eb3002c4eae7b1615c8a16b17b60e119fca7a8c1..120ffd68ab0afeb8c08ffc0affe8c06f076f32f5 100644 (file)
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -753,10 +753,8 @@ static void bch2_gc_free(struct bch_fs *c)
        genradix_free(&c->reflink_gc_table);
        genradix_free(&c->gc_stripes);
 
-       for_each_member_device(c, ca) {
-               kvfree(rcu_dereference_protected(ca->buckets_gc, 1));
-               ca->buckets_gc = NULL;
-       }
+       for_each_member_device(c, ca)
+               genradix_free(&ca->buckets_gc);
 }
 
 static int bch2_gc_start(struct bch_fs *c)
@@ -910,20 +908,12 @@ static int bch2_gc_alloc_start(struct bch_fs *c)
        int ret = 0;
 
        for_each_member_device(c, ca) {
-               struct bucket_array *buckets = kvmalloc(sizeof(struct bucket_array) +
-                               ca->mi.nbuckets * sizeof(struct bucket),
-                               GFP_KERNEL|__GFP_ZERO);
-               if (!buckets) {
+               ret = genradix_prealloc(&ca->buckets_gc, ca->mi.nbuckets, GFP_KERNEL);
+               if (ret) {
                        bch2_dev_put(ca);
                        ret = -BCH_ERR_ENOMEM_gc_alloc_start;
                        break;
                }
-
-               buckets->first_bucket   = ca->mi.first_bucket;
-               buckets->nbuckets       = ca->mi.nbuckets;
-               buckets->nbuckets_minus_first =
-                       buckets->nbuckets - buckets->first_bucket;
-               rcu_assign_pointer(ca->buckets_gc, buckets);
        }
 
        bch_err_fn(c, ret);

diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index edbdffd508fc3b0f1c78a47b33d554b043bc3ce7..e2cb7b24b220634b711116518aee06cc85bbd497 100644 (file)
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -80,22 +80,9 @@ static inline void bucket_lock(struct bucket *b)
                         TASK_UNINTERRUPTIBLE);
 }
 
-static inline struct bucket_array *gc_bucket_array(struct bch_dev *ca)
-{
-       return rcu_dereference_check(ca->buckets_gc,
-                                    !ca->fs ||
-                                    percpu_rwsem_is_held(&ca->fs->mark_lock) ||
-                                    lockdep_is_held(&ca->fs->state_lock) ||
-                                    lockdep_is_held(&ca->bucket_lock));
-}
-
 static inline struct bucket *gc_bucket(struct bch_dev *ca, size_t b)
 {
-       struct bucket_array *buckets = gc_bucket_array(ca);
-
-       if (b - buckets->first_bucket >= buckets->nbuckets_minus_first)
-               return NULL;
-       return buckets->b + b;
+       return genradix_ptr(&ca->buckets_gc, b);
 }
 
 static inline struct bucket_gens *bucket_gens(struct bch_dev *ca)

diff --git a/fs/bcachefs/buckets_types.h b/fs/bcachefs/buckets_types.h
index a19460a1bb7c8584f2df686b595e116ad5e693ce..28bd09a253c83e6bc1e5ac0c73550c3bc2414e8d 100644 (file)
--- a/fs/bcachefs/buckets_types.h
+++ b/fs/bcachefs/buckets_types.h
@@ -19,14 +19,6 @@ struct bucket {
        u32                     stripe_sectors;
 } __aligned(sizeof(long));
 
-struct bucket_array {
-       struct rcu_head         rcu;
-       u16                     first_bucket;
-       size_t                  nbuckets;
-       size_t                  nbuckets_minus_first;
-       struct bucket           b[] __counted_by(nbuckets);
-};
-
 struct bucket_gens {
        struct rcu_head         rcu;
        u16                     first_bucket;