eb1388553e
Add two tests to deslave a port from and reenslave to a bridge. This should retain the ability of the system to forward traffic, but on an offloading driver that is sensitive to ordering of operations, it might not. The first test does this configuration in a way that relies on vlan_default_pvid to assign the PVID. The second test disables that autoconfiguration and configures PVID by hand in a separate step. Signed-off-by: Petr Machata <petrm@nvidia.com> Reviewed-by: Danielle Ratson <danieller@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
191 lines
4.0 KiB
Bash
Executable File
191 lines
4.0 KiB
Bash
Executable File
#!/bin/bash
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
# +------------------------+ +----------------------+
|
|
# | H1 (vrf) | | H2 (vrf) |
|
|
# | + $h1 | | + $h2 |
|
|
# | | 192.0.2.1/28 | | | 192.0.2.130/28 |
|
|
# | | 2001:db8:1::1/64 | | | 2001:db8:2::2/64 |
|
|
# | | | | | |
|
|
# +----|-------------------+ +--|-------------------+
|
|
# | |
|
|
# +----|--------------------------------------------------|-------------------+
|
|
# | SW | | |
|
|
# | +--|-----------------------------+ + $swp2 |
|
|
# | | + $swp1 BR1 (802.1q) | 192.0.2.129/28 |
|
|
# | | 192.0.2.2/28 | 2001:db8:2::1/64 |
|
|
# | | 2001:db8:1::1/64 | |
|
|
# | | | |
|
|
# | +--------------------------------+ |
|
|
# +---------------------------------------------------------------------------+
|
|
|
|
ALL_TESTS="
|
|
ping_ipv4
|
|
ping_ipv6
|
|
config_remaster
|
|
ping_ipv4
|
|
ping_ipv6
|
|
config_remove_pvid
|
|
ping_ipv4_fails
|
|
ping_ipv6_fails
|
|
config_add_pvid
|
|
ping_ipv4
|
|
ping_ipv6
|
|
config_late_pvid
|
|
ping_ipv4
|
|
ping_ipv6
|
|
"
|
|
NUM_NETIFS=4
|
|
source lib.sh
|
|
|
|
h1_create()
|
|
{
|
|
simple_if_init $h1 192.0.2.1/28 2001:db8:1::1/64
|
|
ip -4 route add 192.0.2.128/28 vrf v$h1 nexthop via 192.0.2.2
|
|
ip -6 route add 2001:db8:2::/64 vrf v$h1 nexthop via 2001:db8:1::2
|
|
}
|
|
|
|
h1_destroy()
|
|
{
|
|
ip -6 route del 2001:db8:2::/64 vrf v$h1
|
|
ip -4 route del 192.0.2.128/28 vrf v$h1
|
|
simple_if_fini $h1 192.0.2.1/28 2001:db8:1::1/64
|
|
}
|
|
|
|
h2_create()
|
|
{
|
|
simple_if_init $h2 192.0.2.130/28 2001:db8:2::2/64
|
|
ip -4 route add 192.0.2.0/28 vrf v$h2 nexthop via 192.0.2.129
|
|
ip -6 route add 2001:db8:1::/64 vrf v$h2 nexthop via 2001:db8:2::1
|
|
}
|
|
|
|
h2_destroy()
|
|
{
|
|
ip -6 route del 2001:db8:1::/64 vrf v$h2
|
|
ip -4 route del 192.0.2.0/28 vrf v$h2
|
|
simple_if_fini $h2 192.0.2.130/28 2001:db8:2::2/64
|
|
}
|
|
|
|
router_create()
|
|
{
|
|
ip link add name br1 address $(mac_get $swp1) \
|
|
type bridge vlan_filtering 1
|
|
ip link set dev br1 up
|
|
|
|
ip link set dev $swp1 master br1
|
|
ip link set dev $swp1 up
|
|
__addr_add_del br1 add 192.0.2.2/28 2001:db8:1::2/64
|
|
|
|
ip link set dev $swp2 up
|
|
__addr_add_del $swp2 add 192.0.2.129/28 2001:db8:2::1/64
|
|
}
|
|
|
|
router_destroy()
|
|
{
|
|
__addr_add_del $swp2 del 192.0.2.129/28 2001:db8:2::1/64
|
|
ip link set dev $swp2 down
|
|
|
|
__addr_add_del br1 del 192.0.2.2/28 2001:db8:1::2/64
|
|
ip link set dev $swp1 down
|
|
ip link set dev $swp1 nomaster
|
|
|
|
ip link del dev br1
|
|
}
|
|
|
|
config_remaster()
|
|
{
|
|
log_info "Remaster bridge slave"
|
|
|
|
ip link set dev $swp1 nomaster
|
|
sleep 2
|
|
ip link set dev $swp1 master br1
|
|
}
|
|
|
|
config_remove_pvid()
|
|
{
|
|
log_info "Remove PVID from the bridge"
|
|
|
|
bridge vlan add dev br1 vid 1 self
|
|
sleep 2
|
|
}
|
|
|
|
config_add_pvid()
|
|
{
|
|
log_info "Add PVID to the bridge"
|
|
|
|
bridge vlan add dev br1 vid 1 self pvid untagged
|
|
sleep 2
|
|
}
|
|
|
|
config_late_pvid()
|
|
{
|
|
log_info "Add bridge PVID after enslaving port"
|
|
|
|
ip link set dev $swp1 nomaster
|
|
ip link set dev br1 type bridge vlan_default_pvid 0
|
|
sleep 2
|
|
ip link set dev $swp1 master br1
|
|
ip link set dev br1 type bridge vlan_default_pvid 1
|
|
}
|
|
|
|
setup_prepare()
|
|
{
|
|
h1=${NETIFS[p1]}
|
|
swp1=${NETIFS[p2]}
|
|
|
|
swp2=${NETIFS[p3]}
|
|
h2=${NETIFS[p4]}
|
|
|
|
vrf_prepare
|
|
|
|
h1_create
|
|
h2_create
|
|
|
|
router_create
|
|
|
|
forwarding_enable
|
|
}
|
|
|
|
cleanup()
|
|
{
|
|
pre_cleanup
|
|
|
|
forwarding_restore
|
|
|
|
router_destroy
|
|
|
|
h2_destroy
|
|
h1_destroy
|
|
|
|
vrf_cleanup
|
|
}
|
|
|
|
ping_ipv4()
|
|
{
|
|
ping_test $h1 192.0.2.130
|
|
}
|
|
|
|
ping_ipv6()
|
|
{
|
|
ping6_test $h1 2001:db8:2::2
|
|
}
|
|
|
|
ping_ipv4_fails()
|
|
{
|
|
ping_test_fails $h1 192.0.2.130
|
|
}
|
|
|
|
ping_ipv6_fails()
|
|
{
|
|
ping6_test_fails $h1 2001:db8:2::2
|
|
}
|
|
|
|
trap cleanup EXIT
|
|
|
|
setup_prepare
|
|
setup_wait
|
|
|
|
tests_run
|
|
|
|
exit $EXIT_STATUS
|