AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-22 18:32:14 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

torture: Allow --kconfig options to override --kcsan defaults

Browse Source 
Currently, attempting to override a --kcsan default with a --kconfig
option might or might not work.  However, it would be good to allow the
user to adjust the --kcsan defaults, for example, to specify a different
time for CONFIG_KCSAN_REPORT_ONCE_IN_MS.  This commit therefore uses the
new config_override_param() bash function to apply the --kcsan defaults
and then apply the --kconfig options, which allows this overriding
to occur.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
This commit is contained in:
Paul E. McKenney 2020-04-09 16:10:36 -07:00
parent 6be63d7d9c
commit 3d17ded902
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,9 @@ else
fi fi
echo " --- $config_template" >> $resdir/ConfigFragment.input echo " --- $config_template" >> $resdir/ConfigFragment.input
cat $config_template >> $resdir/ConfigFragment.input cat $config_template >> $resdir/ConfigFragment.input
config_override_param "--kconfig argument" Kc1 Kc2 "$TORTURE_KCONFIG_ARG" config_override_param "--kcsan options" Kc1 Kc2 "$TORTURE_KCONFIG_KCSAN_ARG"
cp $T/Kc2 $resdir/ConfigFragment config_override_param "--kconfig argument" Kc2 Kc3 "$TORTURE_KCONFIG_ARG"
cp $T/Kc3 $resdir/ConfigFragment
base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'` base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`
if test "$base_resdir" != "$resdir" -a -f $base_resdir/bzImage -a -f $base_resdir/vmlinux if test "$base_resdir" != "$resdir" -a -f $base_resdir/bzImage -a -f $base_resdir/vmlinux
@ -87,7 +88,7 @@ then
ln -s $base_resdir/.config $resdir # for kvm-recheck.sh ln -s $base_resdir/.config $resdir # for kvm-recheck.sh
# Arch-independent indicator # Arch-independent indicator
touch $resdir/builtkernel touch $resdir/builtkernel
elif kvm-build.sh $T/Kc2 $resdir elif kvm-build.sh $T/Kc3 $resdir
then then
# Had to build a kernel for this test. # Had to build a kernel for this test.
QEMU="`identify_qemu vmlinux`" QEMU="`identify_qemu vmlinux`"

3
tools/testing/selftests/rcutorture/bin/kvm.sh
View File

@ -205,9 +205,6 @@ else
exit 1 exit 1
fi fi
TORTURE_KCONFIG_ARG="${TORTURE_KCONFIG_ARG} ${TORTURE_KCONFIG_KCSAN_ARG}"
TORTURE_KCONFIG_ARG="`echo ${TORTURE_KCONFIG_ARG} | sed -e 's/^ *//' -e 's/ *$//'`"
CONFIGFRAG=${KVM}/configs/${TORTURE_SUITE}; export CONFIGFRAG CONFIGFRAG=${KVM}/configs/${TORTURE_SUITE}; export CONFIGFRAG
defaultconfigs="`tr '\012' ' ' < $CONFIGFRAG/CFLIST`" defaultconfigs="`tr '\012' ' ' < $CONFIGFRAG/CFLIST`"