Commit 5d4c8513 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more bcachefs fixes from Kent Overstreet:

 - revert the SLAB_ACCOUNT patch, something crazy is going on in memcg
   and someone forgot to test

 - minor fixes: missing rcu_read_lock(), scheduling while atomic (in an
   emergency shutdown path)

 - two lockdep fixes; these could have gone earlier, but were left to
   bake awhile

* tag 'bcachefs-2024-07-12' of https://evilpiepirate.org/git/bcachefs:
  bcachefs: bch2_gc_btree() should not use btree_root_lock
  bcachefs: Set PF_MEMALLOC_NOFS when trans->locked
  bcachefs; Use trans_unlock_long() when waiting on allocator
  Revert "bcachefs: Mark bch_inode_info as SLAB_ACCOUNT"
  bcachefs: fix scheduling while atomic in break_cycle()
  bcachefs: Fix RCU splat
parents 43db1e03 1841027c

fs/bcachefs/btree_gc.c

+22 −8
Original line number Diff line number Diff line
@@ -641,16 +641,30 @@ static int bch2_gc_btree(struct btree_trans *trans, enum btree_id btree, bool in 
		target_depth = 0;



	/* root */

	mutex_lock(&c->btree_root_lock);

	struct btree *b = bch2_btree_id_root(c, btree)->b;

	if (!btree_node_fake(b)) {

	do {

retry_root:

		bch2_trans_begin(trans);



		struct btree_iter iter;

		bch2_trans_node_iter_init(trans, &iter, btree, POS_MIN,

					  0, bch2_btree_id_root(c, btree)->b->c.level, 0);

		struct btree *b = bch2_btree_iter_peek_node(&iter);

		ret = PTR_ERR_OR_ZERO(b);

		if (ret)

			goto err_root;



		if (b != btree_node_root(c, b)) {

			bch2_trans_iter_exit(trans, &iter);

			goto retry_root;

		}



		gc_pos_set(c, gc_pos_btree(btree, b->c.level + 1, SPOS_MAX));

		ret = lockrestart_do(trans,

			bch2_gc_mark_key(trans, b->c.btree_id, b->c.level + 1,

					 NULL, NULL, bkey_i_to_s_c(&b->key), initial));

		struct bkey_s_c k = bkey_i_to_s_c(&b->key);

		ret = bch2_gc_mark_key(trans, btree, b->c.level + 1, NULL, NULL, k, initial);

		level = b->c.level;

	}

	mutex_unlock(&c->btree_root_lock);

err_root:

		bch2_trans_iter_exit(trans, &iter);

	} while (bch2_err_matches(ret, BCH_ERR_transaction_restart));



	if (ret)

		return ret;

fs/bcachefs/btree_iter.c

+4 −3
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ static int bch2_btree_path_traverse_all(struct btree_trans *trans) 


	bch2_trans_unlock(trans);

	cond_resched();

	trans->locked = true;

	trans_set_locked(trans);



	if (unlikely(trans->memory_allocation_failure)) {

		struct closure cl;
@@ -3089,7 +3089,8 @@ u32 bch2_trans_begin(struct btree_trans *trans) 
		bch2_trans_srcu_unlock(trans);



	trans->last_begin_ip = _RET_IP_;

	trans->locked  = true;



	trans_set_locked(trans);



	if (trans->restarted) {

		bch2_btree_path_traverse_all(trans);
@@ -3159,7 +3160,6 @@ struct btree_trans *__bch2_trans_get(struct bch_fs *c, unsigned fn_idx) 
	trans->last_begin_time	= local_clock();

	trans->fn_idx		= fn_idx;

	trans->locking_wait.task = current;

	trans->locked		= true;

	trans->journal_replay_not_finished =

		unlikely(!test_bit(JOURNAL_replay_done, &c->journal.flags)) &&

		atomic_inc_not_zero(&c->journal_keys.ref);
@@ -3193,6 +3193,7 @@ struct btree_trans *__bch2_trans_get(struct bch_fs *c, unsigned fn_idx) 
	trans->srcu_idx		= srcu_read_lock(&c->btree_trans_barrier);

	trans->srcu_lock_time	= jiffies;

	trans->srcu_held	= true;

	trans_set_locked(trans);



	closure_init_stack_release(&trans->ref);

	return trans;

fs/bcachefs/btree_locking.c

+4 −6
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static noinline int break_cycle(struct lock_graph *g, struct printbuf *cycle) 
			prt_newline(&buf);

		}



		bch2_print_string_as_lines(KERN_ERR, buf.buf);

		bch2_print_string_as_lines_nonblocking(KERN_ERR, buf.buf);

		printbuf_exit(&buf);

		BUG();

	}
@@ -792,7 +792,7 @@ static inline int __bch2_trans_relock(struct btree_trans *trans, bool trace) 
			return bch2_trans_relock_fail(trans, path, &f, trace);

	}



	trans->locked = true;

	trans_set_locked(trans);

out:

	bch2_trans_verify_locks(trans);

	return 0;
@@ -812,16 +812,14 @@ void bch2_trans_unlock_noassert(struct btree_trans *trans) 
{

	__bch2_trans_unlock(trans);



	trans->locked = false;

	trans->last_unlock_ip = _RET_IP_;

	trans_set_unlocked(trans);

}



void bch2_trans_unlock(struct btree_trans *trans)

{

	__bch2_trans_unlock(trans);



	trans->locked = false;

	trans->last_unlock_ip = _RET_IP_;

	trans_set_unlocked(trans);

}



void bch2_trans_unlock_long(struct btree_trans *trans)

fs/bcachefs/btree_locking.h

+22 −0
Original line number Diff line number Diff line
@@ -193,6 +193,28 @@ int bch2_six_check_for_deadlock(struct six_lock *lock, void *p); 


/* lock: */



static inline void trans_set_locked(struct btree_trans *trans)

{

	if (!trans->locked) {

		trans->locked = true;

		trans->last_unlock_ip = 0;



		trans->pf_memalloc_nofs = (current->flags & PF_MEMALLOC_NOFS) != 0;

		current->flags |= PF_MEMALLOC_NOFS;

	}

}



static inline void trans_set_unlocked(struct btree_trans *trans)

{

	if (trans->locked) {

		trans->locked = false;

		trans->last_unlock_ip = _RET_IP_;



		if (!trans->pf_memalloc_nofs)

			current->flags &= ~PF_MEMALLOC_NOFS;

	}

}



static inline int __btree_node_lock_nopath(struct btree_trans *trans,

					 struct btree_bkey_cached_common *b,

					 enum six_lock_type type,

fs/bcachefs/btree_types.h

+1 −0
Original line number Diff line number Diff line
@@ -484,6 +484,7 @@ struct btree_trans { 
	bool			lock_may_not_fail:1;

	bool			srcu_held:1;

	bool			locked:1;

	bool			pf_memalloc_nofs:1;

	bool			write_locked:1;

	bool			used_mempool:1;

	bool			in_traverse_all:1;