a5202e173d
This commit causes kvm-test-1-run-batch.sh to use the new kvm-assign-cpus.sh and kvm-get-cpus-script.sh scripts to create a TORTURE_AFFINITY environment variable containing either an empty string (for no affinity) or a list of CPUs to pin the scenario's vCPUs to. The additional change to kvm-test-1-run.sh places the per-scenario number-of-CPUs information where it can easily be found. If there is some reason why affinity cannot be supplied, this commit prints and logs the reason via changes to kvm-again.sh. Finally, this commit updates the kvm-remote.sh script to copy the qemu-affinity output files back to the host system. Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
92 lines
2.6 KiB
Bash
Executable File
92 lines
2.6 KiB
Bash
Executable File
#!/bin/bash
|
|
# SPDX-License-Identifier: GPL-2.0+
|
|
#
|
|
# Carry out a kvm-based run for the specified batch of scenarios, which
|
|
# might have been built by --build-only kvm.sh run.
|
|
#
|
|
# Usage: kvm-test-1-run-batch.sh SCENARIO [ SCENARIO ... ]
|
|
#
|
|
# Each SCENARIO is the name of a directory in the current directory
|
|
# containing a ready-to-run qemu-cmd file.
|
|
#
|
|
# Copyright (C) 2021 Facebook, Inc.
|
|
#
|
|
# Authors: Paul E. McKenney <paulmck@kernel.org>
|
|
|
|
T=${TMPDIR-/tmp}/kvm-test-1-run-batch.sh.$$
|
|
trap 'rm -rf $T' 0
|
|
mkdir $T
|
|
|
|
echo ---- Running batch $*
|
|
# Check arguments
|
|
runfiles=
|
|
for i in "$@"
|
|
do
|
|
if ! echo $i | grep -q '^[^/.a-z]\+\(\.[0-9]\+\)\?$'
|
|
then
|
|
echo Bad scenario name: \"$i\" 1>&2
|
|
exit 1
|
|
fi
|
|
if ! test -d "$i"
|
|
then
|
|
echo Scenario name not a directory: \"$i\" 1>&2
|
|
exit 2
|
|
fi
|
|
if ! test -f "$i/qemu-cmd"
|
|
then
|
|
echo Scenario lacks a command file: \"$i/qemu-cmd\" 1>&2
|
|
exit 3
|
|
fi
|
|
rm -f $i/build.*
|
|
touch $i/build.run
|
|
runfiles="$runfiles $i/build.run"
|
|
done
|
|
|
|
# Extract settings from the qemu-cmd file.
|
|
grep '^#' $1/qemu-cmd | sed -e 's/^# //' > $T/qemu-cmd-settings
|
|
. $T/qemu-cmd-settings
|
|
|
|
# Start up jitter, start each scenario, wait, end jitter.
|
|
echo ---- System running test: `uname -a`
|
|
echo ---- Starting kernels. `date` | tee -a log
|
|
$TORTURE_JITTER_START
|
|
kvm-assign-cpus.sh /sys/devices/system/node > $T/cpuarray.awk
|
|
for i in "$@"
|
|
do
|
|
echo ---- System running test: `uname -a` > $i/kvm-test-1-run-qemu.sh.out
|
|
echo > $i/kvm-test-1-run-qemu.sh.out
|
|
export TORTURE_AFFINITY=
|
|
kvm-get-cpus-script.sh $T/cpuarray.awk $T/cpubatches.awk $T/cpustate
|
|
cat << ' ___EOF___' >> $T/cpubatches.awk
|
|
END {
|
|
affinitylist = "";
|
|
if (!gotcpus()) {
|
|
print "echo No CPU-affinity information, so no taskset command.";
|
|
} else if (cpu_count !~ /^[0-9][0-9]*$/) {
|
|
print "echo " scenario ": Bogus number of CPUs (old qemu-cmd?), so no taskset command.";
|
|
} else {
|
|
affinitylist = nextcpus(cpu_count);
|
|
if (!(affinitylist ~ /^[0-9,-][0-9,-]*$/))
|
|
print "echo " scenario ": Bogus CPU-affinity information, so no taskset command.";
|
|
else if (!dumpcpustate())
|
|
print "echo " scenario ": Could not dump state, so no taskset command.";
|
|
else
|
|
print "export TORTURE_AFFINITY=" affinitylist;
|
|
}
|
|
}
|
|
___EOF___
|
|
cpu_count="`grep '# TORTURE_CPU_COUNT=' $i/qemu-cmd | sed -e 's/^.*=//'`"
|
|
affinity_export="`awk -f $T/cpubatches.awk -v cpu_count="$cpu_count" -v scenario=$i < /dev/null`"
|
|
$affinity_export
|
|
kvm-test-1-run-qemu.sh $i >> $i/kvm-test-1-run-qemu.sh.out 2>&1 &
|
|
done
|
|
for i in $runfiles
|
|
do
|
|
while ls $i > /dev/null 2>&1
|
|
do
|
|
:
|
|
done
|
|
done
|
|
echo ---- All kernel runs complete. `date` | tee -a log
|
|
$TORTURE_JITTER_STOP
|