bcachefs: Plumb bch_validate_flags to sb_field_ops.validate()

Kent Overstreet · Kent Overstreet · commit a5c3e265d3b6 · 2024-05-09T16:23:36.000-04:00
Signed-off-by: Kent Overstreet &lt;kent.overstreet@linux.dev&gt;
diff --git a/fs/bcachefs/checksum.c b/fs/bcachefs/checksum.c
@@ -469,9 +469,8 @@ int bch2_rechecksum_bio(struct bch_fs *c, struct bio *bio,
 
 /* BCH_SB_FIELD_crypt: */
 
-static int bch2_sb_crypt_validate(struct bch_sb *sb,
-				  struct bch_sb_field *f,
-				  struct printbuf *err)
+static int bch2_sb_crypt_validate(struct bch_sb *sb, struct bch_sb_field *f,
+				  enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_crypt *crypt = field_to_type(f, crypt);
 
diff --git a/fs/bcachefs/disk_groups.c b/fs/bcachefs/disk_groups.c
@@ -18,9 +18,8 @@ static int group_cmp(const void *_l, const void *_r)
 		strncmp(l->label, r->label, sizeof(l->label));
 }
 
-static int bch2_sb_disk_groups_validate(struct bch_sb *sb,
-					struct bch_sb_field *f,
-					struct printbuf *err)
+static int bch2_sb_disk_groups_validate(struct bch_sb *sb, struct bch_sb_field *f,
+				enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_disk_groups *groups =
 		field_to_type(f, disk_groups);
diff --git a/fs/bcachefs/journal_sb.c b/fs/bcachefs/journal_sb.c
@@ -16,9 +16,8 @@ static int u64_cmp(const void *_l, const void *_r)
 	return cmp_int(*l, *r);
 }
 
-static int bch2_sb_journal_validate(struct bch_sb *sb,
-				    struct bch_sb_field *f,
-				    struct printbuf *err)
+static int bch2_sb_journal_validate(struct bch_sb *sb, struct bch_sb_field *f,
+				enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_journal *journal = field_to_type(f, journal);
 	struct bch_member m = bch2_sb_member_get(sb, sb->dev_idx);
@@ -99,9 +98,8 @@ static int u64_range_cmp(const void *_l, const void *_r)
 	return cmp_int(l->start, r->start);
 }
 
-static int bch2_sb_journal_v2_validate(struct bch_sb *sb,
-				    struct bch_sb_field *f,
-				    struct printbuf *err)
+static int bch2_sb_journal_v2_validate(struct bch_sb *sb, struct bch_sb_field *f,
+				enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_journal_v2 *journal = field_to_type(f, journal_v2);
 	struct bch_member m = bch2_sb_member_get(sb, sb->dev_idx);
diff --git a/fs/bcachefs/journal_seq_blacklist.c b/fs/bcachefs/journal_seq_blacklist.c
@@ -162,9 +162,8 @@ int bch2_blacklist_table_initialize(struct bch_fs *c)
 	return 0;
 }
 
-static int bch2_sb_journal_seq_blacklist_validate(struct bch_sb *sb,
-						  struct bch_sb_field *f,
-						  struct printbuf *err)
+static int bch2_sb_journal_seq_blacklist_validate(struct bch_sb *sb, struct bch_sb_field *f,
+				enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_journal_seq_blacklist *bl =
 		field_to_type(f, journal_seq_blacklist);
diff --git a/fs/bcachefs/quota.c b/fs/bcachefs/quota.c
@@ -20,7 +20,7 @@ static const char * const bch2_quota_counters[] = {
 };
 
 static int bch2_sb_quota_validate(struct bch_sb *sb, struct bch_sb_field *f,
-				  struct printbuf *err)
+				  enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_quota *q = field_to_type(f, quota);
 
@@ -60,8 +60,7 @@ const struct bch_sb_field_ops bch_sb_field_ops_quota = {
 };
 
 int bch2_quota_invalid(struct bch_fs *c, struct bkey_s_c k,
-		       enum bch_validate_flags flags,
-		       struct printbuf *err)
+		       enum bch_validate_flags flags, struct printbuf *err)
 {
 	int ret = 0;
 
diff --git a/fs/bcachefs/replicas.c b/fs/bcachefs/replicas.c
@@ -860,7 +860,7 @@ static int bch2_cpu_replicas_validate(struct bch_replicas_cpu *cpu_r,
 }
 
 static int bch2_sb_replicas_validate(struct bch_sb *sb, struct bch_sb_field *f,
-				     struct printbuf *err)
+				     enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_replicas *sb_r = field_to_type(f, replicas);
 	struct bch_replicas_cpu cpu_r;
@@ -899,7 +899,7 @@ const struct bch_sb_field_ops bch_sb_field_ops_replicas = {
 };
 
 static int bch2_sb_replicas_v0_validate(struct bch_sb *sb, struct bch_sb_field *f,
-					struct printbuf *err)
+					enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_replicas_v0 *sb_r = field_to_type(f, replicas_v0);
 	struct bch_replicas_cpu cpu_r;
diff --git a/fs/bcachefs/sb-clean.c b/fs/bcachefs/sb-clean.c
@@ -266,9 +266,8 @@ void bch2_journal_super_entries_add_common(struct bch_fs *c,
 	}
 }
 
-static int bch2_sb_clean_validate(struct bch_sb *sb,
-				  struct bch_sb_field *f,
-				  struct printbuf *err)
+static int bch2_sb_clean_validate(struct bch_sb *sb, struct bch_sb_field *f,
+				  enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_clean *clean = field_to_type(f, clean);
 
diff --git a/fs/bcachefs/sb-counters.c b/fs/bcachefs/sb-counters.c
@@ -20,9 +20,8 @@ static size_t bch2_sb_counter_nr_entries(struct bch_sb_field_counters *ctrs)
 	return (__le64 *) vstruct_end(&ctrs->field) - &ctrs->d[0];
 };
 
-static int bch2_sb_counters_validate(struct bch_sb *sb,
-				     struct bch_sb_field *f,
-				     struct printbuf *err)
+static int bch2_sb_counters_validate(struct bch_sb *sb, struct bch_sb_field *f,
+				enum bch_validate_flags flags, struct printbuf *err)
 {
 	return 0;
 };
diff --git a/fs/bcachefs/sb-downgrade.c b/fs/bcachefs/sb-downgrade.c
@@ -138,7 +138,7 @@ downgrade_entry_next_c(const struct bch_sb_field_downgrade_entry *e)
 	     _i = downgrade_entry_next_c(_i))
 
 static int bch2_sb_downgrade_validate(struct bch_sb *sb, struct bch_sb_field *f,
-				      struct printbuf *err)
+				      enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_downgrade *e = field_to_type(f, downgrade);
 
