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

torture: Put kvm.sh batch-creation awk script into a temp file 



This commit is a first step towards pinning guest-OS vCPUs so as
to force latency differences, especially on multi-socket systems.
The kvm.sh script puts its batch-creation awk script into a temporary
file so that later commits can add the awk code needed to dole out CPUs
so as to maximize latency differences.  This awk code will be used by
multiple scripts.

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

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

+15 −12
Original line number Diff line number Diff line
@@ -430,17 +430,8 @@ then 
	git diff HEAD >> $resdir/$ds/testid.txt

fi

___EOF___

awk < $T/cfgcpu.pack \

	-v TORTURE_BUILDONLY="$TORTURE_BUILDONLY" \

	-v CONFIGDIR="$CONFIGFRAG/" \

	-v KVM="$KVM" \

	-v ncpus=$cpus \

	-v jitter="$jitter" \

	-v rd=$resdir/$ds/ \

	-v dur=$dur \

	-v TORTURE_QEMU_ARG="$TORTURE_QEMU_ARG" \

	-v TORTURE_BOOTARGS="$TORTURE_BOOTARGS" \

'BEGIN {

cat << '___EOF___' > $T/dumpbatches.awk

BEGIN {

	i = 0;

}
@@ -560,7 +551,19 @@ END { 
	# Dump the last batch.

	if (ncpus != 0)

		dump(first, i, batchnum);

}' >> $T/script

}

___EOF___

awk < $T/cfgcpu.pack \

	-v TORTURE_BUILDONLY="$TORTURE_BUILDONLY" \

	-v CONFIGDIR="$CONFIGFRAG/" \

	-v KVM="$KVM" \

	-v ncpus=$cpus \

	-v jitter="$jitter" \

	-v rd=$resdir/$ds/ \

	-v dur=$dur \

	-v TORTURE_QEMU_ARG="$TORTURE_QEMU_ARG" \

	-v TORTURE_BOOTARGS="$TORTURE_BOOTARGS" \

	-f $T/dumpbatches.awk >> $T/script

echo kvm-end-run-stats.sh "$resdir/$ds" "$starttime" >> $T/script



# Extract the tests and their batches from the script.