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

Merge branch 'mlxsw-Make-driver-more-robust' 



Ido Schimmel says:

====================
mlxsw: Make driver more robust

In recent months we fixed several bugs in the driver that could have
been avoided by re-evaluating some of the involved code paths and by
introducing relevant and comprehensive test cases.

This patchset tries to do that by introducing a set of small and mostly
non-functional changes in addition to a new test. I have further
improvements in mind, but they can be done in a different set.

Patch #1 makes sure we correctly sanitize upper devices of a VLAN
interface.

Patch #2 removes an unexpected behavior from the driver, in which routes
configured on a VLAN interface will cease being offloaded after certain
operations.

Patch #3 is a small cleanup.

Patch #4 simplifies the driver by removing reference counting from VLAN
entries configured on a port.

Patches #5-#6 simplify linking/unlinking from a bridge, especially when
LAG and VLAN devices are involved. They make both operations symmetric
even when ports are unlinked from a bridged LAG device.

Patch #7-#9 make router interface (RIF) deletion more robust by removing
reliance on device chain to indicate whether a NETDEV_DOWN event in the
inet{,6}addr notification chains should be processed. This is due to the
fact that IP addresses can be flushed from a netdev after it was
unlinked from its lower device.

Patch #10 adds a new test to for valid and invalid configurations over
mlxsw ports. Some of the test cases are derived from recent fixes. I
expect that more test cases will be added over time.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 05572271 489c25f9

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

+96 −54
Original line number Diff line number Diff line
@@ -1141,16 +1141,20 @@ static void mlxsw_sp_port_vlan_flush(struct mlxsw_sp_port *mlxsw_sp_port) 


	list_for_each_entry_safe(mlxsw_sp_port_vlan, tmp,

				 &mlxsw_sp_port->vlans_list, list)

		mlxsw_sp_port_vlan_put(mlxsw_sp_port_vlan);

		mlxsw_sp_port_vlan_destroy(mlxsw_sp_port_vlan);

}



static struct mlxsw_sp_port_vlan *

struct mlxsw_sp_port_vlan *

mlxsw_sp_port_vlan_create(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid)

{

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;

	bool untagged = vid == 1;

	int err;



	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);

	if (mlxsw_sp_port_vlan)

		return ERR_PTR(-EEXIST);



	err = mlxsw_sp_port_vlan_set(mlxsw_sp_port, vid, vid, true, untagged);

	if (err)

		return ERR_PTR(err);
@@ -1162,7 +1166,6 @@ mlxsw_sp_port_vlan_create(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid) 
	}



	mlxsw_sp_port_vlan->mlxsw_sp_port = mlxsw_sp_port;

	mlxsw_sp_port_vlan->ref_count = 1;

	mlxsw_sp_port_vlan->vid = vid;

	list_add(&mlxsw_sp_port_vlan->list, &mlxsw_sp_port->vlans_list);
@@ -1173,44 +1176,19 @@ err_port_vlan_alloc: 
	return ERR_PTR(err);

}



static void

mlxsw_sp_port_vlan_destroy(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan)

void mlxsw_sp_port_vlan_destroy(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan)

{

	struct mlxsw_sp_port *mlxsw_sp_port = mlxsw_sp_port_vlan->mlxsw_sp_port;

	u16 vid = mlxsw_sp_port_vlan->vid;



	list_del(&mlxsw_sp_port_vlan->list);

	kfree(mlxsw_sp_port_vlan);

	mlxsw_sp_port_vlan_set(mlxsw_sp_port, vid, vid, false, false);

}



struct mlxsw_sp_port_vlan *

mlxsw_sp_port_vlan_get(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid)

{

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;



	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);

	if (mlxsw_sp_port_vlan) {

		mlxsw_sp_port_vlan->ref_count++;

		return mlxsw_sp_port_vlan;

	}



	return mlxsw_sp_port_vlan_create(mlxsw_sp_port, vid);

}



void mlxsw_sp_port_vlan_put(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan)

{

	struct mlxsw_sp_fid *fid = mlxsw_sp_port_vlan->fid;



	if (--mlxsw_sp_port_vlan->ref_count != 0)

		return;



	if (mlxsw_sp_port_vlan->bridge_port)

		mlxsw_sp_port_vlan_bridge_leave(mlxsw_sp_port_vlan);

	else if (fid)

	else if (mlxsw_sp_port_vlan->fid)

		mlxsw_sp_port_vlan_router_leave(mlxsw_sp_port_vlan);



	mlxsw_sp_port_vlan_destroy(mlxsw_sp_port_vlan);

	list_del(&mlxsw_sp_port_vlan->list);

	kfree(mlxsw_sp_port_vlan);

	mlxsw_sp_port_vlan_set(mlxsw_sp_port, vid, vid, false, false);

}



static int mlxsw_sp_port_add_vid(struct net_device *dev,
@@ -1224,7 +1202,7 @@ static int mlxsw_sp_port_add_vid(struct net_device *dev, 
	if (!vid)

		return 0;



	return PTR_ERR_OR_ZERO(mlxsw_sp_port_vlan_get(mlxsw_sp_port, vid));

	return PTR_ERR_OR_ZERO(mlxsw_sp_port_vlan_create(mlxsw_sp_port, vid));

}



static int mlxsw_sp_port_kill_vid(struct net_device *dev,
@@ -1242,7 +1220,7 @@ static int mlxsw_sp_port_kill_vid(struct net_device *dev, 
	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);

	if (!mlxsw_sp_port_vlan)

		return 0;

	mlxsw_sp_port_vlan_put(mlxsw_sp_port_vlan);

	mlxsw_sp_port_vlan_destroy(mlxsw_sp_port_vlan);



	return 0;

}
@@ -3198,12 +3176,12 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
		goto err_port_nve_init;

	}



	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_get(mlxsw_sp_port, 1);

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_create(mlxsw_sp_port, 1);

	if (IS_ERR(mlxsw_sp_port_vlan)) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to create VID 1\n",

			mlxsw_sp_port->local_port);

		err = PTR_ERR(mlxsw_sp_port_vlan);

		goto err_port_vlan_get;

		goto err_port_vlan_create;

	}



	mlxsw_sp_port_switchdev_init(mlxsw_sp_port);
@@ -3224,8 +3202,8 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
err_register_netdev:

	mlxsw_sp->ports[local_port] = NULL;

	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_vlan_put(mlxsw_sp_port_vlan);

err_port_vlan_get:

	mlxsw_sp_port_vlan_destroy(mlxsw_sp_port_vlan);

err_port_vlan_create:

	mlxsw_sp_port_nve_fini(mlxsw_sp_port);

err_port_nve_init:

	mlxsw_sp_tc_qdisc_fini(mlxsw_sp_port);
@@ -4520,6 +4498,25 @@ void mlxsw_sp_port_dev_put(struct mlxsw_sp_port *mlxsw_sp_port) 
	dev_put(mlxsw_sp_port->dev);

}



static void

mlxsw_sp_port_lag_uppers_cleanup(struct mlxsw_sp_port *mlxsw_sp_port,

				 struct net_device *lag_dev)

{

	struct net_device *br_dev = netdev_master_upper_dev_get(lag_dev);

	struct net_device *upper_dev;

	struct list_head *iter;



	if (netif_is_bridge_port(lag_dev))

		mlxsw_sp_port_bridge_leave(mlxsw_sp_port, lag_dev, br_dev);



	netdev_for_each_upper_dev_rcu(lag_dev, upper_dev, iter) {

		if (!netif_is_bridge_port(upper_dev))

			continue;

		br_dev = netdev_master_upper_dev_get(upper_dev);

		mlxsw_sp_port_bridge_leave(mlxsw_sp_port, upper_dev, br_dev);

	}

}



static int mlxsw_sp_lag_create(struct mlxsw_sp *mlxsw_sp, u16 lag_id)

{

	char sldr_pl[MLXSW_REG_SLDR_LEN];
@@ -4712,6 +4709,10 @@ static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port, 


	/* Any VLANs configured on the port are no longer valid */

	mlxsw_sp_port_vlan_flush(mlxsw_sp_port);

	/* Make the LAG and its directly linked uppers leave bridges they

	 * are memeber in

	 */

	mlxsw_sp_port_lag_uppers_cleanup(mlxsw_sp_port, lag_dev);



	if (lag->ref_count == 1)

		mlxsw_sp_lag_destroy(mlxsw_sp, lag_id);
@@ -4721,7 +4722,7 @@ static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port, 
	mlxsw_sp_port->lagged = 0;

	lag->ref_count--;



	mlxsw_sp_port_vlan_get(mlxsw_sp_port, 1);

	mlxsw_sp_port_vlan_create(mlxsw_sp_port, 1);

	/* Make sure untagged frames are allowed to ingress */

	mlxsw_sp_port_pvid_set(mlxsw_sp_port, 1);

}
@@ -5000,6 +5001,16 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev, 
		} else if (netif_is_macvlan(upper_dev)) {

			if (!info->linking)

				mlxsw_sp_rif_macvlan_del(mlxsw_sp, upper_dev);

		} else if (is_vlan_dev(upper_dev)) {

			struct net_device *br_dev;



			if (!netif_is_bridge_port(upper_dev))

				break;

			if (info->linking)

				break;

			br_dev = netdev_master_upper_dev_get(upper_dev);

			mlxsw_sp_port_bridge_leave(mlxsw_sp_port, upper_dev,

						   br_dev);

		}

		break;

	}
@@ -5156,6 +5167,48 @@ static int mlxsw_sp_netdevice_lag_port_vlan_event(struct net_device *vlan_dev, 
	return 0;

}



