mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
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: Paul E. McKenney <paulmck@kernel.org>
This commit is contained in:
parent
2f25542c6f
commit
171cfa011e
7 changed files with 17 additions and 12 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#
|
||||
# Adds per-version torture-module parameters to kernels supporting them.
|
||||
per_version_boot_params () {
|
||||
echo $1 refscale.shutdown=1 \
|
||||
refscale.verbose=0
|
||||
echo refscale.shutdown=1 \
|
||||
refscale.verbose=0 \
|
||||
$1
|
||||
}
|
||||
|
|
|
@ -22,8 +22,9 @@ scftorture_param_onoff () {
|
|||
#
|
||||
# Adds per-version torture-module parameters to kernels supporting them.
|
||||
per_version_boot_params () {
|
||||
echo $1 `scftorture_param_onoff "$1" "$2"` \
|
||||
echo `scftorture_param_onoff "$1" "$2"` \
|
||||
scftorture.stat_interval=15 \
|
||||
scftorture.shutdown_secs=$3 \
|
||||
scftorture.verbose=1
|
||||
scftorture.verbose=1 \
|
||||
$1
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue