Commit e2a316b3 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: BCH_WATERMARK_interior_updates 



This adds a new watermark, higher priority than BCH_WATERMARK_reclaim,
for interior btree updates. We've seen a deadlock where journal replay
triggers a ton of btree node merges, and these use up all available open
buckets and then interior updates get stuck.

One cause of this is that we're currently lacking btree node merging on
write buffer btrees - that needs to be fixed as well.

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

fs/bcachefs/alloc_foreground.c

+3 −1
Original line number Diff line number Diff line
@@ -188,8 +188,10 @@ long bch2_bucket_alloc_new_fs(struct bch_dev *ca) 
static inline unsigned open_buckets_reserved(enum bch_watermark watermark)

{

	switch (watermark) {

	case BCH_WATERMARK_reclaim:

	case BCH_WATERMARK_interior_updates:

		return 0;

	case BCH_WATERMARK_reclaim:

		return OPEN_BUCKETS_COUNT / 6;

	case BCH_WATERMARK_btree:

	case BCH_WATERMARK_btree_copygc:

		return OPEN_BUCKETS_COUNT / 4;

fs/bcachefs/alloc_types.h

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ struct bucket_alloc_state { 
	x(copygc)			\

	x(btree)			\

	x(btree_copygc)			\

	x(reclaim)

	x(reclaim)			\

	x(interior_updates)



enum bch_watermark {

#define x(name)	BCH_WATERMARK_##name,

fs/bcachefs/btree_io.c

+1 −1
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ static void btree_node_write_work(struct work_struct *work) 
	} else {

		ret = bch2_trans_do(c, NULL, NULL, 0,

			bch2_btree_node_update_key_get_iter(trans, b, &wbio->key,

					BCH_WATERMARK_reclaim|

					BCH_WATERMARK_interior_updates|

					BCH_TRANS_COMMIT_journal_reclaim|

					BCH_TRANS_COMMIT_no_enospc|

					BCH_TRANS_COMMIT_no_check_rw,

fs/bcachefs/btree_trans_commit.c

+2 −1
Original line number Diff line number Diff line
@@ -887,6 +887,7 @@ int bch2_trans_commit_error(struct btree_trans *trans, unsigned flags, 
			    int ret, unsigned long trace_ip)

{

	struct bch_fs *c = trans->c;

	enum bch_watermark watermark = flags & BCH_WATERMARK_MASK;



	switch (ret) {

	case -BCH_ERR_btree_insert_btree_node_full:
@@ -905,7 +906,7 @@ int bch2_trans_commit_error(struct btree_trans *trans, unsigned flags, 
		 * flag

		 */

		if ((flags & BCH_TRANS_COMMIT_journal_reclaim) &&

		    (flags & BCH_WATERMARK_MASK) != BCH_WATERMARK_reclaim) {

		    watermark < BCH_WATERMARK_reclaim) {

			ret = -BCH_ERR_journal_reclaim_would_deadlock;

			break;

		}

fs/bcachefs/btree_update_interior.c

+3 −3
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static void btree_update_nodes_written(struct btree_update *as) 
	 * which may require allocations as well.

	 */

	ret = commit_do(trans, &as->disk_res, &journal_seq,

			BCH_WATERMARK_reclaim|

			BCH_WATERMARK_interior_updates|

			BCH_TRANS_COMMIT_no_enospc|

			BCH_TRANS_COMMIT_no_check_rw|

			BCH_TRANS_COMMIT_journal_reclaim,
@@ -1121,7 +1121,7 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path, 
		unsigned journal_flags = watermark|JOURNAL_RES_GET_CHECK;



		if ((flags & BCH_TRANS_COMMIT_journal_reclaim) &&

		    watermark != BCH_WATERMARK_reclaim)

		    watermark < BCH_WATERMARK_reclaim)

			journal_flags |= JOURNAL_RES_GET_NONBLOCK;



		ret = drop_locks_do(trans,
@@ -1217,7 +1217,7 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path, 
		 */

		if (bch2_err_matches(ret, ENOSPC) &&

		    (flags & BCH_TRANS_COMMIT_journal_reclaim) &&

		    watermark != BCH_WATERMARK_reclaim) {

		    watermark < BCH_WATERMARK_reclaim) {

			ret = -BCH_ERR_journal_reclaim_would_deadlock;

			goto err;

		}