Commit 8080ff5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bcachefs-2025-01-29' of git://evilpiepirate.org/bcachefs 

Pull bcachefs fixes from Kent Overstreet:

 - second half of a fix for a bug that'd been causing oopses on
   filesystems using snapshots with memory pressure (key cache fills for
   snaphots btrees are tricky)

 - build fix for strange compiler configurations that double stack frame
   size

 - "journal stuck timeout" now takes into account device latency: this
   fixes some spurious warnings, and the main remaining source of SRCU
   lock hold time warnings (I'm no longer seeing this in my CI, so any
   users still seeing this should definitely ping me)

 - fix for slow/hanging unmounts (" Improve journal pin flushing")

 - some more tracepoint fixes/improvements, to chase down the "rebalance
   isn't making progress" issues

* tag 'bcachefs-2025-01-29' of git://evilpiepirate.org/bcachefs:
  bcachefs: Improve trace_move_extent_finish
  bcachefs: Fix trace_copygc
  bcachefs: Journal writes are now IOPRIO_CLASS_RT
  bcachefs: Improve journal pin flushing
  bcachefs: fix bch2_btree_node_flags
  bcachefs: rebalance, copygc enabled are runtime opts
  bcachefs: Improve decompression error messages
  bcachefs: bset_blacklisted_journal_seq is now AUTOFIX
  bcachefs: "Journal stuck" timeout now takes into account device latency
  bcachefs: Reduce stack frame size of __bch2_str_hash_check_key()
  bcachefs: Fix btree_trans_peek_key_cache()
parents 72deda0a 5d9ccda9

fs/bcachefs/btree_cache.c

+4 −1
Original line number Diff line number Diff line
@@ -24,7 +24,10 @@ do { \ 
} while (0)



const char * const bch2_btree_node_flags[] = {

#define x(f)	#f,

	"typebit",

	"typebit",

	"typebit",

#define x(f)	[BTREE_NODE_##f] = #f,

	BTREE_FLAGS()

#undef x

	NULL

fs/bcachefs/btree_iter.c

+1 −2
Original line number Diff line number Diff line
@@ -2239,8 +2239,6 @@ struct bkey_s_c btree_trans_peek_key_cache(struct btree_iter *iter, struct bpos 
	if (unlikely(ret))

		return bkey_s_c_err(ret);



	btree_path_set_should_be_locked(trans, trans->paths + iter->key_cache_path);



	k = bch2_btree_path_peek_slot(trans->paths + iter->key_cache_path, &u);

	if (!k.k)

		return k;
@@ -2251,6 +2249,7 @@ struct bkey_s_c btree_trans_peek_key_cache(struct btree_iter *iter, struct bpos 


	iter->k = u;

	k.k = &iter->k;

	btree_path_set_should_be_locked(trans, trans->paths + iter->key_cache_path);

	return k;

}

fs/bcachefs/btree_key_cache.c

+3 −1
Original line number Diff line number Diff line
@@ -291,8 +291,10 @@ static noinline int btree_key_cache_fill(struct btree_trans *trans, 
					 struct btree_path *ck_path,

					 unsigned flags)

{

	if (flags & BTREE_ITER_cached_nofill)

	if (flags & BTREE_ITER_cached_nofill) {

		ck_path->l[0].b = NULL;

		return 0;

	}



	struct bch_fs *c = trans->c;

	struct btree_iter iter;

fs/bcachefs/btree_trans_commit.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static __always_inline int bch2_trans_journal_res_get(struct btree_trans *trans, 
						      unsigned flags)

{

	return bch2_journal_res_get(&trans->c->journal, &trans->journal_res,

				    trans->journal_u64s, flags);

				    trans->journal_u64s, flags, trans);

}



#define JSET_ENTRY_LOG_U64s		4

fs/bcachefs/compress.c

+22 −9
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "compress.h"

#include "error.h"

#include "extents.h"

#include "io_write.h"

#include "opts.h"

#include "super-io.h"
@@ -254,11 +255,14 @@ static int __bio_uncompress(struct bch_fs *c, struct bio *src, 
	goto out;

}



int bch2_bio_uncompress_inplace(struct bch_fs *c, struct bio *bio,

				struct bch_extent_crc_unpacked *crc)

int bch2_bio_uncompress_inplace(struct bch_write_op *op,

				struct bio *bio)

{

	struct bch_fs *c = op->c;

	struct bch_extent_crc_unpacked *crc = &op->crc;

	struct bbuf data = { NULL };

	size_t dst_len = crc->uncompressed_size << 9;

	int ret = 0;



	/* bio must own its pages: */

	BUG_ON(!bio->bi_vcnt);
@@ -266,17 +270,26 @@ int bch2_bio_uncompress_inplace(struct bch_fs *c, struct bio *bio, 


	if (crc->uncompressed_size << 9	> c->opts.encoded_extent_max ||

	    crc->compressed_size << 9	> c->opts.encoded_extent_max) {

		bch_err(c, "error rewriting existing data: extent too big");

		struct printbuf buf = PRINTBUF;

		bch2_write_op_error(&buf, op);

		prt_printf(&buf, "error rewriting existing data: extent too big");

		bch_err_ratelimited(c, "%s", buf.buf);

		printbuf_exit(&buf);

		return -EIO;

	}



	data = __bounce_alloc(c, dst_len, WRITE);



	if (__bio_uncompress(c, bio, data.b, *crc)) {

		if (!c->opts.no_data_io)

			bch_err(c, "error rewriting existing data: decompression error");

		bio_unmap_or_unbounce(c, data);

		return -EIO;

		if (!c->opts.no_data_io) {

			struct printbuf buf = PRINTBUF;

			bch2_write_op_error(&buf, op);

			prt_printf(&buf, "error rewriting existing data: decompression error");

			bch_err_ratelimited(c, "%s", buf.buf);

			printbuf_exit(&buf);

		}

		ret = -EIO;

		goto err;

	}



	/*
@@ -293,9 +306,9 @@ int bch2_bio_uncompress_inplace(struct bch_fs *c, struct bio *bio, 
	crc->uncompressed_size	= crc->live_size;

	crc->offset		= 0;

	crc->csum		= (struct bch_csum) { 0, 0 };



err:

	bio_unmap_or_unbounce(c, data);

	return 0;

	return ret;

}



int bch2_bio_uncompress(struct bch_fs *c, struct bio *src,