Messages in this thread Patch in this message | | | Date | Tue, 29 Aug 2017 07:25:05 -0700 | From | tip-bot for Peter Zijlstra <> | Subject | [tip:locking/core] locking/lockdep/selftests: Fix mixed read-write ABBA tests |
| |
Commit-ID: d82fed75294229abc9d757f08a4817febae6c4f4 Gitweb: http://git.kernel.org/tip/d82fed75294229abc9d757f08a4817febae6c4f4 Author: Peter Zijlstra <peterz@infradead.org> AuthorDate: Mon, 28 Aug 2017 14:42:45 +0200 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Tue, 29 Aug 2017 15:15:17 +0200
locking/lockdep/selftests: Fix mixed read-write ABBA tests
Commit:
e91498589746 ("locking/lockdep/selftests: Add mixed read-write ABBA tests")
adds an explicit FAILURE to the locking selftest but overlooked the fact that this kills lockdep. Fudge the test to avoid this.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: hpa@zytor.com Link: http://lkml.kernel.org/r/20170828124245.xlo2yshxq2btgmuf@hirez.programming.kicks-ass.net Signed-off-by: Ingo Molnar <mingo@kernel.org> --- lib/locking-selftest.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c index 3c7151a..cd0b5c9 100644 --- a/lib/locking-selftest.c +++ b/lib/locking-selftest.c @@ -2031,6 +2031,12 @@ void locking_selftest(void) print_testname("mixed read-lock/lock-write ABBA"); pr_cont(" |"); dotest(rlock_ABBA1, FAILURE, LOCKTYPE_RWLOCK); + /* + * Lockdep does indeed fail here, but there's nothing we can do about + * that now. Don't kill lockdep for it. + */ + unexpected_testcase_failures--; + pr_cont(" |"); dotest(rwsem_ABBA1, FAILURE, LOCKTYPE_RWSEM);
| |