Skip to content

Commit a7a7369

Browse files
melverpaulmckrcu
authored andcommitted
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>
1 parent eb32f9f commit a7a7369

2 files changed

Lines changed: 0 additions & 12 deletions

File tree

kernel/kcsan/core.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -479,15 +479,6 @@ kcsan_setup_watchpoint(const volatile void *ptr, size_t size, int type)
479479
break; /* ignore; we do not diff the values */
480480
}
481481

482-
if (IS_ENABLED(CONFIG_KCSAN_DEBUG)) {
483-
kcsan_disable_current();
484-
pr_err("watching %s, size: %zu, addr: %px [slot: %d, encoded: %lx]\n",
485-
is_write ? "write" : "read", size, ptr,
486-
watchpoint_slot((unsigned long)ptr),
487-
encode_watchpoint((unsigned long)ptr, size, is_write));
488-
kcsan_enable_current();
489-
}
490-
491482
/*
492483
* Delay this thread, to increase probability of observing a racy
493484
* conflicting access.

lib/Kconfig.kcsan

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ config KCSAN_VERBOSE
6262
generated from any one of them, system stability may suffer due to
6363
deadlocks or recursion. If in doubt, say N.
6464

65-
config KCSAN_DEBUG
66-
bool "Debugging of KCSAN internals"
67-
6865
config KCSAN_SELFTEST
6966
bool "Perform short selftests on boot"
7067
default y

0 commit comments

Comments
 (0)