Commit 9c69f888 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bcachefs-2025-05-08' of git://evilpiepirate.org/bcachefs 

Pull bcachefs fixes from Kent Overstreet:

 - Some fixes to help with filesystem analysis: ensure superblock
   error count gets written if we go ERO, don't discard the journal
   aggressively (so it's available for list_journal -a)

 - Fix lost wakeup on arm causing us to get stuck when reading btree
   nodes

 - Fix fsck failing to exit on ctrl-c

 - An additional fix for filesystems with misaligned bucket sizes: we
   now ensure that allocations are properly aligned

 - Setting background target but not promote target will now leave that
   data cached on the foreground target, as it used to

 - Revert a change to when we allocate the VFS superblock, this was done
   for implementing blk_holder_ops but ended up not being needed, and
   allocating a superblock and not setting SB_BORN while we do recovery
   caused sync() calls and other things to hang

 - Assorted fixes for harmless error messages that caused concern to
   users

* tag 'bcachefs-2025-05-08' of git://evilpiepirate.org/bcachefs:
  bcachefs: Don't aggressively discard the journal
  bcachefs: Ensure superblock gets written when we go ERO
  bcachefs: Filter out harmless EROFS error messages
  bcachefs: journal_shutdown is EROFS, not EIO
  bcachefs: Call bch2_fs_start before getting vfs superblock
  bcachefs: fix hung task timeout in journal read
  bcachefs: Add missing barriers before wake_up_bit()
  bcachefs: Ensure proper write alignment
  bcachefs: Improve want_cached_ptr()
  bcachefs: thread_with_stdio: fix spinning instead of exiting
parents acaa3e72 8e4d2803

fs/bcachefs/alloc_foreground.c

+21 −1
Original line number Diff line number Diff line
@@ -1422,11 +1422,31 @@ int bch2_alloc_sectors_start_trans(struct btree_trans *trans, 


	wp->sectors_free = UINT_MAX;



	open_bucket_for_each(c, &wp->ptrs, ob, i)

	open_bucket_for_each(c, &wp->ptrs, ob, i) {

		/*

		 * Ensure proper write alignment - either due to misaligned

		 * bucket sizes (from buggy bcachefs-tools), or writes that mix

		 * logical/physical alignment:

		 */

		struct bch_dev *ca = ob_dev(c, ob);

		u64 offset = bucket_to_sector(ca, ob->bucket) +

			ca->mi.bucket_size -

			ob->sectors_free;

		unsigned align = round_up(offset, block_sectors(c)) - offset;



		ob->sectors_free = max_t(int, 0, ob->sectors_free - align);



		wp->sectors_free = min(wp->sectors_free, ob->sectors_free);

	}



	wp->sectors_free = rounddown(wp->sectors_free, block_sectors(c));



	/* Did alignment use up space in an open_bucket? */

	if (unlikely(!wp->sectors_free)) {

		bch2_alloc_sectors_done(c, wp);

		goto retry;

	}



	BUG_ON(!wp->sectors_free || wp->sectors_free == UINT_MAX);



	return 0;

fs/bcachefs/btree_io.c

+8 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ void bch2_btree_node_io_unlock(struct btree *b) 


	clear_btree_node_write_in_flight_inner(b);

	clear_btree_node_write_in_flight(b);

	smp_mb__after_atomic();

	wake_up_bit(&b->flags, BTREE_NODE_write_in_flight);

}
@@ -1400,6 +1401,7 @@ static void btree_node_read_work(struct work_struct *work) 


	printbuf_exit(&buf);

	clear_btree_node_read_in_flight(b);

	smp_mb__after_atomic();

	wake_up_bit(&b->flags, BTREE_NODE_read_in_flight);

}
@@ -1595,6 +1597,7 @@ static CLOSURE_CALLBACK(btree_node_read_all_replicas_done) 
	printbuf_exit(&buf);



	clear_btree_node_read_in_flight(b);

	smp_mb__after_atomic();

	wake_up_bit(&b->flags, BTREE_NODE_read_in_flight);

}
@@ -1721,6 +1724,7 @@ void bch2_btree_node_read(struct btree_trans *trans, struct btree *b, 
		set_btree_node_read_error(b);

		bch2_btree_lost_data(c, b->c.btree_id);

		clear_btree_node_read_in_flight(b);

		smp_mb__after_atomic();

		wake_up_bit(&b->flags, BTREE_NODE_read_in_flight);

		printbuf_exit(&buf);

		return;
@@ -2061,9 +2065,11 @@ static void __btree_node_write_done(struct bch_fs *c, struct btree *b, u64 start 


	if (new & (1U << BTREE_NODE_write_in_flight))

		__bch2_btree_node_write(c, b, BTREE_WRITE_ALREADY_STARTED|type);

	else

	else {

		smp_mb__after_atomic();

		wake_up_bit(&b->flags, BTREE_NODE_write_in_flight);

	}

}



static void btree_node_write_done(struct bch_fs *c, struct btree *b, u64 start_time)

{
@@ -2175,6 +2181,7 @@ static void btree_node_write_endio(struct bio *bio) 
	}



	clear_btree_node_write_in_flight_inner(b);

	smp_mb__after_atomic();

	wake_up_bit(&b->flags, BTREE_NODE_write_in_flight_inner);

	INIT_WORK(&wb->work, btree_node_write_work);

	queue_work(c->btree_io_complete_wq, &wb->work);

fs/bcachefs/buckets.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static inline void bucket_unlock(struct bucket *b) 
	BUILD_BUG_ON(!((union ulong_byte_assert) { .ulong = 1UL << BUCKET_LOCK_BITNR }).byte);



	clear_bit_unlock(BUCKET_LOCK_BITNR, (void *) &b->lock);

	smp_mb__after_atomic();

	wake_up_bit((void *) &b->lock, BUCKET_LOCK_BITNR);

}

fs/bcachefs/ec.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ static inline void gc_stripe_unlock(struct gc_stripe *s) 
	BUILD_BUG_ON(!((union ulong_byte_assert) { .ulong = 1UL << BUCKET_LOCK_BITNR }).byte);



	clear_bit_unlock(BUCKET_LOCK_BITNR, (void *) &s->lock);

	smp_mb__after_atomic();

	wake_up_bit((void *) &s->lock, BUCKET_LOCK_BITNR);

}

fs/bcachefs/errcode.h

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ 
	x(BCH_ERR_invalid_sb,		invalid_sb_downgrade)			\

	x(BCH_ERR_invalid,		invalid_bkey)				\

	x(BCH_ERR_operation_blocked,    nocow_lock_blocked)			\

	x(EIO,				journal_shutdown)			\

	x(EROFS,			journal_shutdown)			\

	x(EIO,				journal_flush_err)			\

	x(EIO,				journal_write_err)			\

	x(EIO,				btree_node_read_err)			\