locking/selftests: More granular debug_locks_verbose

Showing all tests all the time is tiresome.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index c722ec19cd00485ceb9ba4dfce2cf9c5d2deb1d0..611a5c3034e7b29a11e25fdb29ebcfbc4170d6a6 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -802,13 +802,14 @@
                        insecure, please do not use on production kernels.
 
        debug_locks_verbose=
-                       [KNL] verbose self-tests
-                       Format=<0|1>
+                       [KNL] verbose locking self-tests
+                       Format: <int>
                        Print debugging info while doing the locking API
                        self-tests.
-                       We default to 0 (no extra messages), setting it to
-                       1 will print _a lot_ more information - normally
-                       only useful to kernel developers.
+                       Bitmask for the various LOCKTYPE_ tests. Defaults to 0
+                       (no extra messages), setting it to -1 (all bits set)
+                       will print _a_lot_ more information - normally only
+                       useful to lockdep developers.
 
        debug_objects   [KNL] Enable object debugging
 

diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 23376eeccf7cf72eeb3573f43461ff976700902f..3306f43b00071b925a5d98f0b63512dc34d9fe42 100644 (file)
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -1390,6 +1390,8 @@ static void dotest(void (*testcase_fn)(void), int expected, int lockclass_mask)
 
        WARN_ON(irqs_disabled());
 
+       debug_locks_silent = !(debug_locks_verbose & lockclass_mask);
+
        testcase_fn();
        /*
         * Filter out expected failures:
@@ -1410,7 +1412,7 @@ static void dotest(void (*testcase_fn)(void), int expected, int lockclass_mask)
        }
        testcase_total++;
 
-       if (debug_locks_verbose)
+       if (debug_locks_verbose & lockclass_mask)
                pr_cont(" lockclass mask: %x, debug_locks: %d, expected: %d\n",
                        lockclass_mask, debug_locks, expected);
        /*
@@ -2674,7 +2676,6 @@ void locking_selftest(void)
        printk("  --------------------------------------------------------------------------\n");
 
        init_shared_classes();
-       debug_locks_silent = !debug_locks_verbose;
        lockdep_set_selftest_task(current);
 
        DO_TESTCASE_6R("A-A deadlock", AA);