static int mlxsw_sp_netdevice_bridge_vlan_event(struct net_device *vlan_dev,

						struct net_device *br_dev,

						unsigned long event, void *ptr,

						u16 vid)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(vlan_dev);

	struct netdev_notifier_changeupper_info *info = ptr;

	struct netlink_ext_ack *extack;

	struct net_device *upper_dev;



	if (!mlxsw_sp)

		return 0;



	extack = netdev_notifier_info_to_extack(&info->info);



	switch (event) {

	case NETDEV_PRECHANGEUPPER:

		upper_dev = info->upper_dev;

		if (!netif_is_macvlan(upper_dev)) {

			NL_SET_ERR_MSG_MOD(extack, "Unknown upper device type");

			return -EOPNOTSUPP;

		}

		if (!info->linking)

			break;

		if (netif_is_macvlan(upper_dev) &&

		    !mlxsw_sp_rif_find_by_dev(mlxsw_sp, vlan_dev)) {

			NL_SET_ERR_MSG_MOD(extack, "macvlan is only supported on top of router interfaces");

			return -EOPNOTSUPP;

		}

		break;

	case NETDEV_CHANGEUPPER:

		upper_dev = info->upper_dev;

		if (info->linking)

			break;

		if (netif_is_macvlan(upper_dev))

			mlxsw_sp_rif_macvlan_del(mlxsw_sp, upper_dev);

		break;

	}



	return 0;

}



static int mlxsw_sp_netdevice_vlan_event(struct net_device *vlan_dev,

					 unsigned long event, void *ptr)

{
@@ -5169,6 +5222,9 @@ static int mlxsw_sp_netdevice_vlan_event(struct net_device *vlan_dev, 
		return mlxsw_sp_netdevice_lag_port_vlan_event(vlan_dev,

							      real_dev, event,

							      ptr, vid);

	else if (netif_is_bridge_master(real_dev))

		return mlxsw_sp_netdevice_bridge_vlan_event(vlan_dev, real_dev,

							    event, ptr, vid);



	return 0;

}
@@ -5358,18 +5414,10 @@ static struct notifier_block mlxsw_sp_inetaddr_valid_nb __read_mostly = { 
	.notifier_call = mlxsw_sp_inetaddr_valid_event,

};



static struct notifier_block mlxsw_sp_inetaddr_nb __read_mostly = {

	.notifier_call = mlxsw_sp_inetaddr_event,

};



static struct notifier_block mlxsw_sp_inet6addr_valid_nb __read_mostly = {

	.notifier_call = mlxsw_sp_inet6addr_valid_event,

};



static struct notifier_block mlxsw_sp_inet6addr_nb __read_mostly = {

	.notifier_call = mlxsw_sp_inet6addr_event,

};



static const struct pci_device_id mlxsw_sp1_pci_id_table[] = {

	{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SPECTRUM), 0},

	{0, },
@@ -5395,9 +5443,7 @@ static int __init mlxsw_sp_module_init(void) 
	int err;



	register_inetaddr_validator_notifier(&mlxsw_sp_inetaddr_valid_nb);

	register_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);

	register_inet6addr_validator_notifier(&mlxsw_sp_inet6addr_valid_nb);

	register_inet6addr_notifier(&mlxsw_sp_inet6addr_nb);



	err = mlxsw_core_driver_register(&mlxsw_sp1_driver);

	if (err)
@@ -5424,9 +5470,7 @@ err_sp1_pci_driver_register: 
err_sp2_core_driver_register:

	mlxsw_core_driver_unregister(&mlxsw_sp1_driver);

err_sp1_core_driver_register:

	unregister_inet6addr_notifier(&mlxsw_sp_inet6addr_nb);

	unregister_inet6addr_validator_notifier(&mlxsw_sp_inet6addr_valid_nb);

	unregister_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);

	unregister_inetaddr_validator_notifier(&mlxsw_sp_inetaddr_valid_nb);

	return err;

}
@@ -5437,9 +5481,7 @@ static void __exit mlxsw_sp_module_exit(void) 
	mlxsw_pci_driver_unregister(&mlxsw_sp1_pci_driver);

	mlxsw_core_driver_unregister(&mlxsw_sp2_driver);

	mlxsw_core_driver_unregister(&mlxsw_sp1_driver);

	unregister_inet6addr_notifier(&mlxsw_sp_inet6addr_nb);

	unregister_inet6addr_validator_notifier(&mlxsw_sp_inet6addr_valid_nb);

	unregister_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);

	unregister_inetaddr_validator_notifier(&mlxsw_sp_inetaddr_valid_nb);

}

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

+3 −9
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ struct mlxsw_sp_port_vlan { 
	struct list_head list;

	struct mlxsw_sp_port *mlxsw_sp_port;

	struct mlxsw_sp_fid *fid;

	unsigned int ref_count;

	u16 vid;

	struct mlxsw_sp_bridge_port *bridge_port;

	struct list_head bridge_vlan_node;
@@ -410,8 +409,8 @@ int mlxsw_sp_port_vid_learning_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid, 
				   bool learn_enable);

