Commit 36b0bdb6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-selftests-unique-namespace' 

Hangbin Liu says:

====================
Convert net selftests to run in unique namespace (Part 2)

Here is the 2nd part of converting net selftests to run in unique namespace.
This part converts all bridge, vxlan, vrf tests.

Here is the part 1 link:
https://lore.kernel.org/netdev/20231202020110.362433-1-liuhangbin@gmail.com


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6b4756be 61b12ebe

tools/testing/selftests/net/test_bridge_backup_port.sh

+182 −189

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/net/test_bridge_neigh_suppress.sh

+162 −169

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/net/test_vxlan_mdb.sh

+99 −103
Original line number Diff line number Diff line
@@ -55,9 +55,8 @@ 
# | ns2_v4                             | | ns2_v6                             |

# +------------------------------------+ +------------------------------------+



source lib.sh

ret=0

# Kselftest framework requirement - SKIP code is 4.

ksft_skip=4



CONTROL_PATH_TESTS="

	basic_star_g_ipv4_ipv4
@@ -260,9 +259,6 @@ setup_common() 
	local local_addr1=$1; shift

	local local_addr2=$1; shift



	ip netns add $ns1

	ip netns add $ns2



	ip link add name veth0 type veth peer name veth1

	ip link set dev veth0 netns $ns1 name veth0

	ip link set dev veth1 netns $ns2 name veth0
@@ -273,36 +269,36 @@ setup_common() 


setup_v4()

{

	setup_common ns1_v4 ns2_v4 192.0.2.1 192.0.2.2

	setup_ns ns1_v4 ns2_v4

	setup_common $ns1_v4 $ns2_v4 192.0.2.1 192.0.2.2



	ip -n ns1_v4 address add 192.0.2.17/28 dev veth0

	ip -n ns2_v4 address add 192.0.2.18/28 dev veth0

	ip -n $ns1_v4 address add 192.0.2.17/28 dev veth0

	ip -n $ns2_v4 address add 192.0.2.18/28 dev veth0



	ip -n ns1_v4 route add default via 192.0.2.18

	ip -n ns2_v4 route add default via 192.0.2.17

	ip -n $ns1_v4 route add default via 192.0.2.18

	ip -n $ns2_v4 route add default via 192.0.2.17

}



cleanup_v4()

{

	ip netns del ns2_v4

	ip netns del ns1_v4

	cleanup_ns $ns2_v4 $ns1_v4

}



setup_v6()

{

	setup_common ns1_v6 ns2_v6 2001:db8:1::1 2001:db8:1::2

	setup_ns ns1_v6 ns2_v6

	setup_common $ns1_v6 $ns2_v6 2001:db8:1::1 2001:db8:1::2



	ip -n ns1_v6 address add 2001:db8:2::1/64 dev veth0 nodad

	ip -n ns2_v6 address add 2001:db8:2::2/64 dev veth0 nodad

	ip -n $ns1_v6 address add 2001:db8:2::1/64 dev veth0 nodad

	ip -n $ns2_v6 address add 2001:db8:2::2/64 dev veth0 nodad



	ip -n ns1_v6 route add default via 2001:db8:2::2

	ip -n ns2_v6 route add default via 2001:db8:2::1

	ip -n $ns1_v6 route add default via 2001:db8:2::2

	ip -n $ns2_v6 route add default via 2001:db8:2::1

}



cleanup_v6()

{

	ip netns del ns2_v6

	ip netns del ns1_v6

	cleanup_ns $ns2_v6 $ns1_v6

}



setup()
@@ -433,7 +429,7 @@ basic_common() 


basic_star_g_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local grp_key="grp 239.1.1.1"

	local vtep_ip=198.51.100.100
@@ -446,7 +442,7 @@ basic_star_g_ipv4_ipv4() 


basic_star_g_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local grp_key="grp ff0e::1"

	local vtep_ip=198.51.100.100
@@ -459,7 +455,7 @@ basic_star_g_ipv6_ipv4() 


basic_star_g_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local grp_key="grp 239.1.1.1"

	local vtep_ip=2001:db8:1000::1
@@ -472,7 +468,7 @@ basic_star_g_ipv4_ipv6() 


basic_star_g_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local grp_key="grp ff0e::1"

	local vtep_ip=2001:db8:1000::1
@@ -485,7 +481,7 @@ basic_star_g_ipv6_ipv6() 


