Commit 5e329145 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Check journal entries for invalid keys in trans commit path 



Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent c98d132e

fs/bcachefs/bcachefs_format.h

+13 −0
Original line number Diff line number Diff line
@@ -2172,6 +2172,19 @@ enum { 
	BCH_JSET_ENTRY_NR

};



static inline bool jset_entry_is_key(struct jset_entry *e)

{

	switch (e->type) {

	case BCH_JSET_ENTRY_btree_keys:

	case BCH_JSET_ENTRY_btree_root:

	case BCH_JSET_ENTRY_overwrite:

	case BCH_JSET_ENTRY_write_buffer_keys:

		return true;

	}



	return false;

}



/*

 * Journal sequence numbers can be blacklisted: bsets record the max sequence

 * number of all the journal entries they contain updates for, so that on

fs/bcachefs/btree_trans_commit.c

+39 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "errcode.h"

#include "error.h"

#include "journal.h"

#include "journal_io.h"

#include "journal_reclaim.h"

#include "replicas.h"

#include "snapshot.h"
@@ -798,6 +799,27 @@ static noinline int bch2_trans_commit_bkey_invalid(struct btree_trans *trans, 
	return -EINVAL;

}



static noinline int bch2_trans_commit_journal_entry_invalid(struct btree_trans *trans,

						   struct jset_entry *i)

{

	struct bch_fs *c = trans->c;

	struct printbuf buf = PRINTBUF;



	prt_printf(&buf, "invalid bkey on insert from %s", trans->fn);

	prt_newline(&buf);

	printbuf_indent_add(&buf, 2);



	bch2_journal_entry_to_text(&buf, c, i);

	prt_newline(&buf);



	bch2_print_string_as_lines(KERN_ERR, buf.buf);



	bch2_inconsistent_error(c);

	bch2_dump_trans_updates(trans);



	return -EINVAL;

}



static int bch2_trans_commit_journal_pin_flush(struct journal *j,

				struct journal_entry_pin *_pin, u64 seq)

{
@@ -998,6 +1020,23 @@ int __bch2_trans_commit(struct btree_trans *trans, unsigned flags) 
			return ret;

	}



	for (struct jset_entry *i = trans->journal_entries;

	     i != (void *) ((u64 *) trans->journal_entries + trans->journal_entries_u64s);

	     i = vstruct_next(i)) {

		enum bkey_invalid_flags invalid_flags = 0;



		if (!(flags & BCH_TRANS_COMMIT_no_journal_res))

			invalid_flags |= BKEY_INVALID_WRITE|BKEY_INVALID_COMMIT;



		if (unlikely(bch2_journal_entry_validate(c, NULL, i,

					bcachefs_metadata_version_current,

					CPU_BIG_ENDIAN, invalid_flags)))

			ret = bch2_trans_commit_journal_entry_invalid(trans, i);



		if (ret)

			return ret;

	}



	if (unlikely(!test_bit(BCH_FS_may_go_rw, &c->flags))) {

		ret = do_bch2_trans_commit_to_journal_replay(trans);

		goto out_reset;