int mlxsw_sp_port_pvid_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid);

struct mlxsw_sp_port_vlan *

mlxsw_sp_port_vlan_get(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid);

void mlxsw_sp_port_vlan_put(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);

mlxsw_sp_port_vlan_create(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid);

void mlxsw_sp_port_vlan_destroy(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);

int mlxsw_sp_port_vlan_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid_begin,

			   u16 vid_end, bool is_member, bool untagged);

int mlxsw_sp_flow_counter_get(struct mlxsw_sp *mlxsw_sp,
@@ -459,12 +458,8 @@ int mlxsw_sp_netdevice_router_port_event(struct net_device *dev, 
					 unsigned long event, void *ptr);

void mlxsw_sp_rif_macvlan_del(struct mlxsw_sp *mlxsw_sp,

			      const struct net_device *macvlan_dev);

int mlxsw_sp_inetaddr_event(struct notifier_block *unused,

			    unsigned long event, void *ptr);

int mlxsw_sp_inetaddr_valid_event(struct notifier_block *unused,

				  unsigned long event, void *ptr);

int mlxsw_sp_inet6addr_event(struct notifier_block *unused,

			     unsigned long event, void *ptr);

int mlxsw_sp_inet6addr_valid_event(struct notifier_block *unused,

				   unsigned long event, void *ptr);

int mlxsw_sp_netdevice_vrf_event(struct net_device *l3_dev, unsigned long event,
@@ -484,7 +479,6 @@ mlxsw_sp_netdevice_ipip_ul_event(struct mlxsw_sp *mlxsw_sp, 
				 struct netdev_notifier_info *info);

void

mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);

void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif);

void mlxsw_sp_rif_destroy_by_dev(struct mlxsw_sp *mlxsw_sp,

				 struct net_device *dev);

struct mlxsw_sp_rif *mlxsw_sp_rif_find_by_dev(const struct mlxsw_sp *mlxsw_sp,
@@ -785,10 +779,10 @@ int mlxsw_sp_fid_port_vid_map(struct mlxsw_sp_fid *fid, 
			      struct mlxsw_sp_port *mlxsw_sp_port, u16 vid);

void mlxsw_sp_fid_port_vid_unmap(struct mlxsw_sp_fid *fid,

				 struct mlxsw_sp_port *mlxsw_sp_port, u16 vid);

enum mlxsw_sp_rif_type mlxsw_sp_fid_rif_type(const struct mlxsw_sp_fid *fid);

u16 mlxsw_sp_fid_index(const struct mlxsw_sp_fid *fid);

enum mlxsw_sp_fid_type mlxsw_sp_fid_type(const struct mlxsw_sp_fid *fid);

void mlxsw_sp_fid_rif_set(struct mlxsw_sp_fid *fid, struct mlxsw_sp_rif *rif);

struct mlxsw_sp_rif *mlxsw_sp_fid_rif(const struct mlxsw_sp_fid *fid);

enum mlxsw_sp_rif_type

mlxsw_sp_fid_type_rif_type(const struct mlxsw_sp *mlxsw_sp,

			   enum mlxsw_sp_fid_type type);

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

+15 −19
Original line number Diff line number Diff line
@@ -349,11 +349,6 @@ void mlxsw_sp_fid_port_vid_unmap(struct mlxsw_sp_fid *fid, 
	fid->fid_family->ops->port_vid_unmap(fid, mlxsw_sp_port, vid);

}



enum mlxsw_sp_rif_type mlxsw_sp_fid_rif_type(const struct mlxsw_sp_fid *fid)

{

	return fid->fid_family->rif_type;

}



u16 mlxsw_sp_fid_index(const struct mlxsw_sp_fid *fid)

{

	return fid->fid_index;
@@ -369,6 +364,11 @@ void mlxsw_sp_fid_rif_set(struct mlxsw_sp_fid *fid, struct mlxsw_sp_rif *rif) 
	fid->rif = rif;

}



struct mlxsw_sp_rif *mlxsw_sp_fid_rif(const struct mlxsw_sp_fid *fid)

{

	return fid->rif;

}



enum mlxsw_sp_rif_type

mlxsw_sp_fid_type_rif_type(const struct mlxsw_sp *mlxsw_sp,

			   enum mlxsw_sp_fid_type type)
@@ -1083,12 +1083,9 @@ void mlxsw_sp_fid_put(struct mlxsw_sp_fid *fid) 
	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;

	struct mlxsw_sp *mlxsw_sp = fid_family->mlxsw_sp;



	if (--fid->ref_count == 1 && fid->rif) {

		/* Destroy the associated RIF and let it drop the last

		 * reference on the FID.

		 */

		return mlxsw_sp_rif_destroy(fid->rif);

	} else if (fid->ref_count == 0) {

	if (--fid->ref_count != 0)

		return;



	list_del(&fid->list);

	rhashtable_remove_fast(&mlxsw_sp->fid_core->fid_ht,

			       &fid->ht_node, mlxsw_sp_fid_ht_params);
@@ -1097,7 +1094,6 @@ void mlxsw_sp_fid_put(struct mlxsw_sp_fid *fid) 
		    fid_family->fids_bitmap);

	kfree(fid);

}

}



