Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

rcutorture: Use nr_cpus rather than maxcpus to limit test size 



The maxcpus= kernel boot parameter limits the number of CPUs brought
online at boot time, but it does nothing to prevent additional CPUs
from being brought up later.  Placing a hard cap on the total number
of CPUs is instead the job of the nr_cpus= boot parameter.  This commit
therefore switches the configfrag_boot_cpus() shell function from maxcpus=
to nr_cpus=.  This commit also adds a nr_cpus=43 kernel parameter to RCU's
TREE01 test scenario, but retains the maxcpus=8 kernel parameter in order
to test the ability of RCU expedited grace periods to handle new CPUs
coming online for the first time during grace-period initialization.
Finally, this commit makes the torture scheduling allow maxcpus= to
override other means of specifying the number of CPUs to allow for.
This last works because the torture kernel modules size their workloads
based on the number of CPUs present at the start of the test, not the
ultimate number of CPUs.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent b3c98314

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

+26 −1
Original line number Diff line number Diff line
@@ -66,8 +66,33 @@ configfrag_boot_params () { 


# configfrag_boot_cpus bootparam-string config-fragment-file config-cpus

#

# Decreases number of CPUs based on any maxcpus= boot parameters specified.

# Decreases number of CPUs based on any nr_cpus= boot parameters specified.

configfrag_boot_cpus () {

	local bootargs="`configfrag_boot_params "$1" "$2"`"

	local nr_cpus

	if echo "${bootargs}" | grep -q 'nr_cpus=[0-9]'

	then

		nr_cpus="`echo "${bootargs}" | sed -e 's/^.*nr_cpus=\([0-9]*\).*$/\1/'`"

		if test "$3" -gt "$nr_cpus"

		then

			echo $nr_cpus

		else

			echo $3

		fi

	else

		echo $3

	fi

}



# configfrag_boot_maxcpus bootparam-string config-fragment-file config-cpus

#

# Decreases number of CPUs based on any maxcpus= boot parameters specified.

# This allows tests where additional CPUs come online later during the

# test run.  However, the torture parameters will be set based on the

# number of CPUs initially present, so the scripting should schedule

# test runs based on the maxcpus= boot parameter controlling the initial

# number of CPUs instead of on the ultimate number of CPUs.

configfrag_boot_maxcpus () {

	local bootargs="`configfrag_boot_params "$1" "$2"`"

	local maxcpus

	if echo "${bootargs}" | grep -q 'maxcpus=[0-9]'

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

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ do 
	then

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

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

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

		for ((cur_rep=0;cur_rep<$config_reps;cur_rep++))

		do

			echo $CF1 $cpu_count >> $T/cfgcpu

tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot

+1 −1
Original line number Diff line number Diff line 
rcutorture.torture_type=rcu_bh maxcpus=8

rcutorture.torture_type=rcu_bh maxcpus=8 nr_cpus=43

rcutree.gp_preinit_delay=3

rcutree.gp_init_delay=3

rcutree.gp_cleanup_delay=3