basic_sg_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local grp_key="grp 239.1.1.1 src 192.0.2.129"

	local vtep_ip=198.51.100.100
@@ -498,7 +494,7 @@ basic_sg_ipv4_ipv4() 


basic_sg_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local grp_key="grp ff0e::1 src 2001:db8:100::1"

	local vtep_ip=198.51.100.100
@@ -511,7 +507,7 @@ basic_sg_ipv6_ipv4() 


basic_sg_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local grp_key="grp 239.1.1.1 src 192.0.2.129"

	local vtep_ip=2001:db8:1000::1
@@ -524,7 +520,7 @@ basic_sg_ipv4_ipv6() 


basic_sg_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local grp_key="grp ff0e::1 src 2001:db8:100::1"

	local vtep_ip=2001:db8:1000::1
@@ -694,7 +690,7 @@ star_g_common() 


star_g_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local grp=239.1.1.1

	local src1=192.0.2.129

	local src2=192.0.2.130
@@ -711,7 +707,7 @@ star_g_ipv4_ipv4() 


star_g_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local grp=ff0e::1

	local src1=2001:db8:100::1

	local src2=2001:db8:100::2
@@ -728,7 +724,7 @@ star_g_ipv6_ipv4() 


star_g_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local grp=239.1.1.1

	local src1=192.0.2.129

	local src2=192.0.2.130
@@ -745,7 +741,7 @@ star_g_ipv4_ipv6() 


star_g_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local grp=ff0e::1

	local src1=2001:db8:100::1

	local src2=2001:db8:100::2
@@ -793,7 +789,7 @@ sg_common() 


sg_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local grp=239.1.1.1

	local src=192.0.2.129

	local vtep_ip=198.51.100.100
@@ -808,7 +804,7 @@ sg_ipv4_ipv4() 


sg_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local grp=ff0e::1

	local src=2001:db8:100::1

	local vtep_ip=198.51.100.100
@@ -823,7 +819,7 @@ sg_ipv6_ipv4() 


sg_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local grp=239.1.1.1

	local src=192.0.2.129

	local vtep_ip=2001:db8:1000::1
@@ -838,7 +834,7 @@ sg_ipv4_ipv6() 


sg_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local grp=ff0e::1

	local src=2001:db8:100::1

	local vtep_ip=2001:db8:1000::1
@@ -918,7 +914,7 @@ dump_common() 


dump_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local local_addr=192.0.2.1

	local remote_prefix=198.51.100.

	local fn=ipv4_grps_get
@@ -932,7 +928,7 @@ dump_ipv4_ipv4() 


dump_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local local_addr=192.0.2.1

	local remote_prefix=198.51.100.

	local fn=ipv6_grps_get
@@ -946,7 +942,7 @@ dump_ipv6_ipv4() 


dump_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local local_addr=2001:db8:1::1

	local remote_prefix=2001:db8:1000::

	local fn=ipv4_grps_get
@@ -960,7 +956,7 @@ dump_ipv4_ipv6() 


dump_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local local_addr=2001:db8:1::1

	local remote_prefix=2001:db8:1000::

	local fn=ipv6_grps_get
@@ -1072,8 +1068,8 @@ encap_params_common() 


encap_params_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local vtep1_ip=198.51.100.100

	local vtep2_ip=198.51.100.200

	local plen=32
@@ -1091,8 +1087,8 @@ encap_params_ipv4_ipv4() 


encap_params_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local vtep1_ip=198.51.100.100

	local vtep2_ip=198.51.100.200

	local plen=32
@@ -1110,8 +1106,8 @@ encap_params_ipv6_ipv4() 


encap_params_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local plen=128
@@ -1129,8 +1125,8 @@ encap_params_ipv4_ipv6() 


encap_params_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local plen=128
@@ -1208,8 +1204,8 @@ starg_exclude_ir_common() 


starg_exclude_ir_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local vtep1_ip=198.51.100.100

	local vtep2_ip=198.51.100.200

	local plen=32
@@ -1227,8 +1223,8 @@ starg_exclude_ir_ipv4_ipv4() 


starg_exclude_ir_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local vtep1_ip=198.51.100.100

	local vtep2_ip=198.51.100.200

	local plen=32
@@ -1246,8 +1242,8 @@ starg_exclude_ir_ipv6_ipv4() 


starg_exclude_ir_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local plen=128
@@ -1265,8 +1261,8 @@ starg_exclude_ir_ipv4_ipv6() 


