]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/journal.h
Update bcachefs sources to 4837f82ee1 bcachefs: Use cached iterators for alloc btree
[bcachefs-tools-debian] / libbcachefs / journal.h
index d785a0cbc5a51c2370bf5be83444e7ee0db82c0c..30de6d96188ed38012ab6a556e0b5105cc1164ba 100644 (file)
@@ -1,5 +1,6 @@
-#ifndef _BCACHE_JOURNAL_H
-#define _BCACHE_JOURNAL_H
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _BCACHEFS_JOURNAL_H
+#define _BCACHEFS_JOURNAL_H
 
 /*
  * THE JOURNAL:
 
 #include "journal_types.h"
 
-/*
- * Only used for holding the journal entries we read in btree_journal_read()
- * during cache_registration
- */
-struct journal_replay {
-       struct list_head        list;
-       struct jset             j;
-};
+struct bch_fs;
 
-static inline struct jset_entry *__jset_entry_type_next(struct jset *jset,
-                                       struct jset_entry *entry, unsigned type)
+static inline void journal_wake(struct journal *j)
 {
-       while (entry < vstruct_last(jset)) {
-               if (entry->type == type)
-                       return entry;
-
-               entry = vstruct_next(entry);
-       }
-
-       return NULL;
+       wake_up(&j->wait);
+       closure_wake_up(&j->async_wait);
+       closure_wake_up(&j->preres_wait);
 }
 
-#define for_each_jset_entry_type(entry, jset, type)                    \
-       for (entry = (jset)->start;                                     \
-            (entry = __jset_entry_type_next(jset, entry, type));       \
-            entry = vstruct_next(entry))
-
-#define for_each_jset_key(k, _n, entry, jset)                          \
-       for_each_jset_entry_type(entry, jset, JOURNAL_ENTRY_BTREE_KEYS) \
-               vstruct_for_each_safe(entry, k, _n)
-
-#define JOURNAL_PIN    (32 * 1024)
-
-static inline bool journal_pin_active(struct journal_entry_pin *pin)
+static inline struct journal_buf *journal_cur_buf(struct journal *j)
 {
-       return pin->pin_list != NULL;
+       return j->buf + j->reservations.idx;
 }
 
-static inline struct journal_entry_pin_list *
-journal_seq_pin(struct journal *j, u64 seq)
+static inline struct journal_buf *journal_prev_buf(struct journal *j)
 {
-       return &j->pin.data[(size_t) seq & j->pin.mask];
+       return j->buf + !j->reservations.idx;
 }
 
-void bch2_journal_pin_add(struct journal *, struct journal_res *,
-                         struct journal_entry_pin *, journal_pin_flush_fn);
-void bch2_journal_pin_drop(struct journal *, struct journal_entry_pin *);
-void bch2_journal_pin_add_if_older(struct journal *,
-                                 struct journal_entry_pin *,
-                                 struct journal_entry_pin *,
-                                 journal_pin_flush_fn);
-void bch2_journal_flush_pins(struct journal *, u64);
+/* Sequence number of oldest dirty journal entry */
 
-struct closure;
-struct bch_fs;
-struct keylist;
+static inline u64 journal_last_seq(struct journal *j)
+{
+       return j->pin.front;
+}
 
-struct bkey_i *bch2_journal_find_btree_root(struct bch_fs *, struct jset *,
-                                          enum btree_id, unsigned *);
+static inline u64 journal_cur_seq(struct journal *j)
+{
+       BUG_ON(j->pin.back - 1 != atomic64_read(&j->seq));
 
-int bch2_journal_seq_should_ignore(struct bch_fs *, u64, struct btree *);
+       return j->pin.back - 1;
+}
 
 u64 bch2_inode_journal_seq(struct journal *, u64);
 
