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

mlxsw: spectrum: Export function to check if RIF exists 



After the previous patch, all the callers of mlxsw_sp_rif_find_by_dev()
outside of the routing code use it to understand if a RIF exists for the
passed netdev.

Therefore, export a function to check if a RIF exists and make
mlxsw_sp_rif_find_by_dev() internal to the routing code.

This will later allow us to more easily introduce the router lock which
will also protect the RIFs.

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

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

+4 −4
Original line number Diff line number Diff line
@@ -6316,7 +6316,7 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev, 
			return -EINVAL;

		}

		if (netif_is_macvlan(upper_dev) &&

		    !mlxsw_sp_rif_find_by_dev(mlxsw_sp, lower_dev)) {

		    !mlxsw_sp_rif_exists(mlxsw_sp, lower_dev)) {

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

			return -EOPNOTSUPP;

		}
@@ -6472,7 +6472,7 @@ static int mlxsw_sp_netdevice_port_vlan_event(struct net_device *vlan_dev, 
			return -EINVAL;

		}

		if (netif_is_macvlan(upper_dev) &&

		    !mlxsw_sp_rif_find_by_dev(mlxsw_sp, vlan_dev)) {

		    !mlxsw_sp_rif_exists(mlxsw_sp, vlan_dev)) {

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

			return -EOPNOTSUPP;

		}
@@ -6549,7 +6549,7 @@ static int mlxsw_sp_netdevice_bridge_vlan_event(struct net_device *vlan_dev, 
		if (!info->linking)

			break;

		if (netif_is_macvlan(upper_dev) &&

		    !mlxsw_sp_rif_find_by_dev(mlxsw_sp, vlan_dev)) {

		    !mlxsw_sp_rif_exists(mlxsw_sp, vlan_dev)) {

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

			return -EOPNOTSUPP;

		}
@@ -6609,7 +6609,7 @@ static int mlxsw_sp_netdevice_bridge_event(struct net_device *br_dev, 
		if (!info->linking)

			break;

		if (netif_is_macvlan(upper_dev) &&

		    !mlxsw_sp_rif_find_by_dev(mlxsw_sp, br_dev)) {

		    !mlxsw_sp_rif_exists(mlxsw_sp, br_dev)) {

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

			return -EOPNOTSUPP;

		}

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

+2 −2
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ void 
mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);

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,

bool mlxsw_sp_rif_exists(struct mlxsw_sp *mlxsw_sp,

			 const struct net_device *dev);

u16 mlxsw_sp_rif_vid(struct mlxsw_sp *mlxsw_sp, const struct net_device *dev);

u8 mlxsw_sp_router_port(const struct mlxsw_sp *mlxsw_sp);

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

+10 −1
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ struct mlxsw_sp_rif_ops { 
	void (*fdb_del)(struct mlxsw_sp_rif *rif, const char *mac);

};



static struct mlxsw_sp_rif *

mlxsw_sp_rif_find_by_dev(const struct mlxsw_sp *mlxsw_sp,

			 const struct net_device *dev);

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,
@@ -6256,7 +6259,7 @@ static int mlxsw_sp_router_fib_event(struct notifier_block *nb, 
	return NOTIFY_BAD;

}



struct mlxsw_sp_rif *

static struct mlxsw_sp_rif *

mlxsw_sp_rif_find_by_dev(const struct mlxsw_sp *mlxsw_sp,

			 const struct net_device *dev)

{
@@ -6270,6 +6273,12 @@ mlxsw_sp_rif_find_by_dev(const struct mlxsw_sp *mlxsw_sp, 
	return NULL;

}



bool mlxsw_sp_rif_exists(struct mlxsw_sp *mlxsw_sp,

			 const struct net_device *dev)

{

	return !!mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev);

}



u16 mlxsw_sp_rif_vid(struct mlxsw_sp *mlxsw_sp, const struct net_device *dev)

{

	struct mlxsw_sp_rif *rif;