starg_exclude_ir_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local plen=128
@@ -1344,8 +1340,8 @@ starg_include_ir_common() 


starg_include_ir_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local vtep1_ip=198.51.100.100

	local vtep2_ip=198.51.100.200

	local plen=32
@@ -1363,8 +1359,8 @@ starg_include_ir_ipv4_ipv4() 


starg_include_ir_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local vtep1_ip=198.51.100.100

	local vtep2_ip=198.51.100.200

	local plen=32
@@ -1382,8 +1378,8 @@ starg_include_ir_ipv6_ipv4() 


starg_include_ir_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local plen=128
@@ -1401,8 +1397,8 @@ starg_include_ir_ipv4_ipv6() 


starg_include_ir_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local plen=128
@@ -1462,8 +1458,8 @@ starg_exclude_p2mp_common() 


starg_exclude_p2mp_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local mcast_grp=238.1.1.1

	local plen=32

	local grp=239.1.1.1
@@ -1480,8 +1476,8 @@ starg_exclude_p2mp_ipv4_ipv4() 


starg_exclude_p2mp_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local mcast_grp=238.1.1.1

	local plen=32

	local grp=ff0e::1
@@ -1498,8 +1494,8 @@ starg_exclude_p2mp_ipv6_ipv4() 


starg_exclude_p2mp_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local mcast_grp=ff0e::2

	local plen=128

	local grp=239.1.1.1
@@ -1516,8 +1512,8 @@ starg_exclude_p2mp_ipv4_ipv6() 


starg_exclude_p2mp_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local mcast_grp=ff0e::2

	local plen=128

	local grp=ff0e::1
@@ -1576,8 +1572,8 @@ starg_include_p2mp_common() 


starg_include_p2mp_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local mcast_grp=238.1.1.1

	local plen=32

	local grp=239.1.1.1
@@ -1594,8 +1590,8 @@ starg_include_p2mp_ipv4_ipv4() 


starg_include_p2mp_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local mcast_grp=238.1.1.1

	local plen=32

	local grp=ff0e::1
@@ -1612,8 +1608,8 @@ starg_include_p2mp_ipv6_ipv4() 


starg_include_p2mp_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local mcast_grp=ff0e::2

	local plen=128

	local grp=239.1.1.1
@@ -1630,8 +1626,8 @@ starg_include_p2mp_ipv4_ipv6() 


starg_include_p2mp_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local mcast_grp=ff0e::2

	local plen=128

	local grp=ff0e::1
@@ -1709,8 +1705,8 @@ egress_vni_translation_common() 


egress_vni_translation_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local mcast_grp=238.1.1.1

	local plen=32

	local proto="ipv4"
@@ -1727,8 +1723,8 @@ egress_vni_translation_ipv4_ipv4() 


egress_vni_translation_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local mcast_grp=238.1.1.1

	local plen=32

	local proto="ipv6"
@@ -1745,8 +1741,8 @@ egress_vni_translation_ipv6_ipv4() 


egress_vni_translation_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local mcast_grp=ff0e::2

	local plen=128

	local proto="ipv4"
@@ -1763,8 +1759,8 @@ egress_vni_translation_ipv4_ipv6() 


egress_vni_translation_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local mcast_grp=ff0e::2

	local plen=128

	local proto="ipv6"
@@ -1929,8 +1925,8 @@ all_zeros_mdb_common() 


all_zeros_mdb_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local vtep1_ip=198.51.100.101

	local vtep2_ip=198.51.100.102

	local vtep3_ip=198.51.100.103
@@ -1947,8 +1943,8 @@ all_zeros_mdb_ipv4() 


all_zeros_mdb_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local vtep3_ip=2001:db8:3000::1
@@ -2021,8 +2017,8 @@ mdb_fdb_common() 


mdb_fdb_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local vtep1_ip=198.51.100.100

	local vtep2_ip=198.51.100.200

	local plen=32
@@ -2040,8 +2036,8 @@ mdb_fdb_ipv4_ipv4() 


mdb_fdb_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns2=ns2_v4

	local ns1=$ns1_v4

	local ns2=$ns2_v4

	local vtep1_ip=198.51.100.100

	local vtep2_ip=198.51.100.200

	local plen=32
@@ -2059,8 +2055,8 @@ mdb_fdb_ipv6_ipv4() 


mdb_fdb_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local plen=128
@@ -2078,8 +2074,8 @@ mdb_fdb_ipv4_ipv6() 


