A handful of changes to the performance tests to make them more robust and faster. David Gibson (4): gitignore pidfiles other than passt.pid test: Combine iperf3c and iperf3s into a single DSL command test: Parameterize run time for throughput performance tests test: Rewrite test_iperf3 .gitignore | 3 +- test/lib/test | 113 +++++++++++++++++++------------------------- test/perf/passt_tcp | 68 ++++++++++---------------- test/perf/passt_udp | 63 +++++++++--------------- test/perf/pasta_tcp | 59 +++++++++-------------- test/perf/pasta_udp | 61 ++++++++++-------------- 6 files changed, 143 insertions(+), 224 deletions(-) -- 2.37.2
The tests now use a number of pidfiles for qemu and pasta as well as passt.pid. Broaden the .gitignore file so these aren't unintentially committed. Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au> --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4aab0f6..9b17f12 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ /qrap /pasta.1 /seccomp.h -/passt.pid +/*.pid README.plain.md -- 2.37.2
These two commands in the DSL to run an iperf client and server are always
used together, and some of the parameters must match between them. The
iperf3s must also be run more or less immediately after iperf3c, since
iperf3c will run a client in the background after a sleep and requires a
server to be running before it will work.
A bunch of things can be made cleaner if we make a single DSL command that
runs both sides of the test. For now make the combined command work
exactly like the two commands together did, warts and all.
This does lose the ability for the DSL scripts to give additional options
to the iperf3 server, but we weren't using that anyway.
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
test/lib/test | 90 ++++++++++++++++++++++-----------------------
test/perf/passt_tcp | 60 ++++++++++--------------------
test/perf/passt_udp | 60 ++++++++++--------------------
test/perf/pasta_tcp | 51 +++++++++----------------
test/perf/pasta_udp | 58 +++++++++++------------------
5 files changed, 122 insertions(+), 197 deletions(-)
diff --git a/test/lib/test b/test/lib/test
index e5a8632..600399b 100755
--- a/test/lib/test
+++ b/test/lib/test
@@ -13,74 +13,73 @@
# Copyright (c) 2021 Red Hat GmbH
# Author: Stefano Brivio <sbrivio(a)redhat.com>
-# test_iperf3() - Ugly helper for iperf3c/iperf3s directives
-# $1: Role: client or server
-# $2: Pane name, can be lowercase
-# $3: Destination name or address for client
-# $4: Port number, ${i} is translated to process index
-# $5: Number of processes to run in parallel
-# $@: Options
+# test_iperf3() - Ugly helper for iperf3 directive
+# $1: Variable name: to put the measure bandwidth into
+# $2: Source/client pane name, can be lowercase
+# $3: Destination/server pane name, can be lowercase
+# $4: Destination name or address for client
+# $5: Port number, ${i} is translated to process index
+# $6: Number of processes to run in parallel
+# $@: Client options
test_iperf3() {
- __role="${1}"; shift
- __pane="$(echo "${1}" | tr [a-z] [A-Z])"; shift
- [ "${__role}" = "client" ] && __dest="${1}"
&& shift || __dest=""
+ __var="${1}"; shift
+ __cpane="$(echo "${1}" | tr [a-z] [A-Z])"; shift
+ __spane="$(echo "${1}" | tr [a-z] [A-Z])"; shift
+ __dest="${1}"; shift
__port="${1}"; shift
__procs="$((${1} - 1))"; shift
- [ "${__role}" = "server" ] && __role_opt="-c" ||
__role_opt="-s1J"
+ pane_run "${__spane}" 'for i in $(seq 0 '${__procs}');
do' \
+ ':> s${i}.bw; done'
+ pane_status "${__spane}"
+
+ __udp=0
+ for __opt in ${@}; do
+ [ "${__opt}" = "-u" ] && __udp=1
+ done
- if [ ${__role} = "client" ]; then
- UDP_CLIENT=0
- for __opt in ${@}; do
- [ "${__opt}" = "-u" ] && UDP_CLIENT=1
- done
-
- (
+ (
sleep 2
- pane_run "${__pane}" 'for i in $(seq 0 '${__procs}');' \
- 'do ( iperf3 -c '"${__dest}"' -p
'"${__port}" \
- "${@}" ' -T s${i} & echo $! > c${i}.pid & ); done'
+ pane_run "${__cpane}" 'for i in $(seq 0
'${__procs}');' \
+ 'do ( iperf3 -c '"${__dest}"' -p
'"${__port}" \
+ "${@}" ' -T s${i} & echo $! > c${i}.pid & ); done'
sleep 40
- pane_run "${__pane}" 'for i in $(seq 0 '${__procs}');
do'\
+ pane_run "${__cpane}" 'for i in $(seq 0 '${__procs}');
do'\
'kill -INT $(cat c${i}.pid) 2>/dev/null; done'
- ) &
- return
- fi
+ ) &
- pane_run "${__pane}" 'for i in $(seq 0 '${__procs}');
do' \
- ':> s${i}.bw; done'
- pane_status "${__pane}"
-
- if [ ${UDP_CLIENT} -eq 0 ]; then
- pane_run "${__pane}" 'for i in $(seq 0 '${__procs}');' \
- 'do ( ( iperf3 -s1J -p '"${__port} ${@}" \
+ if [ ${__udp} -eq 0 ]; then
+ pane_run "${__spane}" 'for i in $(seq 0
'${__procs}');' \
+ 'do ( ( iperf3 -s1J -p '"${__port}" \
'& echo $! > s${i}.pid ) 2>/dev/null' \
'| jq -rM ".end.sum_received.bits_per_second"' \
'> s${i}.bw & );' \
'done'
else
- pane_run "${__pane}" 'for i in $(seq 0 '${__procs}');' \
- 'do ( ( iperf3 -s1J -i 30 -p '"${__port} ${@}" \
+ pane_run "${__spane}" 'for i in $(seq 0
'${__procs}');' \
+ 'do ( ( iperf3 -s1J -i 30 -p '"${__port}" \
'& echo $! > s${i}.pid ) 2>/dev/null' \
'| jq -rM ".intervals[0].sum.bits_per_second"' \
'> s${i}.bw & );' \
'done'
fi
- pane_status "${__pane}"
+ pane_status "${__spane}"
sleep 45
- pane_run "${__pane}" 'for i in $(seq 0 '${__procs}');
do' \
+ pane_run "${__spane}" 'for i in $(seq 0 '${__procs}');
do' \
'kill -INT $(cat s${i}.pid) 2>/dev/null; done'
sleep 4
- pane_wait "${__pane}"
- pane_run "${__pane}" '(cat s*.bw |' \
+ pane_wait "${__spane}"
+ pane_run "${__spane}" '(cat s*.bw |' \
'sed '"'"'s/\(.*\)/\1\+/g'"'"'
|' \
'tr -d "\n"; echo 0) | bc -l'
- pane_wait "${__pane}"
- pane_parse "${__pane}"
- pane_run "${__pane}" 'for i in $(seq 0 '${__procs}');
do' \
+ pane_wait "${__spane}"
+ __bw="$(pane_parse "${__spane}")"
+ pane_run "${__spane}" 'for i in $(seq 0 '${__procs}');
do' \
'rm -f [cs]${i}.bw [cs]${i}.pid; done'
- pane_status "${__pane}"
+ pane_status "${__spane}"
+
+ TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}"
"__${__var}__" "${__bw}" )"
}
test_one_line() {
@@ -323,11 +322,8 @@ test_one_line() {
"lat")
table_value_latency ${__arg} || TEST_ONE_perf_nok=1
;;
- "iperf3c")
- test_iperf3 client ${__arg}
- ;;
- "iperf3s")
- TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__arg%%
*}__" "$(test_iperf3 server ${__arg#* })" )"
+ "iperf3")
+ test_iperf3 ${__arg}
;;
"set")
TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__arg%%
*}__" "${__arg#* }")"
diff --git a/test/perf/passt_tcp b/test/perf/passt_tcp
index e80b608..811b8de 100644
--- a/test/perf/passt_tcp
+++ b/test/perf/passt_tcp
@@ -58,23 +58,19 @@ bw -
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1280
-iperf3c guest __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 4M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 4M
bw __BW__ 1.2 1.5
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1500
-iperf3c guest __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 4M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 4M
bw __BW__ 1.6 1.8
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 9000
-iperf3c guest __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 8M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 8M
bw __BW__ 4.0 5.0
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 65520
-iperf3c guest __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 16M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 16M
bw __BW__ 7.0 8.0
tl TCP RR latency over IPv6: guest to host
@@ -101,33 +97,27 @@ lat __LAT__ 500 400
tr TCP throughput over IPv4: guest to host
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 256
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -w 1M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 1M
bw __BW__ 0.2 0.3
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 576
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -w 1M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 1M
bw __BW__ 0.5 0.8
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1280
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -w 4M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 4M
bw __BW__ 1.2 1.5
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1500
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -w 4M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 4M
bw __BW__ 1.6 1.8
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 9000
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -w 8M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 8M
bw __BW__ 4.0 5.0
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 65520
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -w 16M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 16M
bw __BW__ 7.0 8.0
tl TCP RR latency over IPv4: guest to host
@@ -155,20 +145,16 @@ tr TCP throughput over IPv6: host to guest
bw -
bw -
ns ip link set dev lo mtu 1280
-iperf3c ns ::1 100${i}1 __THREADS__ __OPTS__
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
bw __BW__ 1.0 1.2
ns ip link set dev lo mtu 1500
-iperf3c ns ::1 100${i}1 __THREADS__ __OPTS__
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
bw __BW__ 2.0 3.0
ns ip link set dev lo mtu 9000
-iperf3c ns ::1 100${i}1 __THREADS__ __OPTS__
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
bw __BW__ 5.0 6.0
ns ip link set dev lo mtu 65520
-iperf3c ns ::1 100${i}1 __THREADS__ __OPTS__
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
bw __BW__ 6.0 6.8
ns ip link set dev lo mtu 65535
@@ -195,29 +181,23 @@ lat __LAT__ 500 350
tr TCP throughput over IPv4: host to guest
ns ip link set dev lo mtu 256
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
bw __BW__ 0.3 0.5
ns ip link set dev lo mtu 576
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
bw __BW__ 0.5 1.0
ns ip link set dev lo mtu 1280
ns ip addr add ::1 dev lo
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
bw __BW__ 2.0 3.0
ns ip link set dev lo mtu 1500
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
bw __BW__ 2.0 3.0
ns ip link set dev lo mtu 9000
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
bw __BW__ 5.0 6.0
ns ip link set dev lo mtu 65520
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
bw __BW__ 6.0 6.8
ns ip link set dev lo mtu 65535
diff --git a/test/perf/passt_udp b/test/perf/passt_udp
index 05e692e..50c675e 100644
--- a/test/perf/passt_udp
+++ b/test/perf/passt_udp
@@ -51,23 +51,19 @@ bw -
bw -
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1280
-iperf3c guest __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 2G
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 2G
bw __BW__ 0.8 1.2
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1500
-iperf3c guest __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 3G
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 3G
bw __BW__ 1.0 1.5
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 9000
-iperf3c guest __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 5G
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 5G
bw __BW__ 4.0 5.0
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 65520
-iperf3c guest __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 7G
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 7G
bw __BW__ 4.0 5.0
tl UDP RR latency over IPv6: guest to host
@@ -84,33 +80,27 @@ lat __LAT__ 200 150
tr UDP throughput over IPv4: guest to host
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 256
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -b 500M
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 500M
bw __BW__ 0.0 0.0
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 576
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -b 1G
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 1G
bw __BW__ 0.4 0.6
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1280
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -b 2G
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 2G
bw __BW__ 0.8 1.2
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1500
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -b 3G
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 3G
bw __BW__ 1.0 1.5
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 9000
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -b 6G
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 6G
bw __BW__ 4.0 5.0
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 65520
-iperf3c guest __GW__ 100${i}2 __THREADS__ __OPTS__ -b 7G
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 7G
bw __BW__ 4.0 5.0
tl UDP RR latency over IPv4: guest to host
@@ -128,20 +118,16 @@ tr UDP throughput over IPv6: host to guest
bw -
bw -
ns ip link set dev lo mtu 1280
-iperf3c ns ::1 100${i}1 __THREADS__ __OPTS__ -b 2G
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__ -b 2G
bw __BW__ 0.8 1.2
ns ip link set dev lo mtu 1500
-iperf3c ns ::1 100${i}1 __THREADS__ __OPTS__ -b 2G
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__ -b 2G
bw __BW__ 1.0 1.5
ns ip link set dev lo mtu 9000
-iperf3c ns ::1 100${i}1 __THREADS__ __OPTS__ -b 3G
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__ -b 3G
bw __BW__ 3.0 4.0
ns ip link set dev lo mtu 65520
-iperf3c ns ::1 100${i}1 __THREADS__ __OPTS__ -b 3G
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__ -b 3G
bw __BW__ 3.0 4.0
tl UDP RR latency over IPv6: host to guest
@@ -158,29 +144,23 @@ ns ip link set dev lo mtu 65535
tr UDP throughput over IPv4: host to guest
ns ip link set dev lo mtu 256
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 1G
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 1G
bw __BW__ 0.0 0.0
ns ip link set dev lo mtu 576
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 1G
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 1G
bw __BW__ 0.4 0.6
ns ip link set dev lo mtu 1280
ns ip addr add ::1 dev lo
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
bw __BW__ 0.8 1.2
ns ip link set dev lo mtu 1500
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
bw __BW__ 1.0 1.5
ns ip link set dev lo mtu 9000
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
bw __BW__ 3.0 4.0
ns ip link set dev lo mtu 65520
-iperf3c ns 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
-iperf3s BW guest 100${i}1 __THREADS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
bw __BW__ 3.0 4.0
tl UDP RR latency over IPv4: host to guest
diff --git a/test/perf/pasta_tcp b/test/perf/pasta_tcp
index f4e97cb..6a120c9 100644
--- a/test/perf/pasta_tcp
+++ b/test/perf/pasta_tcp
@@ -38,20 +38,17 @@ th MTU 1500B 4000B 16384B 65535B
tr TCP throughput over IPv6: ns to host
ns ip link set dev lo mtu 1500
-iperf3c ns ::1 100${i}3 __THREADS__ __OPTS__
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 4000
iperf3c ns ::1 100${i}3 __THREADS__ __OPTS__
iperf3s BW host 100${i}3 __THREADS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 16384
-iperf3c ns ::1 100${i}3 __THREADS__ __OPTS__
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 65535
-iperf3c ns ::1 100${i}3 __THREADS__ __OPTS__
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__
bw __BW__ 15.0 20.0
tl TCP RR latency over IPv6: ns to host
@@ -75,20 +72,16 @@ lat __LAT__ 500 350
tr TCP throughput over IPv4: ns to host
ns ip link set dev lo mtu 1500
-iperf3c ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 4000
-iperf3c ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 16384
-iperf3c ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 65535
-iperf3c ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__
bw __BW__ 15.0 20.0
tl TCP RR latency over IPv4: ns to host
@@ -114,8 +107,7 @@ tr TCP throughput over IPv6: host to ns
bw -
bw -
bw -
-iperf3c host ::1 100${i}2 __THREADS__ __OPTS__
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW host ns ::1 100${i}2 __THREADS__ __OPTS__
bw __BW__ 15.0 20.0
tl TCP RR latency over IPv6: host to ns
@@ -141,8 +133,7 @@ tr TCP throughput over IPv4: host to ns
bw -
bw -
bw -
-iperf3c host 127.0.0.1 100${i}2 __THREADS__ __OPTS__
-iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW host ns 127.0.0.1 100${i}2 __THREADS__ __OPTS__
bw __BW__ 15.0 20.0
tl TCP RR latency over IPv4: host to ns
@@ -184,20 +175,16 @@ th MTU 1500B 4000B 16384B 65520B
tr TCP throughput over IPv6: ns to host
ns ip link set dev __IFNAME__ mtu 1500
-iperf3c ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 512k
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 512k
bw __BW__ 0.2 0.4
ns ip link set dev __IFNAME__ mtu 4000
-iperf3c ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 1M
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 1M
bw __BW__ 0.3 0.5
ns ip link set dev __IFNAME__ mtu 16384
-iperf3c ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 8M
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 8M
bw __BW__ 1.5 2.0
ns ip link set dev __IFNAME__ mtu 65520
-iperf3c ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 8M
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 8M
bw __BW__ 2.0 2.5
tl TCP RR latency over IPv6: ns to host
@@ -221,20 +208,16 @@ lat __LAT__ 1500 500
tr TCP throughput over IPv4: ns to host
ns ip link set dev __IFNAME__ mtu 1500
-iperf3c ns __GW__ 100${i}3 __THREADS__ __OPTS__ -w 512k
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -w 512k
bw __BW__ 0.2 0.4
ns ip link set dev __IFNAME__ mtu 4000
-iperf3c ns __GW__ 100${i}3 __THREADS__ __OPTS__ -w 1M
-iperf3s BW host 100${i}3 __THREADS__
+iperf3s BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -w 1M
bw __BW__ 0.3 0.5
ns ip link set dev __IFNAME__ mtu 16384
-iperf3c ns __GW__ 100${i}3 __THREADS__ __OPTS__ -w 8M
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -w 8M
bw __BW__ 1.5 2.0
ns ip link set dev __IFNAME__ mtu 65520
-iperf3c ns __GW__ 100${i}3 __THREADS__ __OPTS__ -w 8M
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -w 8M
bw __BW__ 2.0 2.5
tl TCP RR latency over IPv4: ns to host
diff --git a/test/perf/pasta_udp b/test/perf/pasta_udp
index 5f750b5..0555d54 100644
--- a/test/perf/pasta_udp
+++ b/test/perf/pasta_udp
@@ -33,20 +33,16 @@ th MTU 1500B 4000B 16384B 65535B
tr UDP throughput over IPv6: ns to host
ns ip link set dev lo mtu 1500
-iperf3c ns ::1 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 3G
bw __BW__ 1.0 1.5
ns ip link set dev lo mtu 4000
-iperf3c ns ::1 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 3G
bw __BW__ 1.2 1.8
ns ip link set dev lo mtu 16384
-iperf3c ns ::1 100${i}3 __THREADS__ __OPTS__ -b 10G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 10G
bw __BW__ 5.0 6.0
ns ip link set dev lo mtu 65535
-iperf3c ns ::1 100${i}3 __THREADS__ __OPTS__ -b 15G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 15G
bw __BW__ 7.0 9.0
tl UDP RR latency over IPv6: ns to host
@@ -61,20 +57,16 @@ lat __LAT__ 200 150
tr UDP throughput over IPv4: ns to host
ns ip link set dev lo mtu 1500
-iperf3c ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 3G
bw __BW__ 1.0 1.5
ns ip link set dev lo mtu 4000
-iperf3c ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 3G
bw __BW__ 1.2 1.8
ns ip link set dev lo mtu 16384
-iperf3c ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 10G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 10G
bw __BW__ 5.0 6.0
ns ip link set dev lo mtu 65535
-iperf3c ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 15G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 15G
bw __BW__ 7.0 9.0
tl UDP RR latency over IPv4: ns to host
@@ -91,8 +83,9 @@ tr UDP throughput over IPv6: host to ns
bw -
bw -
bw -
-iperf3c host ::1 100${i}2 __THREADS__ __OPTS__ -b 15G
-iperf3s BW ns 100${i}2 __THREADS__
+#iperf3c host ::1 100${i}2 __THREADS__ __OPTS__ -b 15G
+#iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW host ns ::1 100${i}2 __THREADS__ __OPTS__ -b 15G
bw __BW__ 7.0 9.0
tl UDP RR latency over IPv6: host to ns
@@ -109,8 +102,9 @@ tr UDP throughput over IPv4: host to ns
bw -
bw -
bw -
-iperf3c host 127.0.0.1 100${i}2 __THREADS__ __OPTS__ -b 15G
-iperf3s BW ns 100${i}2 __THREADS__
+#iperf3c host 127.0.0.1 100${i}2 __THREADS__ __OPTS__ -b 15G
+#iperf3s BW ns 100${i}2 __THREADS__
+iperf3 BW host ns 127.0.0.1 100${i}2 __THREADS__ __OPTS__ -b 15G
bw __BW__ 7.0 9.0
tl UDP RR latency over IPv4: host to ns
@@ -139,20 +133,16 @@ th MTU 1500B 4000B 16384B 65520B
tr UDP throughput over IPv6: ns to host
ns ip link set dev __IFNAME__ mtu 1500
-iperf3c ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 2G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 2G
bw __BW__ 0.3 0.5
ns ip link set dev __IFNAME__ mtu 4000
-iperf3c ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 3G
bw __BW__ 0.5 0.8
ns ip link set dev __IFNAME__ mtu 16384
-iperf3c ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 4G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 4G
bw __BW__ 3.0 4.0
ns ip link set dev __IFNAME__ mtu 65520
-iperf3c ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 6G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 6G
bw __BW__ 6.0 7.0
tl UDP RR latency over IPv6: ns to host
@@ -167,20 +157,16 @@ lat __LAT__ 200 150
tr UDP throughput over IPv4: ns to host
ns ip link set dev __IFNAME__ mtu 1500
-iperf3c ns __GW__ 100${i}3 __THREADS__ __OPTS__ -b 2G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 2G
bw __BW__ 0.3 0.5
ns ip link set dev __IFNAME__ mtu 4000
-iperf3c ns __GW__ 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 3G
bw __BW__ 0.5 0.8
ns ip link set dev __IFNAME__ mtu 16384
-iperf3c ns __GW__ 100${i}3 __THREADS__ __OPTS__ -b 4G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 4G
bw __BW__ 3.0 4.0
ns ip link set dev __IFNAME__ mtu 65520
-iperf3c ns __GW__ 100${i}3 __THREADS__ __OPTS__ -b 6G
-iperf3s BW host 100${i}3 __THREADS__
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 6G
bw __BW__ 6.0 7.0
tl UDP RR latency over IPv4: ns to host
--
2.37.2
Currently all the throughput tests are run for 30s. This is reflected in
both the actual parameters given to the iperf commands, but also in the
matching sleeps in test_iperf3.
Allow this to be adjusted more easily with a new parameter to test_iperf3.
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
test/lib/test | 9 +++++----
test/perf/passt_tcp | 44 +++++++++++++++++++++++---------------------
test/perf/passt_udp | 43 ++++++++++++++++++++++---------------------
test/perf/pasta_tcp | 40 +++++++++++++++++++++-------------------
test/perf/pasta_udp | 43 ++++++++++++++++++++++---------------------
5 files changed, 93 insertions(+), 86 deletions(-)
diff --git a/test/lib/test b/test/lib/test
index 600399b..8eb1ee5 100755
--- a/test/lib/test
+++ b/test/lib/test
@@ -28,6 +28,7 @@ test_iperf3() {
__dest="${1}"; shift
__port="${1}"; shift
__procs="$((${1} - 1))"; shift
+ __time="${1}"; shift
pane_run "${__spane}" 'for i in $(seq 0 '${__procs}');
do' \
':> s${i}.bw; done'
@@ -42,8 +43,8 @@ test_iperf3() {
sleep 2
pane_run "${__cpane}" 'for i in $(seq 0
'${__procs}');' \
'do ( iperf3 -c '"${__dest}"' -p
'"${__port}" \
- "${@}" ' -T s${i} & echo $! > c${i}.pid & ); done'
- sleep 40
+ '-t'${__time} "${@}" ' -T s${i} & echo $! > c${i}.pid
& ); done'
+ sleep $(echo ${__time} + 10 | bc -l)
pane_run "${__cpane}" 'for i in $(seq 0 '${__procs}');
do'\
'kill -INT $(cat c${i}.pid) 2>/dev/null; done'
) &
@@ -57,7 +58,7 @@ test_iperf3() {
'done'
else
pane_run "${__spane}" 'for i in $(seq 0
'${__procs}');' \
- 'do ( ( iperf3 -s1J -i 30 -p '"${__port}" \
+ 'do ( ( iperf3 -s1J -i '${__time}' -p '"${__port}" \
'& echo $! > s${i}.pid ) 2>/dev/null' \
'| jq -rM ".intervals[0].sum.bits_per_second"' \
'> s${i}.bw & );' \
@@ -65,7 +66,7 @@ test_iperf3() {
fi
pane_status "${__spane}"
- sleep 45
+ sleep $(echo ${__time} + 15 | bc -l)
pane_run "${__spane}" 'for i in $(seq 0 '${__procs}');
do' \
'kill -INT $(cat s${i}.pid) 2>/dev/null; done'
sleep 4
diff --git a/test/perf/passt_tcp b/test/perf/passt_tcp
index 811b8de..a960341 100644
--- a/test/perf/passt_tcp
+++ b/test/perf/passt_tcp
@@ -44,7 +44,9 @@ hout FREQ [ -n "__FREQ_CPUFREQ__" ] && echo
__FREQ_CPUFREQ__ || echo __FREQ_PROC
set THREADS 1
set STREAMS 8
-set OPTS -Z -P __STREAMS__ -l 1M -i1 -t30 -O5 --pacing-timer 1000000
+set TIME 30
+hout OMIT echo __TIME__ / 6 | bc -l
+set OPTS -Z -P __STREAMS__ -l 1M -i1 -O__OMIT__ --pacing-timer 1000000
info Throughput in Gbps, latency in µs, one thread at __FREQ__ GHz, __STREAMS__ streams
report passt tcp __THREADS__ __FREQ__
@@ -58,19 +60,19 @@ bw -
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1280
-iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 4M
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 4M
bw __BW__ 1.2 1.5
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1500
-iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 4M
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 4M
bw __BW__ 1.6 1.8
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 9000
-iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 8M
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 8M
bw __BW__ 4.0 5.0
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 65520
-iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 16M
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 16M
bw __BW__ 7.0 8.0
tl TCP RR latency over IPv6: guest to host
@@ -97,27 +99,27 @@ lat __LAT__ 500 400
tr TCP throughput over IPv4: guest to host
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 256
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 1M
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 1M
bw __BW__ 0.2 0.3
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 576
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 1M
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 1M
bw __BW__ 0.5 0.8
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1280
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 4M
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 4M
bw __BW__ 1.2 1.5
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1500
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 4M
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 4M
bw __BW__ 1.6 1.8
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 9000
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 8M
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 8M
bw __BW__ 4.0 5.0
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 65520
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 16M
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 16M
bw __BW__ 7.0 8.0
tl TCP RR latency over IPv4: guest to host
@@ -145,16 +147,16 @@ tr TCP throughput over IPv6: host to guest
bw -
bw -
ns ip link set dev lo mtu 1280
-iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__
bw __BW__ 1.0 1.2
ns ip link set dev lo mtu 1500
-iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__
bw __BW__ 2.0 3.0
ns ip link set dev lo mtu 9000
-iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__
bw __BW__ 5.0 6.0
ns ip link set dev lo mtu 65520
-iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__
bw __BW__ 6.0 6.8
ns ip link set dev lo mtu 65535
@@ -181,23 +183,23 @@ lat __LAT__ 500 350
tr TCP throughput over IPv4: host to guest
ns ip link set dev lo mtu 256
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
bw __BW__ 0.3 0.5
ns ip link set dev lo mtu 576
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
bw __BW__ 0.5 1.0
ns ip link set dev lo mtu 1280
ns ip addr add ::1 dev lo
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
bw __BW__ 2.0 3.0
ns ip link set dev lo mtu 1500
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
bw __BW__ 2.0 3.0
ns ip link set dev lo mtu 9000
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
bw __BW__ 5.0 6.0
ns ip link set dev lo mtu 65520
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
bw __BW__ 6.0 6.8
ns ip link set dev lo mtu 65535
diff --git a/test/perf/passt_udp b/test/perf/passt_udp
index 50c675e..d199523 100644
--- a/test/perf/passt_udp
+++ b/test/perf/passt_udp
@@ -37,7 +37,8 @@ hout FREQ [ -n "__FREQ_CPUFREQ__" ] && echo
__FREQ_CPUFREQ__ || echo __FREQ_PROC
set THREADS 4
set STREAMS 1
-set OPTS -u -i1 -t30 -P __STREAMS__ --pacing-timer 1000
+set TIME 30
+set OPTS -u -i1 -P __STREAMS__ --pacing-timer 1000
info Throughput in Gbps, latency in µs, __THREADS__ threads at __FREQ__ GHz, one stream
each
@@ -51,19 +52,19 @@ bw -
bw -
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1280
-iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 2G
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 2G
bw __BW__ 0.8 1.2
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1500
-iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 3G
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 1.0 1.5
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 9000
-iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 5G
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 5G
bw __BW__ 4.0 5.0
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 65520
-iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -b 7G
+iperf3 BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 7G
bw __BW__ 4.0 5.0
tl UDP RR latency over IPv6: guest to host
@@ -80,27 +81,27 @@ lat __LAT__ 200 150
tr UDP throughput over IPv4: guest to host
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 256
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 500M
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 500M
bw __BW__ 0.0 0.0
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 576
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 1G
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 1G
bw __BW__ 0.4 0.6
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1280
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 2G
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 2G
bw __BW__ 0.8 1.2
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 1500
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 3G
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 1.0 1.5
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 9000
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 6G
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 6G
bw __BW__ 4.0 5.0
virtio_net_workaround
guest ip link set dev __IFNAME__ mtu 65520
-iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -b 7G
+iperf3 BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 7G
bw __BW__ 4.0 5.0
tl UDP RR latency over IPv4: guest to host
@@ -118,16 +119,16 @@ tr UDP throughput over IPv6: host to guest
bw -
bw -
ns ip link set dev lo mtu 1280
-iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__ -b 2G
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__ -b 2G
bw __BW__ 0.8 1.2
ns ip link set dev lo mtu 1500
-iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__ -b 2G
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__ -b 2G
bw __BW__ 1.0 1.5
ns ip link set dev lo mtu 9000
-iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 3.0 4.0
ns ip link set dev lo mtu 65520
-iperf3 BW ns guest ::1 100${i}1 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 3.0 4.0
tl UDP RR latency over IPv6: host to guest
@@ -144,23 +145,23 @@ ns ip link set dev lo mtu 65535
tr UDP throughput over IPv4: host to guest
ns ip link set dev lo mtu 256
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 1G
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__ -b 1G
bw __BW__ 0.0 0.0
ns ip link set dev lo mtu 576
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 1G
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__ -b 1G
bw __BW__ 0.4 0.6
ns ip link set dev lo mtu 1280
ns ip addr add ::1 dev lo
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 0.8 1.2
ns ip link set dev lo mtu 1500
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 1.0 1.5
ns ip link set dev lo mtu 9000
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 3.0 4.0
ns ip link set dev lo mtu 65520
-iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 3.0 4.0
tl UDP RR latency over IPv4: host to guest
diff --git a/test/perf/pasta_tcp b/test/perf/pasta_tcp
index 6a120c9..d607029 100644
--- a/test/perf/pasta_tcp
+++ b/test/perf/pasta_tcp
@@ -23,7 +23,9 @@ ns sysctl -w net.ipv4.tcp_timestamps=0
set THREADS 2
set STREAMS 2
-set OPTS -Z -w 4M -l 1M -P __STREAMS__ -i1 -t30 -O5 --pacing-timer 10000
+set TIME 30
+hout OMIT echo __TIME__ / 6 | bc -l
+set OPTS -Z -w 4M -l 1M -P __STREAMS__ -i1 -O__OMIT__ --pacing-timer 10000
hout FREQ_PROCFS (echo "scale=1"; sed -n 's/cpu MHz.*:
\([0-9]*\)\..*$/(\1+10^2\/2)\/10^3/p' /proc/cpuinfo) | bc -l | head -n1
hout FREQ_CPUFREQ (echo "scale=1"; printf '( %i + 10^5 / 2 ) /
10^6\n' $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq) ) | bc -l
@@ -38,17 +40,17 @@ th MTU 1500B 4000B 16384B 65535B
tr TCP throughput over IPv6: ns to host
ns ip link set dev lo mtu 1500
-iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __TIME__ __OPTS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 4000
-iperf3c ns ::1 100${i}3 __THREADS__ __OPTS__
+iperf3c ns ::1 100${i}3 __THREADS__ __TIME__ __OPTS__
iperf3s BW host 100${i}3 __THREADS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 16384
-iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __TIME__ __OPTS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 65535
-iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __TIME__ __OPTS__
bw __BW__ 15.0 20.0
tl TCP RR latency over IPv6: ns to host
@@ -72,16 +74,16 @@ lat __LAT__ 500 350
tr TCP throughput over IPv4: ns to host
ns ip link set dev lo mtu 1500
-iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __TIME__ __OPTS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 4000
-iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __TIME__ __OPTS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 16384
-iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __TIME__ __OPTS__
bw __BW__ 15.0 20.0
ns ip link set dev lo mtu 65535
-iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __TIME__ __OPTS__
bw __BW__ 15.0 20.0
tl TCP RR latency over IPv4: ns to host
@@ -107,7 +109,7 @@ tr TCP throughput over IPv6: host to ns
bw -
bw -
bw -
-iperf3 BW host ns ::1 100${i}2 __THREADS__ __OPTS__
+iperf3 BW host ns ::1 100${i}2 __THREADS__ __TIME__ __OPTS__
bw __BW__ 15.0 20.0
tl TCP RR latency over IPv6: host to ns
@@ -133,7 +135,7 @@ tr TCP throughput over IPv4: host to ns
bw -
bw -
bw -
-iperf3 BW host ns 127.0.0.1 100${i}2 __THREADS__ __OPTS__
+iperf3 BW host ns 127.0.0.1 100${i}2 __THREADS__ __TIME__ __OPTS__
bw __BW__ 15.0 20.0
tl TCP RR latency over IPv4: host to ns
@@ -175,16 +177,16 @@ th MTU 1500B 4000B 16384B 65520B
tr TCP throughput over IPv6: ns to host
ns ip link set dev __IFNAME__ mtu 1500
-iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 512k
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -w 512k
bw __BW__ 0.2 0.4
ns ip link set dev __IFNAME__ mtu 4000
-iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 1M
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -w 1M
bw __BW__ 0.3 0.5
ns ip link set dev __IFNAME__ mtu 16384
-iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 8M
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -w 8M
bw __BW__ 1.5 2.0
ns ip link set dev __IFNAME__ mtu 65520
-iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -w 8M
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -w 8M
bw __BW__ 2.0 2.5
tl TCP RR latency over IPv6: ns to host
@@ -208,16 +210,16 @@ lat __LAT__ 1500 500
tr TCP throughput over IPv4: ns to host
ns ip link set dev __IFNAME__ mtu 1500
-iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -w 512k
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -w 512k
bw __BW__ 0.2 0.4
ns ip link set dev __IFNAME__ mtu 4000
-iperf3s BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -w 1M
+iperf3s BW ns host __GW__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -w 1M
bw __BW__ 0.3 0.5
ns ip link set dev __IFNAME__ mtu 16384
-iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -w 8M
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -w 8M
bw __BW__ 1.5 2.0
ns ip link set dev __IFNAME__ mtu 65520
-iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -w 8M
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -w 8M
bw __BW__ 2.0 2.5
tl TCP RR latency over IPv4: ns to host
diff --git a/test/perf/pasta_udp b/test/perf/pasta_udp
index 0555d54..ae898b1 100644
--- a/test/perf/pasta_udp
+++ b/test/perf/pasta_udp
@@ -22,7 +22,8 @@ hout FREQ [ -n "__FREQ_CPUFREQ__" ] && echo
__FREQ_CPUFREQ__ || echo __FREQ_PROC
set THREADS 1
set STREAMS 4
-set OPTS -u -i1 -t30 -P __STREAMS__
+set TIME 30
+set OPTS -u -i1 -P __STREAMS__
info Throughput in Gbps, latency in µs, one thread at __FREQ__ GHz, __STREAMS__ streams
@@ -33,16 +34,16 @@ th MTU 1500B 4000B 16384B 65535B
tr UDP throughput over IPv6: ns to host
ns ip link set dev lo mtu 1500
-iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 1.0 1.5
ns ip link set dev lo mtu 4000
-iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 1.2 1.8
ns ip link set dev lo mtu 16384
-iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 10G
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 10G
bw __BW__ 5.0 6.0
ns ip link set dev lo mtu 65535
-iperf3 BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 15G
+iperf3 BW ns host ::1 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 15G
bw __BW__ 7.0 9.0
tl UDP RR latency over IPv6: ns to host
@@ -57,16 +58,16 @@ lat __LAT__ 200 150
tr UDP throughput over IPv4: ns to host
ns ip link set dev lo mtu 1500
-iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 1.0 1.5
ns ip link set dev lo mtu 4000
-iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 1.2 1.8
ns ip link set dev lo mtu 16384
-iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 10G
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 10G
bw __BW__ 5.0 6.0
ns ip link set dev lo mtu 65535
-iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 15G
+iperf3 BW ns host 127.0.0.1 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 15G
bw __BW__ 7.0 9.0
tl UDP RR latency over IPv4: ns to host
@@ -83,9 +84,9 @@ tr UDP throughput over IPv6: host to ns
bw -
bw -
bw -
-#iperf3c host ::1 100${i}2 __THREADS__ __OPTS__ -b 15G
+#iperf3c host ::1 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 15G
#iperf3s BW ns 100${i}2 __THREADS__
-iperf3 BW host ns ::1 100${i}2 __THREADS__ __OPTS__ -b 15G
+iperf3 BW host ns ::1 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 15G
bw __BW__ 7.0 9.0
tl UDP RR latency over IPv6: host to ns
@@ -102,9 +103,9 @@ tr UDP throughput over IPv4: host to ns
bw -
bw -
bw -
-#iperf3c host 127.0.0.1 100${i}2 __THREADS__ __OPTS__ -b 15G
+#iperf3c host 127.0.0.1 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 15G
#iperf3s BW ns 100${i}2 __THREADS__
-iperf3 BW host ns 127.0.0.1 100${i}2 __THREADS__ __OPTS__ -b 15G
+iperf3 BW host ns 127.0.0.1 100${i}2 __THREADS__ __TIME__ __OPTS__ -b 15G
bw __BW__ 7.0 9.0
tl UDP RR latency over IPv4: host to ns
@@ -133,16 +134,16 @@ th MTU 1500B 4000B 16384B 65520B
tr UDP throughput over IPv6: ns to host
ns ip link set dev __IFNAME__ mtu 1500
-iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 2G
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 2G
bw __BW__ 0.3 0.5
ns ip link set dev __IFNAME__ mtu 4000
-iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 0.5 0.8
ns ip link set dev __IFNAME__ mtu 16384
-iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 4G
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 4G
bw __BW__ 3.0 4.0
ns ip link set dev __IFNAME__ mtu 65520
-iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 6G
+iperf3 BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 6G
bw __BW__ 6.0 7.0
tl UDP RR latency over IPv6: ns to host
@@ -157,16 +158,16 @@ lat __LAT__ 200 150
tr UDP throughput over IPv4: ns to host
ns ip link set dev __IFNAME__ mtu 1500
-iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 2G
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 2G
bw __BW__ 0.3 0.5
ns ip link set dev __IFNAME__ mtu 4000
-iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 3G
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 3G
bw __BW__ 0.5 0.8
ns ip link set dev __IFNAME__ mtu 16384
-iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 4G
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 4G
bw __BW__ 3.0 4.0
ns ip link set dev __IFNAME__ mtu 65520
-iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 6G
+iperf3 BW ns host __GW__ 100${i}3 __THREADS__ __TIME__ __OPTS__ -b 6G
bw __BW__ 6.0 7.0
tl UDP RR latency over IPv4: ns to host
--
2.37.2
test_iperf3() is a pretty inscrutable mess of nested background processes.
It has a number of magic sleeps whose value needs to match the durations of
the tests which are given in the DSL test files.
Rewrite it to be cleaner:
* Use the construct (a & b & wait) to run 'a' and 'b' in
parallel, but
then wait for them both to complete before continuing
* This allows us to wait for both the server and client to finish, rather
than having arbitrary sleeps and kills
* Use jq to do all the math we need to get the final result, rather than
jq followed by some complicated 'bc' mangling
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
.gitignore | 1 +
test/lib/test | 68 ++++++++++++++++++---------------------------
test/perf/passt_tcp | 4 +--
test/perf/pasta_tcp | 2 +-
4 files changed, 31 insertions(+), 44 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9b17f12..80967f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@
/pasta.1
/seccomp.h
/*.pid
+/s*.json
README.plain.md
diff --git a/test/lib/test b/test/lib/test
index 8eb1ee5..d4357b7 100755
--- a/test/lib/test
+++ b/test/lib/test
@@ -30,54 +30,40 @@ test_iperf3() {
__procs="$((${1} - 1))"; shift
__time="${1}"; shift
- pane_run "${__spane}" 'for i in $(seq 0 '${__procs}');
do' \
- ':> s${i}.bw; done'
+ pane_run "${__spane}" \
+ '(' \
+ ' for i in $(seq 0 '${__procs}'); do' \
+ ' iperf3 -s1J -p'${__port}' -i'${__time} \
+ ' > s${i}.json &' \
+ ' done;' \
+ ' wait' \
+ ')'
+
+ pane_run "${__cpane}" \
+ '(' \
+ ' for i in $(seq 0 '${__procs}'); do' \
+ ' iperf3 -c '${__dest}' -p '${__port} \
+ ' -t'${__time}' -T s${i} '"${@}"' &' \
+ ' done;' \
+ ' wait' \
+ ')'
+
+ pane_status "${__cpane}"
pane_status "${__spane}"
- __udp=0
+ __jval=".end.sum_received.bits_per_second"
for __opt in ${@}; do
- [ "${__opt}" = "-u" ] && __udp=1
+ # UDP test
+ [ "${__opt}" = "-u" ] &&
__jval=".intervals[0].sum.bits_per_second"
done
- (
- sleep 2
- pane_run "${__cpane}" 'for i in $(seq 0
'${__procs}');' \
- 'do ( iperf3 -c '"${__dest}"' -p
'"${__port}" \
- '-t'${__time} "${@}" ' -T s${i} & echo $! > c${i}.pid
& ); done'
- sleep $(echo ${__time} + 10 | bc -l)
- pane_run "${__cpane}" 'for i in $(seq 0 '${__procs}');
do'\
- 'kill -INT $(cat c${i}.pid) 2>/dev/null; done'
- ) &
-
- if [ ${__udp} -eq 0 ]; then
- pane_run "${__spane}" 'for i in $(seq 0
'${__procs}');' \
- 'do ( ( iperf3 -s1J -p '"${__port}" \
- '& echo $! > s${i}.pid ) 2>/dev/null' \
- '| jq -rM ".end.sum_received.bits_per_second"' \
- '> s${i}.bw & );' \
- 'done'
- else
- pane_run "${__spane}" 'for i in $(seq 0
'${__procs}');' \
- 'do ( ( iperf3 -s1J -i '${__time}' -p '"${__port}" \
- '& echo $! > s${i}.pid ) 2>/dev/null' \
- '| jq -rM ".intervals[0].sum.bits_per_second"' \
- '> s${i}.bw & );' \
- 'done'
- fi
-
- pane_status "${__spane}"
- sleep $(echo ${__time} + 15 | bc -l)
- pane_run "${__spane}" 'for i in $(seq 0 '${__procs}');
do' \
- 'kill -INT $(cat s${i}.pid) 2>/dev/null; done'
- sleep 4
- pane_wait "${__spane}"
- pane_run "${__spane}" '(cat s*.bw |' \
- 'sed '"'"'s/\(.*\)/\1\+/g'"'"'
|' \
- 'tr -d "\n"; echo 0) | bc -l'
+ pane_run "${__spane}" \
+ 'cat s*.json | jq -rMs "map('${__jval}') | add"'
pane_wait "${__spane}"
__bw="$(pane_parse "${__spane}")"
- pane_run "${__spane}" 'for i in $(seq 0 '${__procs}');
do' \
- 'rm -f [cs]${i}.bw [cs]${i}.pid; done'
+
+ pane_run "${__spane}" \
+ 'for i in $(seq 0 '${__procs}'); do rm s${i}.json; done'
pane_status "${__spane}"
TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}"
"__${__var}__" "${__bw}" )"
diff --git a/test/perf/passt_tcp b/test/perf/passt_tcp
index a960341..45095b6 100644
--- a/test/perf/passt_tcp
+++ b/test/perf/passt_tcp
@@ -11,8 +11,8 @@
# Copyright (c) 2021 Red Hat GmbH
# Author: Stefano Brivio <sbrivio(a)redhat.com>
-gtools sysctl ip jq nproc seq sleep bc iperf3 tcp_rr tcp_crr # From neper
-nstools sysctl ip jq nproc seq sleep bc iperf3 tcp_rr tcp_crr
+gtools sysctl ip jq nproc seq sleep iperf3 tcp_rr tcp_crr # From neper
+nstools sysctl ip jq nproc seq sleep iperf3 tcp_rr tcp_crr
htools bc head sed seq
# In this setup, virtio_net TX queue sometimes hangs, still under investigation
diff --git a/test/perf/pasta_tcp b/test/perf/pasta_tcp
index d607029..fc9e408 100644
--- a/test/perf/pasta_tcp
+++ b/test/perf/pasta_tcp
@@ -12,7 +12,7 @@
# Author: Stefano Brivio <sbrivio(a)redhat.com>
htools head ip seq bc sleep iperf3 tcp_rr tcp_crr jq sed
-nstools sysctl nproc ip seq bc sleep iperf3 tcp_rr tcp_crr jq sed
+nstools sysctl nproc ip seq sleep iperf3 tcp_rr tcp_crr jq sed
test pasta: throughput and latency (local connections)
--
2.37.2