Commit d82fed75 authored Aug 28, 2017 by Peter Zijlstra Committed by Ingo Molnar Aug 29, 2017

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



Commit:

  e9149858 ("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>

parent ec81048c

lib/locking-selftest.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -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);