Commit c1f2c6d0 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Add extack for VLAN enslavements 



Similar to physical ports, enslavement of VLAN devices can also fail.
Use extack to indicate why the enslavement failed.

$ ip link add link enp1s0np1 name enp1s0np1.10 type vlan id 10
$ ip link add name bond0 type bond mode 802.3ad
$ ip link set dev enp1s0np1.10 master bond0
Error: spectrum: VLAN devices only support bridge and VRF uppers.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c9f766bc

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+10 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <linux/notifier.h>

#include <linux/dcbnl.h>

#include <linux/inetdevice.h>

#include <linux/netlink.h>

#include <net/switchdev.h>

#include <net/pkt_cls.h>

#include <net/tc_act/tc_mirred.h>
@@ -4389,18 +4390,25 @@ static int mlxsw_sp_netdevice_port_vlan_event(struct net_device *vlan_dev, 
{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

	struct netdev_notifier_changeupper_info *info = ptr;

	struct netlink_ext_ack *extack;

	struct net_device *upper_dev;

	int err = 0;



	extack = netdev_notifier_info_to_extack(&info->info);



	switch (event) {

	case NETDEV_PRECHANGEUPPER:

		upper_dev = info->upper_dev;

		if (!netif_is_bridge_master(upper_dev))

		if (!netif_is_bridge_master(upper_dev)) {

			NL_SET_ERR_MSG(extack, "spectrum: VLAN devices only support bridge and VRF uppers");

			return -EINVAL;

		}

		if (!info->linking)

			break;

		if (netdev_has_any_upper_dev(upper_dev))

		if (netdev_has_any_upper_dev(upper_dev)) {

			NL_SET_ERR_MSG(extack, "spectrum: Enslaving a port to a device that already has an upper device is not supported");

			return -EINVAL;

		}

		break;

	case NETDEV_CHANGEUPPER:

		upper_dev = info->upper_dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE