kcsan: Remove CONFIG_KCSAN_DEBUG

By this point CONFIG_KCSAN_DEBUG is pretty useless, as the system just
isn't usable with it due to spamming console (I imagine a randconfig
test robot will run into this sooner or later). Remove it.

Back in 2019 I used it occasionally to record traces of watchpoints and
verify the encoding is correct, but these days we have proper tests. If
something similar is needed in future, just add it back ad-hoc.

Signed-off-by: Marco Elver <elver@google.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

diff --git a/kernel/kcsan/core.c b/kernel/kcsan/core.c
index 26709ea65c7151c6cd8ef00602baf61ce776fea6..d92977ede7e17be6f24a13c05e34313857f5460f 100644 (file)
--- a/kernel/kcsan/core.c
+++ b/kernel/kcsan/core.c
@@ -479,15 +479,6 @@ kcsan_setup_watchpoint(const volatile void *ptr, size_t size, int type)
                break; /* ignore; we do not diff the values */
        }
 
-       if (IS_ENABLED(CONFIG_KCSAN_DEBUG)) {
-               kcsan_disable_current();
-               pr_err("watching %s, size: %zu, addr: %px [slot: %d, encoded: %lx]\n",
-                      is_write ? "write" : "read", size, ptr,
-                      watchpoint_slot((unsigned long)ptr),
-                      encode_watchpoint((unsigned long)ptr, size, is_write));
-               kcsan_enable_current();
-       }
-
        /*
         * Delay this thread, to increase probability of observing a racy
         * conflicting access.

diff --git a/lib/Kconfig.kcsan b/lib/Kconfig.kcsan
index 6152fbd5cbb43efce1c3fc321510f0a4ceb7fc6a..5304f211f81f1c467fe74e39cb545b819656468d 100644 (file)
--- a/lib/Kconfig.kcsan
+++ b/lib/Kconfig.kcsan
@@ -62,9 +62,6 @@ config KCSAN_VERBOSE
          generated from any one of them, system stability may suffer due to
          deadlocks or recursion.  If in doubt, say N.
 
-config KCSAN_DEBUG
-       bool "Debugging of KCSAN internals"
-
 config KCSAN_SELFTEST
        bool "Perform short selftests on boot"
        default y