@@ -192,8 +164,11 @@ static inline void bch2_journal_set_has_inode(struct journal *j,
                                              u64 inum)
 {
        struct journal_buf *buf = &j->buf[res->idx];
+       unsigned long bit = hash_64(inum, ilog2(sizeof(buf->has_inode) * 8));
 
-       set_bit(hash_64(inum, ilog2(sizeof(buf->has_inode) * 8)), buf->has_inode);
+       /* avoid atomic op if possible */
+       if (unlikely(!test_bit(bit, buf->has_inode)))
+               set_bit(bit, buf->has_inode);
 }
 
 /*
@@ -205,21 +180,43 @@ static inline unsigned jset_u64s(unsigned u64s)
        return u64s + sizeof(struct jset_entry) / sizeof(u64);
 }
 
-static inline void bch2_journal_add_entry_at(struct journal_buf *buf,
-                                           unsigned offset,
-                                           unsigned type, enum btree_id id,
-                                           unsigned level,
-                                           const void *data, size_t u64s)
+static inline int journal_entry_overhead(struct journal *j)
+{
+       return sizeof(struct jset) / sizeof(u64) + j->entry_u64s_reserved;
+}
+
+static inline struct jset_entry *
+bch2_journal_add_entry_noreservation(struct journal_buf *buf, size_t u64s)
 {
-       struct jset_entry *entry = vstruct_idx(buf->data, offset);
+       struct jset *jset = buf->data;
+       struct jset_entry *entry = vstruct_idx(jset, le32_to_cpu(jset->u64s));
 
+       memset(entry, 0, sizeof(*entry));
+       entry->u64s = cpu_to_le16(u64s);
+
+       le32_add_cpu(&jset->u64s, jset_u64s(u64s));
+
+       return entry;
+}
+
+static inline struct jset_entry *
+journal_res_entry(struct journal *j, struct journal_res *res)
+{
+       return vstruct_idx(j->buf[res->idx].data, res->offset);
+}
+
+static inline unsigned journal_entry_set(struct jset_entry *entry, unsigned type,
+                                         enum btree_id id, unsigned level,
+                                         const void *data, unsigned u64s)
+{
        memset(entry, 0, sizeof(*entry));
        entry->u64s     = cpu_to_le16(u64s);
+       entry->type     = type;
        entry->btree_id = id;
        entry->level    = level;
-       entry->type     = type;
+       memcpy_u64s_small(entry->_data, data, u64s);
 
-       memcpy_u64s(entry->_data, data, u64s);
+       return jset_u64s(u64s);
 }
 
 static inline void bch2_journal_add_entry(struct journal *j, struct journal_res *res,
@@ -227,14 +224,12 @@ static inline void bch2_journal_add_entry(struct journal *j, struct journal_res
                                          unsigned level,
                                          const void *data, unsigned u64s)
 {
-       struct journal_buf *buf = &j->buf[res->idx];
-       unsigned actual = jset_u64s(u64s);
+       unsigned actual = journal_entry_set(journal_res_entry(j, res),
+                              type, id, level, data, u64s);
 
        EBUG_ON(!res->ref);
-       BUG_ON(actual > res->u64s);
+       EBUG_ON(actual > res->u64s);
 
-       bch2_journal_add_entry_at(buf, res->offset, type,
-                                 id, level, data, u64s);
        res->offset     += actual;
        res->u64s       -= actual;
 }
@@ -242,11 +237,24 @@ static inline void bch2_journal_add_entry(struct journal *j, struct journal_res
 static inline void bch2_journal_add_keys(struct journal *j, struct journal_res *res,
                                        enum btree_id id, const struct bkey_i *k)
 {
-       bch2_journal_add_entry(j, res, JOURNAL_ENTRY_BTREE_KEYS,
+       bch2_journal_add_entry(j, res, BCH_JSET_ENTRY_btree_keys,
                               id, 0, k, k->k.u64s);
 }
 
-void bch2_journal_buf_put_slowpath(struct journal *, bool);
+static inline bool journal_entry_empty(struct jset *j)
+{
+       struct jset_entry *i;
+
+       if (j->seq != j->last_seq)
+               return false;
+
+       vstruct_for_each(j, i)
+               if (i->type == BCH_JSET_ENTRY_btree_keys && i->u64s)
+                       return false;
+       return true;
+}
+
+void __bch2_journal_buf_put(struct journal *, bool);
 
 static inline void bch2_journal_buf_put(struct journal *j, unsigned idx,
                                       bool need_write_just_set)
@@ -257,17 +265,10 @@ static inline void bch2_journal_buf_put(struct journal *j, unsigned idx,
                                    .buf0_count = idx == 0,
                                    .buf1_count = idx == 1,
                                    }).v, &j->reservations.counter);
-
-       EBUG_ON(s.idx != idx && !s.prev_buf_unwritten);
-
-       /*
-        * Do not initiate a journal write if the journal is in an error state
-        * (previous journal entry write may have failed)
-        */
-       if (s.idx != idx &&
-           !journal_state_count(s, idx) &&
-           s.cur_entry_offset != JOURNAL_ENTRY_ERROR_VAL)
-               bch2_journal_buf_put_slowpath(j, need_write_just_set);
+       if (!journal_state_count(s, idx)) {
+               EBUG_ON(s.idx == idx || !s.prev_buf_unwritten);
+               __bch2_journal_buf_put(j, need_write_just_set);
+       }
 }
 
 /*
@@ -280,11 +281,11 @@ static inline void bch2_journal_res_put(struct journal *j,
        if (!res->ref)
                return;
 
-       lock_release(&j->res_map, 0, _RET_IP_);
+       lock_release(&j->res_map, _THIS_IP_);
 
        while (res->u64s)
                bch2_journal_add_entry(j, res,
-                                      JOURNAL_ENTRY_BTREE_KEYS,
+                                      BCH_JSET_ENTRY_btree_keys,
                                       0, 0, NULL, 0);
 
        bch2_journal_buf_put(j, res->idx, false);
@@ -293,12 +294,16 @@ static inline void bch2_journal_res_put(struct journal *j,
 }
 
 int bch2_journal_res_get_slowpath(struct journal *, struct journal_res *,
-                                unsigned, unsigned);
+                                 unsigned);
+
+#define JOURNAL_RES_GET_NONBLOCK       (1 << 0)
+#define JOURNAL_RES_GET_CHECK          (1 << 1)
+#define JOURNAL_RES_GET_RESERVED       (1 << 2)
+#define JOURNAL_RES_GET_RECLAIM                (1 << 3)
 
 static inline int journal_res_get_fast(struct journal *j,
                                       struct journal_res *res,
-                                      unsigned u64s_min,
-                                      unsigned u64s_max)
+                                      unsigned flags)
 {
        union journal_res_state old, new;
        u64 v = atomic64_read(&j->reservations.counter);
@@ -310,44 +315,157 @@ static inline int journal_res_get_fast(struct journal *j,
                 * Check if there is still room in the current journal
                 * entry:
                 */
