Update bcachefs sources to 9ceb982d77 bcachefs: Store bucket gens in a btree

1 files changed, 100 insertions, 31 deletions

diff --git a/libbcachefs/super-io.h b/libbcachefs/super-io.h
index 8f0d82db..879fddad 100644
--- a/libbcachefs/super-io.h
+++ b/libbcachefs/super-io.h
@@ -2,6 +2,7 @@
 #define _BCACHE_SUPER_IO_H
 
 #include "extents.h"
+#include "eytzinger.h"
 #include "super_types.h"
 
 #include <asm/byteorder.h>
@@ -40,6 +41,15 @@ bch2_fs_sb_resize_##_name(struct bch_fs *c, unsigned u64s)		\
 BCH_SB_FIELD_TYPE(journal);
 BCH_SB_FIELD_TYPE(members);
 BCH_SB_FIELD_TYPE(crypt);
+BCH_SB_FIELD_TYPE(replicas);
+
+static inline bool bch2_dev_exists(struct bch_sb *sb,
+				   struct bch_sb_field_members *mi,
+				   unsigned dev)
+{
+	return dev < sb->nr_devices &&
+		!bch2_is_zero(mi->members[dev].uuid.b, sizeof(uuid_le));
+}
 
 static inline bool bch2_sb_test_feature(struct bch_sb *sb,
 					enum bch_sb_features f)
@@ -91,8 +101,6 @@ static inline struct bch_member_cpu bch2_mi_to_cpu(struct bch_member *mi)
 		.bucket_size	= le16_to_cpu(mi->bucket_size),
 		.state		= BCH_MEMBER_STATE(mi),
 		.tier		= BCH_MEMBER_TIER(mi),
-		.has_metadata	= BCH_MEMBER_HAS_METADATA(mi),
-		.has_data	= BCH_MEMBER_HAS_DATA(mi),
 		.replacement	= BCH_MEMBER_REPLACEMENT(mi),
 		.discard	= BCH_MEMBER_DISCARD(mi),
 		.valid		= !bch2_is_zero(mi->uuid.b, sizeof(uuid_le)),
@@ -105,55 +113,116 @@ int bch2_sb_from_fs(struct bch_fs *, struct bch_dev *);
 void bch2_free_super(struct bcache_superblock *);
 int bch2_super_realloc(struct bcache_superblock *, unsigned);
 
-const char *bch2_validate_journal_layout(struct bch_sb *,
+const char *bch2_sb_validate_journal(struct bch_sb *,
 					 struct bch_member_cpu);
-const char *bch2_validate_cache_super(struct bcache_superblock *);
+const char *bch2_sb_validate(struct bcache_superblock *);
 
 const char *bch2_read_super(struct bcache_superblock *,
 			   struct bch_opts, const char *);
 void bch2_write_super(struct bch_fs *);
 
-void bch2_check_mark_super_slowpath(struct bch_fs *,
-				    const struct bkey_i *, bool);
+static inline bool replicas_test_dev(struct bch_replicas_cpu_entry *e,
+				     unsigned dev)
+{
+	return (e->devs[dev >> 3] & (1 << (dev & 7))) != 0;
+}
 
-static inline bool bch2_check_super_marked(struct bch_fs *c,
-					   const struct bkey_i *k, bool meta)
+static inline void replicas_set_dev(struct bch_replicas_cpu_entry *e,
+				    unsigned dev)
 {
-	struct bkey_s_c_extent e = bkey_i_to_s_c_extent(k);
-	const struct bch_extent_ptr *ptr;
-	unsigned nr_replicas = 0;
-	bool ret = true;
+	e->devs[dev >> 3] |= 1 << (dev & 7);
+}
 
-	extent_for_each_ptr(e, ptr) {
-		struct bch_dev *ca = c->devs[ptr->dev];
+static inline unsigned replicas_dev_slots(struct bch_replicas_cpu *r)
+{
+	return (r->entry_size -
+		offsetof(struct bch_replicas_cpu_entry, devs)) * 8;
+}
 
-		if (ptr->cached)
-			continue;
+static inline struct bch_replicas_cpu_entry *
+cpu_replicas_entry(struct bch_replicas_cpu *r, unsigned i)
+{
+	return (void *) r->entries + r->entry_size * i;
+}
 
-		if (!(meta
-		      ? ca->mi.has_metadata
-		      : ca->mi.has_data)) {
-			ret = false;
-			break;
+int bch2_check_mark_super_slowpath(struct bch_fs *, struct bkey_s_c_extent,
+				   enum bch_data_types);
+
+static inline bool replicas_has_extent(struct bch_replicas_cpu *r,
+				       struct bkey_s_c_extent e,
+				       enum bch_data_types data_type)
+{
+	const struct bch_extent_ptr *ptr;
+	struct bch_replicas_cpu_entry search = {
+		.data_type = data_type,
+	};
+	unsigned max_dev = 0;
+
+	BUG_ON(!data_type ||
+	       data_type == BCH_DATA_SB ||
+	       data_type >= BCH_DATA_NR);
+
+	extent_for_each_ptr(e, ptr)
+		if (!ptr->cached) {
+			max_dev = max_t(unsigned, max_dev, ptr->dev);
+			replicas_set_dev(&search, ptr->dev);
 		}
 
-		nr_replicas++;
-	}
+	return max_dev < replicas_dev_slots(r) &&
+		eytzinger0_find(r->entries, r->nr,
+				r->entry_size,
+				memcmp, &search) < r->nr;
+}
+
+static inline bool bch2_sb_has_replicas(struct bch_fs *c,
+					struct bkey_s_c_extent e,
+					enum bch_data_types data_type)
+{
+	bool ret;
 
-	if (nr_replicas <
-	    (meta ? c->sb.meta_replicas_have : c->sb.data_replicas_have))
-		ret = false;
+	rcu_read_lock();
+	ret = replicas_has_extent(rcu_dereference(c->replicas),
+				  e, data_type);
+	rcu_read_unlock();
 
 	return ret;
 }
 
-static inline void bch2_check_mark_super(struct bch_fs *c,
-					 const struct bkey_i *k, bool meta)
+static inline int bch2_check_mark_super(struct bch_fs *c,
+					struct bkey_s_c_extent e,
+					enum bch_data_types data_type)
 {
-	if (bch2_check_super_marked(c, k, meta))
-		return;
+	struct bch_replicas_cpu *gc_r;
+	bool marked;
 
-	bch2_check_mark_super_slowpath(c, k, meta);
+	rcu_read_lock();
+	marked = replicas_has_extent(rcu_dereference(c->replicas),
+				     e, data_type) &&
+		(!(gc_r = rcu_dereference(c->replicas_gc)) ||
+		 replicas_has_extent(gc_r, e, data_type));
+	rcu_read_unlock();
+
+	if (marked)
+		return 0;
+
+	return bch2_check_mark_super_slowpath(c, e, data_type);
 }
 
+struct replicas_status {
+	struct {
+		unsigned	nr_online;
+		unsigned	nr_offline;
+	}			replicas[BCH_DATA_NR];
+};
+
+struct replicas_status __bch2_replicas_status(struct bch_fs *,
+					      struct bch_dev *);
+struct replicas_status bch2_replicas_status(struct bch_fs *);
+
+unsigned bch2_replicas_online(struct bch_fs *, bool);
+unsigned bch2_dev_has_data(struct bch_fs *, struct bch_dev *);
+
+int bch2_replicas_gc_end(struct bch_fs *, int);
+int bch2_replicas_gc_start(struct bch_fs *, unsigned);
+
 #endif /* _BCACHE_SUPER_IO_H */