Update bcachefs sources to 8c94740b1bf8 bcachefs: Add missing vaidation for jset_entr...

[bcachefs-tools-debian] / libbcachefs / lru.c

diff --git a/libbcachefs/lru.c b/libbcachefs/lru.c
index 215a653322f3b49c58fa0a4a8c775c1785ff1aeb..5340f2d0eebaa70e047417fd98169ff4c8df2110 100644 (file)
--- a/libbcachefs/lru.c
+++ b/libbcachefs/lru.c
@@ -10,17 +10,17 @@
 #include "recovery.h"
 
 /* KEY_TYPE_lru is obsolete: */
-int bch2_lru_invalid(const struct bch_fs *c, struct bkey_s_c k,
+int bch2_lru_invalid(struct bch_fs *c, struct bkey_s_c k,
                     enum bkey_invalid_flags flags,
                     struct printbuf *err)
 {
-       if (!lru_pos_time(k.k->p)) {
-               prt_printf(err, "lru entry at time=0");
-               return -BCH_ERR_invalid_bkey;
-
-       }
+       int ret = 0;
 
-       return 0;
+       bkey_fsck_err_on(!lru_pos_time(k.k->p), c, err,
+                        lru_entry_at_time_0,
+                        "lru entry at time=0");
+fsck_err:
+       return ret;
 }
 
 void bch2_lru_to_text(struct printbuf *out, struct bch_fs *c,
@@ -40,8 +40,8 @@ void bch2_lru_pos_to_text(struct printbuf *out, struct bpos lru)
                   u64_to_bucket(lru.offset).offset);
 }
 
