Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53e50a6e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-Add-VxLAN-support' 



Ido Schimmel says:

====================
mlxsw: Add VxLAN support

This patchset adds support for VxLAN offload in the mlxsw driver.

With regards to the forwarding plane, VxLAN support is composed from two
main parts: Encapsulation and decapsulation.

In the device, NVE encapsulation (and VxLAN in particular) takes place
in the bridge. A packet can be encapsulated using VxLAN either because
it hit an FDB entry that forwards it to the router with the IP of the
remote VTEP or because it was flooded, in which case it is sent to a
list of remote VTEPs (in addition to local ports). In either case, the
VNI is derived from the filtering identifier (FID) the packet was
classified to at ingress and the underlay source IP is taken from a
device global configuration.

VxLAN decapsulation takes place in the underlay router, where packets
that hit a local route that corresponds to the source IP of the local
VTEP are decapsulated and injected to the bridge. The packets are
classified to a FID based on the VNI they came with.

The first six patches export the required APIs in the VxLAN and mlxsw
drivers in order to allow for the introduction of the NVE core in the
next two patches. The NVE core is designed to support a variety of NVE
encapsulations (e.g., VxLAN, NVGRE) and different ASICs, but currently
only VxLAN and Spectrum are supported. Spectrum-2 support will be added
in the future.

The last 10 patches add support for VxLAN decapsulation and
encapsulation and include the addition of the required switchdev APIs in
the VxLAN driver. These APIs allow capable drivers to get a notification
about the addition / deletion of FDB entries to / from the VxLAN's FDB.

Subsequent patchset will add selftests (generic and mlxsw-specific),
data plane learning, FDB extack and vetoing and support for VLAN-aware
bridges (one VNI per VxLAN device model).

v2:
* Implement netif_is_vxlan() using rtnl_link_ops->kind (Jakub & Stephen)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents aadd4355 1231e04f

drivers/net/ethernet/mellanox/mlxsw/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ mlxsw_spectrum-objs := spectrum.o spectrum_buffers.o \ 
				   spectrum_acl_flex_keys.o \

				   spectrum1_mr_tcam.o spectrum2_mr_tcam.o \

				   spectrum_mr_tcam.o spectrum_mr.o \

				   spectrum_qdisc.o spectrum_span.o

				   spectrum_qdisc.o spectrum_span.o \

				   spectrum_nve.o spectrum_nve_vxlan.o

mlxsw_spectrum-$(CONFIG_MLXSW_SPECTRUM_DCB)	+= spectrum_dcb.o

mlxsw_spectrum-$(CONFIG_NET_DEVLINK) += spectrum_dpipe.o

obj-$(CONFIG_MLXSW_MINIMAL)	+= mlxsw_minimal.o

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

+125 −0
Original line number Diff line number Diff line
@@ -2994,6 +2994,13 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
		goto err_port_qdiscs_init;

	}



	err = mlxsw_sp_port_nve_init(mlxsw_sp_port);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to initialize NVE\n",

			mlxsw_sp_port->local_port);

		goto err_port_nve_init;

	}



	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_get(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",
@@ -3022,6 +3029,8 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_vlan_put(mlxsw_sp_port_vlan);

err_port_vlan_get:

	mlxsw_sp_port_nve_fini(mlxsw_sp_port);

err_port_nve_init:

	mlxsw_sp_tc_qdisc_fini(mlxsw_sp_port);

err_port_qdiscs_init:

	mlxsw_sp_port_fids_fini(mlxsw_sp_port);
@@ -3061,6 +3070,7 @@ static void mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port) 
	mlxsw_sp->ports[local_port] = NULL;

	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_vlan_flush(mlxsw_sp_port);

	mlxsw_sp_port_nve_fini(mlxsw_sp_port);

	mlxsw_sp_tc_qdisc_fini(mlxsw_sp_port);

	mlxsw_sp_port_fids_fini(mlxsw_sp_port);

	mlxsw_sp_port_dcb_fini(mlxsw_sp_port);
@@ -3795,6 +3805,12 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
		goto err_afa_init;

	}



	err = mlxsw_sp_nve_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize NVE\n");

		goto err_nve_init;

	}



	err = mlxsw_sp_router_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize router\n");
@@ -3841,6 +3857,8 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
err_netdev_notifier:

	mlxsw_sp_router_fini(mlxsw_sp);

err_router_init:

	mlxsw_sp_nve_fini(mlxsw_sp);

err_nve_init:

	mlxsw_sp_afa_fini(mlxsw_sp);

err_afa_init:

	mlxsw_sp_counter_pool_fini(mlxsw_sp);
@@ -3873,6 +3891,7 @@ static int mlxsw_sp1_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->afk_ops = &mlxsw_sp1_afk_ops;

	mlxsw_sp->mr_tcam_ops = &mlxsw_sp1_mr_tcam_ops;

	mlxsw_sp->acl_tcam_ops = &mlxsw_sp1_acl_tcam_ops;

	mlxsw_sp->nve_ops_arr = mlxsw_sp1_nve_ops_arr;



	return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info);

}
@@ -3887,6 +3906,7 @@ static int mlxsw_sp2_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->afk_ops = &mlxsw_sp2_afk_ops;

	mlxsw_sp->mr_tcam_ops = &mlxsw_sp2_mr_tcam_ops;

	mlxsw_sp->acl_tcam_ops = &mlxsw_sp2_acl_tcam_ops;

	mlxsw_sp->nve_ops_arr = mlxsw_sp2_nve_ops_arr;



	return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info);

}
@@ -3900,6 +3920,7 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core) 
	mlxsw_sp_acl_fini(mlxsw_sp);

	unregister_netdevice_notifier(&mlxsw_sp->netdevice_nb);

	mlxsw_sp_router_fini(mlxsw_sp);

	mlxsw_sp_nve_fini(mlxsw_sp);

	mlxsw_sp_afa_fini(mlxsw_sp);

	mlxsw_sp_counter_pool_fini(mlxsw_sp);

	mlxsw_sp_switchdev_fini(mlxsw_sp);
@@ -4566,6 +4587,41 @@ static void mlxsw_sp_port_ovs_leave(struct mlxsw_sp_port *mlxsw_sp_port) 
	mlxsw_sp_port_vp_mode_set(mlxsw_sp_port, false);

}



static bool mlxsw_sp_bridge_has_multiple_vxlans(struct net_device *br_dev)

{

	unsigned int num_vxlans = 0;

	struct net_device *dev;

	struct list_head *iter;



	netdev_for_each_lower_dev(br_dev, dev, iter) {

		if (netif_is_vxlan(dev))

			num_vxlans++;

	}



	return num_vxlans > 1;

}



static bool mlxsw_sp_bridge_vxlan_is_valid(struct net_device *br_dev,

					   struct netlink_ext_ack *extack)

{

	if (br_multicast_enabled(br_dev)) {

		NL_SET_ERR_MSG_MOD(extack, "Multicast can not be enabled on a bridge with a VxLAN device");

		return false;

	}



	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");

		return false;

	}



	if (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 true;

}



static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev,

					       struct net_device *dev,

					       unsigned long event, void *ptr)
