public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bcachefs: Split trans->last_begin_ip and trans->last_restarted_ip

Browse source 
These are two different things - this improves our debug assert
messages.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-02-18 21:20:18 -05:00
parent 73d86dfd88
commit 5e2d8be8bd
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/bcachefs/btree_iter.c
View file

@ -976,6 +976,7 @@ static int bch2_btree_path_traverse_all(struct btree_trans *trans)
trans->in_traverse_all = true; trans->in_traverse_all = true;
retry_all: retry_all:
trans->restarted = 0; trans->restarted = 0;
trans->last_restarted_ip = 0;
trans_for_each_path(trans, path) trans_for_each_path(trans, path)
path->should_be_locked = false; path->should_be_locked = false;
@ -1360,7 +1361,7 @@ void __noreturn bch2_trans_restart_error(struct btree_trans *trans, u32 restart_
{ {
panic("trans->restart_count %u, should be %u, last restarted by %pS\n", panic("trans->restart_count %u, should be %u, last restarted by %pS\n",
trans->restart_count, restart_count, trans->restart_count, restart_count,
(void *) trans->last_restarted_ip); (void *) trans->last_begin_ip);
} }
void __noreturn bch2_trans_in_restart_error(struct btree_trans *trans) void __noreturn bch2_trans_in_restart_error(struct btree_trans *trans)
@ -2865,7 +2866,7 @@ u32 bch2_trans_begin(struct btree_trans *trans)
if (unlikely(time_after(jiffies, trans->srcu_lock_time + msecs_to_jiffies(10)))) if (unlikely(time_after(jiffies, trans->srcu_lock_time + msecs_to_jiffies(10))))
bch2_trans_reset_srcu_lock(trans); bch2_trans_reset_srcu_lock(trans);
trans->last_restarted_ip = _RET_IP_; trans->last_begin_ip = _RET_IP_;
if (trans->restarted) { if (trans->restarted) {
bch2_btree_path_traverse_all(trans); bch2_btree_path_traverse_all(trans);
trans->notrace_relock_fail = false; trans->notrace_relock_fail = false;

1
fs/bcachefs/btree_iter.h
View file

@ -260,6 +260,7 @@ static inline int btree_trans_restart_nounlock(struct btree_trans *trans, int er
BUG_ON(!bch2_err_matches(err, BCH_ERR_transaction_restart)); BUG_ON(!bch2_err_matches(err, BCH_ERR_transaction_restart));
trans->restarted = err; trans->restarted = err;
trans->last_restarted_ip = _THIS_IP_;
return -err; return -err;
} }

1
fs/bcachefs/btree_types.h
View file

@ -431,6 +431,7 @@ struct btree_trans {
bool notrace_relock_fail:1; bool notrace_relock_fail:1;
enum bch_errcode restarted:16; enum bch_errcode restarted:16;
u32 restart_count; u32 restart_count;
unsigned long last_begin_ip;
unsigned long last_restarted_ip; unsigned long last_restarted_ip;
unsigned long srcu_lock_time; unsigned long srcu_lock_time;