bcachefs: Fix RCU splat

Kent Overstreet · Kent Overstreet · commit 6f692b1672bd · 2024-07-10T12:46:22.000-04:00
Reported-by: syzbot+e74fea078710bbca6f4b@syzkaller.appspotmail.com
Signed-off-by: Kent Overstreet &lt;kent.overstreet@linux.dev&gt;
diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
@@ -805,7 +805,7 @@ int bch2_bucket_ref_update(struct btree_trans *trans, struct bch_dev *ca,
 			"bucket %u:%zu gen %u (mem gen %u) data type %s: stale dirty ptr (gen %u)\n"
 			"while marking %s",
 			ptr->dev, bucket_nr, b_gen,
-			*bucket_gen(ca, bucket_nr),
+			bucket_gen_get(ca, bucket_nr),
 			bch2_data_type_str(bucket_data_type ?: ptr_data_type),
 			ptr->gen,
 			(printbuf_reset(&buf),
diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
@@ -116,6 +116,14 @@ static inline u8 *bucket_gen(struct bch_dev *ca, size_t b)
 	return gens->b + b;
 }
 
+static inline u8 bucket_gen_get(struct bch_dev *ca, size_t b)
+{
+	rcu_read_lock();
+	u8 gen = *bucket_gen(ca, b);
+	rcu_read_unlock();
+	return gen;
+}
+
 static inline size_t PTR_BUCKET_NR(const struct bch_dev *ca,
 				   const struct bch_extent_ptr *ptr)
 {

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,14 @@ static inline u8 bucket_gen(struct bch_dev ca, size_t b)`
`116`	`116`	`return gens->b + b;`
`117`	`117`	`}`
`118`	`118`
	`119`	`+static inline u8 bucket_gen_get(struct bch_dev *ca, size_t b)`
	`120`	`+{`
	`121`	`+ rcu_read_lock();`
	`122`	`+ u8 gen = *bucket_gen(ca, b);`
	`123`	`+ rcu_read_unlock();`
	`124`	`+ return gen;`
	`125`	`+}`
	`126`	`+`
`119`	`127`	`static inline size_t PTR_BUCKET_NR(const struct bch_dev *ca,`
`120`	`128`	`const struct bch_extent_ptr *ptr)`
`121`	`129`	`{`