Commit 981d0413 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull bcachefs from Kent Overstreet:
 "More bcachefs bugfixes for 6.7, and forwards compatibility work:

   - fix for a nasty extents + snapshot interaction, reported when
     reflink of a snapshotted file wouldn't complete but turned out to
     be a more general bug

   - fix for an invalid free in dio write path when iov vector was
     longer than our inline vector

   - fix for a buffer overflow in the nocow write path -
     BCH_REPLICAS_MAX doesn't actually limit the number of pointers in
     an extent when cached pointers are included

   - RO snapshots are actually RO now

   - And, a new superblock section to avoid future breakage when the
     disk space acounting rewrite rolls out: the new superblock section
     describes versions that need work to downgrade, where the work
     required is a list of recovery passes and errors to silently fix"

* tag 'bcachefs-2024-01-01' of https://evilpiepirate.org/git/bcachefs:
  bcachefs: make RO snapshots actually RO
  bcachefs: bch_sb_field_downgrade
  bcachefs: bch_sb.recovery_passes_required
  bcachefs: Add persistent identifiers for recovery passes
  bcachefs: prt_bitflags_vector()
  bcachefs: move BCH_SB_ERRS() to sb-errors_types.h
  bcachefs: fix buffer overflow in nocow write path
  bcachefs: DARRAY_PREALLOCATED()
  bcachefs: Switch darray to kvmalloc()
  bcachefs: Factor out darray resize slowpath
  bcachefs: fix setting version_upgrade_complete
  bcachefs: fix invalid free in dio write path
  bcachefs: Fix extents iteration + snapshots interaction
parents 610a9b8f 0d72ab35

fs/bcachefs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ bcachefs-y := \ 
	clock.o			\

	compress.o		\

	counters.o		\

	darray.o		\

	debug.o			\

	dirent.o		\

	disk_groups.o		\
@@ -70,6 +71,7 @@ bcachefs-y := \ 
	reflink.o		\

	replicas.o		\

	sb-clean.o		\

	sb-downgrade.o		\

	sb-errors.o		\

	sb-members.o		\

	siphash.o		\

fs/bcachefs/acl.c

+2 −1
Original line number Diff line number Diff line
@@ -366,7 +366,8 @@ int bch2_set_acl(struct mnt_idmap *idmap, 
	bch2_trans_begin(trans);

	acl = _acl;



	ret = bch2_inode_peek(trans, &inode_iter, &inode_u, inode_inum(inode),

	ret   = bch2_subvol_is_ro_trans(trans, inode->ei_subvol) ?:

		bch2_inode_peek(trans, &inode_iter, &inode_u, inode_inum(inode),

			      BTREE_ITER_INTENT);

	if (ret)

		goto btree_err;

fs/bcachefs/bcachefs.h

+1 −0
Original line number Diff line number Diff line
@@ -737,6 +737,7 @@ struct bch_fs { 
		unsigned	nsec_per_time_unit;

		u64		features;

		u64		compat;

		unsigned long	errors_silent[BITS_TO_LONGS(BCH_SB_ERR_MAX)];

	}			sb;

fs/bcachefs/bcachefs_format.h

+38 −13
Original line number Diff line number Diff line
@@ -1219,7 +1219,9 @@ struct bch_sb_field { 
	x(journal_v2,			9)	\

	x(counters,			10)	\

	x(members_v2,			11)	\

	x(errors,	12)

	x(errors,			12)	\

	x(ext,				13)	\

	x(downgrade,			14)



enum bch_sb_field_type {

#define x(f, nr)	BCH_SB_FIELD_##f = nr,
@@ -1631,6 +1633,24 @@ struct bch_sb_field_errors { 
LE64_BITMASK(BCH_SB_ERROR_ENTRY_ID,	struct bch_sb_field_error_entry, v,  0, 16);

LE64_BITMASK(BCH_SB_ERROR_ENTRY_NR,	struct bch_sb_field_error_entry, v, 16, 64);



struct bch_sb_field_ext {

	struct bch_sb_field	field;

	__le64			recovery_passes_required[2];

	__le64			errors_silent[8];

};



struct bch_sb_field_downgrade_entry {

	__le16			version;

	__le64			recovery_passes[2];

	__le16			nr_errors;

	__le16			errors[] __counted_by(nr_errors);

} __packed __aligned(2);



struct bch_sb_field_downgrade {

	struct bch_sb_field	field;

	struct bch_sb_field_downgrade_entry entries[];

};



/* Superblock: */



/*
@@ -1644,6 +1664,11 @@ LE64_BITMASK(BCH_SB_ERROR_ENTRY_NR, struct bch_sb_field_error_entry, v, 16, 64); 


#define RECOVERY_PASS_ALL_FSCK		(1ULL << 63)



/*

 * field 1:		version name

 * field 2:		BCH_VERSION(major, minor)

 * field 3:		recovery passess required on upgrade

 */

#define BCH_METADATA_VERSIONS()						\

	x(bkey_renumber,		BCH_VERSION(0, 10),		\

	  RECOVERY_PASS_ALL_FSCK)					\

fs/bcachefs/btree_iter.c

+24 −11
Original line number Diff line number Diff line
@@ -2085,18 +2085,16 @@ struct bkey_s_c bch2_btree_iter_peek_upto(struct btree_iter *iter, struct bpos e 
			goto out_no_locked;



		/*

		 * iter->pos should be mononotically increasing, and always be

		 * equal to the key we just returned - except extents can

		 * straddle iter->pos:

		 * We need to check against @end before FILTER_SNAPSHOTS because

		 * if we get to a different inode that requested we might be

		 * seeing keys for a different snapshot tree that will all be

		 * filtered out.

		 *

		 * But we can't do the full check here, because bkey_start_pos()

		 * isn't monotonically increasing before FILTER_SNAPSHOTS, and

		 * that's what we check against in extents mode:

		 */

		if (!(iter->flags & BTREE_ITER_IS_EXTENTS))

			iter_pos = k.k->p;

		else

			iter_pos = bkey_max(iter->pos, bkey_start_pos(k.k));



		if (unlikely(!(iter->flags & BTREE_ITER_IS_EXTENTS)

			     ? bkey_gt(iter_pos, end)

			     : bkey_ge(iter_pos, end)))

		if (k.k->p.inode > end.inode)

			goto end;



		if (iter->update_path &&
@@ -2155,6 +2153,21 @@ struct bkey_s_c bch2_btree_iter_peek_upto(struct btree_iter *iter, struct bpos e 
			continue;

		}



		/*

		 * iter->pos should be mononotically increasing, and always be

		 * equal to the key we just returned - except extents can

		 * straddle iter->pos:

		 */

		if (!(iter->flags & BTREE_ITER_IS_EXTENTS))

			iter_pos = k.k->p;

		else

			iter_pos = bkey_max(iter->pos, bkey_start_pos(k.k));



		if (unlikely(!(iter->flags & BTREE_ITER_IS_EXTENTS)

			     ? bkey_gt(iter_pos, end)

			     : bkey_ge(iter_pos, end)))

			goto end;



		break;

	}