torture: Loosen .config checks for KCSAN kernels

KCSAN enables some Kconfig options unilaterally and unconditionally,
including CONFIG_PROVE_LOCKING.  This in turn enables CONFIG_PROVE_RCU
and CONFIG_PREEMPT_COUNT, which conflicts with constraints in SRCU-T,
TRACE01, and TREE10, which in turn causes rcutorture to emit spurious
configuration complaints.  This commit therefore forgives configuration
complaints involving CONFIG_PROVE_RCU and CONFIG_PREEMPT_COUNT.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
index 97bdacc3fc55fcc0e4f9cd0dd076ec097b27faea..5be670dd400901d77f7838ecc01163a79503a25b 100755 (executable)
--- a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
@@ -52,6 +52,13 @@ do
                                echo QEMU killed
                        fi
                        configcheck.sh $i/.config $i/ConfigFragment > $i/ConfigFragment.diags 2>&1
+                       if grep -q '^CONFIG_KCSAN=y$' $i/ConfigFragment.input
+                       then
+                               # KCSAN forces a number of Kconfig options, so remove
+                               # complaints about those Kconfig options in KCSAN runs.
+                               mv $i/ConfigFragment.diags $i/ConfigFragment.diags.kcsan
+                               grep -v -E 'CONFIG_PROVE_RCU|CONFIG_PREEMPT_COUNT' $i/ConfigFragment.diags.kcsan > $i/ConfigFragment.diags
+                       fi
                        if test -s $i/ConfigFragment.diags
                        then
                                cat $i/ConfigFragment.diags