-               if (old.cur_entry_offset + u64s_min > j->cur_entry_u64s)
+               if (new.cur_entry_offset + res->u64s > j->cur_entry_u64s)
                        return 0;
 
-               res->offset     = old.cur_entry_offset;
-               res->u64s       = min(u64s_max, j->cur_entry_u64s -
-                                     old.cur_entry_offset);
+               EBUG_ON(!journal_state_count(new, new.idx));
+
+               if (!(flags & JOURNAL_RES_GET_RESERVED) &&
+                   !test_bit(JOURNAL_MAY_GET_UNRESERVED, &j->flags))
+                       return 0;
+
+               if (flags & JOURNAL_RES_GET_CHECK)
+                       return 1;
 
-               journal_state_inc(&new);
                new.cur_entry_offset += res->u64s;
+               journal_state_inc(&new);
        } while ((v = atomic64_cmpxchg(&j->reservations.counter,
                                       old.v, new.v)) != old.v);
 
-       res->ref = true;
-       res->idx = new.idx;
-       res->seq = le64_to_cpu(j->buf[res->idx].data->seq);
+       res->ref        = true;
+       res->idx        = old.idx;
+       res->offset     = old.cur_entry_offset;
+       res->seq        = le64_to_cpu(j->buf[old.idx].data->seq);
        return 1;
 }
 
 static inline int bch2_journal_res_get(struct journal *j, struct journal_res *res,
-                                     unsigned u64s_min, unsigned u64s_max)
+                                      unsigned u64s, unsigned flags)
 {
        int ret;
 
        EBUG_ON(res->ref);
-       EBUG_ON(u64s_max < u64s_min);
+       EBUG_ON(!test_bit(JOURNAL_STARTED, &j->flags));
 
-       if (journal_res_get_fast(j, res, u64s_min, u64s_max))
+       res->u64s = u64s;
+
+       if (journal_res_get_fast(j, res, flags))
                goto out;
 
-       ret = bch2_journal_res_get_slowpath(j, res, u64s_min, u64s_max);
+       ret = bch2_journal_res_get_slowpath(j, res, flags);
        if (ret)
                return ret;
 out:
-       lock_acquire_shared(&j->res_map, 0, 0, NULL, _THIS_IP_);
-       EBUG_ON(!res->ref);
+       if (!(flags & JOURNAL_RES_GET_CHECK)) {
+               lock_acquire_shared(&j->res_map, 0,
+                                   (flags & JOURNAL_RES_GET_NONBLOCK) != 0,
+                                   NULL, _THIS_IP_);
+               EBUG_ON(!res->ref);
+       }
        return 0;
 }
 
