Similar to IPIP and IP6IP6, introduce specific selftest for IPv4 over IPv6 flowtable sw acceleration in nft_flowtable.sh Signed-off-by: Lorenzo Bianconi --- .../selftests/net/netfilter/nft_flowtable.sh | 33 +++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/netfilter/nft_flowtable.sh b/tools/testing/selftests/net/netfilter/nft_flowtable.sh index 7a34ef468975..219339dbaf6e 100755 --- a/tools/testing/selftests/net/netfilter/nft_flowtable.sh +++ b/tools/testing/selftests/net/netfilter/nft_flowtable.sh @@ -579,9 +579,8 @@ if ! test_tcp_forwarding_nat "$ns1" "$ns2" 1 ""; then ip netns exec "$nsr1" nft list ruleset fi -# IPIP tunnel test: -# Add IPIP tunnel interfaces and check flowtable acceleration. -test_ipip() { +# IP tunnel tests: +test_ip_tnls() { if ! ip -net "$nsr1" link add name tun0 type ipip \ local 192.168.10.1 remote 192.168.10.2 >/dev/null;then echo "SKIP: could not add ipip tunnel" @@ -594,7 +593,9 @@ ip netns exec "$nsr1" sysctl net.ipv4.conf.tun0.forwarding=1 > /dev/null ip -net "$nsr1" link add name tun6 type ip6tnl local fee1:2::1 remote fee1:2::2 ip -net "$nsr1" link set tun6 up +ip -net "$nsr1" addr add 192.168.210.1/24 dev tun6 ip -net "$nsr1" addr add fee1:3::1/64 dev tun6 nodad +ip netns exec "$nsr1" sysctl net.ipv4.conf.tun6.forwarding=1 > /dev/null ip -net "$nsr2" link add name tun0 type ipip local 192.168.10.2 remote 192.168.10.1 ip -net "$nsr2" link set tun0 up @@ -603,7 +604,9 @@ ip netns exec "$nsr2" sysctl net.ipv4.conf.tun0.forwarding=1 > /dev/null ip -net "$nsr2" link add name tun6 type ip6tnl local fee1:2::2 remote fee1:2::1 || ret=1 ip -net "$nsr2" link set tun6 up +ip -net "$nsr2" addr add 192.168.210.2/24 dev tun6 ip -net "$nsr2" addr add fee1:3::2/64 dev tun6 nodad +ip netns exec "$nsr2" sysctl net.ipv4.conf.tun6.forwarding=1 > /dev/null ip -net "$nsr1" route change default via 192.168.100.2 ip -net "$nsr2" route change default via 192.168.100.1 @@ -636,6 +639,15 @@ else ret=1 fi +ip -net "$nsr1" route change default via 192.168.210.2 +ip -net "$nsr2" route change default via 192.168.210.1 + +if ! test_tcp_forwarding_nat "$ns1" "$ns2" 1 "IP6IP4 tunnel"; then + echo "FAIL: flow offload for ns1/ns2 with IP6IP4 tunnel" 1>&2 + ip netns exec "$nsr1" nft list ruleset + ret=1 +fi + # Create vlan tagged devices for IPIP traffic. ip -net "$nsr1" link add link veth1 name veth1.10 type vlan id 10 ip -net "$nsr1" link set veth1.10 up @@ -653,7 +665,9 @@ ip netns exec "$nsr1" nft -a insert rule inet filter forward 'meta oif tun0.10 a ip -net "$nsr1" link add name tun6.10 type ip6tnl local fee1:4::1 remote fee1:4::2 ip -net "$nsr1" link set tun6.10 up +ip -net "$nsr1" addr add 192.168.220.1/24 dev tun6.10 ip -net "$nsr1" addr add fee1:5::1/64 dev tun6.10 nodad +ip netns exec "$nsr1" sysctl net.ipv4.conf.tun6/10.forwarding=1 > /dev/null ip -6 -net "$nsr1" route delete default ip -6 -net "$nsr1" route add default via fee1:5::2 ip netns exec "$nsr1" nft -a insert rule inet filter forward 'meta oif tun6.10 accept' @@ -672,7 +686,9 @@ ip netns exec "$nsr2" sysctl net.ipv4.conf.tun0/10.forwarding=1 > /dev/null ip -net "$nsr2" link add name tun6.10 type ip6tnl local fee1:4::2 remote fee1:4::1 || ret=1 ip -net "$nsr2" link set tun6.10 up +ip -net "$nsr2" addr add 192.168.220.2/24 dev tun6.10 ip -net "$nsr2" addr add fee1:5::2/64 dev tun6.10 nodad +ip netns exec "$nsr2" sysctl net.ipv4.conf.tun6/10.forwarding=1 > /dev/null ip -6 -net "$nsr2" route delete default ip -6 -net "$nsr2" route add default via fee1:5::1 @@ -690,6 +706,15 @@ else ret=1 fi +ip -net "$nsr1" route change default via 192.168.220.2 +ip -net "$nsr2" route change default via 192.168.220.1 + +if ! test_tcp_forwarding_nat "$ns1" "$ns2" 1 "IP6IP4 tunnel over vlan"; then + echo "FAIL: flow offload for ns1/ns2 with IP6IP4 tunnel over vlan" 1>&2 + ip netns exec "$nsr1" nft list ruleset + ret=1 +fi + # Restore the previous configuration ip -net "$nsr1" route change default via 192.168.10.2 ip -net "$nsr2" route change default via 192.168.10.1 @@ -782,7 +807,7 @@ ip -net "$nsr1" addr add dead:1::1/64 dev veth0 nodad ip -net "$nsr1" link set up dev veth0 } -test_ipip +test_ip_tnls test_bridge -- 2.54.0