Skip to content

Commit 04dbcdb

Browse files
committed
torture: Add a --kasan argument
Make it a bit easier to apply KASAN to rcutorture runs with a new --kasan argument, again leveraging the config_override_param() bash function. Signed-off-by: Paul E. McKenney <[email protected]>
1 parent 409670a commit 04dbcdb

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ config_override_param () {
6666
echo > $T/KcList
6767
config_override_param "$config_dir/CFcommon" KcList "`cat $config_dir/CFcommon 2> /dev/null`"
6868
config_override_param "$config_template" KcList "`cat $config_template 2> /dev/null`"
69+
config_override_param "--kasan options" KcList "$TORTURE_KCONFIG_KASAN_ARG"
6970
config_override_param "--kcsan options" KcList "$TORTURE_KCONFIG_KCSAN_ARG"
7071
config_override_param "--kconfig argument" KcList "$TORTURE_KCONFIG_ARG"
7172
cp $T/KcList $resdir/ConfigFragment

tools/testing/selftests/rcutorture/bin/kvm.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ TORTURE_DEFCONFIG=defconfig
3131
TORTURE_BOOT_IMAGE=""
3232
TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD
3333
TORTURE_KCONFIG_ARG=""
34+
TORTURE_KCONFIG_KASAN_ARG=""
3435
TORTURE_KCONFIG_KCSAN_ARG=""
3536
TORTURE_KMAKE_ARG=""
3637
TORTURE_QEMU_MEM=512
@@ -134,6 +135,9 @@ do
134135
TORTURE_KCONFIG_ARG="$2"
135136
shift
136137
;;
138+
--kasan)
139+
TORTURE_KCONFIG_KASAN_ARG="CONFIG_DEBUG_INFO=y CONFIG_KASAN=y"; export TORTURE_KCONFIG_KASAN_ARG
140+
;;
137141
--kcsan)
138142
TORTURE_KCONFIG_KCSAN_ARG="CONFIG_DEBUG_INFO=y CONFIG_KCSAN=y CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC=n CONFIG_KCSAN_REPORT_VALUE_CHANGE_ONLY=n CONFIG_KCSAN_REPORT_ONCE_IN_MS=100000 CONFIG_KCSAN_VERBOSE=y CONFIG_KCSAN_INTERRUPT_WATCHER=y"; export TORTURE_KCONFIG_KCSAN_ARG
139143
;;
@@ -314,6 +318,7 @@ TORTURE_BUILDONLY="$TORTURE_BUILDONLY"; export TORTURE_BUILDONLY
314318
TORTURE_DEFCONFIG="$TORTURE_DEFCONFIG"; export TORTURE_DEFCONFIG
315319
TORTURE_INITRD="$TORTURE_INITRD"; export TORTURE_INITRD
316320
TORTURE_KCONFIG_ARG="$TORTURE_KCONFIG_ARG"; export TORTURE_KCONFIG_ARG
321+
TORTURE_KCONFIG_KASAN_ARG="$TORTURE_KCONFIG_KASAN_ARG"; export TORTURE_KCONFIG_KASAN_ARG
317322
TORTURE_KCONFIG_KCSAN_ARG="$TORTURE_KCONFIG_KCSAN_ARG"; export TORTURE_KCONFIG_KCSAN_ARG
318323
TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG"; export TORTURE_KMAKE_ARG
319324
TORTURE_QEMU_CMD="$TORTURE_QEMU_CMD"; export TORTURE_QEMU_CMD

0 commit comments

Comments
 (0)