The following commit has been merged into the locking/kcsan branch of tip: Commit-ID: 8cfbb04fae75260eae07ab8c74c1dcd44294d739 Gitweb: https://git.kernel.org/tip/8cfbb04fae75260eae07ab8c74c1dcd44294d739 Author: Marco Elver <elver@xxxxxxxxxx> AuthorDate: Tue, 04 Feb 2020 18:21:12 +01:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Sat, 21 Mar 2020 09:42:26 +01:00 kcsan: Clean up the main KCSAN Kconfig option This patch cleans up the rules of the 'KCSAN' Kconfig option by: 1. implicitly selecting 'STACKTRACE' instead of depending on it; 2. depending on DEBUG_KERNEL, to avoid accidentally turning KCSAN on if the kernel is not meant to be a debug kernel; 3. updating the short and long summaries. Signed-off-by: Marco Elver <elver@xxxxxxxxxx> Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- lib/Kconfig.kcsan | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/Kconfig.kcsan b/lib/Kconfig.kcsan index 020ac63..9785bbf 100644 --- a/lib/Kconfig.kcsan +++ b/lib/Kconfig.kcsan @@ -4,12 +4,15 @@ config HAVE_ARCH_KCSAN bool menuconfig KCSAN - bool "KCSAN: watchpoint-based dynamic data race detector" - depends on HAVE_ARCH_KCSAN && !KASAN && STACKTRACE + bool "KCSAN: dynamic data race detector" + depends on HAVE_ARCH_KCSAN && DEBUG_KERNEL && !KASAN + select STACKTRACE help - Kernel Concurrency Sanitizer is a dynamic data race detector, which - uses a watchpoint-based sampling approach to detect races. See - <file:Documentation/dev-tools/kcsan.rst> for more details. + The Kernel Concurrency Sanitizer (KCSAN) is a dynamic data race + detector, which relies on compile-time instrumentation, and uses a + watchpoint-based sampling approach to detect data races. + + See <file:Documentation/dev-tools/kcsan.rst> for more details. if KCSAN
![]() |