@@ -4595,6 +4651,11 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev, 
		}

		if (!info->linking)

			break;

		if (netif_is_bridge_master(upper_dev) &&

		    !mlxsw_sp_bridge_device_is_offloaded(mlxsw_sp, upper_dev) &&

		    mlxsw_sp_bridge_has_vxlan(upper_dev) &&

		    !mlxsw_sp_bridge_vxlan_is_valid(upper_dev, extack))

			return -EOPNOTSUPP;

		if (netdev_has_any_upper_dev(upper_dev) &&

		    (!netif_is_bridge_master(upper_dev) ||

		     !mlxsw_sp_bridge_device_is_offloaded(mlxsw_sp,
@@ -4752,6 +4813,11 @@ static int mlxsw_sp_netdevice_port_vlan_event(struct net_device *vlan_dev, 
		}

		if (!info->linking)

			break;

		if (netif_is_bridge_master(upper_dev) &&

		    !mlxsw_sp_bridge_device_is_offloaded(mlxsw_sp, upper_dev) &&

		    mlxsw_sp_bridge_has_vxlan(upper_dev) &&

		    !mlxsw_sp_bridge_vxlan_is_valid(upper_dev, extack))

			return -EOPNOTSUPP;

		if (netdev_has_any_upper_dev(upper_dev) &&

		    (!netif_is_bridge_master(upper_dev) ||

		     !mlxsw_sp_bridge_device_is_offloaded(mlxsw_sp,
@@ -4898,6 +4964,63 @@ static bool mlxsw_sp_is_vrf_event(unsigned long event, void *ptr) 
	return netif_is_l3_master(info->upper_dev);

}



static int mlxsw_sp_netdevice_vxlan_event(struct mlxsw_sp *mlxsw_sp,

					  struct net_device *dev,

					  unsigned long event, void *ptr)

{

	struct netdev_notifier_changeupper_info *cu_info;

	struct netdev_notifier_info *info = ptr;

	struct netlink_ext_ack *extack;

	struct net_device *upper_dev;



	extack = netdev_notifier_info_to_extack(info);



	switch (event) {

	case NETDEV_CHANGEUPPER:

		cu_info = container_of(info,

				       struct netdev_notifier_changeupper_info,

				       info);

		upper_dev = cu_info->upper_dev;

		if (!netif_is_bridge_master(upper_dev))

			return 0;

		if (!mlxsw_sp_lower_get(upper_dev))

			return 0;

		if (!mlxsw_sp_bridge_vxlan_is_valid(upper_dev, extack))

			return -EOPNOTSUPP;

		if (cu_info->linking) {

			if (!netif_running(dev))

				return 0;

			return mlxsw_sp_bridge_vxlan_join(mlxsw_sp, upper_dev,

							  dev, extack);

		} else {

			mlxsw_sp_bridge_vxlan_leave(mlxsw_sp, upper_dev, dev);

		}

		break;

	case NETDEV_PRE_UP:

		upper_dev = netdev_master_upper_dev_get(dev);

		if (!upper_dev)

			return 0;

		if (!netif_is_bridge_master(upper_dev))

			return 0;

		if (!mlxsw_sp_lower_get(upper_dev))

			return 0;

		return mlxsw_sp_bridge_vxlan_join(mlxsw_sp, upper_dev, dev,

						  extack);

	case NETDEV_DOWN:

		upper_dev = netdev_master_upper_dev_get(dev);

		if (!upper_dev)

			return 0;

		if (!netif_is_bridge_master(upper_dev))

			return 0;

		if (!mlxsw_sp_lower_get(upper_dev))

			return 0;

		mlxsw_sp_bridge_vxlan_leave(mlxsw_sp, upper_dev, dev);

		break;

	}



	return 0;

}



static int mlxsw_sp_netdevice_event(struct notifier_block *nb,

				    unsigned long event, void *ptr)

{
@@ -4914,6 +5037,8 @@ static int mlxsw_sp_netdevice_event(struct notifier_block *nb, 
	}

	mlxsw_sp_span_respin(mlxsw_sp);



	if (netif_is_vxlan(dev))

		err = mlxsw_sp_netdevice_vxlan_event(mlxsw_sp, dev, event, ptr);

	if (mlxsw_sp_netdev_is_ipip_ol(mlxsw_sp, dev))

		err = mlxsw_sp_netdevice_ipip_ol_event(mlxsw_sp, dev,

						       event, ptr);

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

+89 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <net/psample.h>

#include <net/pkt_cls.h>

#include <net/red.h>

#include <net/vxlan.h>



#include "port.h"

#include "core.h"
@@ -55,6 +56,8 @@ enum mlxsw_sp_resource_id { 
struct mlxsw_sp_port;

struct mlxsw_sp_rif;

struct mlxsw_sp_span_entry;

enum mlxsw_sp_l3proto;

union mlxsw_sp_l3addr;



struct mlxsw_sp_upper {

	struct net_device *dev;
@@ -113,9 +116,11 @@ struct mlxsw_sp_acl; 
struct mlxsw_sp_counter_pool;

struct mlxsw_sp_fid_core;

struct mlxsw_sp_kvdl;

struct mlxsw_sp_nve;

struct mlxsw_sp_kvdl_ops;

struct mlxsw_sp_mr_tcam_ops;

struct mlxsw_sp_acl_tcam_ops;

struct mlxsw_sp_nve_ops;



struct mlxsw_sp {

	struct mlxsw_sp_port **ports;
@@ -132,6 +137,7 @@ struct mlxsw_sp { 
	struct mlxsw_sp_acl *acl;

	struct mlxsw_sp_fid_core *fid_core;

	struct mlxsw_sp_kvdl *kvdl;

	struct mlxsw_sp_nve *nve;

	struct notifier_block netdevice_nb;



	struct mlxsw_sp_counter_pool *counter_pool;
@@ -146,6 +152,7 @@ struct mlxsw_sp { 
	const struct mlxsw_afk_ops *afk_ops;

	const struct mlxsw_sp_mr_tcam_ops *mr_tcam_ops;

	const struct mlxsw_sp_acl_tcam_ops *acl_tcam_ops;

	const struct mlxsw_sp_nve_ops **nve_ops_arr;

};



static inline struct mlxsw_sp_upper *
@@ -235,6 +242,25 @@ struct mlxsw_sp_port { 
	struct mlxsw_sp_acl_block *eg_acl_block;

};



static inline struct net_device *

mlxsw_sp_bridge_vxlan_dev_find(struct net_device *br_dev)

{

	struct net_device *dev;

	struct list_head *iter;



	netdev_for_each_lower_dev(br_dev, dev, iter) {

		if (netif_is_vxlan(dev))

			return dev;

	}



	return NULL;

}



static inline bool mlxsw_sp_bridge_has_vxlan(struct net_device *br_dev)

{

	return !!mlxsw_sp_bridge_vxlan_dev_find(br_dev);

}



static inline bool

mlxsw_sp_port_is_pause_en(const struct mlxsw_sp_port *mlxsw_sp_port)

{
@@ -330,6 +356,13 @@ void mlxsw_sp_port_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_port, 
				struct net_device *br_dev);

bool mlxsw_sp_bridge_device_is_offloaded(const struct mlxsw_sp *mlxsw_sp,

					 const struct net_device *br_dev);

int mlxsw_sp_bridge_vxlan_join(struct mlxsw_sp *mlxsw_sp,

			       const struct net_device *br_dev,

			       const struct net_device *vxlan_dev,

			       struct netlink_ext_ack *extack);

void mlxsw_sp_bridge_vxlan_leave(struct mlxsw_sp *mlxsw_sp,

				 const struct net_device *br_dev,

				 const struct net_device *vxlan_dev);



/* spectrum.c */

int mlxsw_sp_port_ets_set(struct mlxsw_sp_port *mlxsw_sp_port,
@@ -431,6 +464,15 @@ struct mlxsw_sp_rif *mlxsw_sp_rif_find_by_dev(const struct mlxsw_sp *mlxsw_sp, 
					      const struct net_device *dev);

u8 mlxsw_sp_router_port(const struct mlxsw_sp *mlxsw_sp);

struct mlxsw_sp_fid *mlxsw_sp_rif_fid(const struct mlxsw_sp_rif *rif);

int mlxsw_sp_router_nve_promote_decap(struct mlxsw_sp *mlxsw_sp, u32 ul_tb_id,

				      enum mlxsw_sp_l3proto ul_proto,

				      const union mlxsw_sp_l3addr *ul_sip,

				      u32 tunnel_index);

void mlxsw_sp_router_nve_demote_decap(struct mlxsw_sp *mlxsw_sp, u32 ul_tb_id,

				      enum mlxsw_sp_l3proto ul_proto,

				      const union mlxsw_sp_l3addr *ul_sip);

int mlxsw_sp_router_tb_id_vr_id(struct mlxsw_sp *mlxsw_sp, u32 tb_id,

				u16 *vr_id);



/* spectrum_kvdl.c */

enum mlxsw_sp_kvdl_entry_type {
@@ -679,6 +721,16 @@ int mlxsw_sp_setup_tc_prio(struct mlxsw_sp_port *mlxsw_sp_port, 
			   struct tc_prio_qopt_offload *p);



/* spectrum_fid.c */

struct mlxsw_sp_fid *mlxsw_sp_fid_lookup_by_vni(struct mlxsw_sp *mlxsw_sp,

						__be32 vni);

int mlxsw_sp_fid_vni(const struct mlxsw_sp_fid *fid, __be32 *vni);

int mlxsw_sp_fid_nve_flood_index_set(struct mlxsw_sp_fid *fid,

				     u32 nve_flood_index);

void mlxsw_sp_fid_nve_flood_index_clear(struct mlxsw_sp_fid *fid);

bool mlxsw_sp_fid_nve_flood_index_is_set(const struct mlxsw_sp_fid *fid);

int mlxsw_sp_fid_vni_set(struct mlxsw_sp_fid *fid, __be32 vni);

void mlxsw_sp_fid_vni_clear(struct mlxsw_sp_fid *fid);

bool mlxsw_sp_fid_vni_is_set(const struct mlxsw_sp_fid *fid);

int mlxsw_sp_fid_flood_set(struct mlxsw_sp_fid *fid,

			   enum mlxsw_sp_flood_type packet_type, u8 local_port,

			   bool member);
@@ -697,6 +749,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_8021d_get(struct mlxsw_sp *mlxsw_sp,

					    int br_ifindex);

struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_lookup(struct mlxsw_sp *mlxsw_sp,

					       int br_ifindex);

struct mlxsw_sp_fid *mlxsw_sp_fid_rfid_get(struct mlxsw_sp *mlxsw_sp,

					   u16 rif_index);

struct mlxsw_sp_fid *mlxsw_sp_fid_dummy_get(struct mlxsw_sp *mlxsw_sp);
@@ -742,4 +796,39 @@ extern const struct mlxsw_sp_mr_tcam_ops mlxsw_sp1_mr_tcam_ops; 
/* spectrum2_mr_tcam.c */

extern const struct mlxsw_sp_mr_tcam_ops mlxsw_sp2_mr_tcam_ops;



/* spectrum_nve.c */

enum mlxsw_sp_nve_type {

	MLXSW_SP_NVE_TYPE_VXLAN,

};



struct mlxsw_sp_nve_params {

	enum mlxsw_sp_nve_type type;

	__be32 vni;

	const struct net_device *dev;

};



extern const struct mlxsw_sp_nve_ops *mlxsw_sp1_nve_ops_arr[];

extern const struct mlxsw_sp_nve_ops *mlxsw_sp2_nve_ops_arr[];



int mlxsw_sp_nve_flood_ip_add(struct mlxsw_sp *mlxsw_sp,

			      struct mlxsw_sp_fid *fid,

			      enum mlxsw_sp_l3proto proto,

			      union mlxsw_sp_l3addr *addr);

void mlxsw_sp_nve_flood_ip_del(struct mlxsw_sp *mlxsw_sp,

			       struct mlxsw_sp_fid *fid,

			       enum mlxsw_sp_l3proto proto,

			       union mlxsw_sp_l3addr *addr);

u32 mlxsw_sp_nve_decap_tunnel_index_get(const struct mlxsw_sp *mlxsw_sp);

bool mlxsw_sp_nve_ipv4_route_is_decap(const struct mlxsw_sp *mlxsw_sp,

				      u32 tb_id, __be32 addr);

int mlxsw_sp_nve_fid_enable(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *fid,

			    struct mlxsw_sp_nve_params *params,

			    struct netlink_ext_ack *extack);

void mlxsw_sp_nve_fid_disable(struct mlxsw_sp *mlxsw_sp,

			      struct mlxsw_sp_fid *fid);

int mlxsw_sp_port_nve_init(struct mlxsw_sp_port *mlxsw_sp_port);

void mlxsw_sp_port_nve_fini(struct mlxsw_sp_port *mlxsw_sp_port);

int mlxsw_sp_nve_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_nve_fini(struct mlxsw_sp *mlxsw_sp);



#endif

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

+220 −5
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/if_vlan.h>

#include <linux/if_bridge.h>

#include <linux/netdevice.h>

#include <linux/rhashtable.h>

#include <linux/rtnetlink.h>



#include "spectrum.h"
@@ -14,6 +15,7 @@ 
struct mlxsw_sp_fid_family;



struct mlxsw_sp_fid_core {

	struct rhashtable vni_ht;

	struct mlxsw_sp_fid_family *fid_family_arr[MLXSW_SP_FID_TYPE_MAX];

	unsigned int *port_fid_mappings;

};
@@ -24,6 +26,12 @@ struct mlxsw_sp_fid { 
	unsigned int ref_count;

	u16 fid_index;

	struct mlxsw_sp_fid_family *fid_family;



	struct rhash_head vni_ht_node;

	__be32 vni;

	u32 nve_flood_index;

	u8 vni_valid:1,

	   nve_flood_index_valid:1;

};



struct mlxsw_sp_fid_8021q {
@@ -36,6 +44,12 @@ struct mlxsw_sp_fid_8021d { 
	int br_ifindex;

};



static const struct rhashtable_params mlxsw_sp_fid_vni_ht_params = {

	.key_len = sizeof_field(struct mlxsw_sp_fid, vni),

	.key_offset = offsetof(struct mlxsw_sp_fid, vni),

	.head_offset = offsetof(struct mlxsw_sp_fid, vni_ht_node),

};



struct mlxsw_sp_flood_table {

	enum mlxsw_sp_flood_type packet_type;

	enum mlxsw_reg_sfgc_bridge_type bridge_type;
@@ -56,6 +70,11 @@ struct mlxsw_sp_fid_ops { 
			    struct mlxsw_sp_port *port, u16 vid);

	void (*port_vid_unmap)(struct mlxsw_sp_fid *fid,

			       struct mlxsw_sp_port *port, u16 vid);

	int (*vni_set)(struct mlxsw_sp_fid *fid, __be32 vni);

	void (*vni_clear)(struct mlxsw_sp_fid *fid);

	int (*nve_flood_index_set)(struct mlxsw_sp_fid *fid,

				   u32 nve_flood_index);

	void (*nve_flood_index_clear)(struct mlxsw_sp_fid *fid);

};



struct mlxsw_sp_fid_family {
@@ -94,6 +113,117 @@ static const int *mlxsw_sp_packet_type_sfgc_types[] = { 
	[MLXSW_SP_FLOOD_TYPE_MC]	= mlxsw_sp_sfgc_mc_packet_types,

};



struct mlxsw_sp_fid *mlxsw_sp_fid_lookup_by_vni(struct mlxsw_sp *mlxsw_sp,

						__be32 vni)

{

	struct mlxsw_sp_fid *fid;



	fid = rhashtable_lookup_fast(&mlxsw_sp->fid_core->vni_ht, &vni,

				     mlxsw_sp_fid_vni_ht_params);

	if (fid)

		fid->ref_count++;



	return fid;

}



int mlxsw_sp_fid_vni(const struct mlxsw_sp_fid *fid, __be32 *vni)

{

	if (!fid->vni_valid)

		return -EINVAL;



	*vni = fid->vni;



	return 0;

}



int mlxsw_sp_fid_nve_flood_index_set(struct mlxsw_sp_fid *fid,

				     u32 nve_flood_index)

{

	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;

	const struct mlxsw_sp_fid_ops *ops = fid_family->ops;

	int err;



	if (WARN_ON(!ops->nve_flood_index_set || fid->nve_flood_index_valid))

		return -EINVAL;



	err = ops->nve_flood_index_set(fid, nve_flood_index);

	if (err)

		return err;



	fid->nve_flood_index = nve_flood_index;

	fid->nve_flood_index_valid = true;



	return 0;

}



void mlxsw_sp_fid_nve_flood_index_clear(struct mlxsw_sp_fid *fid)

{

	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;

	const struct mlxsw_sp_fid_ops *ops = fid_family->ops;



	if (WARN_ON(!ops->nve_flood_index_clear || !fid->nve_flood_index_valid))

		return;



	fid->nve_flood_index_valid = false;

	ops->nve_flood_index_clear(fid);

}



bool mlxsw_sp_fid_nve_flood_index_is_set(const struct mlxsw_sp_fid *fid)

{

	return fid->nve_flood_index_valid;

}



int mlxsw_sp_fid_vni_set(struct mlxsw_sp_fid *fid, __be32 vni)

{

	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;

	const struct mlxsw_sp_fid_ops *ops = fid_family->ops;

	struct mlxsw_sp *mlxsw_sp = fid_family->mlxsw_sp;

	int err;



	if (WARN_ON(!ops->vni_set || fid->vni_valid))

		return -EINVAL;



	fid->vni = vni;

	err = rhashtable_lookup_insert_fast(&mlxsw_sp->fid_core->vni_ht,

					    &fid->vni_ht_node,

					    mlxsw_sp_fid_vni_ht_params);

	if (err)

		return err;



	err = ops->vni_set(fid, vni);

	if (err)

		goto err_vni_set;



	fid->vni_valid = true;



	return 0;



err_vni_set:

	rhashtable_remove_fast(&mlxsw_sp->fid_core->vni_ht, &fid->vni_ht_node,

			       mlxsw_sp_fid_vni_ht_params);

	return err;

}



void mlxsw_sp_fid_vni_clear(struct mlxsw_sp_fid *fid)

{

	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;

	const struct mlxsw_sp_fid_ops *ops = fid_family->ops;

	struct mlxsw_sp *mlxsw_sp = fid_family->mlxsw_sp;



	if (WARN_ON(!ops->vni_clear || !fid->vni_valid))

		return;



	fid->vni_valid = false;

	ops->vni_clear(fid);

	rhashtable_remove_fast(&mlxsw_sp->fid_core->vni_ht, &fid->vni_ht_node,

			       mlxsw_sp_fid_vni_ht_params);

}



bool mlxsw_sp_fid_vni_is_set(const struct mlxsw_sp_fid *fid)

{

	return fid->vni_valid;

}



static const struct mlxsw_sp_flood_table *

mlxsw_sp_fid_flood_table_lookup(const struct mlxsw_sp_fid *fid,

				enum mlxsw_sp_flood_type packet_type)
@@ -217,6 +347,21 @@ static int mlxsw_sp_fid_op(struct mlxsw_sp *mlxsw_sp, u16 fid_index, 
	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfmr), sfmr_pl);

}



static int mlxsw_sp_fid_vni_op(struct mlxsw_sp *mlxsw_sp, u16 fid_index,

			       __be32 vni, bool vni_valid, u32 nve_flood_index,

			       bool nve_flood_index_valid)

{

	char sfmr_pl[MLXSW_REG_SFMR_LEN];



	mlxsw_reg_sfmr_pack(sfmr_pl, MLXSW_REG_SFMR_OP_CREATE_FID, fid_index,

			    0);

	mlxsw_reg_sfmr_vv_set(sfmr_pl, vni_valid);

	mlxsw_reg_sfmr_vni_set(sfmr_pl, be32_to_cpu(vni));

	mlxsw_reg_sfmr_vtfp_set(sfmr_pl, nve_flood_index_valid);

	mlxsw_reg_sfmr_nve_tunnel_flood_ptr_set(sfmr_pl, nve_flood_index);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfmr), sfmr_pl);

}



static int mlxsw_sp_fid_vid_map(struct mlxsw_sp *mlxsw_sp, u16 fid_index,

				u16 vid, bool valid)

{
@@ -393,6 +538,8 @@ static int mlxsw_sp_fid_8021d_configure(struct mlxsw_sp_fid *fid) 


static void mlxsw_sp_fid_8021d_deconfigure(struct mlxsw_sp_fid *fid)

{

	if (fid->vni_valid)

		mlxsw_sp_nve_fid_disable(fid->fid_family->mlxsw_sp, fid);

	mlxsw_sp_fid_op(fid->fid_family->mlxsw_sp, fid->fid_index, 0, false);

}
@@ -531,6 +678,41 @@ mlxsw_sp_fid_8021d_port_vid_unmap(struct mlxsw_sp_fid *fid, 
				    mlxsw_sp_port->local_port, vid, false);

}



static int mlxsw_sp_fid_8021d_vni_set(struct mlxsw_sp_fid *fid, __be32 vni)

{

	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;



	return mlxsw_sp_fid_vni_op(fid_family->mlxsw_sp, fid->fid_index, vni,

				   true, fid->nve_flood_index,

				   fid->nve_flood_index_valid);

}



static void mlxsw_sp_fid_8021d_vni_clear(struct mlxsw_sp_fid *fid)

{

	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;



	mlxsw_sp_fid_vni_op(fid_family->mlxsw_sp, fid->fid_index, 0, false,

			    fid->nve_flood_index, fid->nve_flood_index_valid);

}



static int mlxsw_sp_fid_8021d_nve_flood_index_set(struct mlxsw_sp_fid *fid,

						  u32 nve_flood_index)

{

	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;



	return mlxsw_sp_fid_vni_op(fid_family->mlxsw_sp, fid->fid_index,

				   fid->vni, fid->vni_valid, nve_flood_index,

				   true);

}



static void mlxsw_sp_fid_8021d_nve_flood_index_clear(struct mlxsw_sp_fid *fid)

{

	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;



	mlxsw_sp_fid_vni_op(fid_family->mlxsw_sp, fid->fid_index, fid->vni,

			    fid->vni_valid, 0, false);

}



static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021d_ops = {

	.setup			= mlxsw_sp_fid_8021d_setup,

	.configure		= mlxsw_sp_fid_8021d_configure,
@@ -540,6 +722,10 @@ static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021d_ops = { 
	.flood_index		= mlxsw_sp_fid_8021d_flood_index,

	.port_vid_map		= mlxsw_sp_fid_8021d_port_vid_map,

	.port_vid_unmap		= mlxsw_sp_fid_8021d_port_vid_unmap,

	.vni_set		= mlxsw_sp_fid_8021d_vni_set,

	.vni_clear		= mlxsw_sp_fid_8021d_vni_clear,

	.nve_flood_index_set	= mlxsw_sp_fid_8021d_nve_flood_index_set,

	.nve_flood_index_clear	= mlxsw_sp_fid_8021d_nve_flood_index_clear,

};



static const struct mlxsw_sp_flood_table mlxsw_sp_fid_8021d_flood_tables[] = {
@@ -708,14 +894,12 @@ static const struct mlxsw_sp_fid_family *mlxsw_sp_fid_family_arr[] = { 
	[MLXSW_SP_FID_TYPE_DUMMY]	= &mlxsw_sp_fid_dummy_family,

};



static struct mlxsw_sp_fid *mlxsw_sp_fid_get(struct mlxsw_sp *mlxsw_sp,

static struct mlxsw_sp_fid *mlxsw_sp_fid_lookup(struct mlxsw_sp *mlxsw_sp,

						enum mlxsw_sp_fid_type type,

						const void *arg)

{

	struct mlxsw_sp_fid_family *fid_family;

	struct mlxsw_sp_fid *fid;

	u16 fid_index;

	int err;



	fid_family = mlxsw_sp->fid_core->fid_family_arr[type];

	list_for_each_entry(fid, &fid_family->fids_list, list) {
@@ -725,6 +909,23 @@ static struct mlxsw_sp_fid *mlxsw_sp_fid_get(struct mlxsw_sp *mlxsw_sp, 
		return fid;

	}



	return NULL;

}



static struct mlxsw_sp_fid *mlxsw_sp_fid_get(struct mlxsw_sp *mlxsw_sp,

					     enum mlxsw_sp_fid_type type,

					     const void *arg)

{

	struct mlxsw_sp_fid_family *fid_family;

	struct mlxsw_sp_fid *fid;

	u16 fid_index;

	int err;



	fid = mlxsw_sp_fid_lookup(mlxsw_sp, type, arg);

	if (fid)

		return fid;



	fid_family = mlxsw_sp->fid_core->fid_family_arr[type];

	fid = kzalloc(fid_family->fid_size, GFP_KERNEL);

	if (!fid)

		return ERR_PTR(-ENOMEM);
@@ -784,6 +985,13 @@ 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);

}



struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_lookup(struct mlxsw_sp *mlxsw_sp,

					       int br_ifindex)

{

	return mlxsw_sp_fid_lookup(mlxsw_sp, MLXSW_SP_FID_TYPE_8021D,

				   &br_ifindex);

}



struct mlxsw_sp_fid *mlxsw_sp_fid_rfid_get(struct mlxsw_sp *mlxsw_sp,

					   u16 rif_index)

{
@@ -918,6 +1126,10 @@ int mlxsw_sp_fids_init(struct mlxsw_sp *mlxsw_sp) 
		return -ENOMEM;

	mlxsw_sp->fid_core = fid_core;



	err = rhashtable_init(&fid_core->vni_ht, &mlxsw_sp_fid_vni_ht_params);

	if (err)

		goto err_rhashtable_init;



	fid_core->port_fid_mappings = kcalloc(max_ports, sizeof(unsigned int),

					      GFP_KERNEL);

	if (!fid_core->port_fid_mappings) {
@@ -944,6 +1156,8 @@ int mlxsw_sp_fids_init(struct mlxsw_sp *mlxsw_sp) 
	}

	kfree(fid_core->port_fid_mappings);

err_alloc_port_fid_mappings:

	rhashtable_destroy(&fid_core->vni_ht);

err_rhashtable_init:

	kfree(fid_core);

	return err;

}
@@ -957,5 +1171,6 @@ void mlxsw_sp_fids_fini(struct mlxsw_sp *mlxsw_sp) 
		mlxsw_sp_fid_family_unregister(mlxsw_sp,

					       fid_core->fid_family_arr[i]);

	kfree(fid_core->port_fid_mappings);

	rhashtable_destroy(&fid_core->vni_ht);

	kfree(fid_core);

}

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

0 → 100644
+982 −0

File added.

Preview size limit exceeded, changes collapsed.