struct mlxsw_sp_fid *mlxsw_sp_fid_8021q_get(struct mlxsw_sp *mlxsw_sp, u16 vid)

{

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

+106 −60
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/gcd.h>

#include <linux/random.h>

#include <linux/if_macvlan.h>

#include <linux/refcount.h>

#include <net/netevent.h>

#include <net/neighbour.h>

#include <net/arp.h>
@@ -70,6 +71,8 @@ struct mlxsw_sp_router { 
	bool aborted;

	struct notifier_block fib_nb;

	struct notifier_block netevent_nb;

	struct notifier_block inetaddr_nb;

	struct notifier_block inet6addr_nb;

	const struct mlxsw_sp_rif_ops **rif_ops_arr;

	const struct mlxsw_sp_ipip_ops **ipip_ops_arr;

};
@@ -104,6 +107,7 @@ struct mlxsw_sp_rif_params { 


struct mlxsw_sp_rif_subport {

	struct mlxsw_sp_rif common;

	refcount_t ref_count;

	union {

		u16 system_port;

		u16 lag_id;
@@ -136,6 +140,7 @@ struct mlxsw_sp_rif_ops { 
	void (*fdb_del)(struct mlxsw_sp_rif *rif, const char *mac);

};



static void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif);

static void mlxsw_sp_lpm_tree_hold(struct mlxsw_sp_lpm_tree *lpm_tree);

static void mlxsw_sp_lpm_tree_put(struct mlxsw_sp *mlxsw_sp,

				  struct mlxsw_sp_lpm_tree *lpm_tree);
@@ -6297,6 +6302,7 @@ mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp, 
		err = -ENOMEM;

		goto err_rif_alloc;

	}

	dev_hold(rif->dev);

	rif->mlxsw_sp = mlxsw_sp;

	rif->ops = ops;
@@ -6335,6 +6341,7 @@ err_configure: 
	if (fid)

		mlxsw_sp_fid_put(fid);

err_fid_get:

	dev_put(rif->dev);

	kfree(rif);

err_rif_alloc:

err_rif_index_alloc:
@@ -6343,7 +6350,7 @@ err_rif_index_alloc: 
	return ERR_PTR(err);

}



void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif)

static void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif)

{

	const struct mlxsw_sp_rif_ops *ops = rif->ops;

	struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;
@@ -6362,6 +6369,7 @@ void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif) 
	if (fid)

		/* Loopback RIFs are not associated with a FID. */

		mlxsw_sp_fid_put(fid);

	dev_put(rif->dev);

	kfree(rif);

	vr->rif_count--;

	mlxsw_sp_vr_put(mlxsw_sp, vr);
@@ -6392,6 +6400,40 @@ mlxsw_sp_rif_subport_params_init(struct mlxsw_sp_rif_params *params, 
		params->system_port = mlxsw_sp_port->local_port;

}



static struct mlxsw_sp_rif_subport *

mlxsw_sp_rif_subport_rif(const struct mlxsw_sp_rif *rif)

{

	return container_of(rif, struct mlxsw_sp_rif_subport, common);

}



static struct mlxsw_sp_rif *

mlxsw_sp_rif_subport_get(struct mlxsw_sp *mlxsw_sp,

			 const struct mlxsw_sp_rif_params *params,

			 struct netlink_ext_ack *extack)

{

	struct mlxsw_sp_rif_subport *rif_subport;

	struct mlxsw_sp_rif *rif;



	rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, params->dev);

	if (!rif)

		return mlxsw_sp_rif_create(mlxsw_sp, params, extack);



	rif_subport = mlxsw_sp_rif_subport_rif(rif);

	refcount_inc(&rif_subport->ref_count);

	return rif;

}



static void mlxsw_sp_rif_subport_put(struct mlxsw_sp_rif *rif)

{

	struct mlxsw_sp_rif_subport *rif_subport;



	rif_subport = mlxsw_sp_rif_subport_rif(rif);

	if (!refcount_dec_and_test(&rif_subport->ref_count))

		return;



	mlxsw_sp_rif_destroy(rif);

}



static int

