netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Ahern <dsahern@kernel.org>
To: davem@davemloft.net, netdev@vger.kernel.org
Cc: idosch@mellanox.com, kafai@fb.com, weiwan@google.com,
	sbrivio@redhat.com, David Ahern <dsahern@gmail.com>
Subject: [PATCH net-next 18/19] selftests: icmp_redirect: Add support for routing via nexthop objects
Date: Wed,  5 Jun 2019 16:15:22 -0700	[thread overview]
Message-ID: <20190605231523.18424-19-dsahern@kernel.org> (raw)
In-Reply-To: <20190605231523.18424-1-dsahern@kernel.org>

From: David Ahern <dsahern@gmail.com>

Add a second pass to icmp_redirect.sh to use nexthop objects for
routes.

Signed-off-by: David Ahern <dsahern@gmail.com>
---
 tools/testing/selftests/net/icmp_redirect.sh | 49 ++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/tools/testing/selftests/net/icmp_redirect.sh b/tools/testing/selftests/net/icmp_redirect.sh
index 76a7c4472dc3..18c5de53558a 100755
--- a/tools/testing/selftests/net/icmp_redirect.sh
+++ b/tools/testing/selftests/net/icmp_redirect.sh
@@ -331,6 +331,38 @@ run_ping()
 	run_cmd ip netns exec h1 ${ping6} -q -M want -i 0.5 -c 10 -w 2 -s ${sz} ${H1_PING_ARG} ${H2_N2_IP6}
 }
 
+replace_route_new()
+{
+	# r1 to h2 via r2 and eth0
+	run_cmd ip -netns r1 nexthop replace id 1 via ${R2_N1_IP} dev eth0
+	run_cmd ip -netns r1 nexthop replace id 2 via ${R2_LLADDR} dev eth0
+}
+
+reset_route_new()
+{
+	run_cmd ip -netns r1 nexthop flush
+	run_cmd ip -netns h1 nexthop flush
+
+	initial_route_new
+}
+
+initial_route_new()
+{
+	# r1 to h2 via r2 and eth1
+	run_cmd ip -netns r1 nexthop add id 1 via ${R2_R1_N1_IP} dev eth1
+	run_cmd ip -netns r1 ro add ${H2_N2} nhid 1
+
+	run_cmd ip -netns r1 nexthop add id 2 via ${R2_R1_N1_IP6} dev eth1
+	run_cmd ip -netns r1 -6 ro add ${H2_N2_6} nhid 2
+
+	# h1 to h2 via r1
+	run_cmd ip -netns h1 nexthop add id 1 via ${R1_N1_IP} dev br0
+	run_cmd ip -netns h1 ro add ${H1_VRF_ARG} ${H2_N2} nhid 1
+
+	run_cmd ip -netns h1 nexthop add id 2 via ${R1_LLADDR} dev br0
+	run_cmd ip -netns h1 -6 ro add ${H1_VRF_ARG} ${H2_N2_6} nhid 2
+}
+
 replace_route_legacy()
 {
 	# r1 to h2 via r2 and eth0
@@ -479,6 +511,23 @@ WITH_VRF=yes
 setup
 do_test "legacy"
 
+cleanup
+log_section "Routing with nexthop objects"
+ip nexthop ls >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+	WITH_VRF=no
+	setup
+	do_test "new"
+
+	cleanup
+	log_section "Routing with nexthop objects and VRF"
+	WITH_VRF=yes
+	setup
+	do_test "new"
+else
+	echo "Nexthop objects not supported; skipping tests"
+fi
+
 printf "\nTests passed: %3d\n" ${nsuccess}
 printf "Tests failed: %3d\n"   ${nfail}
 
-- 
2.11.0


  parent reply	other threads:[~2019-06-05 23:15 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-05 23:15 [PATCH net-next 00/19] net: Enable nexthop objects with IPv4 and IPv6 routes David Ahern
2019-06-05 23:15 ` [PATCH net-next 01/19] nexthops: Add ipv6 helper to walk all fib6_nh in a nexthop struct David Ahern
2019-06-06 21:52   ` David Miller
2019-06-06 22:01     ` David Ahern
2019-06-05 23:15 ` [PATCH net-next 02/19] ipv6: Handle all fib6_nh in a nexthop in fib6_drop_pcpu_from David Ahern
2019-06-05 23:15 ` [PATCH net-next 03/19] ipv6: Handle all fib6_nh in a nexthop in rt6_device_match David Ahern
2019-06-05 23:15 ` [PATCH net-next 04/19] ipv6: Handle all fib6_nh in a nexthop in __find_rr_leaf David Ahern
2019-06-05 23:15 ` [PATCH net-next 05/19] ipv6: Handle all fib6_nh in a nexthop in rt6_nlmsg_size David Ahern
2019-06-05 23:15 ` [PATCH net-next 06/19] ipv6: Handle all fib6_nh in a nexthop in fib6_info_uses_dev David Ahern
2019-06-05 23:15 ` [PATCH net-next 07/19] ipv6: Handle all fib6_nh in a nexthop in exception handling David Ahern
2019-06-05 23:15 ` [PATCH net-next 08/19] ipv6: Handle all fib6_nh in a nexthop in __ip6_route_redirect David Ahern
2019-06-05 23:15 ` [PATCH net-next 09/19] ipv6: Handle all fib6_nh in a nexthop in rt6_do_redirect David Ahern
2019-06-05 23:15 ` [PATCH net-next 10/19] ipv6: Handle all fib6_nh in a nexthop in mtu updates David Ahern
2019-06-05 23:15 ` [PATCH net-next 11/19] ipv4: Allow routes to use nexthop objects David Ahern
2019-06-05 23:15 ` [PATCH net-next 12/19] ipv4: Optimization for fib_info lookup with nexthops David Ahern
2019-06-05 23:15 ` [PATCH net-next 13/19] ipv6: Allow routes to use nexthop objects David Ahern
2019-06-05 23:15 ` [PATCH net-next 14/19] nexthops: add support for replace David Ahern
2019-06-06 21:52   ` David Miller
2019-06-05 23:15 ` [PATCH net-next 15/19] selftests: pmtu: Move running of test into a new function David Ahern
2019-06-06  5:51   ` Stefano Brivio
2019-06-05 23:15 ` [PATCH net-next 16/19] selftests: pmtu: Move route installs to " David Ahern
2019-06-06  5:51   ` Stefano Brivio
2019-06-05 23:15 ` [PATCH net-next 17/19] selftests: pmtu: Add support for routing via nexthop objects David Ahern
2019-06-06  5:51   ` Stefano Brivio
2019-06-05 23:15 ` David Ahern [this message]
2019-06-05 23:15 ` [PATCH net-next 19/19] selftests: Add test with multiple prefixes using single nexthop David Ahern

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=20190605231523.18424-19-dsahern@kernel.org \
    --to=dsahern@kernel.org \
    --cc=davem@davemloft.net \
    --cc=dsahern@gmail.com \
    --cc=idosch@mellanox.com \
    --cc=kafai@fb.com \
    --cc=netdev@vger.kernel.org \
    --cc=sbrivio@redhat.com \
    --cc=weiwan@google.com \
    /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).