aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-09-02 12:04:32 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-09-07 11:01:22 +0200
commit5c13b511d9e97ae24cfa7bb87a1e23648c8d8249 (patch)
treef75b5548081a6158796b6e045fdfab7c37137272
parent55679a16af441344eacc95ae8d5e952aae2313b0 (diff)
downloadpasst-5c13b511d9e97ae24cfa7bb87a1e23648c8d8249.tar
passt-5c13b511d9e97ae24cfa7bb87a1e23648c8d8249.tar.gz
passt-5c13b511d9e97ae24cfa7bb87a1e23648c8d8249.tar.bz2
passt-5c13b511d9e97ae24cfa7bb87a1e23648c8d8249.tar.lz
passt-5c13b511d9e97ae24cfa7bb87a1e23648c8d8249.tar.xz
passt-5c13b511d9e97ae24cfa7bb87a1e23648c8d8249.tar.zst
passt-5c13b511d9e97ae24cfa7bb87a1e23648c8d8249.zip
test: Combine iperf3c and iperf3s into a single DSL command
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@gibson.dropbear.id.au>
-rwxr-xr-xtest/lib/test90
-rw-r--r--test/perf/passt_tcp60
-rw-r--r--test/perf/passt_udp60
-rw-r--r--test/perf/pasta_tcp51
-rw-r--r--test/perf/pasta_udp58
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@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