diff --git a/fs/bcachefs/sb-errors.c b/fs/bcachefs/sb-errors.c
@@ -30,7 +30,7 @@ static inline unsigned bch2_sb_field_errors_u64s(unsigned nr)
 }
 
 static int bch2_sb_errors_validate(struct bch_sb *sb, struct bch_sb_field *f,
-				   struct printbuf *err)
+				   enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_errors *e = field_to_type(f, errors);
 	unsigned i, nr = bch2_sb_field_errors_nr_entries(e);
diff --git a/fs/bcachefs/sb-members.c b/fs/bcachefs/sb-members.c
@@ -261,9 +261,8 @@ static void member_to_text(struct printbuf *out,
 	printbuf_indent_sub(out, 2);
 }
 
-static int bch2_sb_members_v1_validate(struct bch_sb *sb,
-				    struct bch_sb_field *f,
-				    struct printbuf *err)
+static int bch2_sb_members_v1_validate(struct bch_sb *sb, struct bch_sb_field *f,
+				enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_members_v1 *mi = field_to_type(f, members_v1);
 	unsigned i;
@@ -311,9 +310,8 @@ static void bch2_sb_members_v2_to_text(struct printbuf *out, struct bch_sb *sb,
 		member_to_text(out, members_v2_get(mi, i), gi, sb, i);
 }
 
-static int bch2_sb_members_v2_validate(struct bch_sb *sb,
-				       struct bch_sb_field *f,
-				       struct printbuf *err)
+static int bch2_sb_members_v2_validate(struct bch_sb *sb, struct bch_sb_field *f,
+				enum bch_validate_flags flags, struct printbuf *err)
 {
 	struct bch_sb_field_members_v2 *mi = field_to_type(f, members_v2);
 	size_t mi_bytes = (void *) __bch2_members_v2_get_mut(mi, sb->nr_devices) -
diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
@@ -76,7 +76,7 @@ const char * const bch2_sb_fields[] = {
 };
 
 static int bch2_sb_field_validate(struct bch_sb *, struct bch_sb_field *,
-				  struct printbuf *);
+				  enum bch_validate_flags, struct printbuf *);
 
 struct bch_sb_field *bch2_sb_field_get_id(struct bch_sb *sb,
 				      enum bch_sb_field_type type)
@@ -344,8 +344,8 @@ static int bch2_sb_compatible(struct bch_sb *sb, struct printbuf *out)
 	return 0;
 }
 
