Commit f4bb495c authored by David S. Miller's avatar David S. Miller

Merge branch 'mlxsw-Add-VxLAN-support-with-VLAN-aware-bridges'

Ido Schimmel says:

====================
mlxsw: Add VxLAN support with VLAN-aware bridges

Commit 53e50a6e ("Merge branch 'mlxsw-Add-VxLAN-support'") added
mlxsw support for VxLAN when the VxLAN device was enslaved to
VLAN-unaware bridges. This patchset extends mlxsw to also support VxLAN
with VLAN-aware bridges.

With VLAN-aware bridges, the VxLAN device's VNI is mapped to the VLAN
that is configured as 'pvid untagged' on the corresponding bridge port.
To prevent ambiguity, mlxsw forbids configurations in which the same
VLAN is configured as 'pvid untagged' on multiple VxLAN devices.

Patches #1-#2 add the necessary APIs in mlxsw and the bridge driver.

Patches #3-#4 perform small refactoring in order to prepare mlxsw for
VLAN-aware support.

Patch #5 finally enables the enslavement of VxLAN devices to a
VLAN-aware bridge. Among other things, it extends mlxsw to handle
switchdev notifications about VLAN add / delete on a VxLAN device
enslaved to an offloaded VLAN-aware bridge.

Patches #6-#8 add selftests to test the new functionality.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 734317d9 b5166d7a
...@@ -4782,6 +4782,30 @@ static bool mlxsw_sp_bridge_has_multiple_vxlans(struct net_device *br_dev) ...@@ -4782,6 +4782,30 @@ static bool mlxsw_sp_bridge_has_multiple_vxlans(struct net_device *br_dev)
return num_vxlans > 1; return num_vxlans > 1;
} }
static bool mlxsw_sp_bridge_vxlan_vlan_is_valid(struct net_device *br_dev)
{
DECLARE_BITMAP(vlans, VLAN_N_VID) = {0};
struct net_device *dev;
struct list_head *iter;
netdev_for_each_lower_dev(br_dev, dev, iter) {
u16 pvid;
int err;
if (!netif_is_vxlan(dev))
continue;
err = mlxsw_sp_vxlan_mapped_vid(dev, &pvid);
if (err || !pvid)
continue;
if (test_and_set_bit(pvid, vlans))
return false;
}
return true;
}
static bool mlxsw_sp_bridge_vxlan_is_valid(struct net_device *br_dev, static bool mlxsw_sp_bridge_vxlan_is_valid(struct net_device *br_dev,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
...@@ -4790,13 +4814,15 @@ static bool mlxsw_sp_bridge_vxlan_is_valid(struct net_device *br_dev, ...@@ -4790,13 +4814,15 @@ static bool mlxsw_sp_bridge_vxlan_is_valid(struct net_device *br_dev,
return false; return false;
} }
if (br_vlan_enabled(br_dev)) { if (!br_vlan_enabled(br_dev) &&
NL_SET_ERR_MSG_MOD(extack, "VLAN filtering can not be enabled on a bridge with a VxLAN device"); mlxsw_sp_bridge_has_multiple_vxlans(br_dev)) {
NL_SET_ERR_MSG_MOD(extack, "Multiple VxLAN devices are not supported in a VLAN-unaware bridge");
return false; return false;
} }
if (mlxsw_sp_bridge_has_multiple_vxlans(br_dev)) { if (br_vlan_enabled(br_dev) &&
NL_SET_ERR_MSG_MOD(extack, "Multiple VxLAN devices are not supported in a VLAN-unaware bridge"); !mlxsw_sp_bridge_vxlan_vlan_is_valid(br_dev)) {
NL_SET_ERR_MSG_MOD(extack, "Multiple VxLAN devices cannot have the same VLAN as PVID and egress untagged");
return false; return false;
} }
...@@ -5171,10 +5197,21 @@ static int mlxsw_sp_netdevice_vxlan_event(struct mlxsw_sp *mlxsw_sp, ...@@ -5171,10 +5197,21 @@ static int mlxsw_sp_netdevice_vxlan_event(struct mlxsw_sp *mlxsw_sp,
if (cu_info->linking) { if (cu_info->linking) {
if (!netif_running(dev)) if (!netif_running(dev))
return 0; return 0;
/* When the bridge is VLAN-aware, the VNI of the VxLAN
* device needs to be mapped to a VLAN, but at this
* point no VLANs are configured on the VxLAN device
*/
if (br_vlan_enabled(upper_dev))
return 0;
return mlxsw_sp_bridge_vxlan_join(mlxsw_sp, upper_dev, return mlxsw_sp_bridge_vxlan_join(mlxsw_sp, upper_dev,
dev, extack); dev, 0, extack);
} else { } else {
mlxsw_sp_bridge_vxlan_leave(mlxsw_sp, upper_dev, dev); /* VLANs were already flushed, which triggered the
* necessary cleanup
*/
if (br_vlan_enabled(upper_dev))
return 0;
mlxsw_sp_bridge_vxlan_leave(mlxsw_sp, dev);
} }
break; break;
case NETDEV_PRE_UP: case NETDEV_PRE_UP:
...@@ -5185,7 +5222,7 @@ static int mlxsw_sp_netdevice_vxlan_event(struct mlxsw_sp *mlxsw_sp, ...@@ -5185,7 +5222,7 @@ static int mlxsw_sp_netdevice_vxlan_event(struct mlxsw_sp *mlxsw_sp,
return 0; return 0;
if (!mlxsw_sp_lower_get(upper_dev)) if (!mlxsw_sp_lower_get(upper_dev))
return 0; return 0;
return mlxsw_sp_bridge_vxlan_join(mlxsw_sp, upper_dev, dev, return mlxsw_sp_bridge_vxlan_join(mlxsw_sp, upper_dev, dev, 0,
extack); extack);
case NETDEV_DOWN: case NETDEV_DOWN:
upper_dev = netdev_master_upper_dev_get(dev); upper_dev = netdev_master_upper_dev_get(dev);
...@@ -5195,7 +5232,7 @@ static int mlxsw_sp_netdevice_vxlan_event(struct mlxsw_sp *mlxsw_sp, ...@@ -5195,7 +5232,7 @@ static int mlxsw_sp_netdevice_vxlan_event(struct mlxsw_sp *mlxsw_sp,
return 0; return 0;
if (!mlxsw_sp_lower_get(upper_dev)) if (!mlxsw_sp_lower_get(upper_dev))
return 0; return 0;
mlxsw_sp_bridge_vxlan_leave(mlxsw_sp, upper_dev, dev); mlxsw_sp_bridge_vxlan_leave(mlxsw_sp, dev);
break; break;
} }
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/rhashtable.h> #include <linux/rhashtable.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/if_bridge.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/dcbnl.h> #include <linux/dcbnl.h>
...@@ -261,6 +262,26 @@ static inline bool mlxsw_sp_bridge_has_vxlan(struct net_device *br_dev) ...@@ -261,6 +262,26 @@ static inline bool mlxsw_sp_bridge_has_vxlan(struct net_device *br_dev)
return !!mlxsw_sp_bridge_vxlan_dev_find(br_dev); return !!mlxsw_sp_bridge_vxlan_dev_find(br_dev);
} }
static inline int
mlxsw_sp_vxlan_mapped_vid(const struct net_device *vxlan_dev, u16 *p_vid)
{
struct bridge_vlan_info vinfo;
u16 vid = 0;
int err;
err = br_vlan_get_pvid(vxlan_dev, &vid);
if (err || !vid)
goto out;
err = br_vlan_get_info(vxlan_dev, vid, &vinfo);
if (err || !(vinfo.flags & BRIDGE_VLAN_INFO_UNTAGGED))
vid = 0;
out:
*p_vid = vid;
return err;
}
static inline bool static inline bool
mlxsw_sp_port_is_pause_en(const struct mlxsw_sp_port *mlxsw_sp_port) mlxsw_sp_port_is_pause_en(const struct mlxsw_sp_port *mlxsw_sp_port)
{ {
...@@ -358,10 +379,9 @@ bool mlxsw_sp_bridge_device_is_offloaded(const struct mlxsw_sp *mlxsw_sp, ...@@ -358,10 +379,9 @@ bool mlxsw_sp_bridge_device_is_offloaded(const struct mlxsw_sp *mlxsw_sp,
const struct net_device *br_dev); const struct net_device *br_dev);
int mlxsw_sp_bridge_vxlan_join(struct mlxsw_sp *mlxsw_sp, int mlxsw_sp_bridge_vxlan_join(struct mlxsw_sp *mlxsw_sp,
const struct net_device *br_dev, const struct net_device *br_dev,
const struct net_device *vxlan_dev, const struct net_device *vxlan_dev, u16 vid,
struct netlink_ext_ack *extack); struct netlink_ext_ack *extack);
void mlxsw_sp_bridge_vxlan_leave(struct mlxsw_sp *mlxsw_sp, void mlxsw_sp_bridge_vxlan_leave(struct mlxsw_sp *mlxsw_sp,
const struct net_device *br_dev,
const struct net_device *vxlan_dev); const struct net_device *vxlan_dev);
/* spectrum.c */ /* spectrum.c */
...@@ -753,6 +773,8 @@ u16 mlxsw_sp_fid_8021q_vid(const struct mlxsw_sp_fid *fid); ...@@ -753,6 +773,8 @@ u16 mlxsw_sp_fid_8021q_vid(const struct mlxsw_sp_fid *fid);
struct mlxsw_sp_fid *mlxsw_sp_fid_8021q_get(struct mlxsw_sp *mlxsw_sp, u16 vid); struct mlxsw_sp_fid *mlxsw_sp_fid_8021q_get(struct mlxsw_sp *mlxsw_sp, u16 vid);
struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_get(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_get(struct mlxsw_sp *mlxsw_sp,
int br_ifindex); int br_ifindex);
struct mlxsw_sp_fid *mlxsw_sp_fid_8021q_lookup(struct mlxsw_sp *mlxsw_sp,
u16 vid);
struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_lookup(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_lookup(struct mlxsw_sp *mlxsw_sp,
int br_ifindex); int br_ifindex);
struct mlxsw_sp_fid *mlxsw_sp_fid_rfid_get(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *mlxsw_sp_fid_rfid_get(struct mlxsw_sp *mlxsw_sp,
......
...@@ -1068,6 +1068,12 @@ struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_get(struct mlxsw_sp *mlxsw_sp, ...@@ -1068,6 +1068,12 @@ struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_get(struct mlxsw_sp *mlxsw_sp,
return mlxsw_sp_fid_get(mlxsw_sp, MLXSW_SP_FID_TYPE_8021D, &br_ifindex); return mlxsw_sp_fid_get(mlxsw_sp, MLXSW_SP_FID_TYPE_8021D, &br_ifindex);
} }
struct mlxsw_sp_fid *mlxsw_sp_fid_8021q_lookup(struct mlxsw_sp *mlxsw_sp,
u16 vid)
{
return mlxsw_sp_fid_lookup(mlxsw_sp, MLXSW_SP_FID_TYPE_8021Q, &vid);
}
struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_lookup(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_lookup(struct mlxsw_sp *mlxsw_sp,
int br_ifindex) int br_ifindex)
{ {
......
...@@ -1217,9 +1217,13 @@ void br_vlan_get_stats(const struct net_bridge_vlan *v, ...@@ -1217,9 +1217,13 @@ void br_vlan_get_stats(const struct net_bridge_vlan *v,
int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid) int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid)
{ {
struct net_bridge_vlan_group *vg; struct net_bridge_vlan_group *vg;
struct net_bridge_port *p;
ASSERT_RTNL(); ASSERT_RTNL();
if (netif_is_bridge_master(dev)) p = br_port_get_check_rtnl(dev);
if (p)
vg = nbp_vlan_group(p);
else if (netif_is_bridge_master(dev))
vg = br_vlan_group(netdev_priv(dev)); vg = br_vlan_group(netdev_priv(dev));
else else
return -EINVAL; return -EINVAL;
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
lib_dir=$(dirname $0)/../../../net/forwarding lib_dir=$(dirname $0)/../../../net/forwarding
ALL_TESTS="sanitization_test offload_indication_test" ALL_TESTS="sanitization_test offload_indication_test \
sanitization_vlan_aware_test offload_indication_vlan_aware_test"
NUM_NETIFS=2 NUM_NETIFS=2
source $lib_dir/lib.sh source $lib_dir/lib.sh
...@@ -81,7 +82,7 @@ sanitization_single_dev_vlan_aware_test() ...@@ -81,7 +82,7 @@ sanitization_single_dev_vlan_aware_test()
ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \ ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \
ttl 20 tos inherit local 198.51.100.1 dstport 4789 ttl 20 tos inherit local 198.51.100.1 dstport 4789
sanitization_single_dev_test_fail sanitization_single_dev_test_pass
ip link del dev vxlan0 ip link del dev vxlan0
ip link del dev br0 ip link del dev br0
...@@ -654,6 +655,207 @@ offload_indication_test() ...@@ -654,6 +655,207 @@ offload_indication_test()
offload_indication_setup_destroy offload_indication_setup_destroy
} }
sanitization_vlan_aware_test()
{
RET=0
ip link add dev br0 type bridge mcast_snooping 0 vlan_filtering 1
ip link add name vxlan10 up master br0 type vxlan id 10 nolearning \
noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789
ip link add name vxlan20 up master br0 type vxlan id 20 nolearning \
noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789
# Test that when each VNI is mapped to a different VLAN we can enslave
# a port to the bridge
bridge vlan add vid 10 dev vxlan10 pvid untagged
bridge vlan add vid 20 dev vxlan20 pvid untagged
ip link set dev $swp1 master br0
check_err $?
log_test "vlan-aware - enslavement to vlan-aware bridge"
# Try to map both VNIs to the same VLAN and make sure configuration
# fails
RET=0
bridge vlan add vid 10 dev vxlan20 pvid untagged &> /dev/null
check_fail $?
log_test "vlan-aware - two vnis mapped to the same vlan"
# Test that enslavement of a port to a bridge fails when two VNIs
# are mapped to the same VLAN
RET=0
ip link set dev $swp1 nomaster
bridge vlan del vid 20 dev vxlan20 pvid untagged
bridge vlan add vid 10 dev vxlan20 pvid untagged
ip link set dev $swp1 master br0 &> /dev/null
check_fail $?
log_test "vlan-aware - failed enslavement to vlan-aware bridge"
ip link del dev vxlan20
ip link del dev vxlan10
ip link del dev br0
}
offload_indication_vlan_aware_setup_create()
{
# Create a simple setup with two VxLAN devices and a single VLAN-aware
# bridge
ip link add name br0 up type bridge mcast_snooping 0 vlan_filtering 1 \
vlan_default_pvid 0
ip link set dev $swp1 master br0
bridge vlan add vid 10 dev $swp1
bridge vlan add vid 20 dev $swp1
ip address add 198.51.100.1/32 dev lo
ip link add name vxlan10 up master br0 type vxlan id 10 nolearning \
noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789
ip link add name vxlan20 up master br0 type vxlan id 20 nolearning \
noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789
bridge vlan add vid 10 dev vxlan10 pvid untagged
bridge vlan add vid 20 dev vxlan20 pvid untagged
}
offload_indication_vlan_aware_setup_destroy()
{
bridge vlan del vid 20 dev vxlan20
bridge vlan del vid 10 dev vxlan10
ip link del dev vxlan20
ip link del dev vxlan10
ip address del 198.51.100.1/32 dev lo
bridge vlan del vid 20 dev $swp1
bridge vlan del vid 10 dev $swp1
ip link set dev $swp1 nomaster
ip link del dev br0
}
offload_indication_vlan_aware_fdb_test()
{
RET=0
log_info "vxlan entry offload indication - vlan-aware"
bridge fdb add de:ad:be:ef:13:37 dev vxlan10 self master static \
dst 198.51.100.2 vlan 10
bridge fdb show brport vxlan10 | grep de:ad:be:ef:13:37 | grep self \
| grep -q offload
check_err $?
bridge fdb show brport vxlan10 | grep de:ad:be:ef:13:37 | grep -v self \
| grep -q offload
check_err $?
log_test "vxlan entry offload indication - initial state"
# Remove FDB entry from the bridge driver and check that corresponding
# entry in the VxLAN driver is not marked as offloaded
RET=0
bridge fdb del de:ad:be:ef:13:37 dev vxlan10 master vlan 10
bridge fdb show brport vxlan10 | grep de:ad:be:ef:13:37 | grep self \
| grep -q offload
check_fail $?
log_test "vxlan entry offload indication - after removal from bridge"
# Add the FDB entry back to the bridge driver and make sure it is
# marked as offloaded in both drivers
RET=0
bridge fdb add de:ad:be:ef:13:37 dev vxlan10 master static vlan 10
bridge fdb show brport vxlan10 | grep de:ad:be:ef:13:37 | grep self \
| grep -q offload
check_err $?
bridge fdb show brport vxlan10 | grep de:ad:be:ef:13:37 | grep -v self \
| grep -q offload
check_err $?
log_test "vxlan entry offload indication - after re-add to bridge"
# Remove FDB entry from the VxLAN driver and check that corresponding
# entry in the bridge driver is not marked as offloaded
RET=0
bridge fdb del de:ad:be:ef:13:37 dev vxlan10 self
bridge fdb show brport vxlan10 | grep de:ad:be:ef:13:37 | grep -v self \
| grep -q offload
check_fail $?
log_test "vxlan entry offload indication - after removal from vxlan"
# Add the FDB entry back to the VxLAN driver and make sure it is
# marked as offloaded in both drivers
RET=0
bridge fdb add de:ad:be:ef:13:37 dev vxlan10 self dst 198.51.100.2
bridge fdb show brport vxlan10 | grep de:ad:be:ef:13:37 | grep self \
| grep -q offload
check_err $?
bridge fdb show brport vxlan10 | grep de:ad:be:ef:13:37 | grep -v self \
| grep -q offload
check_err $?
log_test "vxlan entry offload indication - after re-add to vxlan"
bridge fdb del de:ad:be:ef:13:37 dev vxlan10 self master vlan 10
}
offload_indication_vlan_aware_decap_route_test()
{
RET=0
ip route show table local | grep 198.51.100.1 | grep -q offload
check_err $?
# Toggle PVID flag on one VxLAN device and make sure route is still
# marked as offloaded
bridge vlan add vid 10 dev vxlan10 untagged
ip route show table local | grep 198.51.100.1 | grep -q offload
check_err $?
# Toggle PVID flag on second VxLAN device and make sure route is no
# longer marked as offloaded
bridge vlan add vid 20 dev vxlan20 untagged
ip route show table local | grep 198.51.100.1 | grep -q offload
check_fail $?
# Toggle PVID flag back and make sure route is marked as offloaded
bridge vlan add vid 10 dev vxlan10 pvid untagged
bridge vlan add vid 20 dev vxlan20 pvid untagged
ip route show table local | grep 198.51.100.1 | grep -q offload
check_err $?
log_test "vxlan decap route - vni map/unmap"
}
offload_indication_vlan_aware_test()
{
offload_indication_vlan_aware_setup_create
offload_indication_vlan_aware_fdb_test
offload_indication_vlan_aware_decap_route_test
offload_indication_vlan_aware_setup_destroy
}
trap cleanup EXIT trap cleanup EXIT
setup_prepare setup_prepare
......
This diff is collapsed.
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
# A wrapper to run VXLAN tests with an unusual port number.
VXPORT=8472
ALL_TESTS="
ping_ipv4
"
source vxlan_bridge_1q.sh
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment