From: David Ahern <dsahern@gmail.com>
To: netdev@vger.kernel.org
Cc: idosch@mellanox.com, David Ahern <dsahern@gmail.com>
Subject: [PATCH net-next 1/4] selftests: fib_tests: simplify ip commands in a namespace
Date: Tue, 13 Feb 2018 08:37:33 -0800 [thread overview]
Message-ID: <20180213163736.1538-2-dsahern@gmail.com> (raw)
In-Reply-To: <20180213163736.1538-1-dsahern@gmail.com>
'ip netns exec testns ip' is more efficiently handled using 'ip -netns';
runs the ip command after switching the namespace and avoids an exec.
Signed-off-by: David Ahern <dsahern@gmail.com>
---
tools/testing/selftests/net/fib_tests.sh | 210 +++++++++++++++----------------
1 file changed, 105 insertions(+), 105 deletions(-)
diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh
index a9154eefb2e2..672f263f8f53 100755
--- a/tools/testing/selftests/net/fib_tests.sh
+++ b/tools/testing/selftests/net/fib_tests.sh
@@ -34,23 +34,23 @@ fib_unreg_unicast_test()
netns_create "testns"
- ip netns exec testns ip link add dummy0 type dummy
- ip netns exec testns ip link set dev dummy0 up
+ ip -netns testns link add dummy0 type dummy
+ ip -netns testns link set dev dummy0 up
- ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
- ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
+ ip -netns testns address add 198.51.100.1/24 dev dummy0
+ ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
- ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
+ ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
check_err $?
- ip netns exec testns ip link del dev dummy0
+ ip -netns testns link del dev dummy0
check_err $?
- ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
+ ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
check_fail $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
check_fail $?
ip netns del testns
@@ -68,40 +68,40 @@ fib_unreg_multipath_test()
netns_create "testns"
- ip netns exec testns ip link add dummy0 type dummy
- ip netns exec testns ip link set dev dummy0 up
+ ip -netns testns link add dummy0 type dummy
+ ip -netns testns link set dev dummy0 up
- ip netns exec testns ip link add dummy1 type dummy
- ip netns exec testns ip link set dev dummy1 up
+ ip -netns testns link add dummy1 type dummy
+ ip -netns testns link set dev dummy1 up
- ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
- ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
+ ip -netns testns address add 198.51.100.1/24 dev dummy0
+ ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
- ip netns exec testns ip address add 192.0.2.1/24 dev dummy1
- ip netns exec testns ip -6 address add 2001:db8:2::1/64 dev dummy1
+ ip -netns testns address add 192.0.2.1/24 dev dummy1
+ ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy1
- ip netns exec testns ip route add 203.0.113.0/24 \
+ ip -netns testns route add 203.0.113.0/24 \
nexthop via 198.51.100.2 dev dummy0 \
nexthop via 192.0.2.2 dev dummy1
- ip netns exec testns ip -6 route add 2001:db8:3::/64 \
+ ip -netns testns -6 route add 2001:db8:3::/64 \
nexthop via 2001:db8:1::2 dev dummy0 \
nexthop via 2001:db8:2::2 dev dummy1
- ip netns exec testns ip route get fibmatch 203.0.113.1 &> /dev/null
+ ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
check_err $?
- ip netns exec testns ip link del dev dummy0
+ ip -netns testns link del dev dummy0
check_err $?
- ip netns exec testns ip route get fibmatch 203.0.113.1 &> /dev/null
+ ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
check_fail $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
# In IPv6 we do not flush the entire multipath route.
check_err $?
- ip netns exec testns ip link del dev dummy1
+ ip -netns testns link del dev dummy1
ip netns del testns
@@ -126,26 +126,26 @@ fib_down_unicast_test()
netns_create "testns"
- ip netns exec testns ip link add dummy0 type dummy
- ip netns exec testns ip link set dev dummy0 up
+ ip -netns testns link add dummy0 type dummy
+ ip -netns testns link set dev dummy0 up
- ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
- ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
+ ip -netns testns address add 198.51.100.1/24 dev dummy0
+ ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
- ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
+ ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
check_err $?
- ip netns exec testns ip link set dev dummy0 down
+ ip -netns testns link set dev dummy0 down
check_err $?
- ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
+ ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
check_fail $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
check_fail $?
- ip netns exec testns ip link del dev dummy0
+ ip -netns testns link del dev dummy0
ip netns del testns
@@ -161,31 +161,31 @@ fib_down_multipath_test_do()
local down_dev=$1
local up_dev=$2
- ip netns exec testns ip route get fibmatch 203.0.113.1 \
+ ip -netns testns route get fibmatch 203.0.113.1 \
oif $down_dev &> /dev/null
check_fail $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 \
+ ip -netns testns -6 route get fibmatch 2001:db8:3::1 \
oif $down_dev &> /dev/null
check_fail $?
- ip netns exec testns ip route get fibmatch 203.0.113.1 \
+ ip -netns testns route get fibmatch 203.0.113.1 \
oif $up_dev &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 \
+ ip -netns testns -6 route get fibmatch 2001:db8:3::1 \
oif $up_dev &> /dev/null
check_err $?
- ip netns exec testns ip route get fibmatch 203.0.113.1 | \
+ ip -netns testns route get fibmatch 203.0.113.1 | \
grep $down_dev | grep -q "dead linkdown"
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 | \
+ ip -netns testns -6 route get fibmatch 2001:db8:3::1 | \
grep $down_dev | grep -q "dead linkdown"
check_err $?
- ip netns exec testns ip route get fibmatch 203.0.113.1 | \
+ ip -netns testns route get fibmatch 203.0.113.1 | \
grep $up_dev | grep -q "dead linkdown"
check_fail $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 | \
+ ip -netns testns -6 route get fibmatch 2001:db8:3::1 | \
grep $up_dev | grep -q "dead linkdown"
check_fail $?
}
@@ -196,52 +196,52 @@ fib_down_multipath_test()
netns_create "testns"
- ip netns exec testns ip link add dummy0 type dummy
- ip netns exec testns ip link set dev dummy0 up
+ ip -netns testns link add dummy0 type dummy
+ ip -netns testns link set dev dummy0 up
- ip netns exec testns ip link add dummy1 type dummy
- ip netns exec testns ip link set dev dummy1 up
+ ip -netns testns link add dummy1 type dummy
+ ip -netns testns link set dev dummy1 up
- ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
- ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
+ ip -netns testns address add 198.51.100.1/24 dev dummy0
+ ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
- ip netns exec testns ip address add 192.0.2.1/24 dev dummy1
- ip netns exec testns ip -6 address add 2001:db8:2::1/64 dev dummy1
+ ip -netns testns address add 192.0.2.1/24 dev dummy1
+ ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy1
- ip netns exec testns ip route add 203.0.113.0/24 \
+ ip -netns testns route add 203.0.113.0/24 \
nexthop via 198.51.100.2 dev dummy0 \
nexthop via 192.0.2.2 dev dummy1
- ip netns exec testns ip -6 route add 2001:db8:3::/64 \
+ ip -netns testns -6 route add 2001:db8:3::/64 \
nexthop via 2001:db8:1::2 dev dummy0 \
nexthop via 2001:db8:2::2 dev dummy1
- ip netns exec testns ip route get fibmatch 203.0.113.1 &> /dev/null
+ ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
check_err $?
- ip netns exec testns ip link set dev dummy0 down
+ ip -netns testns link set dev dummy0 down
check_err $?
fib_down_multipath_test_do "dummy0" "dummy1"
- ip netns exec testns ip link set dev dummy0 up
+ ip -netns testns link set dev dummy0 up
check_err $?
- ip netns exec testns ip link set dev dummy1 down
+ ip -netns testns link set dev dummy1 down
check_err $?
fib_down_multipath_test_do "dummy1" "dummy0"
- ip netns exec testns ip link set dev dummy0 down
+ ip -netns testns link set dev dummy0 down
check_err $?
- ip netns exec testns ip route get fibmatch 203.0.113.1 &> /dev/null
+ ip -netns testns route get fibmatch 203.0.113.1 &> /dev/null
check_fail $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:3::1 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:3::1 &> /dev/null
check_fail $?
- ip netns exec testns ip link del dev dummy1
- ip netns exec testns ip link del dev dummy0
+ ip -netns testns link del dev dummy1
+ ip -netns testns link del dev dummy0
ip netns del testns
@@ -267,56 +267,56 @@ fib_carrier_local_test()
# Local routes should not be affected when carrier changes.
netns_create "testns"
- ip netns exec testns ip link add dummy0 type dummy
- ip netns exec testns ip link set dev dummy0 up
+ ip -netns testns link add dummy0 type dummy
+ ip -netns testns link set dev dummy0 up
- ip netns exec testns ip link set dev dummy0 carrier on
+ ip -netns testns link set dev dummy0 carrier on
- ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
- ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
+ ip -netns testns address add 198.51.100.1/24 dev dummy0
+ ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
- ip netns exec testns ip route get fibmatch 198.51.100.1 &> /dev/null
+ ip -netns testns route get fibmatch 198.51.100.1 &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::1 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:1::1 &> /dev/null
check_err $?
- ip netns exec testns ip route get fibmatch 198.51.100.1 | \
+ ip -netns testns route get fibmatch 198.51.100.1 | \
grep -q "linkdown"
check_fail $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::1 | \
+ ip -netns testns -6 route get fibmatch 2001:db8:1::1 | \
grep -q "linkdown"
check_fail $?
- ip netns exec testns ip link set dev dummy0 carrier off
+ ip -netns testns link set dev dummy0 carrier off
- ip netns exec testns ip route get fibmatch 198.51.100.1 &> /dev/null
+ ip -netns testns route get fibmatch 198.51.100.1 &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::1 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:1::1 &> /dev/null
check_err $?
- ip netns exec testns ip route get fibmatch 198.51.100.1 | \
+ ip -netns testns route get fibmatch 198.51.100.1 | \
grep -q "linkdown"
check_fail $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::1 | \
+ ip -netns testns -6 route get fibmatch 2001:db8:1::1 | \
grep -q "linkdown"
check_fail $?
- ip netns exec testns ip address add 192.0.2.1/24 dev dummy0
- ip netns exec testns ip -6 address add 2001:db8:2::1/64 dev dummy0
+ ip -netns testns address add 192.0.2.1/24 dev dummy0
+ ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy0
- ip netns exec testns ip route get fibmatch 192.0.2.1 &> /dev/null
+ ip -netns testns route get fibmatch 192.0.2.1 &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:2::1 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:2::1 &> /dev/null
check_err $?
- ip netns exec testns ip route get fibmatch 192.0.2.1 | \
+ ip -netns testns route get fibmatch 192.0.2.1 | \
grep -q "linkdown"
check_fail $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:2::1 | \
+ ip -netns testns -6 route get fibmatch 2001:db8:2::1 | \
grep -q "linkdown"
check_fail $?
- ip netns exec testns ip link del dev dummy0
+ ip -netns testns link del dev dummy0
ip netns del testns
@@ -333,56 +333,56 @@ fib_carrier_unicast_test()
netns_create "testns"
- ip netns exec testns ip link add dummy0 type dummy
- ip netns exec testns ip link set dev dummy0 up
+ ip -netns testns link add dummy0 type dummy
+ ip -netns testns link set dev dummy0 up
- ip netns exec testns ip link set dev dummy0 carrier on
+ ip -netns testns link set dev dummy0 carrier on
- ip netns exec testns ip address add 198.51.100.1/24 dev dummy0
- ip netns exec testns ip -6 address add 2001:db8:1::1/64 dev dummy0
+ ip -netns testns address add 198.51.100.1/24 dev dummy0
+ ip -netns testns -6 address add 2001:db8:1::1/64 dev dummy0
- ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
+ ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
check_err $?
- ip netns exec testns ip route get fibmatch 198.51.100.2 | \
+ ip -netns testns route get fibmatch 198.51.100.2 | \
grep -q "linkdown"
check_fail $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 | \
+ ip -netns testns -6 route get fibmatch 2001:db8:1::2 | \
grep -q "linkdown"
check_fail $?
- ip netns exec testns ip link set dev dummy0 carrier off
+ ip -netns testns link set dev dummy0 carrier off
- ip netns exec testns ip route get fibmatch 198.51.100.2 &> /dev/null
+ ip -netns testns route get fibmatch 198.51.100.2 &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:1::2 &> /dev/null
check_err $?
- ip netns exec testns ip route get fibmatch 198.51.100.2 | \
+ ip -netns testns route get fibmatch 198.51.100.2 | \
grep -q "linkdown"
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:1::2 | \
+ ip -netns testns -6 route get fibmatch 2001:db8:1::2 | \
grep -q "linkdown"
check_err $?
- ip netns exec testns ip address add 192.0.2.1/24 dev dummy0
- ip netns exec testns ip -6 address add 2001:db8:2::1/64 dev dummy0
+ ip -netns testns address add 192.0.2.1/24 dev dummy0
+ ip -netns testns -6 address add 2001:db8:2::1/64 dev dummy0
- ip netns exec testns ip route get fibmatch 192.0.2.2 &> /dev/null
+ ip -netns testns route get fibmatch 192.0.2.2 &> /dev/null
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:2::2 &> /dev/null
+ ip -netns testns -6 route get fibmatch 2001:db8:2::2 &> /dev/null
check_err $?
- ip netns exec testns ip route get fibmatch 192.0.2.2 | \
+ ip -netns testns route get fibmatch 192.0.2.2 | \
grep -q "linkdown"
check_err $?
- ip netns exec testns ip -6 route get fibmatch 2001:db8:2::2 | \
+ ip -netns testns -6 route get fibmatch 2001:db8:2::2 | \
grep -q "linkdown"
check_err $?
- ip netns exec testns ip link del dev dummy0
+ ip -netns testns link del dev dummy0
ip netns del testns
--
2.11.0
next prev parent reply other threads:[~2018-02-13 16:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 16:37 [PATCH net-next 0/4] selftests: fib_tests: simplifications, verbosity and a race David Ahern
2018-02-13 16:37 ` David Ahern [this message]
2018-02-13 16:37 ` [PATCH net-next 2/4] selftests: fib_tests: Make test results more verbose David Ahern
2018-02-13 16:37 ` [PATCH net-next 3/4] selftests: fib_tests: Move admin of dummy0 to helpers David Ahern
2018-02-13 16:37 ` [PATCH net-next 4/4] selftests: fib_tests: sleep after changing carrier David Ahern
2018-02-13 19:34 ` [PATCH net-next 0/4] selftests: fib_tests: simplifications, verbosity and a race David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180213163736.1538-2-dsahern@gmail.com \
--to=dsahern@gmail.com \
--cc=idosch@mellanox.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).