-static int __bch2_lru_set(struct btree_trans *trans, u16 lru_id,
-                         u64 dev_bucket, u64 time, bool set)
+static inline int __bch2_lru_set(struct btree_trans *trans, u16 lru_id,
+                                u64 dev_bucket, u64 time, bool set)
 {
        return time
                ? bch2_btree_bit_mod(trans, BTREE_ID_lru,
@@ -51,12 +51,12 @@ static int __bch2_lru_set(struct btree_trans *trans, u16 lru_id,
 
 int bch2_lru_del(struct btree_trans *trans, u16 lru_id, u64 dev_bucket, u64 time)
 {
-       return __bch2_lru_set(trans, lru_id, dev_bucket, time, KEY_TYPE_deleted);
+       return __bch2_lru_set(trans, lru_id, dev_bucket, time, false);
 }
 
 int bch2_lru_set(struct btree_trans *trans, u16 lru_id, u64 dev_bucket, u64 time)
 {
-       return __bch2_lru_set(trans, lru_id, dev_bucket, time, KEY_TYPE_set);
+       return __bch2_lru_set(trans, lru_id, dev_bucket, time, true);
 }
 
 int bch2_lru_change(struct btree_trans *trans,
@@ -66,8 +66,8 @@ int bch2_lru_change(struct btree_trans *trans,
        if (old_time == new_time)
                return 0;
 
-       return  bch2_lru_del(trans, lru_id, dev_bucket, old_time) ?:
-               bch2_lru_set(trans, lru_id, dev_bucket, new_time);
+       return  __bch2_lru_set(trans, lru_id, dev_bucket, old_time, false) ?:
+               __bch2_lru_set(trans, lru_id, dev_bucket, new_time, true);
 }
 
 static const char * const bch2_lru_types[] = {
@@ -77,10 +77,11 @@ static const char * const bch2_lru_types[] = {
        NULL
 };
 
-static int bch2_check_lru_key(struct btree_trans *trans,
-                             struct btree_iter *lru_iter,
-                             struct bkey_s_c lru_k,
-                             struct bpos *last_flushed_pos)
+/* Returns 1 if key has been deleted */
+int bch2_check_lru_key(struct btree_trans *trans,
+                      struct btree_iter *lru_iter,
+                      struct bkey_s_c lru_k,
+                      struct bpos *last_flushed_pos)
 {
        struct bch_fs *c = trans->c;
        struct btree_iter iter;
@@ -89,15 +90,15 @@ static int bch2_check_lru_key(struct btree_trans *trans,
        const struct bch_alloc_v4 *a;
        struct printbuf buf1 = PRINTBUF;
        struct printbuf buf2 = PRINTBUF;
-       enum bch_lru_type type = lru_type(lru_k);
        struct bpos alloc_pos = u64_to_bucket(lru_k.k->p.offset);
        u64 idx;
        int ret;
 
        if (fsck_err_on(!bch2_dev_bucket_exists(c, alloc_pos), c,
+                       lru_entry_to_invalid_bucket,
                        "lru key points to nonexistent device:bucket %llu:%llu",
                        alloc_pos.inode, alloc_pos.offset))
-               return bch2_btree_delete_at(trans, lru_iter, 0);
+               goto delete;
 
        k = bch2_bkey_get_iter(trans, &iter, BTREE_ID_alloc, alloc_pos, 0);
        ret = bkey_err(k);
@@ -106,6 +107,7 @@ static int bch2_check_lru_key(struct btree_trans *trans,
 
        a = bch2_alloc_to_v4(k, &a_convert);
 
+       enum bch_lru_type type = lru_type(lru_k);
        switch (type) {
        case BCH_LRU_read:
                idx = alloc_lru_idx_read(*a);
@@ -113,6 +115,9 @@ static int bch2_check_lru_key(struct btree_trans *trans,
        case BCH_LRU_fragmentation:
                idx = a->fragmentation_lru;
                break;
+       default:
+               /* unknown LRU type, don't check: */
+               goto out;
        }
 
        if (lru_k.k->type != KEY_TYPE_set ||
@@ -124,15 +129,18 @@ static int bch2_check_lru_key(struct btree_trans *trans,
                        goto out;
                }
 
-               if (c->opts.reconstruct_alloc ||
-                   fsck_err(c, "incorrect lru entry: lru %s time %llu\n"
+               if ((c->opts.reconstruct_alloc &&
+                    c->curr_recovery_pass <= BCH_RECOVERY_PASS_check_lrus) ||
+                   fsck_err(c, lru_entry_bad,
+                            "incorrect lru entry: lru %s time %llu\n"
                             "  %s\n"
-                            "  for %s",
+                            "for\n"
+                            "  %s",
                             bch2_lru_types[type],
                             lru_pos_time(lru_k.k->p),
                             (bch2_bkey_val_to_text(&buf1, c, lru_k), buf1.buf),
                             (bch2_bkey_val_to_text(&buf2, c, k), buf2.buf)))
-                       ret = bch2_btree_delete_at(trans, lru_iter, 0);
+                       goto delete;
        }
 out:
 err:
@@ -141,6 +149,14 @@ fsck_err:
        printbuf_exit(&buf2);
        printbuf_exit(&buf1);
        return ret;
+delete:
+       ret =   bch2_btree_delete_at(trans, lru_iter, 0) ?:
+               bch2_trans_commit(trans, NULL, NULL,
+                                 BCH_WATERMARK_btree|
+                                 BCH_TRANS_COMMIT_lazy_rw|
+                                 BCH_TRANS_COMMIT_no_enospc) ?:
+               1;
+       goto out;
 }
 
 int bch2_check_lrus(struct bch_fs *c)
@@ -148,15 +164,14 @@ int bch2_check_lrus(struct bch_fs *c)
        struct btree_iter iter;
        struct bkey_s_c k;
        struct bpos last_flushed_pos = POS_MIN;
-       int ret = 0;
 
-       ret = bch2_trans_run(c,
-               for_each_btree_key_commit(trans, iter,
-                               BTREE_ID_lru, POS_MIN, BTREE_ITER_PREFETCH, k,
-                               NULL, NULL, BTREE_INSERT_NOFAIL|BTREE_INSERT_LAZY_RW,
-                       bch2_check_lru_key(trans, &iter, k, &last_flushed_pos)));
-       if (ret)
-               bch_err_fn(c, ret);
-       return ret;
+       int ret = bch2_trans_run(c,
+               for_each_btree_key2(trans, iter,
+                               BTREE_ID_lru, POS_MIN, BTREE_ITER_PREFETCH, k, ({
+                       int ret2 = bch2_check_lru_key(trans, &iter, k, &last_flushed_pos);
 
+                       ret2 < 0 ? ret2 : 0;
+               })));
+       bch_err_fn(c, ret);
+       return ret;
 }