mlxsw_sp_port_vlan_router_join(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan,

			       struct net_device *l3_dev,
@@ -6399,22 +6441,18 @@ mlxsw_sp_port_vlan_router_join(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan, 
{

	struct mlxsw_sp_port *mlxsw_sp_port = mlxsw_sp_port_vlan->mlxsw_sp_port;

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	struct mlxsw_sp_rif_params params = {

		.dev = l3_dev,

	};

	u16 vid = mlxsw_sp_port_vlan->vid;

	struct mlxsw_sp_rif *rif;

	struct mlxsw_sp_fid *fid;

	int err;



	rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, l3_dev);

	if (!rif) {

		struct mlxsw_sp_rif_params params = {

			.dev = l3_dev,

		};



	mlxsw_sp_rif_subport_params_init(&params, mlxsw_sp_port_vlan);

		rif = mlxsw_sp_rif_create(mlxsw_sp, &params, extack);

	rif = mlxsw_sp_rif_subport_get(mlxsw_sp, &params, extack);

	if (IS_ERR(rif))

		return PTR_ERR(rif);

	}



	/* FID was already created, just take a reference */

	fid = rif->ops->fid_get(rif, extack);
@@ -6441,6 +6479,7 @@ err_port_vid_learning_set: 
	mlxsw_sp_fid_port_vid_unmap(fid, mlxsw_sp_port, vid);

err_fid_port_vid_map:

	mlxsw_sp_fid_put(fid);

	mlxsw_sp_rif_subport_put(rif);

	return err;

}
@@ -6449,6 +6488,7 @@ mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan) 
{

	struct mlxsw_sp_port *mlxsw_sp_port = mlxsw_sp_port_vlan->mlxsw_sp_port;

	struct mlxsw_sp_fid *fid = mlxsw_sp_port_vlan->fid;

	struct mlxsw_sp_rif *rif = mlxsw_sp_fid_rif(fid);

	u16 vid = mlxsw_sp_port_vlan->vid;



	if (WARN_ON(mlxsw_sp_fid_type(fid) != MLXSW_SP_FID_TYPE_RFID))
@@ -6458,10 +6498,8 @@ mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan) 
	mlxsw_sp_port_vid_stp_set(mlxsw_sp_port, vid, BR_STATE_BLOCKING);

	mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid, true);

	mlxsw_sp_fid_port_vid_unmap(fid, mlxsw_sp_port, vid);

	/* If router port holds the last reference on the rFID, then the

	 * associated Sub-port RIF will be destroyed.

	 */

	mlxsw_sp_fid_put(fid);

	mlxsw_sp_rif_subport_put(rif);

}



static int mlxsw_sp_inetaddr_port_vlan_event(struct net_device *l3_dev,
@@ -6535,11 +6573,11 @@ static int mlxsw_sp_inetaddr_lag_event(struct net_device *lag_dev, 
					     extack);

}



