]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/journal_io.c
Update bcachefs sources to 6f603b8d79 bcachefs: some improvements to startup messages...
[bcachefs-tools-debian] / libbcachefs / journal_io.c
index a7791518c35bd25e9087cc9cd029bbb36bde24a8..56950049e8929c7e9ff66b01e776323f1b61e69d 100644 (file)
@@ -1,15 +1,11 @@
 #include "bcachefs.h"
-#include "alloc_background.h"
 #include "alloc_foreground.h"
-#include "btree_gc.h"
-#include "btree_update.h"
 #include "buckets.h"
 #include "checksum.h"
 #include "error.h"
 #include "journal.h"
 #include "journal_io.h"
 #include "journal_reclaim.h"
-#include "journal_seq_blacklist.h"
 #include "replicas.h"
 
 #include <trace/events/bcachefs.h>
@@ -643,57 +639,11 @@ err:
        goto out;
 }
 
-void bch2_journal_entries_free(struct list_head *list)
-{
-
-       while (!list_empty(list)) {
-               struct journal_replay *i =
-                       list_first_entry(list, struct journal_replay, list);
-               list_del(&i->list);
-               kvpfree(i, offsetof(struct journal_replay, j) +
-                       vstruct_bytes(&i->j));
-       }
-}
-
-int bch2_journal_set_seq(struct bch_fs *c, u64 last_seq, u64 end_seq)
-{
-       struct journal *j = &c->journal;
-       struct journal_entry_pin_list *p;
-       u64 seq, nr = end_seq - last_seq + 1;
-
-       if (nr > j->pin.size) {
-               free_fifo(&j->pin);
-               init_fifo(&j->pin, roundup_pow_of_two(nr), GFP_KERNEL);
-               if (!j->pin.data) {
-                       bch_err(c, "error reallocating journal fifo (%llu open entries)", nr);
-                       return -ENOMEM;
-               }
-       }
-
-       atomic64_set(&j->seq, end_seq);
-       j->last_seq_ondisk = last_seq;
-
-       j->pin.front    = last_seq;
-       j->pin.back     = end_seq + 1;
-
-       fifo_for_each_entry_ptr(p, &j->pin, seq) {
-               INIT_LIST_HEAD(&p->list);
-               INIT_LIST_HEAD(&p->flushed);
-               atomic_set(&p->count, 0);
-               p->devs.nr = 0;
-       }
-
-       return 0;
-}
-
 int bch2_journal_read(struct bch_fs *c, struct list_head *list)
 {
-       struct journal *j = &c->journal;
        struct journal_list jlist;
        struct journal_replay *i;
-       struct journal_entry_pin_list *p;
        struct bch_dev *ca;
-       u64 cur_seq, end_seq;
        unsigned iter;
        size_t keys = 0, entries = 0;
        bool degraded = false;
@@ -725,17 +675,12 @@ int bch2_journal_read(struct bch_fs *c, struct list_head *list)
        if (jlist.ret)
                return jlist.ret;
 
-       if (list_empty(list)){
-               bch_err(c, "no journal entries found");
-               return BCH_FSCK_REPAIR_IMPOSSIBLE;
-       }
-
        list_for_each_entry(i, list, list) {
+               struct jset_entry *entry;
+               struct bkey_i *k, *_n;
                struct bch_replicas_padded replicas;
                char buf[80];
 
-               bch2_devlist_to_replicas(&replicas.e, BCH_DATA_JOURNAL, i->devs);
-
                ret = jset_validate_entries(c, &i->j, READ);
                if (ret)
                        goto fsck_err;
@@ -745,6 +690,8 @@ int bch2_journal_read(struct bch_fs *c, struct list_head *list)
                 * the devices - this is wrong:
                 */
 
+               bch2_devlist_to_replicas(&replicas.e, BCH_DATA_JOURNAL, i->devs);
+
                if (!degraded &&
                    (test_bit(BCH_FS_REBUILD_REPLICAS, &c->flags) ||
                     fsck_err_on(!bch2_replicas_marked(c, &replicas.e, false), c,
@@ -755,178 +702,19 @@ int bch2_journal_read(struct bch_fs *c, struct list_head *list)
                        if (ret)
                                return ret;
                }
-       }
-
-       i = list_last_entry(list, struct journal_replay, list);
-
-       ret = bch2_journal_set_seq(c,
-                                  le64_to_cpu(i->j.last_seq),
-                                  le64_to_cpu(i->j.seq));
-       if (ret)
-               return ret;
-
-       mutex_lock(&j->blacklist_lock);
-
-       list_for_each_entry(i, list, list) {
-               p = journal_seq_pin(j, le64_to_cpu(i->j.seq));
-
-               atomic_set(&p->count, 1);
-               p->devs = i->devs;
-
-               if (bch2_journal_seq_blacklist_read(j, i)) {
-                       mutex_unlock(&j->blacklist_lock);
-                       return -ENOMEM;
-               }
-       }
-
-       mutex_unlock(&j->blacklist_lock);
-
-       cur_seq = journal_last_seq(j);
-       end_seq = le64_to_cpu(list_last_entry(list,
-                               struct journal_replay, list)->j.seq);
-
-       list_for_each_entry(i, list, list) {
-               struct jset_entry *entry;
-               struct bkey_i *k, *_n;
-               bool blacklisted;
-
-               mutex_lock(&j->blacklist_lock);
-               while (cur_seq < le64_to_cpu(i->j.seq) &&
-                      bch2_journal_seq_blacklist_find(j, cur_seq))
-                       cur_seq++;
-
-               blacklisted = bch2_journal_seq_blacklist_find(j,
-                                                        le64_to_cpu(i->j.seq));
-               mutex_unlock(&j->blacklist_lock);
-
-               fsck_err_on(blacklisted, c,
-                           "found blacklisted journal entry %llu",
-                           le64_to_cpu(i->j.seq));
-
-               fsck_err_on(le64_to_cpu(i->j.seq) != cur_seq, c,
-                       "journal entries %llu-%llu missing! (replaying %llu-%llu)",
-                       cur_seq, le64_to_cpu(i->j.seq) - 1,
-                       journal_last_seq(j), end_seq);
-
-               cur_seq = le64_to_cpu(i->j.seq) + 1;
 
                for_each_jset_key(k, _n, entry, &i->j)
                        keys++;
                entries++;
        }
 
-       bch_info(c, "journal read done, %zu keys in %zu entries, seq %llu",
-                keys, entries, journal_cur_seq(j));
-fsck_err:
-       return ret;
-}
-
-/* journal replay: */
-
-static int bch2_extent_replay_key(struct bch_fs *c, struct bkey_i *k)
-{
-       /*
-        * We might cause compressed extents to be
-        * split, so we need to pass in a
-        * disk_reservation:
-        */
-       struct disk_reservation disk_res =
-               bch2_disk_reservation_init(c, 0);
-       BKEY_PADDED(k) split;
-       struct btree_iter iter;
-       int ret;
-
-       bch2_btree_iter_init(&iter, c, BTREE_ID_EXTENTS,
-                            bkey_start_pos(&k->k),
-                            BTREE_ITER_INTENT);
-       do {
-               ret = bch2_btree_iter_traverse(&iter);
-               if (ret)
-                       break;
-
-               bkey_copy(&split.k, k);
-               bch2_cut_front(iter.pos, &split.k);
-               bch2_extent_trim_atomic(&split.k, &iter);
-
-               ret = bch2_disk_reservation_add(c, &disk_res,
-                               split.k.k.size *
-                               bch2_bkey_nr_dirty_ptrs(bkey_i_to_s_c(&split.k)),
-                               BCH_DISK_RESERVATION_NOFAIL);
-               BUG_ON(ret);
-
-               ret = bch2_btree_insert_at(c, &disk_res, NULL,
-                                          BTREE_INSERT_ATOMIC|
-                                          BTREE_INSERT_NOFAIL|
-                                          BTREE_INSERT_JOURNAL_REPLAY,
-                                          BTREE_INSERT_ENTRY(&iter, &split.k));
-       } while ((!ret || ret == -EINTR) &&
-                bkey_cmp(k->k.p, iter.pos));
-
-       bch2_disk_reservation_put(c, &disk_res);
+       if (!list_empty(list)) {
+               i = list_last_entry(list, struct journal_replay, list);
 
-       /*
-        * This isn't strictly correct - we should only be relying on the btree
-        * node lock for synchronization with gc when we've got a write lock
-        * held.
-        *
-        * but - there are other correctness issues if btree gc were to run
-        * before journal replay finishes
-        */
-       bch2_mark_key(c, bkey_i_to_s_c(k), false, -((s64) k->k.size),
-                     gc_pos_btree_node(iter.l[0].b),
-                     NULL, 0, 0);
-       bch2_btree_iter_unlock(&iter);
-
-       return ret;
-}
-
-int bch2_journal_replay(struct bch_fs *c, struct list_head *list)
-{
-       struct journal *j = &c->journal;
-       struct bkey_i *k, *_n;
-       struct jset_entry *entry;
-       struct journal_replay *i, *n;
-       int ret = 0;
-
-       list_for_each_entry_safe(i, n, list, list) {
-               j->replay_journal_seq = le64_to_cpu(i->j.seq);
-
-               for_each_jset_key(k, _n, entry, &i->j) {
-                       switch (entry->btree_id) {
-                       case BTREE_ID_ALLOC:
-                               ret = bch2_alloc_replay_key(c, k);
-                               break;
-                       case BTREE_ID_EXTENTS:
-                               ret = bch2_extent_replay_key(c, k);
-                               break;
-                       default:
-                               ret = bch2_btree_insert(c, entry->btree_id, k,
-                                               NULL, NULL,
-                                               BTREE_INSERT_NOFAIL|
-                                               BTREE_INSERT_JOURNAL_REPLAY|
-                                               BTREE_INSERT_NOMARK);
-                               break;
-                       }
-
-                       if (ret) {
-                               bch_err(c, "journal replay: error %d while replaying key",
-                                       ret);
-                               goto err;
-                       }
-
-                       cond_resched();
-               }
-
-               bch2_journal_pin_put(j, j->replay_journal_seq);
+               bch_info(c, "journal read done, %zu keys in %zu entries, seq %llu",
+                        keys, entries, le64_to_cpu(i->j.seq));
        }
-
-       j->replay_journal_seq = 0;
-
-       bch2_journal_set_replay_done(j);
-       bch2_journal_flush_all_pins(j);
-       ret = bch2_journal_error(j);
-err:
-       bch2_journal_entries_free(list);
+fsck_err:
        return ret;
 }
 
@@ -1159,7 +947,6 @@ out:
        return;
 err:
        bch2_fatal_error(c);
-       bch2_journal_halt(j);
        spin_lock(&j->lock);
        goto out;
 }
@@ -1205,7 +992,8 @@ void bch2_journal_write(struct closure *cl)
        j->write_start_time = local_clock();
 
        start   = vstruct_last(jset);
-       end     = bch2_journal_super_entries_add_common(c, start);
+       end     = bch2_journal_super_entries_add_common(c, start,
+                                               le64_to_cpu(jset->seq));
        u64s    = (u64 *) end - (u64 *) start;
        BUG_ON(u64s > j->entry_u64s_reserved);
 
@@ -1270,7 +1058,6 @@ void bch2_journal_write(struct closure *cl)
        spin_unlock(&j->lock);
 
        if (ret) {
-               bch2_journal_halt(j);
                bch_err(c, "Unable to allocate journal write");
                bch2_fatal_error(c);
                continue_at(cl, journal_write_done, system_highpri_wq);