Commit 22bf64cc authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

torture: Make kvm.sh include --kconfig arguments in CPU calculation 



Currently, passing something like "--kconfig CONFIG_NR_CPUS=2" to kvm.sh
has no effect on scenario scheduling.  For scenarios that do not specify
the number of CPUs, this can result in kvm.sh wastefully scheduling only
one scenario at a time even when the --kconfig argument would allow
a number to be run concurrently.  This commit therefore makes kvm.sh
consider the --kconfig arguments when scheduling scenarios across the
available CPUs.

Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 23239fc0

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

+7 −1
Original line number Diff line number Diff line
@@ -290,7 +290,13 @@ for CF1 in $configs_derep 
do

	if test -f "$CONFIGFRAG/$CF1"

	then

		if echo "$TORTURE_KCONFIG_ARG" | grep -q '\<CONFIG_NR_CPUS='

		then

			echo "$TORTURE_KCONFIG_ARG" | tr -s ' ' | tr ' ' '\012' > $T/KCONFIG_ARG

			cpu_count=`configNR_CPUS.sh $T/KCONFIG_ARG`

		else

			cpu_count=`configNR_CPUS.sh $CONFIGFRAG/$CF1`

		fi

		cpu_count=`configfrag_boot_cpus "$TORTURE_BOOTARGS" "$CONFIGFRAG/$CF1" "$cpu_count"`

		cpu_count=`configfrag_boot_maxcpus "$TORTURE_BOOTARGS" "$CONFIGFRAG/$CF1" "$cpu_count"`

		echo $CF1 $cpu_count >> $T/cfgcpu