From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 31 May 2017 15:05:46 +0000 (+0200)
Subject: locking/selftest: Remove the bad unlock ordering test
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cfb6133399a490419cda55fcdcf9dbbca65eacba;p=linux.git
locking/selftest: Remove the bad unlock ordering test
There is no such thing as a bad unlock order.
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: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index f3a217ea03888..dd09e517c492b 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -515,34 +515,6 @@ GENERATE_TESTCASE(double_unlock_rsem)
#undef E
-/*
- * Bad unlock ordering:
- */
-#define E() \
- \
- LOCK(A); \
- LOCK(B); \
- UNLOCK(A); /* fail */ \
- UNLOCK(B);
-
-/*
- * 6 testcases:
- */
-#include "locking-selftest-spin.h"
-GENERATE_TESTCASE(bad_unlock_order_spin)
-#include "locking-selftest-wlock.h"
-GENERATE_TESTCASE(bad_unlock_order_wlock)
-#include "locking-selftest-rlock.h"
-GENERATE_TESTCASE(bad_unlock_order_rlock)
-#include "locking-selftest-mutex.h"
-GENERATE_TESTCASE(bad_unlock_order_mutex)
-#include "locking-selftest-wsem.h"
-GENERATE_TESTCASE(bad_unlock_order_wsem)
-#include "locking-selftest-rsem.h"
-GENERATE_TESTCASE(bad_unlock_order_rsem)
-
-#undef E
-
/*
* initializing a held lock:
*/
@@ -1825,7 +1797,6 @@ void locking_selftest(void)
DO_TESTCASE_6R("A-B-C-D-B-C-D-A deadlock", ABCDBCDA);
DO_TESTCASE_6("double unlock", double_unlock);
DO_TESTCASE_6("initialize held", init_held);
- DO_TESTCASE_6_SUCCESS("bad unlock order", bad_unlock_order);
printk(" --------------------------------------------------------------------------\n");
print_testname("recursive read-lock");