Commit f5fcbc8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bcachefs-2024-05-07.2' of https://evilpiepirate.org/git/bcachefs 

Pull bcachefs fixes from Kent Overstreet:

 - Various syzbot fixes; mainly small gaps in validation

 - Fix an integer overflow in fiemap() which was preventing filefrag
   from returning the full list of extents

 - Fix a refcounting bug on the device refcount, turned up by new
   assertions in the development branch

 - Fix a device removal/readd bug; write_super() was repeatedly dropping
   and retaking bch_dev->io_ref references

* tag 'bcachefs-2024-05-07.2' of https://evilpiepirate.org/git/bcachefs:
  bcachefs: Add missing sched_annotate_sleep() in bch2_journal_flush_seq_async()
  bcachefs: Fix race in bch2_write_super()
  bcachefs: BCH_SB_LAYOUT_SIZE_BITS_MAX
  bcachefs: Add missing skcipher_request_set_callback() call
  bcachefs: Fix snapshot_t() usage in bch2_fs_quota_read_inode()
  bcachefs: Fix shift-by-64 in bformat_needs_redo()
  bcachefs: Guard against unknown k.k->type in __bkey_invalid()
  bcachefs: Add missing validation for superblock section clean
  bcachefs: Fix assert in bch2_alloc_v4_invalid()
  bcachefs: fix overflow in fiemap
  bcachefs: Add a better limit for maximum number of buckets
  bcachefs: Fix lifetime issue in device iterator helpers
  bcachefs: Fix bch2_dev_lookup() refcounting
  bcachefs: Initialize bch_write_op->failed in inline data path
  bcachefs: Fix refcount put in sb_field_resize error path
  bcachefs: Inodes need extra padding for varint_decode_fast()
  bcachefs: Fix early error path in bch2_fs_btree_key_cache_exit()
  bcachefs: bucket_pos_to_bp_noerror()
  bcachefs: don't free error pointers
  bcachefs: Fix a scheduler splat in __bch2_next_write_buffer_flush_journal_buf()
parents 6d7ddd80 6e297a73

fs/bcachefs/alloc_background.c

+2 −2
Original line number Diff line number Diff line
@@ -244,10 +244,10 @@ int bch2_alloc_v4_invalid(struct bch_fs *c, struct bkey_s_c k, 
	struct bkey_s_c_alloc_v4 a = bkey_s_c_to_alloc_v4(k);

	int ret = 0;



	bkey_fsck_err_on(alloc_v4_u64s(a.v) > bkey_val_u64s(k.k), c, err,

	bkey_fsck_err_on(alloc_v4_u64s_noerror(a.v) > bkey_val_u64s(k.k), c, err,

			 alloc_v4_val_size_bad,

			 "bad val size (%u > %zu)",

			 alloc_v4_u64s(a.v), bkey_val_u64s(k.k));

			 alloc_v4_u64s_noerror(a.v), bkey_val_u64s(k.k));



	bkey_fsck_err_on(!BCH_ALLOC_V4_BACKPOINTERS_START(a.v) &&

			 BCH_ALLOC_V4_NR_BACKPOINTERS(a.v), c, err,

fs/bcachefs/alloc_background.h

+6 −2
Original line number Diff line number Diff line
@@ -126,13 +126,17 @@ static inline struct bpos alloc_freespace_pos(struct bpos pos, struct bch_alloc_ 
	return pos;

}



static inline unsigned alloc_v4_u64s(const struct bch_alloc_v4 *a)

static inline unsigned alloc_v4_u64s_noerror(const struct bch_alloc_v4 *a)

{

	unsigned ret = (BCH_ALLOC_V4_BACKPOINTERS_START(a) ?:

	return (BCH_ALLOC_V4_BACKPOINTERS_START(a) ?:

			BCH_ALLOC_V4_U64s_V0) +

		BCH_ALLOC_V4_NR_BACKPOINTERS(a) *

		(sizeof(struct bch_backpointer) / sizeof(u64));

}



static inline unsigned alloc_v4_u64s(const struct bch_alloc_v4 *a)

{

	unsigned ret = alloc_v4_u64s_noerror(a);

	BUG_ON(ret > U8_MAX - BKEY_U64s);

	return ret;

}

fs/bcachefs/backpointers.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int bch2_backpointer_invalid(struct bch_fs *c, struct bkey_s_c k, 
	int ret = 0;



	bkey_fsck_err_on((bp.v->bucket_offset >> MAX_EXTENT_COMPRESS_RATIO_SHIFT) >= ca->mi.bucket_size ||

			 !bpos_eq(bp.k->p, bucket_pos_to_bp(c, bucket, bp.v->bucket_offset)),

			 !bpos_eq(bp.k->p, bucket_pos_to_bp_noerror(ca, bucket, bp.v->bucket_offset)),

			 c, err,

			 backpointer_bucket_offset_wrong,

			 "backpointer bucket_offset wrong");

fs/bcachefs/backpointers.h

+10 −4
Original line number Diff line number Diff line
@@ -45,6 +45,15 @@ static inline struct bpos bp_pos_to_bucket(const struct bch_fs *c, 
	return POS(bp_pos.inode, sector_to_bucket(ca, bucket_sector));

}



static inline struct bpos bucket_pos_to_bp_noerror(const struct bch_dev *ca,

						   struct bpos bucket,

						   u64 bucket_offset)

{

	return POS(bucket.inode,

		   (bucket_to_sector(ca, bucket.offset) <<

		    MAX_EXTENT_COMPRESS_RATIO_SHIFT) + bucket_offset);

}



/*

 * Convert from pos in alloc btree + bucket offset to pos in backpointer btree:

 */
@@ -53,10 +62,7 @@ static inline struct bpos bucket_pos_to_bp(const struct bch_fs *c, 
					   u64 bucket_offset)

{

	struct bch_dev *ca = bch_dev_bkey_exists(c, bucket.inode);

	struct bpos ret = POS(bucket.inode,

			      (bucket_to_sector(ca, bucket.offset) <<

			       MAX_EXTENT_COMPRESS_RATIO_SHIFT) + bucket_offset);



	struct bpos ret = bucket_pos_to_bp_noerror(ca, bucket, bucket_offset);

	EBUG_ON(!bkey_eq(bucket, bp_pos_to_bucket(c, ret)));

	return ret;

}

fs/bcachefs/bcachefs_format.h

+8 −0
Original line number Diff line number Diff line
@@ -591,6 +591,12 @@ struct bch_member { 
	__le64			btree_allocated_bitmap;

};



/*

 * This limit comes from the bucket_gens array - it's a single allocation, and

 * kernel allocation are limited to INT_MAX

 */

#define BCH_MEMBER_NBUCKETS_MAX	(INT_MAX - 64)



#define BCH_MEMBER_V1_BYTES	56



LE64_BITMASK(BCH_MEMBER_STATE,		struct bch_member, flags,  0,  4)
@@ -897,6 +903,8 @@ unsigned bcachefs_metadata_required_upgrade_below = bcachefs_metadata_version_re 
#define BCH_SB_SECTOR			8

#define BCH_SB_MEMBERS_MAX		64 /* XXX kill */



#define BCH_SB_LAYOUT_SIZE_BITS_MAX	16 /* 32 MB */



struct bch_sb_layout {

	__uuid_t		magic;	/* bcachefs superblock UUID */

	__u8			layout_type;