nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

locking/lockdep/selftests: Fix mixed read-write ABBA tests

Browse source 
Commit:

  e914985897 ("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>
This commit is contained in:
Peter Zijlstra 2017-08-28 14:42:45 +02:00 committed by Ingo Molnar
parent ec81048cc3
commit d82fed7529
1 changed files with 6 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
lib/locking-selftest.c
View file

@ -2031,6 +2031,12 @@ void locking_selftest(void)
print_testname("mixed read-lock/lock-write ABBA"); print_testname("mixed read-lock/lock-write ABBA");
pr_cont(" |"); pr_cont(" |");
dotest(rlock_ABBA1, FAILURE, LOCKTYPE_RWLOCK); 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(" |"); pr_cont(" |");
dotest(rwsem_ABBA1, FAILURE, LOCKTYPE_RWSEM); dotest(rwsem_ABBA1, FAILURE, LOCKTYPE_RWSEM);