OSDN Git Service

locking/selftest: Remove the bad unlock ordering test
authorPeter Zijlstra <peterz@infradead.org>
Wed, 31 May 2017 15:05:46 +0000 (17:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 8 Jun 2017 08:35:49 +0000 (10:35 +0200)
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>
lib/locking-selftest.c

index f3a217e..dd09e51 100644 (file)
@@ -516,34 +516,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:
  */
 #define E()                                    \
@@ -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");