Skip to content

Commit 4416c5f

Browse files
liuhangbindavem330
authored andcommitted
selftests/net: use unique netns name for setup_loopback.sh setup_veth.sh
The setup_loopback and setup_veth use their own way to create namespace. So let's just re-define server_ns/client_ns to unique name. At the same time update the namespace name in gro.sh and toeplitz.sh. As I don't have env to run toeplitz.sh. Here is only the gro test result. # ./gro.sh running test ipv4 data Expected {200 }, Total 1 packets Received {200 }, Total 1 packets. ... Gro::large test passed. All Tests Succeeded! Acked-by: David Ahern <[email protected]> Signed-off-by: Hangbin Liu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 976fd1f commit 4416c5f

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed

tools/testing/selftests/net/gro.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ run_test() {
2323
# on every try.
2424
for tries in {1..3}; do
2525
# Actual test starts here
26-
ip netns exec server_ns ./gro "${ARGS[@]}" "--rx" "--iface" "server" \
26+
ip netns exec $server_ns ./gro "${ARGS[@]}" "--rx" "--iface" "server" \
2727
1>>log.txt &
2828
server_pid=$!
2929
sleep 0.5 # to allow for socket init
30-
ip netns exec client_ns ./gro "${ARGS[@]}" "--iface" "client" \
30+
ip netns exec $client_ns ./gro "${ARGS[@]}" "--iface" "client" \
3131
1>>log.txt
3232
wait "${server_pid}"
3333
exit_code=$?

tools/testing/selftests/net/setup_loopback.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ readonly FLUSH_PATH="/sys/class/net/${dev}/gro_flush_timeout"
55
readonly IRQ_PATH="/sys/class/net/${dev}/napi_defer_hard_irqs"
66
readonly FLUSH_TIMEOUT="$(< ${FLUSH_PATH})"
77
readonly HARD_IRQS="$(< ${IRQ_PATH})"
8+
readonly server_ns=$(mktemp -u server-XXXXXXXX)
9+
readonly client_ns=$(mktemp -u client-XXXXXXXX)
810

911
netdev_check_for_carrier() {
1012
local -r dev="$1"
@@ -97,12 +99,12 @@ setup_interrupt() {
9799

98100
setup_ns() {
99101
# Set up server_ns namespace and client_ns namespace
100-
setup_macvlan_ns "${dev}" server_ns server "${SERVER_MAC}"
101-
setup_macvlan_ns "${dev}" client_ns client "${CLIENT_MAC}"
102+
setup_macvlan_ns "${dev}" ${server_ns} server "${SERVER_MAC}"
103+
setup_macvlan_ns "${dev}" ${client_ns} client "${CLIENT_MAC}"
102104
}
103105

104106
cleanup_ns() {
105-
cleanup_macvlan_ns server_ns server client_ns client
107+
cleanup_macvlan_ns ${server_ns} server ${client_ns} client
106108
}
107109

108110
setup() {

tools/testing/selftests/net/setup_veth.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/bash
22
# SPDX-License-Identifier: GPL-2.0
33

4+
readonly server_ns=$(mktemp -u server-XXXXXXXX)
5+
readonly client_ns=$(mktemp -u client-XXXXXXXX)
6+
47
setup_veth_ns() {
58
local -r link_dev="$1"
69
local -r ns_name="$2"
@@ -19,14 +22,14 @@ setup_ns() {
1922
# Set up server_ns namespace and client_ns namespace
2023
ip link add name server type veth peer name client
2124

22-
setup_veth_ns "${dev}" server_ns server "${SERVER_MAC}"
23-
setup_veth_ns "${dev}" client_ns client "${CLIENT_MAC}"
25+
setup_veth_ns "${dev}" ${server_ns} server "${SERVER_MAC}"
26+
setup_veth_ns "${dev}" ${client_ns} client "${CLIENT_MAC}"
2427
}
2528

2629
cleanup_ns() {
2730
local ns_name
2831

29-
for ns_name in client_ns server_ns; do
32+
for ns_name in ${client_ns} ${server_ns}; do
3033
[[ -e /var/run/netns/"${ns_name}" ]] && ip netns del "${ns_name}"
3134
done
3235
}

tools/testing/selftests/net/toeplitz.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,14 @@ setup() {
147147
setup_loopback_environment "${DEV}"
148148

149149
# Set up server_ns namespace and client_ns namespace
150-
setup_macvlan_ns "${DEV}" server_ns server \
150+
setup_macvlan_ns "${DEV}" $server_ns server \
151151
"${SERVER_MAC}" "${SERVER_IP}"
152-
setup_macvlan_ns "${DEV}" client_ns client \
152+
setup_macvlan_ns "${DEV}" $client_ns client \
153153
"${CLIENT_MAC}" "${CLIENT_IP}"
154154
}
155155

156156
cleanup() {
157-
cleanup_macvlan_ns server_ns server client_ns client
157+
cleanup_macvlan_ns $server_ns server $client_ns client
158158
cleanup_loopback "${DEV}"
159159
}
160160

@@ -170,22 +170,22 @@ if [[ "${TEST_RSS}" = true ]]; then
170170
# RPS/RFS must be disabled because they move packets between cpus,
171171
# which breaks the PACKET_FANOUT_CPU identification of RSS decisions.
172172
eval "$(get_disable_rfs_cmd) $(get_disable_rps_cmd)" \
173-
ip netns exec server_ns ./toeplitz "${IP_FLAG}" "${PROTO_FLAG}" \
173+
ip netns exec $server_ns ./toeplitz "${IP_FLAG}" "${PROTO_FLAG}" \
174174
-d "${PORT}" -i "${DEV}" -k "${KEY}" -T 1000 \
175175
-C "$(get_rx_irq_cpus)" -s -v &
176176
elif [[ ! -z "${RPS_MAP}" ]]; then
177177
eval "$(get_disable_rfs_cmd) $(get_set_rps_bitmaps_cmd ${RPS_MAP})" \
178-
ip netns exec server_ns ./toeplitz "${IP_FLAG}" "${PROTO_FLAG}" \
178+
ip netns exec $server_ns ./toeplitz "${IP_FLAG}" "${PROTO_FLAG}" \
179179
-d "${PORT}" -i "${DEV}" -k "${KEY}" -T 1000 \
180180
-r "0x${RPS_MAP}" -s -v &
181181
else
182-
ip netns exec server_ns ./toeplitz "${IP_FLAG}" "${PROTO_FLAG}" \
182+
ip netns exec $server_ns ./toeplitz "${IP_FLAG}" "${PROTO_FLAG}" \
183183
-d "${PORT}" -i "${DEV}" -k "${KEY}" -T 1000 -s -v &
184184
fi
185185

186186
server_pid=$!
187187

188-
ip netns exec client_ns ./toeplitz_client.sh "${PROTO_FLAG}" \
188+
ip netns exec $client_ns ./toeplitz_client.sh "${PROTO_FLAG}" \
189189
"${IP_FLAG}" "${SERVER_IP%%/*}" "${PORT}" &
190190

191191
client_pid=$!

0 commit comments

Comments
 (0)