Skip to content

Commit

Permalink
Revert "locking/lockdep/selftests: Fix mixed read-write ABBA tests"
Browse files Browse the repository at this point in the history
This reverts commit d82fed7.

Since we now could handle mixed read-write deadlock detection well, the
self tests could be detected as expected, no need to use this
work-around.

Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200807074238.1632519-18-boqun.feng@gmail.com
  • Loading branch information
Boqun Feng authored and Peter Zijlstra committed Aug 26, 2020
1 parent 8ef7ca7 commit 108dc42
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions lib/locking-selftest.c
Original file line number Diff line number Diff line change
Expand Up @@ -2273,14 +2273,6 @@ void locking_selftest(void)
print_testname("mixed read-lock/lock-write ABBA");
pr_cont(" |");
dotest(rlock_ABBA1, FAILURE, LOCKTYPE_RWLOCK);
#ifdef CONFIG_PROVE_LOCKING
/*
* Lockdep does indeed fail here, but there's nothing we can do about
* that now. Don't kill lockdep for it.
*/
unexpected_testcase_failures--;
#endif

pr_cont(" |");
dotest(rwsem_ABBA1, FAILURE, LOCKTYPE_RWSEM);

Expand Down

0 comments on commit 108dc42

Please sign in to comment.