+/* journal_preres: */
+
+static inline bool journal_check_may_get_unreserved(struct journal *j)
+{
+       union journal_preres_state s = READ_ONCE(j->prereserved);
+       bool ret = s.reserved <= s.remaining &&
+               fifo_free(&j->pin) > 8;
+
+       lockdep_assert_held(&j->lock);
+
+       if (ret != test_bit(JOURNAL_MAY_GET_UNRESERVED, &j->flags)) {
+               if (ret) {
+                       set_bit(JOURNAL_MAY_GET_UNRESERVED, &j->flags);
+                       journal_wake(j);
+               } else {
+                       clear_bit(JOURNAL_MAY_GET_UNRESERVED, &j->flags);
+               }
+       }
+       return ret;
+}
+
+static inline void bch2_journal_preres_put(struct journal *j,
+                                          struct journal_preres *res)
+{
+       union journal_preres_state s = { .reserved = res->u64s };
+
+       if (!res->u64s)
+               return;
+
+       s.v = atomic64_sub_return(s.v, &j->prereserved.counter);
+       res->u64s = 0;
+       closure_wake_up(&j->preres_wait);
+
+       if (s.reserved <= s.remaining &&
+           !test_bit(JOURNAL_MAY_GET_UNRESERVED, &j->flags)) {
+               spin_lock(&j->lock);
+               journal_check_may_get_unreserved(j);
+               spin_unlock(&j->lock);
+       }
+}
+
+int __bch2_journal_preres_get(struct journal *,
+                       struct journal_preres *, unsigned, unsigned);
+
+static inline int bch2_journal_preres_get_fast(struct journal *j,
+                                              struct journal_preres *res,
+                                              unsigned new_u64s,
+                                              unsigned flags)
+{
+       int d = new_u64s - res->u64s;
+       union journal_preres_state old, new;
+       u64 v = atomic64_read(&j->prereserved.counter);
+
+       do {
+               old.v = new.v = v;
+
+               new.reserved += d;
+
+               /*
+                * If we're being called from the journal reclaim path, we have
+                * to unconditionally give out the pre-reservation, there's
+                * nothing else sensible we can do - otherwise we'd recurse back
+                * into the reclaim path and deadlock:
+                */
+
+               if (!(flags & JOURNAL_RES_GET_RECLAIM) &&
+                   new.reserved > new.remaining)
+                       return 0;
+       } while ((v = atomic64_cmpxchg(&j->prereserved.counter,
+                                      old.v, new.v)) != old.v);
+
+       res->u64s += d;
+       return 1;
+}
+
+static inline int bch2_journal_preres_get(struct journal *j,
+                                         struct journal_preres *res,
+                                         unsigned new_u64s,
+                                         unsigned flags)
+{
+       if (new_u64s <= res->u64s)
+               return 0;
+
+       if (bch2_journal_preres_get_fast(j, res, new_u64s, flags))
+               return 0;
+
+       if (flags & JOURNAL_RES_GET_NONBLOCK)
+               return -EAGAIN;
+
+       return __bch2_journal_preres_get(j, res, new_u64s, flags);
+}
+
+/* journal_entry_res: */
+
+void bch2_journal_entry_res_resize(struct journal *,
+                                  struct journal_entry_res *,
+                                  unsigned);
+
+u64 bch2_journal_last_unwritten_seq(struct journal *);
+int bch2_journal_open_seq_async(struct journal *, u64, struct closure *);
+
 void bch2_journal_wait_on_seq(struct journal *, u64, struct closure *);
 void bch2_journal_flush_seq_async(struct journal *, u64, struct closure *);
 void bch2_journal_flush_async(struct journal *, struct closure *);
@@ -365,41 +483,37 @@ static inline int bch2_journal_error(struct journal *j)
                ? -EIO : 0;
 }
 
+struct bch_dev;
+
 static inline bool journal_flushes_device(struct bch_dev *ca)
 {
        return true;
 }
 
-void bch2_journal_start(struct bch_fs *);
-int bch2_journal_mark(struct bch_fs *, struct list_head *);
-void bch2_journal_entries_free(struct list_head *);
-int bch2_journal_read(struct bch_fs *, struct list_head *);
-int bch2_journal_replay(struct bch_fs *, struct list_head *);
-
 static inline void bch2_journal_set_replay_done(struct journal *j)
 {
        BUG_ON(!test_bit(JOURNAL_STARTED, &j->flags));
        set_bit(JOURNAL_REPLAY_DONE, &j->flags);
 }
 
+void bch2_journal_unblock(struct journal *);
+void bch2_journal_block(struct journal *);
+
 ssize_t bch2_journal_print_debug(struct journal *, char *);
 ssize_t bch2_journal_print_pins(struct journal *, char *);
 
+int bch2_set_nr_journal_buckets(struct bch_fs *, struct bch_dev *,
+                               unsigned nr);
 int bch2_dev_journal_alloc(struct bch_dev *);
 
-static inline unsigned bch2_nr_journal_buckets(struct bch_sb_field_journal *j)
-{
-       return j
-               ? (__le64 *) vstruct_end(&j->field) - j->buckets
-               : 0;
-}
-
-int bch2_journal_move(struct bch_dev *);
+void bch2_dev_journal_stop(struct journal *, struct bch_dev *);
 
 void bch2_fs_journal_stop(struct journal *);
+int bch2_fs_journal_start(struct journal *, u64, struct list_head *);
+
 void bch2_dev_journal_exit(struct bch_dev *);
 int bch2_dev_journal_init(struct bch_dev *, struct bch_sb *);
 void bch2_fs_journal_exit(struct journal *);
 int bch2_fs_journal_init(struct journal *);
 
-#endif /* _BCACHE_JOURNAL_H */
+#endif /* _BCACHEFS_JOURNAL_H */