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

Commit fd0dd1ab authored by John Hurley's avatar John Hurley Committed by David S. Miller
Browse files

nfp: offload flower vxlan endpoint MAC addresses 



Generate a list of MAC addresses of netdevs that could be used as VXLAN
tunnel end points. Give offloaded MACs an index for storage on the NFP in
the ranges:
0x100-0x1ff physical port representors
0x200-0x2ff VF port representors
0x300-0x3ff other offloads (e.g. vxlan netdevs, ovs bridges)

Assign phys and vf indexes based on unique 8 bit values in the port num.
Maintain list of other netdevs to ensure same netdev is not offloaded
twice and each gets a unique ID without exhausting the entries. Because
the IDs are unique but constant for a netdev, any changes are implemented
by overwriting the index on NFP.

Signed-off-by: default avatarJohn Hurley <john.hurley@netronome.com>
Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b27d6a95

drivers/net/ethernet/netronome/nfp/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ nfp-objs += \ 
	    flower/main.o \

	    flower/match.o \

	    flower/metadata.o \

	    flower/offload.o

	    flower/offload.o \

	    flower/tunnel_conf.o

endif



ifeq ($(CONFIG_BPF_SYSCALL),y)

drivers/net/ethernet/netronome/nfp/flower/cmsg.c

+0 −7
Original line number Diff line number Diff line
@@ -38,17 +38,10 @@ 
#include <net/dst_metadata.h>



#include "main.h"

#include "../nfpcore/nfp_cpp.h"

#include "../nfp_net.h"

#include "../nfp_net_repr.h"

#include "./cmsg.h"



#define nfp_flower_cmsg_warn(app, fmt, args...)				\

	do {								\

		if (net_ratelimit())					\

			nfp_warn((app)->cpp, fmt, ## args);		\

	} while (0)



static struct nfp_flower_cmsg_hdr *

nfp_flower_cmsg_get_hdr(struct sk_buff *skb)

{

drivers/net/ethernet/netronome/nfp/flower/cmsg.h

+9 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/types.h>



#include "../nfp_app.h"

#include "../nfpcore/nfp_cpp.h"



#define NFP_FLOWER_LAYER_META		BIT(0)

#define NFP_FLOWER_LAYER_PORT		BIT(1)
@@ -90,6 +91,12 @@ 
#define NFP_FL_IPV4_TUNNEL_TYPE		GENMASK(7, 4)

#define NFP_FL_IPV4_PRE_TUN_INDEX	GENMASK(2, 0)



#define nfp_flower_cmsg_warn(app, fmt, args...)                         \

	do {                                                            \

		if (net_ratelimit())                                    \

			nfp_warn((app)->cpp, fmt, ## args);             \

	} while (0)



enum nfp_flower_tun_type {

	NFP_FL_TUNNEL_NONE =	0,

	NFP_FL_TUNNEL_VXLAN =	2,
@@ -310,6 +317,7 @@ enum nfp_flower_cmsg_type_port { 
	NFP_FLOWER_CMSG_TYPE_FLOW_DEL =		2,

	NFP_FLOWER_CMSG_TYPE_MAC_REPR =		7,

	NFP_FLOWER_CMSG_TYPE_PORT_MOD =		8,

	NFP_FLOWER_CMSG_TYPE_TUN_MAC =		11,

	NFP_FLOWER_CMSG_TYPE_FLOW_STATS =	15,

	NFP_FLOWER_CMSG_TYPE_PORT_ECHO =	16,

	NFP_FLOWER_CMSG_TYPE_MAX =		32,
@@ -343,6 +351,7 @@ enum nfp_flower_cmsg_port_type { 
	NFP_FLOWER_CMSG_PORT_TYPE_UNSPEC =	0x0,

	NFP_FLOWER_CMSG_PORT_TYPE_PHYS_PORT =	0x1,

	NFP_FLOWER_CMSG_PORT_TYPE_PCIE_PORT =	0x2,

	NFP_FLOWER_CMSG_PORT_TYPE_OTHER_PORT =  0x3,

};



enum nfp_flower_cmsg_port_vnic_type {

drivers/net/ethernet/netronome/nfp/flower/main.c

+13 −0
Original line number Diff line number Diff line
@@ -436,6 +436,16 @@ static void nfp_flower_clean(struct nfp_app *app) 
	app->priv = NULL;

}



static int nfp_flower_start(struct nfp_app *app)

{

	return nfp_tunnel_config_start(app);

}



static void nfp_flower_stop(struct nfp_app *app)

{

	nfp_tunnel_config_stop(app);

}



const struct nfp_app_type app_flower = {

	.id		= NFP_APP_FLOWER_NIC,

	.name		= "flower",
@@ -453,6 +463,9 @@ const struct nfp_app_type app_flower = { 
	.repr_open	= nfp_flower_repr_netdev_open,

	.repr_stop	= nfp_flower_repr_netdev_stop,



	.start		= nfp_flower_start,

	.stop		= nfp_flower_stop,



	.ctrl_msg_rx	= nfp_flower_cmsg_rx,



	.sriov_enable	= nfp_flower_sriov_enable,

drivers/net/ethernet/netronome/nfp/flower/main.h

+18 −0
Original line number Diff line number Diff line
@@ -84,6 +84,13 @@ struct nfp_fl_stats_id { 
 * @flow_table:		Hash table used to store flower rules

 * @cmsg_work:		Workqueue for control messages processing

 * @cmsg_skbs:		List of skbs for control message processing

 * @nfp_mac_off_list:	List of MAC addresses to offload

 * @nfp_mac_index_list:	List of unique 8-bit indexes for non NFP netdevs

 * @nfp_mac_off_lock:	Lock for the MAC address list

 * @nfp_mac_index_lock:	Lock for the MAC index list

 * @nfp_mac_off_ids:	IDA to manage id assignment for offloaded macs

 * @nfp_mac_off_count:	Number of MACs in address list

 * @nfp_tun_mac_nb:	Notifier to monitor link state

 */

struct nfp_flower_priv {

	struct nfp_app *app;
@@ -96,6 +103,13 @@ struct nfp_flower_priv { 
	DECLARE_HASHTABLE(flow_table, NFP_FLOWER_HASH_BITS);

	struct work_struct cmsg_work;

	struct sk_buff_head cmsg_skbs;

	struct list_head nfp_mac_off_list;

	struct list_head nfp_mac_index_list;

	struct mutex nfp_mac_off_lock;

	struct mutex nfp_mac_index_lock;

	struct ida nfp_mac_off_ids;

	int nfp_mac_off_count;

	struct notifier_block nfp_tun_mac_nb;

};



struct nfp_fl_key_ls {
@@ -165,4 +179,8 @@ nfp_flower_remove_fl_table(struct nfp_app *app, unsigned long tc_flower_cookie); 


void nfp_flower_rx_flow_stats(struct nfp_app *app, struct sk_buff *skb);



int nfp_tunnel_config_start(struct nfp_app *app);

void nfp_tunnel_config_stop(struct nfp_app *app);

void nfp_tunnel_write_macs(struct nfp_app *app);



#endif