mdb_fdb_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns2=ns2_v6

	local ns1=$ns1_v6

	local ns2=$ns2_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local plen=128
@@ -2166,7 +2162,7 @@ mdb_torture_common() 


mdb_torture_ipv4_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local vtep1_ip=198.51.100.100

	local vtep2_ip=198.51.100.200

	local grp1=239.1.1.1
@@ -2183,7 +2179,7 @@ mdb_torture_ipv4_ipv4() 


mdb_torture_ipv6_ipv4()

{

	local ns1=ns1_v4

	local ns1=$ns1_v4

	local vtep1_ip=198.51.100.100

	local vtep2_ip=198.51.100.200

	local grp1=ff0e::1
@@ -2200,7 +2196,7 @@ mdb_torture_ipv6_ipv4() 


mdb_torture_ipv4_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local grp1=239.1.1.1
@@ -2217,7 +2213,7 @@ mdb_torture_ipv4_ipv6() 


mdb_torture_ipv6_ipv6()

{

	local ns1=ns1_v6

	local ns1=$ns1_v6

	local vtep1_ip=2001:db8:1000::1

	local vtep2_ip=2001:db8:2000::1

	local grp1=ff0e::1

tools/testing/selftests/net/test_vxlan_nolocalbypass.sh

+23 −25
Original line number Diff line number Diff line
@@ -9,9 +9,8 @@ 
# option and verifies that packets are no longer received by the second VXLAN

# device.



source lib.sh

ret=0

# Kselftest framework requirement - SKIP code is 4.

ksft_skip=4



TESTS="

	nolocalbypass
@@ -98,20 +97,19 @@ tc_check_packets() 


setup()

{

	ip netns add ns1

	setup_ns ns1



	ip -n ns1 link set dev lo up

	ip -n ns1 address add 192.0.2.1/32 dev lo

	ip -n ns1 address add 198.51.100.1/32 dev lo

	ip -n $ns1 address add 192.0.2.1/32 dev lo

	ip -n $ns1 address add 198.51.100.1/32 dev lo



	ip -n ns1 link add name vx0 up type vxlan id 100 local 198.51.100.1 \

	ip -n $ns1 link add name vx0 up type vxlan id 100 local 198.51.100.1 \

		dstport 4789 nolearning

	ip -n ns1 link add name vx1 up type vxlan id 100 dstport 4790

	ip -n $ns1 link add name vx1 up type vxlan id 100 dstport 4790

}



cleanup()

{

	ip netns del ns1 &> /dev/null

	cleanup_ns $ns1

}



################################################################################
@@ -122,40 +120,40 @@ nolocalbypass() 
	local smac=00:01:02:03:04:05

	local dmac=00:0a:0b:0c:0d:0e



	run_cmd "bridge -n ns1 fdb add $dmac dev vx0 self static dst 192.0.2.1 port 4790"

	run_cmd "bridge -n $ns1 fdb add $dmac dev vx0 self static dst 192.0.2.1 port 4790"



	run_cmd "tc -n ns1 qdisc add dev vx1 clsact"

	run_cmd "tc -n ns1 filter add dev vx1 ingress pref 1 handle 101 proto all flower src_mac $smac dst_mac $dmac action pass"

	run_cmd "tc -n $ns1 qdisc add dev vx1 clsact"

	run_cmd "tc -n $ns1 filter add dev vx1 ingress pref 1 handle 101 proto all flower src_mac $smac dst_mac $dmac action pass"



	run_cmd "tc -n ns1 qdisc add dev lo clsact"

	run_cmd "tc -n ns1 filter add dev lo ingress pref 1 handle 101 proto ip flower ip_proto udp dst_port 4790 action drop"

	run_cmd "tc -n $ns1 qdisc add dev lo clsact"

	run_cmd "tc -n $ns1 filter add dev lo ingress pref 1 handle 101 proto ip flower ip_proto udp dst_port 4790 action drop"



	run_cmd "ip -n ns1 -d -j link show dev vx0 | jq -e '.[][\"linkinfo\"][\"info_data\"][\"localbypass\"] == true'"

	run_cmd "ip -n $ns1 -d -j link show dev vx0 | jq -e '.[][\"linkinfo\"][\"info_data\"][\"localbypass\"] == true'"

	log_test $? 0 "localbypass enabled"



	run_cmd "ip netns exec ns1 mausezahn vx0 -a $smac -b $dmac -c 1 -p 100 -q"

	run_cmd "ip netns exec $ns1 mausezahn vx0 -a $smac -b $dmac -c 1 -p 100 -q"



	tc_check_packets "ns1" "dev vx1 ingress" 101 1

	tc_check_packets "$ns1" "dev vx1 ingress" 101 1

	log_test $? 0 "Packet received by local VXLAN device - localbypass"



	run_cmd "ip -n ns1 link set dev vx0 type vxlan nolocalbypass"

	run_cmd "ip -n $ns1 link set dev vx0 type vxlan nolocalbypass"



	run_cmd "ip -n ns1 -d -j link show dev vx0 | jq -e '.[][\"linkinfo\"][\"info_data\"][\"localbypass\"] == false'"

	run_cmd "ip -n $ns1 -d -j link show dev vx0 | jq -e '.[][\"linkinfo\"][\"info_data\"][\"localbypass\"] == false'"

	log_test $? 0 "localbypass disabled"



	run_cmd "ip netns exec ns1 mausezahn vx0 -a $smac -b $dmac -c 1 -p 100 -q"

	run_cmd "ip netns exec $ns1 mausezahn vx0 -a $smac -b $dmac -c 1 -p 100 -q"



	tc_check_packets "ns1" "dev vx1 ingress" 101 1

	tc_check_packets "$ns1" "dev vx1 ingress" 101 1

	log_test $? 0 "Packet not received by local VXLAN device - nolocalbypass"



	run_cmd "ip -n ns1 link set dev vx0 type vxlan localbypass"

	run_cmd "ip -n $ns1 link set dev vx0 type vxlan localbypass"



	run_cmd "ip -n ns1 -d -j link show dev vx0 | jq -e '.[][\"linkinfo\"][\"info_data\"][\"localbypass\"] == true'"

	run_cmd "ip -n $ns1 -d -j link show dev vx0 | jq -e '.[][\"linkinfo\"][\"info_data\"][\"localbypass\"] == true'"

	log_test $? 0 "localbypass enabled"



	run_cmd "ip netns exec ns1 mausezahn vx0 -a $smac -b $dmac -c 1 -p 100 -q"

	run_cmd "ip netns exec $ns1 mausezahn vx0 -a $smac -b $dmac -c 1 -p 100 -q"



	tc_check_packets "ns1" "dev vx1 ingress" 101 2

	tc_check_packets "$ns1" "dev vx1 ingress" 101 2

	log_test $? 0 "Packet received by local VXLAN device - localbypass"

}

tools/testing/selftests/net/test_vxlan_under_vrf.sh

+36 −34
Original line number Diff line number Diff line
@@ -43,15 +43,14 @@ 
# This tests both the connectivity between vm-1 and vm-2, and that the underlay

# can be moved in and out of the vrf by unsetting and setting veth0's master.



source lib.sh

set -e



cleanup() {

    ip link del veth-hv-1 2>/dev/null || true

    ip link del veth-tap 2>/dev/null || true



    for ns in hv-1 hv-2 vm-1 vm-2; do

        ip netns del $ns 2>/dev/null || true

    done

    cleanup_ns $hv_1 $hv_2 $vm_1 $vm_2

}



# Clean start
@@ -60,72 +59,75 @@ cleanup &> /dev/null 
[[ $1 == "clean" ]] && exit 0



trap cleanup EXIT

setup_ns hv_1 hv_2 vm_1 vm_2

hv[1]=$hv_1

hv[2]=$hv_2

vm[1]=$vm_1

vm[2]=$vm_2



# Setup "Hypervisors" simulated with netns

ip link add veth-hv-1 type veth peer name veth-hv-2

setup-hv-networking() {

    hv=$1

    id=$1



    ip netns add hv-$hv

    ip link set veth-hv-$hv netns hv-$hv

    ip -netns hv-$hv link set veth-hv-$hv name veth0

    ip link set veth-hv-$id netns ${hv[$id]}

    ip -netns ${hv[$id]} link set veth-hv-$id name veth0



    ip -netns hv-$hv link add vrf-underlay type vrf table 1

    ip -netns hv-$hv link set vrf-underlay up

    ip -netns hv-$hv addr add 172.16.0.$hv/24 dev veth0

    ip -netns hv-$hv link set veth0 up

    ip -netns ${hv[$id]} link add vrf-underlay type vrf table 1

    ip -netns ${hv[$id]} link set vrf-underlay up

    ip -netns ${hv[$id]} addr add 172.16.0.$id/24 dev veth0

    ip -netns ${hv[$id]} link set veth0 up



    ip -netns hv-$hv link add br0 type bridge

    ip -netns hv-$hv link set br0 up

    ip -netns ${hv[$id]} link add br0 type bridge

    ip -netns ${hv[$id]} link set br0 up



    ip -netns hv-$hv link add vxlan0 type vxlan id 10 local 172.16.0.$hv dev veth0 dstport 4789

    ip -netns hv-$hv link set vxlan0 master br0

    ip -netns hv-$hv link set vxlan0 up

    ip -netns ${hv[$id]} link add vxlan0 type vxlan id 10 local 172.16.0.$id dev veth0 dstport 4789

    ip -netns ${hv[$id]} link set vxlan0 master br0

    ip -netns ${hv[$id]} link set vxlan0 up

}

setup-hv-networking 1

setup-hv-networking 2



# Check connectivity between HVs by pinging hv-2 from hv-1

echo -n "Checking HV connectivity                                           "

ip netns exec hv-1 ping -c 1 -W 1 172.16.0.2 &> /dev/null || (echo "[FAIL]"; false)

ip netns exec $hv_1 ping -c 1 -W 1 172.16.0.2 &> /dev/null || (echo "[FAIL]"; false)

echo "[ OK ]"



# Setups a "VM" simulated by a netns an a veth pair

setup-vm() {

    id=$1



    ip netns add vm-$id

    ip link add veth-tap type veth peer name veth-hv



    ip link set veth-tap netns hv-$id

    ip -netns hv-$id link set veth-tap master br0

    ip -netns hv-$id link set veth-tap up

    ip link set veth-tap netns ${hv[$id]}

    ip -netns ${hv[$id]} link set veth-tap master br0

    ip -netns ${hv[$id]} link set veth-tap up



    ip link set veth-hv address 02:1d:8d:dd:0c:6$id



    ip link set veth-hv netns vm-$id

    ip -netns vm-$id addr add 10.0.0.$id/24 dev veth-hv

    ip -netns vm-$id link set veth-hv up

    ip link set veth-hv netns ${vm[$id]}

    ip -netns ${vm[$id]} addr add 10.0.0.$id/24 dev veth-hv

    ip -netns ${vm[$id]} link set veth-hv up

}

setup-vm 1

setup-vm 2



# Setup VTEP routes to make ARP work

bridge -netns hv-1 fdb add 00:00:00:00:00:00 dev vxlan0 dst 172.16.0.2 self permanent

bridge -netns hv-2 fdb add 00:00:00:00:00:00 dev vxlan0 dst 172.16.0.1 self permanent

bridge -netns $hv_1 fdb add 00:00:00:00:00:00 dev vxlan0 dst 172.16.0.2 self permanent

bridge -netns $hv_2 fdb add 00:00:00:00:00:00 dev vxlan0 dst 172.16.0.1 self permanent



echo -n "Check VM connectivity through VXLAN (underlay in the default VRF)  "

ip netns exec vm-1 ping -c 1 -W 1 10.0.0.2 &> /dev/null || (echo "[FAIL]"; false)

ip netns exec $vm_1 ping -c 1 -W 1 10.0.0.2 &> /dev/null || (echo "[FAIL]"; false)

echo "[ OK ]"



# Move the underlay to a non-default VRF

ip -netns hv-1 link set veth0 vrf vrf-underlay

ip -netns hv-1 link set vxlan0 down

ip -netns hv-1 link set vxlan0 up

ip -netns hv-2 link set veth0 vrf vrf-underlay

ip -netns hv-2 link set vxlan0 down

ip -netns hv-2 link set vxlan0 up

ip -netns $hv_1 link set veth0 vrf vrf-underlay

ip -netns $hv_1 link set vxlan0 down

ip -netns $hv_1 link set vxlan0 up

ip -netns $hv_2 link set veth0 vrf vrf-underlay

ip -netns $hv_2 link set vxlan0 down

ip -netns $hv_2 link set vxlan0 up



echo -n "Check VM connectivity through VXLAN (underlay in a VRF)            "

ip netns exec vm-1 ping -c 1 -W 1 10.0.0.2 &> /dev/null || (echo "[FAIL]"; false)

ip netns exec $vm_1 ping -c 1 -W 1 10.0.0.2 &> /dev/null || (echo "[FAIL]"; false)

echo "[ OK ]"