Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'More-mirror-to-gretap-tests-with-bridge-in-UL' 



Petr Machata says:

====================
More mirror-to-gretap tests with bridge in UL

This patchset adds two more tests where the mirror-to-gretap has a
bridge in underlay packet path, without a VLAN above or below that
bridge.

In patch #1, a non-VLAN-filtering bridge is tested.

In patch #2, a VLAN-filtering bridge is tested.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2d1b1385 239e754a

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

0 → 100755
+132 −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 without vlan filtering (802.1d).

#

# This test uses standard topology for testing mirror-to-gretap. See

# mirror_gre_topo_lib.sh for more details. The full topology is as follows:

#

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

#  | H1                  |                             |                  H2 |

#  |     + $h1           |                             |           $h2 +     |

#  |     | 192.0.2.1/28  |                             |  192.0.2.2/28 |     |

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

#        |                                                             |

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

#  | SW  o---> mirror                                                  |     |

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

#  | |   + $swp1            + br1 (802.1q bridge)                $swp2 +   | |

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

#  |                                                                         |

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

#  | |                      + br2 (802.1d bridge)                          | |

#  | |                        192.0.2.129/28                               | |

#  | |   + $swp3              2001:db8:2::1/64                             | |

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

#  |     |                                          ^                    ^   |

#  |     |                     + gt6 (ip6gretap)    | + gt4 (gretap)     |   |

#  |     |                     : loc=2001:db8:2::1  | : loc=192.0.2.129  |   |

#  |     |                     : rem=2001:db8:2::2 -+ : rem=192.0.2.130 -+   |

#  |     |                     : ttl=100              : ttl=100              |

#  |     |                     : tos=inherit          : tos=inherit          |

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

#        |                     :                      :

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

#  | H3  + $h3                 + h3-gt6(ip6gretap)    + h3-gt4 (gretap)      |

#  |       192.0.2.130/28        loc=2001:db8:2::2      loc=192.0.2.130      |

#  |       2001:db8:2::2/64      rem=2001:db8:2::1      rem=192.0.2.129      |

#  |                             ttl=100                ttl=100              |

#  |                             tos=inherit            tos=inherit          |

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



ALL_TESTS="

	test_gretap

	test_ip6gretap

"



NUM_NETIFS=6

source lib.sh

source mirror_lib.sh

source mirror_gre_lib.sh

source mirror_gre_topo_lib.sh



setup_prepare()

{

	h1=${NETIFS[p1]}

	swp1=${NETIFS[p2]}



	swp2=${NETIFS[p3]}

	h2=${NETIFS[p4]}



	swp3=${NETIFS[p5]}

	h3=${NETIFS[p6]}



	vrf_prepare

	mirror_gre_topo_create



	ip link add name br2 type bridge vlan_filtering 0

	ip link set dev br2 up



	ip link set dev $swp3 master br2

	ip route add 192.0.2.130/32 dev br2

	ip -6 route add 2001:db8:2::2/128 dev br2



	ip address add dev br2 192.0.2.129/28

	ip address add dev br2 2001:db8:2::1/64



	ip address add dev $h3 192.0.2.130/28

	ip address add dev $h3 2001:db8:2::2/64

}



cleanup()

{

	pre_cleanup



	ip address del dev $h3 2001:db8:2::2/64

	ip address del dev $h3 192.0.2.130/28

	ip link del dev br2



	mirror_gre_topo_destroy

	vrf_cleanup

}



test_gretap()

{

	full_test_span_gre_dir gt4 ingress 8 0 "mirror to gretap"

	full_test_span_gre_dir gt4 egress 0 8 "mirror to gretap"

}



test_ip6gretap()

{

	full_test_span_gre_dir gt6 ingress 8 0 "mirror to ip6gretap"

	full_test_span_gre_dir gt6 egress 0 8 "mirror to ip6gretap"

}



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_bridge_1q.sh

0 → 100755
+126 −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).

#

# This test uses standard topology for testing mirror-to-gretap. See

# mirror_gre_topo_lib.sh for more details. The full topology is as follows:

#

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

#  | H1                  |                               |                  H2 |

#  |     + $h1           |                               |           $h2 +     |

#  |     | 192.0.2.1/28  |                               |  192.0.2.2/28 |     |

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

#        |                                                               |

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

#  | SW  o---> mirror                                                    |     |

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

#  | |   + $swp1                  + br1 (802.1q bridge)            $swp2 +   | |

#  | |                              192.0.2.129/28                           | |

#  | |   + $swp3                    2001:db8:2::1/64                         | |

#  | |   | vid555                   vid555[pvid,untagged]                    | |

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

#  |     |                                          ^                      ^   |

#  |     |                     + gt6 (ip6gretap)    |   + gt4 (gretap)     |   |

#  |     |                     : loc=2001:db8:2::1  |   : loc=192.0.2.129  |   |

#  |     |                     : rem=2001:db8:2::2 -+   : rem=192.0.2.130 -+   |

#  |     |                     : ttl=100                : ttl=100              |

#  |     |                     : tos=inherit            : tos=inherit          |

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

#        |                     :                        :

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

#  | H3  + $h3                 + h3-gt6(ip6gretap)      + h3-gt4 (gretap)      |

#  |     |                       loc=2001:db8:2::2        loc=192.0.2.130      |

#  |     + $h3.555               rem=2001:db8:2::1        rem=192.0.2.129      |

#  |       192.0.2.130/28        ttl=100                  ttl=100              |

#  |       2001:db8:2::2/64      tos=inherit              tos=inherit          |

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



ALL_TESTS="

	test_gretap

	test_ip6gretap

"



NUM_NETIFS=6

source lib.sh

source mirror_lib.sh

source mirror_gre_lib.sh

source mirror_gre_topo_lib.sh



setup_prepare()

{

	h1=${NETIFS[p1]}

	swp1=${NETIFS[p2]}



	swp2=${NETIFS[p3]}

	h2=${NETIFS[p4]}



	swp3=${NETIFS[p5]}

	h3=${NETIFS[p6]}



	vrf_prepare

	mirror_gre_topo_create



	ip link set dev $swp3 master br1

	bridge vlan add dev br1 vid 555 pvid untagged self

	ip address add dev br1 192.0.2.129/28

	ip address add dev br1 2001:db8:2::1/64



	ip -4 route add 192.0.2.130/32 dev br1

	ip -6 route add 2001:db8:2::2/128 dev br1



	vlan_create $h3 555 v$h3 192.0.2.130/28 2001:db8:2::2/64

	bridge vlan add dev $swp3 vid 555

}



cleanup()

{

	pre_cleanup



	ip link set dev $swp3 nomaster

	vlan_destroy $h3 555



	mirror_gre_topo_destroy

	vrf_cleanup

}



test_gretap()

{

	full_test_span_gre_dir gt4 ingress 8 0 "mirror to gretap"

	full_test_span_gre_dir gt4 egress 0 8 "mirror to gretap"

}



test_ip6gretap()

{

	full_test_span_gre_dir gt6 ingress 8 0 "mirror to ip6gretap"

	full_test_span_gre_dir gt6 egress 0 8 "mirror to ip6gretap"

}



tests()

{

	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"

tests



if ! tc_offload_check; then

	echo "WARN: Could not test offloaded functionality"

else

	tcflags="skip_sw"

	tests

fi



exit $EXIT_STATUS