static int mlxsw_sp_inetaddr_bridge_event(struct net_device *l3_dev,

static int mlxsw_sp_inetaddr_bridge_event(struct mlxsw_sp *mlxsw_sp,

					  struct net_device *l3_dev,

					  unsigned long event,

					  struct netlink_ext_ack *extack)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(l3_dev);

	struct mlxsw_sp_rif_params params = {

		.dev = l3_dev,

	};
@@ -6560,7 +6598,8 @@ static int mlxsw_sp_inetaddr_bridge_event(struct net_device *l3_dev, 
	return 0;

}



static int mlxsw_sp_inetaddr_vlan_event(struct net_device *vlan_dev,

static int mlxsw_sp_inetaddr_vlan_event(struct mlxsw_sp *mlxsw_sp,

					struct net_device *vlan_dev,

					unsigned long event,

					struct netlink_ext_ack *extack)

{
@@ -6577,7 +6616,8 @@ static int mlxsw_sp_inetaddr_vlan_event(struct net_device *vlan_dev, 
		return __mlxsw_sp_inetaddr_lag_event(vlan_dev, real_dev, event,

						     vid, extack);

	else if (netif_is_bridge_master(real_dev) && br_vlan_enabled(real_dev))

		return mlxsw_sp_inetaddr_bridge_event(vlan_dev, event, extack);

		return mlxsw_sp_inetaddr_bridge_event(mlxsw_sp, vlan_dev, event,

						      extack);



	return 0;

}
@@ -6678,16 +6718,11 @@ void mlxsw_sp_rif_macvlan_del(struct mlxsw_sp *mlxsw_sp, 
			    mlxsw_sp_fid_index(rif->fid), false);

}



static int mlxsw_sp_inetaddr_macvlan_event(struct net_device *macvlan_dev,

static int mlxsw_sp_inetaddr_macvlan_event(struct mlxsw_sp *mlxsw_sp,

					   struct net_device *macvlan_dev,

					   unsigned long event,

					   struct netlink_ext_ack *extack)

{

	struct mlxsw_sp *mlxsw_sp;



	mlxsw_sp = mlxsw_sp_lower_get(macvlan_dev);

	if (!mlxsw_sp)

		return 0;



	switch (event) {

	case NETDEV_UP:

		return mlxsw_sp_rif_macvlan_add(mlxsw_sp, macvlan_dev, extack);
@@ -6726,7 +6761,8 @@ static int mlxsw_sp_router_port_check_rif_addr(struct mlxsw_sp *mlxsw_sp, 
	return 0;

}



static int __mlxsw_sp_inetaddr_event(struct net_device *dev,

static int __mlxsw_sp_inetaddr_event(struct mlxsw_sp *mlxsw_sp,

				     struct net_device *dev,

				     unsigned long event,

				     struct netlink_ext_ack *extack)

{
@@ -6735,21 +6771,24 @@ static int __mlxsw_sp_inetaddr_event(struct net_device *dev, 
	else if (netif_is_lag_master(dev))

		return mlxsw_sp_inetaddr_lag_event(dev, event, extack);

	else if (netif_is_bridge_master(dev))

		return mlxsw_sp_inetaddr_bridge_event(dev, event, extack);

		return mlxsw_sp_inetaddr_bridge_event(mlxsw_sp, dev, event,

						      extack);

	else if (is_vlan_dev(dev))

		return mlxsw_sp_inetaddr_vlan_event(dev, event, extack);

		return mlxsw_sp_inetaddr_vlan_event(mlxsw_sp, dev, event,

						    extack);

	else if (netif_is_macvlan(dev))

		return mlxsw_sp_inetaddr_macvlan_event(dev, event, extack);

		return mlxsw_sp_inetaddr_macvlan_event(mlxsw_sp, dev, event,

						       extack);

	else

		return 0;

}



int mlxsw_sp_inetaddr_event(struct notifier_block *unused,

static int mlxsw_sp_inetaddr_event(struct notifier_block *nb,

				   unsigned long event, void *ptr)

{

	struct in_ifaddr *ifa = (struct in_ifaddr *) ptr;

	struct net_device *dev = ifa->ifa_dev->dev;

	struct mlxsw_sp *mlxsw_sp;

	struct mlxsw_sp_router *router;

	struct mlxsw_sp_rif *rif;

	int err = 0;
@@ -6757,15 +6796,12 @@ int mlxsw_sp_inetaddr_event(struct notifier_block *unused, 
	if (event == NETDEV_UP)

		goto out;



	mlxsw_sp = mlxsw_sp_lower_get(dev);

	if (!mlxsw_sp)

		goto out;



	rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev);

	router = container_of(nb, struct mlxsw_sp_router, inetaddr_nb);

	rif = mlxsw_sp_rif_find_by_dev(router->mlxsw_sp, dev);

	if (!mlxsw_sp_rif_should_config(rif, dev, event))

		goto out;



	err = __mlxsw_sp_inetaddr_event(dev, event, NULL);

	err = __mlxsw_sp_inetaddr_event(router->mlxsw_sp, dev, event, NULL);

out:

	return notifier_from_errno(err);

}
@@ -6792,13 +6828,14 @@ int mlxsw_sp_inetaddr_valid_event(struct notifier_block *unused, 
	if (err)

		goto out;



	err = __mlxsw_sp_inetaddr_event(dev, event, ivi->extack);

	err = __mlxsw_sp_inetaddr_event(mlxsw_sp, dev, event, ivi->extack);

out:

	return notifier_from_errno(err);

}



struct mlxsw_sp_inet6addr_event_work {

	struct work_struct work;

	struct mlxsw_sp *mlxsw_sp;

	struct net_device *dev;

	unsigned long event;

};
@@ -6807,21 +6844,18 @@ static void mlxsw_sp_inet6addr_event_work(struct work_struct *work) 
{

	struct mlxsw_sp_inet6addr_event_work *inet6addr_work =

		container_of(work, struct mlxsw_sp_inet6addr_event_work, work);

	struct mlxsw_sp *mlxsw_sp = inet6addr_work->mlxsw_sp;

	struct net_device *dev = inet6addr_work->dev;

	unsigned long event = inet6addr_work->event;

	struct mlxsw_sp *mlxsw_sp;

	struct mlxsw_sp_rif *rif;



	rtnl_lock();

	mlxsw_sp = mlxsw_sp_lower_get(dev);

	if (!mlxsw_sp)

		goto out;



	rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev);

	if (!mlxsw_sp_rif_should_config(rif, dev, event))

		goto out;



	__mlxsw_sp_inetaddr_event(dev, event, NULL);

	__mlxsw_sp_inetaddr_event(mlxsw_sp, dev, event, NULL);

out:

	rtnl_unlock();

	dev_put(dev);
@@ -6829,25 +6863,25 @@ out: 
}



/* Called with rcu_read_lock() */

int mlxsw_sp_inet6addr_event(struct notifier_block *unused,

static int mlxsw_sp_inet6addr_event(struct notifier_block *nb,

				    unsigned long event, void *ptr)

{

	struct inet6_ifaddr *if6 = (struct inet6_ifaddr *) ptr;

	struct mlxsw_sp_inet6addr_event_work *inet6addr_work;

	struct net_device *dev = if6->idev->dev;

	struct mlxsw_sp_router *router;



	/* NETDEV_UP event is handled by mlxsw_sp_inet6addr_valid_event */

	if (event == NETDEV_UP)

		return NOTIFY_DONE;



	if (!mlxsw_sp_port_dev_lower_find_rcu(dev))

		return NOTIFY_DONE;



	inet6addr_work = kzalloc(sizeof(*inet6addr_work), GFP_ATOMIC);

	if (!inet6addr_work)

		return NOTIFY_BAD;



	router = container_of(nb, struct mlxsw_sp_router, inet6addr_nb);

	INIT_WORK(&inet6addr_work->work, mlxsw_sp_inet6addr_event_work);

	inet6addr_work->mlxsw_sp = router->mlxsw_sp;

	inet6addr_work->dev = dev;

	inet6addr_work->event = event;

	dev_hold(dev);
@@ -6878,7 +6912,7 @@ int mlxsw_sp_inet6addr_valid_event(struct notifier_block *unused, 
	if (err)

		goto out;



	err = __mlxsw_sp_inetaddr_event(dev, event, i6vi->extack);

	err = __mlxsw_sp_inetaddr_event(mlxsw_sp, dev, event, i6vi->extack);

out:

	return notifier_from_errno(err);

}
@@ -6997,9 +7031,10 @@ static int mlxsw_sp_port_vrf_join(struct mlxsw_sp *mlxsw_sp, 
	 */

	rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, l3_dev);

	if (rif)

		__mlxsw_sp_inetaddr_event(l3_dev, NETDEV_DOWN, extack);

		__mlxsw_sp_inetaddr_event(mlxsw_sp, l3_dev, NETDEV_DOWN,

					  extack);



	return __mlxsw_sp_inetaddr_event(l3_dev, NETDEV_UP, extack);

	return __mlxsw_sp_inetaddr_event(mlxsw_sp, l3_dev, NETDEV_UP, extack);

}



static void mlxsw_sp_port_vrf_leave(struct mlxsw_sp *mlxsw_sp,
@@ -7010,7 +7045,7 @@ static void mlxsw_sp_port_vrf_leave(struct mlxsw_sp *mlxsw_sp, 
	rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, l3_dev);

	if (!rif)

		return;

	__mlxsw_sp_inetaddr_event(l3_dev, NETDEV_DOWN, NULL);

	__mlxsw_sp_inetaddr_event(mlxsw_sp, l3_dev, NETDEV_DOWN, NULL);

}



int mlxsw_sp_netdevice_vrf_event(struct net_device *l3_dev, unsigned long event,
@@ -7064,18 +7099,13 @@ static int mlxsw_sp_rif_macvlan_flush(struct mlxsw_sp_rif *rif) 
					     __mlxsw_sp_rif_macvlan_flush, rif);

}



static struct mlxsw_sp_rif_subport *

mlxsw_sp_rif_subport_rif(const struct mlxsw_sp_rif *rif)

{

	return container_of(rif, struct mlxsw_sp_rif_subport, common);

}



static void mlxsw_sp_rif_subport_setup(struct mlxsw_sp_rif *rif,

				       const struct mlxsw_sp_rif_params *params)

{

	struct mlxsw_sp_rif_subport *rif_subport;



	rif_subport = mlxsw_sp_rif_subport_rif(rif);

	refcount_set(&rif_subport->ref_count, 1);

	rif_subport->vid = params->vid;

	rif_subport->lag = params->lag;

	if (params->lag)
@@ -7627,6 +7657,16 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp) 
	mlxsw_sp->router = router;

	router->mlxsw_sp = mlxsw_sp;



	router->inetaddr_nb.notifier_call = mlxsw_sp_inetaddr_event;

	err = register_inetaddr_notifier(&router->inetaddr_nb);

	if (err)

		goto err_register_inetaddr_notifier;



	router->inet6addr_nb.notifier_call = mlxsw_sp_inet6addr_event;

	err = register_inet6addr_notifier(&router->inet6addr_nb);

	if (err)

		goto err_register_inet6addr_notifier;



	INIT_LIST_HEAD(&mlxsw_sp->router->nexthop_neighs_list);

	err = __mlxsw_sp_router_init(mlxsw_sp);

	if (err)
@@ -7712,6 +7752,10 @@ err_ipips_init: 
err_rifs_init:

	__mlxsw_sp_router_fini(mlxsw_sp);

err_router_init:

	unregister_inet6addr_notifier(&router->inet6addr_nb);

err_register_inet6addr_notifier:

	unregister_inetaddr_notifier(&router->inetaddr_nb);

err_register_inetaddr_notifier:

	kfree(mlxsw_sp->router);

	return err;

}
@@ -7729,5 +7773,7 @@ void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp) 
	mlxsw_sp_ipips_fini(mlxsw_sp);

	mlxsw_sp_rifs_fini(mlxsw_sp);

	__mlxsw_sp_router_fini(mlxsw_sp);

	unregister_inet6addr_notifier(&mlxsw_sp->router->inet6addr_nb);

	unregister_inetaddr_notifier(&mlxsw_sp->router->inetaddr_nb);

	kfree(mlxsw_sp->router);

}

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

+27 −41

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE