Commit 494f2e76 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'selftests-mirror-to-gretap-with-team' 



Petr Machata says:

====================
A test for mirror-to-gretap with team in UL packet path

This patchset adds a test for "tc action mirred mirror" where the
mirrored-to device is a gretap, and underlay path contains a team
device.

In patch #1 require_command() is added, which should henceforth be used
to declare dependence on a certain tool.

In patch #2, two new functions, team_create() and team_destroy(), are
added to lib.sh.

The newly-added test uses arping, which isn't necessarily available.
Therefore patch #3 introduces $ARPING, and a preexisting test is fixed
to require_command $ARPING.

In patches #4 and #5, two new tests are added. In both cases, a team
device is on egress path of a mirrored packet in a mirror-to-gretap
scenario. In the first one, the team device is in loadbalance mode, in
the second one it's in lacp mode. (The difference in modes necessitates
a different testing strategy, hence two test cases instead of just
parameterizing one.)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 778c4d5c 541c6ce3

tools/testing/selftests/net/forwarding/lib.sh

+35 −8
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
PING=${PING:=ping}

PING6=${PING6:=ping6}

MZ=${MZ:=mausezahn}

ARPING=${ARPING:=arping}

TEAMD=${TEAMD:=teamd}

WAIT_TIME=${WAIT_TIME:=5}

PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no}

PAUSE_ON_CLEANUP=${PAUSE_ON_CLEANUP:=no}
@@ -62,15 +64,18 @@ if [[ "$CHECK_TC" = "yes" ]]; then 
	check_tc_version

fi



if [[ ! -x "$(command -v jq)" ]]; then

	echo "SKIP: jq not installed"

	exit 1

fi

require_command()

{

	local cmd=$1; shift



if [[ ! -x "$(command -v $MZ)" ]]; then

	echo "SKIP: $MZ not installed"

	if [[ ! -x "$(command -v "$cmd")" ]]; then

		echo "SKIP: $cmd not installed"

		exit 1

	fi

}



require_command jq

require_command $MZ



if [[ ! -v NUM_NETIFS ]]; then

	echo "SKIP: importer does not define \"NUM_NETIFS\""
@@ -422,6 +427,28 @@ vlan_destroy() 
	ip link del dev $name

}



team_create()

{

	local if_name=$1; shift

	local mode=$1; shift



	require_command $TEAMD

	$TEAMD -t $if_name -d -c '{"runner": {"name": "'$mode'"}}'

	for slave in "$@"; do

		ip link set dev $slave down

		ip link set dev $slave master $if_name

		ip link set dev $slave up

	done

	ip link set dev $if_name up

}



team_destroy()

{

	local if_name=$1; shift



	$TEAMD -t $if_name -k

}



master_name_get()

