[PATCH v2 11/15] bcachefs: Relax restrictions on the number of accounting counters

[Nikita Ofitserov via B4 Relay]

From: Nikita Ofitserov <himi...@gmail.com>

Make adding/removing accounting counters easier when upgrading by
removing their exact number from bch_accounting key validity invariants.

Signed-off-by: Nikita Ofitserov <himi...@gmail.com>
---
 fs/bcachefs/disk_accounting.c | 11 ++++++++---
 fs/bcachefs/disk_accounting.h |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/fs/bcachefs/disk_accounting.c b/fs/bcachefs/disk_accounting.c
index 
1649c0e1a89e8f4f04d122e40553b36f11491df5..7e3bcda30f3b027cb88886a633680f77efe0b9d0
 100644
--- a/fs/bcachefs/disk_accounting.c
+++ b/fs/bcachefs/disk_accounting.c
@@ -239,10 +239,12 @@ int bch2_accounting_validate(struct bch_fs *c, struct 
bkey_s_c k,
                         c, accounting_key_junk_at_end,
                         "junk at end of accounting key");
 
-       bkey_fsck_err_on(bch2_accounting_counters(k.k) != 
bch2_accounting_type_nr_counters[acc_k.type],
+       const unsigned nr_counters = bch2_accounting_counters(k.k);
+
+       bkey_fsck_err_on(!nr_counters || nr_counters > 
BCH_ACCOUNTING_MAX_COUNTERS,
                         c, accounting_key_nr_counters_wrong,
                         "accounting key with %u counters, should be %u",
-                        bch2_accounting_counters(k.k), 
bch2_accounting_type_nr_counters[acc_k.type]);
+                        nr_counters, 
bch2_accounting_type_nr_counters[acc_k.type]);
 fsck_err:
        return ret;
 }
@@ -359,10 +361,13 @@ static int __bch2_accounting_mem_insert(struct bch_fs *c, 
struct bkey_s_c_accoun
                            accounting_pos_cmp, &a.k->p) < acc->k.nr)
                return 0;
 
+       struct disk_accounting_pos acc_k;
+       bpos_to_disk_accounting_pos(&acc_k, a.k->p);
+
        struct accounting_mem_entry n = {
                .pos            = a.k->p,
                .bversion       = a.k->bversion,
-               .nr_counters    = bch2_accounting_counters(a.k),
+               .nr_counters    = bch2_accounting_type_nr_counters[acc_k.type],
                .v[0]           = __alloc_percpu_gfp(n.nr_counters * 
sizeof(u64),
                                                     sizeof(u64), GFP_KERNEL),
        };
diff --git a/fs/bcachefs/disk_accounting.h b/fs/bcachefs/disk_accounting.h
index 
c3f2dc5d0c14241f3c0ae2d367d6da504df2e1ab..c0d3d7e8fda6172eb04c8b0d9cd4cd879090e480
 100644
--- a/fs/bcachefs/disk_accounting.h
+++ b/fs/bcachefs/disk_accounting.h
@@ -216,9 +216,9 @@ static inline int bch2_accounting_mem_mod_locked(struct 
btree_trans *trans,
 
        struct accounting_mem_entry *e = &acc->k.data[idx];
 
-       EBUG_ON(bch2_accounting_counters(a.k) != e->nr_counters);
+       const unsigned nr = min_t(unsigned, bch2_accounting_counters(a.k), 
e->nr_counters);
 
-       for (unsigned i = 0; i < bch2_accounting_counters(a.k); i++)
+       for (unsigned i = 0; i < nr; i++)
                this_cpu_add(e->v[gc][i], a.v->d[i]);
        return 0;
 }

-- 
2.50.1