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

torture: Place --bootargs parameters at end of -append list 



Currently, the kernel boot parameters specified by the kvm.sh --bootargs
parameter are placed near the beginning of the -append list that is
passed to qemu.  This means that in the not-uncommon case of a kernel
boot parameter where the last argument wins, the --bootargs list overrides
neither the list in the .boot file nor the additional parameters supplied
by the rcutorture scripting.

This commit therefore places the kernel boot parameters specified by
the kvm.sh --bootargs parameter at the end of qemu's -append list.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ checkarg () { 
configfrag_boot_params () {

	if test -r "$2.boot"

	then

		echo $1 `grep -v '^#' "$2.boot" | tr '\012' ' '`

		echo `grep -v '^#' "$2.boot" | tr '\012' ' '` $1

	else

		echo $1

	fi

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

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ boot_args="`configfrag_boot_params "$boot_args_in" "$config_template"`" 
boot_args="`per_version_boot_params "$boot_args" $resdir/.config $seconds`"

if test -n "$TORTURE_BOOT_GDB_ARG"

then

	boot_args="$boot_args $TORTURE_BOOT_GDB_ARG"

	boot_args="$TORTURE_BOOT_GDB_ARG $boot_args"

fi



# Give bare-metal advice

tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh

+3 −2
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ locktorture_param_onoff () { 
#

# Adds per-version torture-module parameters to kernels supporting them.

per_version_boot_params () {

	echo $1 `locktorture_param_onoff "$1" "$2"` \

	echo	`locktorture_param_onoff "$1" "$2"` \

		locktorture.stat_interval=15 \

		locktorture.shutdown_secs=$3 \

		locktorture.verbose=1

		locktorture.verbose=1 \

		$1

}

tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh

+3 −2
Original line number Diff line number Diff line
@@ -46,10 +46,11 @@ rcutorture_param_stat_interval () { 
#

# Adds per-version torture-module parameters to kernels supporting them.

per_version_boot_params () {

	echo $1 `rcutorture_param_onoff "$1" "$2"` \

	echo	`rcutorture_param_onoff "$1" "$2"` \

		`rcutorture_param_n_barrier_cbs "$1"` \

		`rcutorture_param_stat_interval "$1"` \

		rcutorture.shutdown_secs=$3 \

		rcutorture.test_no_idle_hz=1 \

		rcutorture.verbose=1

		rcutorture.verbose=1 \

		$1

}

tools/testing/selftests/rcutorture/configs/rcuscale/ver_functions.sh

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#

# Adds per-version torture-module parameters to kernels supporting them.

per_version_boot_params () {

	echo $1 rcuscale.shutdown=1 \

		rcuscale.verbose=0

	echo	rcuscale.shutdown=1 \

		rcuscale.verbose=0 \

		$1

}