{

	local if_name=$1

tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh

0 → 100755
+283 −0
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0



# Test for "tc action mirred egress mirror" when the underlay route points at a

# bridge device with vlan filtering (802.1q), and the egress device is a team

# device.

#

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

# | H1                   |                             |                   H2 |

# |     + $h1.333        |                             |        $h1.555 +     |

# |     | 192.0.2.1/28   |                             |  192.0.2.18/28 |     |

# +-----|----------------+                             +----------------|-----+

#       |                               $h1                             |

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

#                                        |

# +--------------------------------------|------------------------------------+

# | SW                                   o---> mirror                         |

# |                                      |                                    |

# |     +--------------------------------+------------------------------+     |

# |     |                              $swp1                            |     |

# |     + $swp1.333                                           $swp1.555 +     |

# |       192.0.2.2/28                                    192.0.2.17/28       |

# |                                                                           |

# | +-----------------------------------------------------------------------+ |

# | |                        BR1 (802.1q)                                   | |

# | |     + lag (team)       192.0.2.129/28                                 | |

# | |    / \                 2001:db8:2::1/64                               | |

# | +---/---\---------------------------------------------------------------+ |

# |    /     \                                                            ^   |

# |   |       \                                        + gt4 (gretap)     |   |

# |   |        \                                         loc=192.0.2.129  |   |

# |   |         \                                        rem=192.0.2.130 -+   |

# |   |          \                                       ttl=100              |

# |   |           \                                      tos=inherit          |

# |   |            \                                                          |

# |   |             \_________________________________                        |

# |   |                                               \                       |

# |   + $swp3                                          + $swp4                |

# +---|------------------------------------------------|----------------------+

#     |                                                |

# +---|----------------------+                     +---|----------------------+

# |   + $h3               H3 |                     |   + $h4               H4 |

# |     192.0.2.130/28       |                     |     192.0.2.130/28       |

# |     2001:db8:2::2/64     |                     |     2001:db8:2::2/64     |

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



ALL_TESTS="

	test_mirror_gretap_first

	test_mirror_gretap_second

"



NUM_NETIFS=6

source lib.sh

source mirror_lib.sh

source mirror_gre_lib.sh



require_command $ARPING



vlan_host_create()

{

	local if_name=$1; shift

	local vid=$1; shift

	local vrf_name=$1; shift

	local ips=("${@}")



	vrf_create $vrf_name

	ip link set dev $vrf_name up

	vlan_create $if_name $vid $vrf_name "${ips[@]}"

}



vlan_host_destroy()

{

	local if_name=$1; shift

	local vid=$1; shift

	local vrf_name=$1; shift



	vlan_destroy $if_name $vid

	ip link set dev $vrf_name down

	vrf_destroy $vrf_name

}



h1_create()

{

	vlan_host_create $h1 333 vrf-h1 192.0.2.1/28

	ip -4 route add 192.0.2.16/28 vrf vrf-h1 nexthop via 192.0.2.2

}



h1_destroy()

{

	ip -4 route del 192.0.2.16/28 vrf vrf-h1

	vlan_host_destroy $h1 333 vrf-h1

}



h2_create()

{

	vlan_host_create $h1 555 vrf-h2 192.0.2.18/28

	ip -4 route add 192.0.2.0/28 vrf vrf-h2 nexthop via 192.0.2.17

}



h2_destroy()

{

	ip -4 route del 192.0.2.0/28 vrf vrf-h2

	vlan_host_destroy $h1 555 vrf-h2

}



h3_create()

{

	simple_if_init $h3 192.0.2.130/28

	tc qdisc add dev $h3 clsact

}



h3_destroy()

{

	tc qdisc del dev $h3 clsact

	simple_if_fini $h3 192.0.2.130/28

}



h4_create()

{

	simple_if_init $h4 192.0.2.130/28

	tc qdisc add dev $h4 clsact

}



h4_destroy()

{

	tc qdisc del dev $h4 clsact

	simple_if_fini $h4 192.0.2.130/28

}



switch_create()

{

	ip link set dev $swp1 up

	tc qdisc add dev $swp1 clsact

	vlan_create $swp1 333 "" 192.0.2.2/28

	vlan_create $swp1 555 "" 192.0.2.17/28



	tunnel_create gt4 gretap 192.0.2.129 192.0.2.130 \

		      ttl 100 tos inherit



	ip link set dev $swp3 up

	ip link set dev $swp4 up



	ip link add name br1 type bridge vlan_filtering 1

	ip link set dev br1 up

	__addr_add_del br1 add 192.0.2.129/32

	ip -4 route add 192.0.2.130/32 dev br1



	team_create lag loadbalance $swp3 $swp4

	ip link set dev lag master br1

}



switch_destroy()

{

	ip link set dev lag nomaster

	team_destroy lag



	ip -4 route del 192.0.2.130/32 dev br1

	__addr_add_del br1 del 192.0.2.129/32

	ip link set dev br1 down

	ip link del dev br1



	ip link set dev $swp4 down

	ip link set dev $swp3 down



	tunnel_destroy gt4



	vlan_destroy $swp1 555

	vlan_destroy $swp1 333

	tc qdisc del dev $swp1 clsact

	ip link set dev $swp1 down

}



setup_prepare()

{

	h1=${NETIFS[p1]}

	swp1=${NETIFS[p2]}



	swp3=${NETIFS[p3]}

	h3=${NETIFS[p4]}



	swp4=${NETIFS[p5]}

	h4=${NETIFS[p6]}



	vrf_prepare



	ip link set dev $h1 up

	h1_create

	h2_create

	h3_create

	h4_create

	switch_create



	trap_install $h3 ingress

	trap_install $h4 ingress

}



cleanup()

{

	pre_cleanup



	trap_uninstall $h4 ingress

	trap_uninstall $h3 ingress



	switch_destroy

	h4_destroy

	h3_destroy

	h2_destroy

	h1_destroy

	ip link set dev $h1 down



	vrf_cleanup

}



test_lag_slave()

{

	local host_dev=$1; shift

	local up_dev=$1; shift

	local down_dev=$1; shift

	local what=$1; shift



	RET=0



	mirror_install $swp1 ingress gt4 \

		       "proto 802.1q flower vlan_id 333 $tcflags"



	# Test connectivity through $up_dev when $down_dev is set down.

	ip link set dev $down_dev down

	setup_wait_dev $up_dev

	setup_wait_dev $host_dev

	$ARPING -I br1 192.0.2.130 -qfc 1

	sleep 2

	mirror_test vrf-h1 192.0.2.1 192.0.2.18 $host_dev 1 10



	# Test lack of connectivity when both slaves are down.

	ip link set dev $up_dev down

	sleep 2

	mirror_test vrf-h1 192.0.2.1 192.0.2.18 $h3 1 0

	mirror_test vrf-h1 192.0.2.1 192.0.2.18 $h4 1 0



	ip link set dev $up_dev up

	ip link set dev $down_dev up

	mirror_uninstall $swp1 ingress



	log_test "$what ($tcflags)"

}



test_mirror_gretap_first()

{

	test_lag_slave $h3 $swp3 $swp4 "mirror to gretap: LAG first slave"

}



test_mirror_gretap_second()

{

	test_lag_slave $h4 $swp4 $swp3 "mirror to gretap: LAG second slave"

}



test_all()

{

	slow_path_trap_install $swp1 ingress

	slow_path_trap_install $swp1 egress



	tests_run



	slow_path_trap_uninstall $swp1 egress

	slow_path_trap_uninstall $swp1 ingress

}



trap cleanup EXIT



setup_prepare

setup_wait



tcflags="skip_hw"

test_all



if ! tc_offload_check; then

	echo "WARN: Could not test offloaded functionality"

else

	tcflags="skip_sw"

	test_all

fi



exit $EXIT_STATUS

tools/testing/selftests/net/forwarding/mirror_gre_lag_lacp.sh

0 → 100755
+285 −0
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0



# Test for "tc action mirred egress mirror" when the underlay route points at a

# team device.

#

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

# | H1                   |                             |                   H2 |

# |    + $h1.333         |                             |        $h1.555 +     |

# |    | 192.0.2.1/28    |                             |  192.0.2.18/28 |     |

# +----|-----------------+                             +----------------|-----+

#      |                                $h1                             |

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

#                                        |

# +--------------------------------------|------------------------------------+

# | SW                                   o---> mirror                         |

# |                                      |                                    |

# |   +----------------------------------+------------------------------+     |

# |   |                                $swp1                            |     |

# |   + $swp1.333                                             $swp1.555 +     |

# |     192.0.2.2/28                                      192.0.2.17/28       |

# |                                                                           |

# |                                                                           |

# |   + gt4 (gretap)      ,-> + lag1 (team)                                   |

# |     loc=192.0.2.129   |   | 192.0.2.129/28                                |

# |     rem=192.0.2.130 --'   |                                               |

# |     ttl=100               |                                               |

# |     tos=inherit           |                                               |

# |      _____________________|______________________                         |

# |     /                                            \                        |

# |    /                                              \                       |

# |   + $swp3                                          + $swp4                |

# +---|------------------------------------------------|----------------------+

#     |                                                |

# +---|------------------------------------------------|----------------------+

# |   + $h3                                            + $h4               H3 |

# |    \                                              /                       |

# |     \____________________________________________/                        |

# |                           |                                               |

# |                           + lag2 (team)                                   |

# |                             192.0.2.130/28                                |

# |                                                                           |

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



ALL_TESTS="

	test_mirror_gretap_first

	test_mirror_gretap_second

"



NUM_NETIFS=6

source lib.sh

source mirror_lib.sh

source mirror_gre_lib.sh



require_command $ARPING



vlan_host_create()

{

	local if_name=$1; shift

	local vid=$1; shift

	local vrf_name=$1; shift

	local ips=("${@}")



	vrf_create $vrf_name

	ip link set dev $vrf_name up

	vlan_create $if_name $vid $vrf_name "${ips[@]}"

}



vlan_host_destroy()

{

	local if_name=$1; shift

	local vid=$1; shift

	local vrf_name=$1; shift



	vlan_destroy $if_name $vid

	ip link set dev $vrf_name down

	vrf_destroy $vrf_name

}



h1_create()

{

	vlan_host_create $h1 333 vrf-h1 192.0.2.1/28

	ip -4 route add 192.0.2.16/28 vrf vrf-h1 nexthop via 192.0.2.2

}



h1_destroy()

{

	ip -4 route del 192.0.2.16/28 vrf vrf-h1

	vlan_host_destroy $h1 333 vrf-h1

}



h2_create()

{

	vlan_host_create $h1 555 vrf-h2 192.0.2.18/28

	ip -4 route add 192.0.2.0/28 vrf vrf-h2 nexthop via 192.0.2.17

}



h2_destroy()

{

	ip -4 route del 192.0.2.0/28 vrf vrf-h2

	vlan_host_destroy $h1 555 vrf-h2

}



h3_create_team()

{

	team_create lag2 lacp $h3 $h4

	__simple_if_init lag2 vrf-h3 192.0.2.130/32

	ip -4 route add vrf vrf-h3 192.0.2.129/32 dev lag2

}



h3_destroy_team()

{

	ip -4 route del vrf vrf-h3 192.0.2.129/32 dev lag2

	__simple_if_fini lag2 192.0.2.130/32

	team_destroy lag2



	ip link set dev $h3 down

	ip link set dev $h4 down

}



h3_create()

{

	vrf_create vrf-h3

	ip link set dev vrf-h3 up

	tc qdisc add dev $h3 clsact

	tc qdisc add dev $h4 clsact

	h3_create_team

}



h3_destroy()

{

	h3_destroy_team

	tc qdisc del dev $h4 clsact

	tc qdisc del dev $h3 clsact

	ip link set dev vrf-h3 down

	vrf_destroy vrf-h3

}



switch_create()

{

	ip link set dev $swp1 up

	tc qdisc add dev $swp1 clsact

	vlan_create $swp1 333 "" 192.0.2.2/28

	vlan_create $swp1 555 "" 192.0.2.17/28



	tunnel_create gt4 gretap 192.0.2.129 192.0.2.130 \

		      ttl 100 tos inherit



	ip link set dev $swp3 up

	ip link set dev $swp4 up

	team_create lag1 lacp $swp3 $swp4

	__addr_add_del lag1 add 192.0.2.129/32

	ip -4 route add 192.0.2.130/32 dev lag1

}



switch_destroy()

{

	ip -4 route del 192.0.2.130/32 dev lag1

	__addr_add_del lag1 del 192.0.2.129/32

	team_destroy lag1



	ip link set dev $swp4 down

	ip link set dev $swp3 down



	tunnel_destroy gt4



	vlan_destroy $swp1 555

	vlan_destroy $swp1 333

	tc qdisc del dev $swp1 clsact

	ip link set dev $swp1 down

}



setup_prepare()

{

	h1=${NETIFS[p1]}

	swp1=${NETIFS[p2]}



	swp3=${NETIFS[p3]}

	h3=${NETIFS[p4]}



	swp4=${NETIFS[p5]}

	h4=${NETIFS[p6]}



	vrf_prepare



	ip link set dev $h1 up

	h1_create

	h2_create

	h3_create

	switch_create



	trap_install $h3 ingress

	trap_install $h4 ingress

}



cleanup()

{

	pre_cleanup



	trap_uninstall $h4 ingress

	trap_uninstall $h3 ingress



	switch_destroy

	h3_destroy

	h2_destroy

	h1_destroy

	ip link set dev $h1 down



	vrf_cleanup

}



test_lag_slave()

{

	local up_dev=$1; shift

	local down_dev=$1; shift

	local what=$1; shift



	RET=0



	mirror_install $swp1 ingress gt4 \

		       "proto 802.1q flower vlan_id 333 $tcflags"



	# Move $down_dev away from the team. That will prompt change in

	# txability of the connected device, without changing its upness. The

	# driver should notice the txability change and move the traffic to the

	# other slave.

	ip link set dev $down_dev nomaster

	sleep 2

	mirror_test vrf-h1 192.0.2.1 192.0.2.18 $up_dev 1 10



	# Test lack of connectivity when neither slave is txable.

	ip link set dev $up_dev nomaster

	sleep 2

	mirror_test vrf-h1 192.0.2.1 192.0.2.18 $h3 1 0

	mirror_test vrf-h1 192.0.2.1 192.0.2.18 $h4 1 0

	mirror_uninstall $swp1 ingress



	# Recreate H3's team device, because mlxsw, which this test is

	# predominantly mean to test, requires a bottom-up construction and

	# doesn't allow enslavement to a device that already has an upper.

	h3_destroy_team

	h3_create_team

	# Wait for ${h,swp}{3,4}.

	setup_wait



	log_test "$what ($tcflags)"

}



test_mirror_gretap_first()

{

	test_lag_slave $h3 $h4 "mirror to gretap: LAG first slave"

}



test_mirror_gretap_second()

{

	test_lag_slave $h4 $h3 "mirror to gretap: LAG second slave"

}



test_all()

{

	slow_path_trap_install $swp1 ingress

	slow_path_trap_install $swp1 egress



	tests_run



	slow_path_trap_uninstall $swp1 egress

	slow_path_trap_uninstall $swp1 ingress

}



trap cleanup EXIT



setup_prepare

setup_wait



tcflags="skip_hw"

test_all



if ! tc_offload_check; then

	echo "WARN: Could not test offloaded functionality"

else

	tcflags="skip_sw"

	test_all

fi



exit $EXIT_STATUS

tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh

+4 −2
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ source mirror_lib.sh 
source mirror_gre_lib.sh

source mirror_gre_topo_lib.sh



require_command $ARPING



setup_prepare()

{

	h1=${NETIFS[p1]}
@@ -149,7 +151,7 @@ test_span_gre_forbidden_egress() 


	bridge vlan add dev $swp3 vid 555

	# Re-prime FDB

	arping -I br1.555 192.0.2.130 -fqc 1

	$ARPING -I br1.555 192.0.2.130 -fqc 1

	sleep 1

	quick_test_span_gre_dir $tundev ingress
@@ -223,7 +225,7 @@ test_span_gre_fdb_roaming() 


	bridge fdb del dev $swp2 $h3mac vlan 555 master

	# Re-prime FDB

	arping -I br1.555 192.0.2.130 -fqc 1

	$ARPING -I br1.555 192.0.2.130 -fqc 1

	sleep 1

	quick_test_span_gre_dir $tundev ingress

CRA Git | Maintained and supported by SUSTech CRA and CCSE