[PATCH 12/12] bcachefs: Fix online hidden (sb+journal) data accounting

[Nikita Ofitserov via B4 Relay]

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

Now the c->usage->hidden counters are kept up to date by the same
trigger-based mechanism as the other ones.

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

diff --git a/fs/bcachefs/disk_accounting.c b/fs/bcachefs/disk_accounting.c
index 
53080f4449737ff384d56a3a150b376dadbfdc73..ea375b8bcebc33917eeaf754934815581232a97e
 100644
--- a/fs/bcachefs/disk_accounting.c
+++ b/fs/bcachefs/disk_accounting.c
@@ -1064,13 +1064,17 @@ void bch2_verify_accounting_clean(struct bch_fs *c)
                case BCH_DISK_ACCOUNTING_dev_data_type: {
                        {
                                guard(rcu)(); /* scoped guard is a loop, and 
doesn't play nicely with continue */
+                               const enum bch_data_type data_type = 
acc_k.dev_data_type.data_type;
                                struct bch_dev *ca = bch2_dev_rcu_noerror(c, 
acc_k.dev_data_type.dev);
                                if (!ca)
                                        continue;
 
-                               v[0] = 
percpu_u64_get(&ca->usage->d[acc_k.dev_data_type.data_type].buckets);
-                               v[1] = 
percpu_u64_get(&ca->usage->d[acc_k.dev_data_type.data_type].sectors);
-                               v[2] = 
percpu_u64_get(&ca->usage->d[acc_k.dev_data_type.data_type].fragmented);
+                               v[0] = 
percpu_u64_get(&ca->usage->d[data_type].buckets);
+                               v[1] = 
percpu_u64_get(&ca->usage->d[data_type].sectors);
+                               v[2] = 
percpu_u64_get(&ca->usage->d[data_type].fragmented);
+
+                               if (data_type == BCH_DATA_sb || data_type == 
BCH_DATA_journal)
+                                       base.hidden += a.v->d[0] * 
ca->mi.bucket_size;
                        }
 
                        if (memcmp(a.v->d, v, 3 * sizeof(u64))) {
@@ -1098,7 +1102,7 @@ void bch2_verify_accounting_clean(struct bch_fs *c)
                mismatch = true;                                                
                \
        }
 
-       //check(hidden);
+       check(hidden);
        check(btree);
        check(data);
        check(cached);
diff --git a/fs/bcachefs/disk_accounting.h b/fs/bcachefs/disk_accounting.h
index 
9e46aaf74704eaf51a643c3e746a440abd175b9e..9fcfc6a6e36958a27b312dad9de29455a6ee8f87
 100644
--- a/fs/bcachefs/disk_accounting.h
+++ b/fs/bcachefs/disk_accounting.h
@@ -186,11 +186,15 @@ static inline int bch2_accounting_mem_mod_locked(struct 
btree_trans *trans,
                        break;
                case BCH_DISK_ACCOUNTING_dev_data_type: {
                        guard(rcu)();
+                       const enum bch_data_type data_type = 
acc_k.dev_data_type.data_type;
                        struct bch_dev *ca = bch2_dev_rcu_noerror(c, 
acc_k.dev_data_type.dev);
                        if (ca) {
-                               
this_cpu_add(ca->usage->d[acc_k.dev_data_type.data_type].buckets, a.v->d[0]);
-                               
this_cpu_add(ca->usage->d[acc_k.dev_data_type.data_type].sectors, a.v->d[1]);
-                               
this_cpu_add(ca->usage->d[acc_k.dev_data_type.data_type].fragmented, a.v->d[2]);
+                               this_cpu_add(ca->usage->d[data_type].buckets, 
a.v->d[0]);
+                               this_cpu_add(ca->usage->d[data_type].sectors, 
a.v->d[1]);
+                               
this_cpu_add(ca->usage->d[data_type].fragmented, a.v->d[2]);
+
+                               if (data_type == BCH_DATA_sb || data_type == 
BCH_DATA_journal)
+                                       trans->fs_usage_delta.hidden += 
a.v->d[0] * ca->mi.bucket_size;
                        }
                        break;
                }

-- 
2.50.1