-static int bch2_sb_validate(struct bch_sb_handle *disk_sb, struct printbuf *out,
-			    int rw)
+static int bch2_sb_validate(struct bch_sb_handle *disk_sb,
+			    enum bch_validate_flags flags, struct printbuf *out)
 {
 	struct bch_sb *sb = disk_sb->sb;
 	struct bch_sb_field_members_v1 *mi;
@@ -401,7 +401,7 @@ static int bch2_sb_validate(struct bch_sb_handle *disk_sb, struct printbuf *out,
 		return -BCH_ERR_invalid_sb_time_precision;
 	}
 
-	if (rw == READ) {
+	if (!flags) {
 		/*
 		 * Been seeing a bug where these are getting inexplicably
 		 * zeroed, so we're now validating them, but we have to be
@@ -457,20 +457,20 @@ static int bch2_sb_validate(struct bch_sb_handle *disk_sb, struct printbuf *out,
 		return -BCH_ERR_invalid_sb_members_missing;
 	}
 
-	ret = bch2_sb_field_validate(sb, &mi->field, out);
+	ret = bch2_sb_field_validate(sb, &mi->field, flags, out);
 	if (ret)
 		return ret;
 
 	vstruct_for_each(sb, f) {
 		if (le32_to_cpu(f->type) == BCH_SB_FIELD_members_v1)
 			continue;
 
-		ret = bch2_sb_field_validate(sb, f, out);
+		ret = bch2_sb_field_validate(sb, f, flags, out);
 		if (ret)
 			return ret;
 	}
 
-	if (rw == WRITE &&
+	if ((flags & BCH_VALIDATE_write) &&
 	    bch2_sb_member_get(sb, sb->dev_idx).seq != sb->seq) {
 		prt_printf(out, "Invalid superblock: member seq %llu != sb seq %llu",
 			   le64_to_cpu(bch2_sb_member_get(sb, sb->dev_idx).seq),
@@ -819,7 +819,7 @@ static int __bch2_read_super(const char *path, struct bch_opts *opts,
 
 	sb->have_layout = true;
 
-	ret = bch2_sb_validate(sb, &err, READ);
+	ret = bch2_sb_validate(sb, 0, &err);
 	if (ret) {
 		bch2_print_opts(opts, KERN_ERR "bcachefs (%s): error validating superblock: %s\n",
 				path, err.buf);
@@ -975,7 +975,7 @@ int bch2_write_super(struct bch_fs *c)
 	darray_for_each(online_devices, ca) {
 		printbuf_reset(&err);
 
-		ret = bch2_sb_validate(&(*ca)->disk_sb, &err, WRITE);
+		ret = bch2_sb_validate(&(*ca)->disk_sb, BCH_VALIDATE_write, &err);
 		if (ret) {
 			bch2_fs_inconsistent(c, "sb invalid before write: %s", err.buf);
 			goto out;
@@ -1161,7 +1161,7 @@ void bch2_sb_upgrade(struct bch_fs *c, unsigned new_version)
 }
 
 static int bch2_sb_ext_validate(struct bch_sb *sb, struct bch_sb_field *f,
-				struct printbuf *err)
+				enum bch_validate_flags flags, struct printbuf *err)
 {
 	if (vstruct_bytes(f) < 88) {
 		prt_printf(err, "field too small (%zu < %u)", vstruct_bytes(f), 88);
@@ -1219,14 +1219,14 @@ static const struct bch_sb_field_ops *bch2_sb_field_type_ops(unsigned type)
 }
 
 static int bch2_sb_field_validate(struct bch_sb *sb, struct bch_sb_field *f,
-				  struct printbuf *err)
+				  enum bch_validate_flags flags, struct printbuf *err)
 {
 	unsigned type = le32_to_cpu(f->type);
 	struct printbuf field_err = PRINTBUF;
 	const struct bch_sb_field_ops *ops = bch2_sb_field_type_ops(type);
 	int ret;
 
-	ret = ops->validate ? ops->validate(sb, f, &field_err) : 0;
+	ret = ops->validate ? ops->validate(sb, f, flags, &field_err) : 0;
 	if (ret) {
 		prt_printf(err, "Invalid superblock section %s: %s",
 			   bch2_sb_fields[type], field_err.buf);
diff --git a/fs/bcachefs/super-io.h b/fs/bcachefs/super-io.h
@@ -51,7 +51,8 @@ void bch2_sb_field_delete(struct bch_sb_handle *, enum bch_sb_field_type);
 extern const char * const bch2_sb_fields[];
 
 struct bch_sb_field_ops {
-	int	(*validate)(struct bch_sb *, struct bch_sb_field *, struct printbuf *);
+	int	(*validate)(struct bch_sb *, struct bch_sb_field *,
+			    enum bch_validate_flags, struct printbuf *);
 	void	(*to_text)(struct printbuf *, struct bch_sb *, struct bch_sb_field *);
 };
 

Original file line number	Diff line number	Diff line change
`@@ -469,9 +469,8 @@ int bch2_rechecksum_bio(struct bch_fs c, struct bio bio,`
`469`	`469`
`470`	`470`	`/* BCH_SB_FIELD_crypt: */`
`471`	`471`
`472`		`-static int bch2_sb_crypt_validate(struct bch_sb *sb,`
`473`		`- struct bch_sb_field *f,`
`474`		`- struct printbuf *err)`
	`472`	`+static int bch2_sb_crypt_validate(struct bch_sb sb, struct bch_sb_field f,`
	`473`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`475`	`474`	`{`
`476`	`475`	`struct bch_sb_field_crypt *crypt = field_to_type(f, crypt);`
`477`	`476`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@ static int group_cmp(const void _l, const void _r)`
`18`	`18`	`strncmp(l->label, r->label, sizeof(l->label));`
`19`	`19`	`}`
`20`	`20`
`21`		`-static int bch2_sb_disk_groups_validate(struct bch_sb *sb,`
`22`		`- struct bch_sb_field *f,`
`23`		`- struct printbuf *err)`
	`21`	`+static int bch2_sb_disk_groups_validate(struct bch_sb sb, struct bch_sb_field f,`
	`22`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`24`	`23`	`{`
`25`	`24`	`struct bch_sb_field_disk_groups *groups =`
`26`	`25`	`field_to_type(f, disk_groups);`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,8 @@ static int u64_cmp(const void _l, const void _r)`
`16`	`16`	`return cmp_int(l, r);`
`17`	`17`	`}`
`18`	`18`
`19`		`-static int bch2_sb_journal_validate(struct bch_sb *sb,`
`20`		`- struct bch_sb_field *f,`
`21`		`- struct printbuf *err)`
	`19`	`+static int bch2_sb_journal_validate(struct bch_sb sb, struct bch_sb_field f,`
	`20`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`22`	`21`	`{`
`23`	`22`	`struct bch_sb_field_journal *journal = field_to_type(f, journal);`
`24`	`23`	`struct bch_member m = bch2_sb_member_get(sb, sb->dev_idx);`
`@@ -99,9 +98,8 @@ static int u64_range_cmp(const void _l, const void _r)`
`99`	`98`	`return cmp_int(l->start, r->start);`
`100`	`99`	`}`
`101`	`100`
`102`		`-static int bch2_sb_journal_v2_validate(struct bch_sb *sb,`
`103`		`- struct bch_sb_field *f,`
`104`		`- struct printbuf *err)`
	`101`	`+static int bch2_sb_journal_v2_validate(struct bch_sb sb, struct bch_sb_field f,`
	`102`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`105`	`103`	`{`
`106`	`104`	`struct bch_sb_field_journal_v2 *journal = field_to_type(f, journal_v2);`
`107`	`105`	`struct bch_member m = bch2_sb_member_get(sb, sb->dev_idx);`
Original file line number	Diff line number	Diff line change
`@@ -162,9 +162,8 @@ int bch2_blacklist_table_initialize(struct bch_fs *c)`
`162`	`162`	`return 0;`
`163`	`163`	`}`
`164`	`164`
`165`		`-static int bch2_sb_journal_seq_blacklist_validate(struct bch_sb *sb,`
`166`		`- struct bch_sb_field *f,`
`167`		`- struct printbuf *err)`
	`165`	`+static int bch2_sb_journal_seq_blacklist_validate(struct bch_sb sb, struct bch_sb_field f,`
	`166`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`168`	`167`	`{`
`169`	`168`	`struct bch_sb_field_journal_seq_blacklist *bl =`
`170`	`169`	`field_to_type(f, journal_seq_blacklist);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ static const char * const bch2_quota_counters[] = {`
`20`	`20`	`};`
`21`	`21`
`22`	`22`	`static int bch2_sb_quota_validate(struct bch_sb sb, struct bch_sb_field f,`
`23`		`- struct printbuf *err)`
	`23`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`24`	`24`	`{`
`25`	`25`	`struct bch_sb_field_quota *q = field_to_type(f, quota);`
`26`	`26`
`@@ -60,8 +60,7 @@ const struct bch_sb_field_ops bch_sb_field_ops_quota = {`
`60`	`60`	`};`
`61`	`61`
`62`	`62`	`int bch2_quota_invalid(struct bch_fs *c, struct bkey_s_c k,`
`63`		`- enum bch_validate_flags flags,`
`64`		`- struct printbuf *err)`
	`63`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`65`	`64`	`{`
`66`	`65`	`int ret = 0;`
`67`	`66`
Original file line number	Diff line number	Diff line change
`@@ -860,7 +860,7 @@ static int bch2_cpu_replicas_validate(struct bch_replicas_cpu *cpu_r,`
`860`	`860`	`}`
`861`	`861`
`862`	`862`	`static int bch2_sb_replicas_validate(struct bch_sb sb, struct bch_sb_field f,`
`863`		`- struct printbuf *err)`
	`863`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`864`	`864`	`{`
`865`	`865`	`struct bch_sb_field_replicas *sb_r = field_to_type(f, replicas);`
`866`	`866`	`struct bch_replicas_cpu cpu_r;`
`@@ -899,7 +899,7 @@ const struct bch_sb_field_ops bch_sb_field_ops_replicas = {`
`899`	`899`	`};`
`900`	`900`
`901`	`901`	`static int bch2_sb_replicas_v0_validate(struct bch_sb sb, struct bch_sb_field f,`
`902`		`- struct printbuf *err)`
	`902`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`903`	`903`	`{`
`904`	`904`	`struct bch_sb_field_replicas_v0 *sb_r = field_to_type(f, replicas_v0);`
`905`	`905`	`struct bch_replicas_cpu cpu_r;`
Original file line number	Diff line number	Diff line change
`@@ -266,9 +266,8 @@ void bch2_journal_super_entries_add_common(struct bch_fs *c,`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`
`269`		`-static int bch2_sb_clean_validate(struct bch_sb *sb,`
`270`		`- struct bch_sb_field *f,`
`271`		`- struct printbuf *err)`
	`269`	`+static int bch2_sb_clean_validate(struct bch_sb sb, struct bch_sb_field f,`
	`270`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`272`	`271`	`{`
`273`	`272`	`struct bch_sb_field_clean *clean = field_to_type(f, clean);`
`274`	`273`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ downgrade_entry_next_c(const struct bch_sb_field_downgrade_entry *e)`
`138`	`138`	`_i = downgrade_entry_next_c(_i))`
`139`	`139`
`140`	`140`	`static int bch2_sb_downgrade_validate(struct bch_sb sb, struct bch_sb_field f,`
`141`		`- struct printbuf *err)`
	`141`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`142`	`142`	`{`
`143`	`143`	`struct bch_sb_field_downgrade *e = field_to_type(f, downgrade);`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ static inline unsigned bch2_sb_field_errors_u64s(unsigned nr)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`static int bch2_sb_errors_validate(struct bch_sb sb, struct bch_sb_field f,`
`33`		`- struct printbuf *err)`
	`33`	`+ enum bch_validate_flags flags, struct printbuf *err)`
`34`	`34`	`{`
`35`	`35`	`struct bch_sb_field_errors *e = field_to_type(f, errors);`
`36`	`36`	`unsigned i, nr = bch2_sb_field_errors_nr_entries(e);`