Skip to content

Commit a883f27

Browse files
paulmckrcuNeeraj Upadhyay (AMD)
authored andcommitted
torture: Provide EXPERT Kconfig option for arm64 KCSAN torture.sh runs
The arm64 architecture requires that KCSAN-enabled kernels be built with the CONFIG_EXPERT=y Kconfig option. This commit therefore causes the torture.sh script to provide this option, but only for --kcsan runs on arm64 systems. Signed-off-by: Paul E. McKenney <paulmck@kernel.org> Cc: Marco Elver <elver@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: <kasan-dev@googlegroups.com> Cc: <linux-arm-kernel@lists.infradead.org> Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Neeraj Upadhyay (AMD) <neeraj.upadhyay@kernel.org>
1 parent 103d567 commit a883f27

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,13 @@ then
313313
do_scftorture=no
314314
fi
315315

316+
# CONFIG_EXPERT=y is currently required for arm64 KCSAN runs.
317+
kcsan_expert=
318+
if test "${thisarch}" = aarch64
319+
then
320+
kcsan_expert="CONFIG_EXPERT=y"
321+
fi
322+
316323
touch $T/failures
317324
touch $T/successes
318325

@@ -392,7 +399,7 @@ function torture_set {
392399
then
393400
chk_rdr_state="CONFIG_RCU_TORTURE_TEST_CHK_RDR_STATE=y"
394401
fi
395-
torture_one "$@" --kconfig "CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y ${chk_rdr_state}" $kcsan_kmake_tag $cur_kcsan_kmake_args --kcsan
402+
torture_one "$@" --kconfig "CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y ${kcsan_expert} ${chk_rdr_state}" $kcsan_kmake_tag $cur_kcsan_kmake_args --kcsan
396403
mv $T/last-resdir $T/last-resdir-kcsan || :
397404
fi
398405
}

0 commit comments

Comments
 (0)