leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jbd2: track more dependencies on transaction commit

Browse Source 
So far we were tracking only dependency on transaction commit due to
starting a new handle (which may require commit to start a new
transaction). Now add tracking also for other cases where we wait for
transaction commit. This way lockdep can catch deadlocks e. g. because we
call jbd2_journal_stop() for a synchronous handle with some locks held
which rank below transaction start.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Jan Kara 2016-06-30 11:40:54 -04:00 committed by Theodore Ts'o
parent ab714aff4f
commit 1eaa566d36
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/jbd2/journal.c
View File

@ -691,6 +691,7 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid)
{ {
int err = 0; int err = 0;
jbd2_might_wait_for_commit(journal);
read_lock(&journal->j_state_lock); read_lock(&journal->j_state_lock);
#ifdef CONFIG_JBD2_DEBUG #ifdef CONFIG_JBD2_DEBUG
if (!tid_geq(journal->j_commit_request, tid)) { if (!tid_geq(journal->j_commit_request, tid)) {

4
fs/jbd2/transaction.c
View File

@ -182,6 +182,8 @@ static int add_transaction_credits(journal_t *journal, int blocks,
int needed; int needed;
int total = blocks + rsv_blocks; int total = blocks + rsv_blocks;
jbd2_might_wait_for_commit(journal);
/* /*
* If the current transaction is locked down for commit, wait * If the current transaction is locked down for commit, wait
* for the lock to be released. * for the lock to be released.
@ -695,6 +697,8 @@ void jbd2_journal_lock_updates(journal_t *journal)
{ {
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
jbd2_might_wait_for_commit(journal);
write_lock(&journal->j_state_lock); write_lock(&journal->j_state_lock);
++journal->j_barrier_count; ++journal->j_barrier_count;

6
include/linux/jbd2.h
View File

@ -1046,6 +1046,12 @@ struct journal_s
#endif #endif
}; };
#define jbd2_might_wait_for_commit(j) \
do { \
rwsem_acquire(&j->j_trans_commit_map, 0, 0, _THIS_IP_); \
rwsem_release(&j->j_trans_commit_map, 1, _THIS_IP_); \
} while (0)
/* journal feature predicate functions */ /* journal feature predicate functions */
#define JBD2_FEATURE_COMPAT_FUNCS(name, flagname) \ #define JBD2_FEATURE_COMPAT_FUNCS(name, flagname) \
static inline bool jbd2_has_feature_##name(journal_t *j) \ static inline bool jbd2_has_feature_##name(journal_t *j) \