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

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

Merge branch 'nfp-introduce-flower-offload-capabilities' 



Simon Horman says:

====================
nfp: introduce flower offload capabilities

this series adds flower offload to the NFP driver. It builds on recent
work to add representor and a skeleton flower app - now the app does what
its name says.

In general the approach taken is to allow some flows within
the universe of possible flower matches and tc actions to be offloaded.
It is planned that this support will grow over time but the support
offered by this patch-set seems to be a reasonable starting point.

Key Changes since v2:
* Revised flow structures to simplify setup/teardown and locking of stats
* Addressed other code-change review of v2

Other review questions regarding v2 have been answered on netdev.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7f304b9e 81f3ddf2

drivers/net/ethernet/netronome/nfp/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -31,8 +31,12 @@ nfp-objs := \ 


ifeq ($(CONFIG_NFP_APP_FLOWER),y)

nfp-objs += \

	    flower/action.o \

	    flower/cmsg.o \

	    flower/main.o

	    flower/main.o \

	    flower/match.o \

	    flower/metadata.o \

	    flower/offload.o

endif



ifeq ($(CONFIG_BPF_SYSCALL),y)

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

0 → 100644
+211 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Netronome Systems, Inc.

 *

 * This software is dual licensed under the GNU General License Version 2,

 * June 1991 as shown in the file COPYING in the top-level directory of this

 * source tree or the BSD 2-Clause License provided below.  You have the

 * option to license this software under the complete terms of either license.

 *

 * The BSD 2-Clause License:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      1. Redistributions of source code must retain the above

 *         copyright notice, this list of conditions and the following

 *         disclaimer.

 *

 *      2. Redistributions in binary form must reproduce the above

 *         copyright notice, this list of conditions and the following

 *         disclaimer in the documentation and/or other materials

 *         provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#include <linux/bitfield.h>

#include <net/pkt_cls.h>

#include <net/switchdev.h>

#include <net/tc_act/tc_gact.h>

#include <net/tc_act/tc_mirred.h>

#include <net/tc_act/tc_vlan.h>



#include "cmsg.h"

#include "main.h"

#include "../nfp_net_repr.h"



static void nfp_fl_pop_vlan(struct nfp_fl_pop_vlan *pop_vlan)

{

	size_t act_size = sizeof(struct nfp_fl_pop_vlan);

	u16 tmp_pop_vlan_op;



	tmp_pop_vlan_op =

		FIELD_PREP(NFP_FL_ACT_LEN_LW, act_size >> NFP_FL_LW_SIZ) |

		FIELD_PREP(NFP_FL_ACT_JMP_ID, NFP_FL_ACTION_OPCODE_POP_VLAN);



	pop_vlan->a_op = cpu_to_be16(tmp_pop_vlan_op);

	pop_vlan->reserved = 0;

}



static void

nfp_fl_push_vlan(struct nfp_fl_push_vlan *push_vlan,

		 const struct tc_action *action)

{

	size_t act_size = sizeof(struct nfp_fl_push_vlan);

	struct tcf_vlan *vlan = to_vlan(action);

	u16 tmp_push_vlan_tci;

	u16 tmp_push_vlan_op;



	tmp_push_vlan_op =

		FIELD_PREP(NFP_FL_ACT_LEN_LW, act_size >> NFP_FL_LW_SIZ) |

		FIELD_PREP(NFP_FL_ACT_JMP_ID, NFP_FL_ACTION_OPCODE_PUSH_VLAN);



	push_vlan->a_op = cpu_to_be16(tmp_push_vlan_op);

	/* Set action push vlan parameters. */

	push_vlan->reserved = 0;

	push_vlan->vlan_tpid = tcf_vlan_push_proto(action);



	tmp_push_vlan_tci =

		FIELD_PREP(NFP_FL_PUSH_VLAN_PRIO, vlan->tcfv_push_prio) |

		FIELD_PREP(NFP_FL_PUSH_VLAN_VID, vlan->tcfv_push_vid) |

		NFP_FL_PUSH_VLAN_CFI;

	push_vlan->vlan_tci = cpu_to_be16(tmp_push_vlan_tci);

}



static int

nfp_fl_output(struct nfp_fl_output *output, const struct tc_action *action,

	      struct nfp_fl_payload *nfp_flow, bool last,

	      struct net_device *in_dev)

{

	size_t act_size = sizeof(struct nfp_fl_output);

	struct net_device *out_dev;

	u16 tmp_output_op;

	int ifindex;



	/* Set action opcode to output action. */

	tmp_output_op =

		FIELD_PREP(NFP_FL_ACT_LEN_LW, act_size >> NFP_FL_LW_SIZ) |

		FIELD_PREP(NFP_FL_ACT_JMP_ID, NFP_FL_ACTION_OPCODE_OUTPUT);



	output->a_op = cpu_to_be16(tmp_output_op);



	/* Set action output parameters. */

	output->flags = cpu_to_be16(last ? NFP_FL_OUT_FLAGS_LAST : 0);



	ifindex = tcf_mirred_ifindex(action);

	out_dev = __dev_get_by_index(dev_net(in_dev), ifindex);

	if (!out_dev)

		return -EOPNOTSUPP;



	/* Only offload egress ports are on the same device as the ingress

	 * port.

	 */

	if (!switchdev_port_same_parent_id(in_dev, out_dev))

		return -EOPNOTSUPP;



	output->port = cpu_to_be32(nfp_repr_get_port_id(out_dev));

	if (!output->port)

		return -EOPNOTSUPP;



	nfp_flow->meta.shortcut = output->port;



	return 0;

}



static int

nfp_flower_loop_action(const struct tc_action *a,

		       struct nfp_fl_payload *nfp_fl, int *a_len,

		       struct net_device *netdev)

{

	struct nfp_fl_push_vlan *psh_v;

	struct nfp_fl_pop_vlan *pop_v;

	struct nfp_fl_output *output;

	int err;



	if (is_tcf_gact_shot(a)) {

		nfp_fl->meta.shortcut = cpu_to_be32(NFP_FL_SC_ACT_DROP);

	} else if (is_tcf_mirred_egress_redirect(a)) {

		if (*a_len + sizeof(struct nfp_fl_output) > NFP_FL_MAX_A_SIZ)

			return -EOPNOTSUPP;



		output = (struct nfp_fl_output *)&nfp_fl->action_data[*a_len];

		err = nfp_fl_output(output, a, nfp_fl, true, netdev);

		if (err)

			return err;



		*a_len += sizeof(struct nfp_fl_output);

	} else if (is_tcf_mirred_egress_mirror(a)) {

		if (*a_len + sizeof(struct nfp_fl_output) > NFP_FL_MAX_A_SIZ)

			return -EOPNOTSUPP;



		output = (struct nfp_fl_output *)&nfp_fl->action_data[*a_len];

		err = nfp_fl_output(output, a, nfp_fl, false, netdev);

		if (err)

			return err;



		*a_len += sizeof(struct nfp_fl_output);

	} else if (is_tcf_vlan(a) && tcf_vlan_action(a) == TCA_VLAN_ACT_POP) {

		if (*a_len + sizeof(struct nfp_fl_pop_vlan) > NFP_FL_MAX_A_SIZ)

			return -EOPNOTSUPP;



		pop_v = (struct nfp_fl_pop_vlan *)&nfp_fl->action_data[*a_len];

		nfp_fl->meta.shortcut = cpu_to_be32(NFP_FL_SC_ACT_POPV);



		nfp_fl_pop_vlan(pop_v);

		*a_len += sizeof(struct nfp_fl_pop_vlan);

	} else if (is_tcf_vlan(a) && tcf_vlan_action(a) == TCA_VLAN_ACT_PUSH) {

		if (*a_len + sizeof(struct nfp_fl_push_vlan) > NFP_FL_MAX_A_SIZ)

			return -EOPNOTSUPP;



		psh_v = (struct nfp_fl_push_vlan *)&nfp_fl->action_data[*a_len];

		nfp_fl->meta.shortcut = cpu_to_be32(NFP_FL_SC_ACT_NULL);



		nfp_fl_push_vlan(psh_v, a);

		*a_len += sizeof(struct nfp_fl_push_vlan);

	} else {

		/* Currently we do not handle any other actions. */

		return -EOPNOTSUPP;

	}



	return 0;

}



int nfp_flower_compile_action(struct tc_cls_flower_offload *flow,

			      struct net_device *netdev,

			      struct nfp_fl_payload *nfp_flow)

{

	int act_len, act_cnt, err;

	const struct tc_action *a;

	LIST_HEAD(actions);



	memset(nfp_flow->action_data, 0, NFP_FL_MAX_A_SIZ);

	nfp_flow->meta.act_len = 0;

	act_len = 0;

	act_cnt = 0;



	tcf_exts_to_list(flow->exts, &actions);

	list_for_each_entry(a, &actions, list) {

		err = nfp_flower_loop_action(a, nfp_flow, &act_len, netdev);

		if (err)

			return err;

		act_cnt++;

	}



	/* We optimise when the action list is small, this can unfortunately

	 * not happen once we have more than one action in the action list.

	 */

	if (act_cnt > 1)

		nfp_flow->meta.shortcut = cpu_to_be32(NFP_FL_SC_ACT_NULL);



	nfp_flow->meta.act_len = act_len;



	return 0;

}

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

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

#include <net/dst_metadata.h>



#include "main.h"

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

#include "../nfp_net_repr.h"

#include "./cmsg.h"
@@ -52,12 +53,7 @@ nfp_flower_cmsg_get_hdr(struct sk_buff *skb) 
	return (struct nfp_flower_cmsg_hdr *)skb->data;

}



static void *nfp_flower_cmsg_get_data(struct sk_buff *skb)

{

	return (unsigned char *)skb->data + NFP_FLOWER_CMSG_HLEN;

}



static struct sk_buff *

struct sk_buff *

nfp_flower_cmsg_alloc(struct nfp_app *app, unsigned int size,

		      enum nfp_flower_cmsg_type_port type)

{
@@ -148,6 +144,9 @@ void nfp_flower_cmsg_rx(struct nfp_app *app, struct sk_buff *skb) 
	case NFP_FLOWER_CMSG_TYPE_PORT_MOD:

		nfp_flower_cmsg_portmod_rx(app, skb);

		break;

	case NFP_FLOWER_CMSG_TYPE_FLOW_STATS:

		nfp_flower_rx_flow_stats(app, skb);

		break;

	default:

		nfp_flower_cmsg_warn(app, "Cannot handle invalid repr control type %u\n",

				     type);

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

+201 −0
Original line number Diff line number Diff line
@@ -40,6 +40,196 @@ 


#include "../nfp_app.h"



#define NFP_FLOWER_LAYER_META		BIT(0)

#define NFP_FLOWER_LAYER_PORT		BIT(1)

#define NFP_FLOWER_LAYER_MAC		BIT(2)

#define NFP_FLOWER_LAYER_TP		BIT(3)

#define NFP_FLOWER_LAYER_IPV4		BIT(4)

#define NFP_FLOWER_LAYER_IPV6		BIT(5)

#define NFP_FLOWER_LAYER_CT		BIT(6)

#define NFP_FLOWER_LAYER_VXLAN		BIT(7)



#define NFP_FLOWER_LAYER_ETHER		BIT(3)

#define NFP_FLOWER_LAYER_ARP		BIT(4)



#define NFP_FLOWER_MASK_VLAN_PRIO	GENMASK(15, 13)

#define NFP_FLOWER_MASK_VLAN_CFI	BIT(12)

#define NFP_FLOWER_MASK_VLAN_VID	GENMASK(11, 0)



#define NFP_FL_SC_ACT_DROP		0x80000000

#define NFP_FL_SC_ACT_USER		0x7D000000

#define NFP_FL_SC_ACT_POPV		0x6A000000

#define NFP_FL_SC_ACT_NULL		0x00000000



/* The maximum action list size (in bytes) supported by the NFP.

 */

#define NFP_FL_MAX_A_SIZ		1216

#define NFP_FL_LW_SIZ			2



/* Action opcodes */

#define NFP_FL_ACTION_OPCODE_OUTPUT	0

#define NFP_FL_ACTION_OPCODE_PUSH_VLAN	1

#define NFP_FL_ACTION_OPCODE_POP_VLAN	2

#define NFP_FL_ACTION_OPCODE_NUM	32



#define NFP_FL_ACT_JMP_ID		GENMASK(15, 8)

#define NFP_FL_ACT_LEN_LW		GENMASK(7, 0)



#define NFP_FL_OUT_FLAGS_LAST		BIT(15)

#define NFP_FL_OUT_FLAGS_USE_TUN	BIT(4)

#define NFP_FL_OUT_FLAGS_TYPE_IDX	GENMASK(2, 0)



#define NFP_FL_PUSH_VLAN_PRIO		GENMASK(15, 13)

#define NFP_FL_PUSH_VLAN_CFI		BIT(12)

#define NFP_FL_PUSH_VLAN_VID		GENMASK(11, 0)



struct nfp_fl_output {

	__be16 a_op;

	__be16 flags;

	__be32 port;

};



struct nfp_fl_push_vlan {

	__be16 a_op;

	__be16 reserved;

	__be16 vlan_tpid;

	__be16 vlan_tci;

};



struct nfp_fl_pop_vlan {

	__be16 a_op;

	__be16 reserved;

};



/* Metadata without L2 (1W/4B)

 * ----------------------------------------------------------------

 *    3                   2                   1

 *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |  key_layers   |    mask_id    |           reserved            |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 */

struct nfp_flower_meta_one {

	u8 nfp_flow_key_layer;

	u8 mask_id;

	u16 reserved;

};



/* Metadata with L2 (1W/4B)

 * ----------------------------------------------------------------

 *    3                   2                   1

 *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |    key_type   |    mask_id    | PCP |p|   vlan outermost VID  |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *                                 ^                               ^

 *                           NOTE: |             TCI               |

 *                                 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 */

struct nfp_flower_meta_two {

	u8 nfp_flow_key_layer;

	u8 mask_id;

	__be16 tci;

};



/* Port details (1W/4B)

 * ----------------------------------------------------------------

 *    3                   2                   1

 *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                         port_ingress                          |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 */

struct nfp_flower_in_port {

	__be32 in_port;

};



/* L2 details (4W/16B)

 *    3                   2                   1

 *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                     mac_addr_dst, 31 - 0                      |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |      mac_addr_dst, 47 - 32    |     mac_addr_src, 15 - 0      |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                     mac_addr_src, 47 - 16                     |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |       mpls outermost label            |  TC |B|   reserved  |q|

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 */

struct nfp_flower_mac_mpls {

	u8 mac_dst[6];

	u8 mac_src[6];

	__be32 mpls_lse;

};



/* L4 ports (for UDP, TCP, SCTP) (1W/4B)

 *    3                   2                   1

 *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |            port_src           |           port_dst            |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 */

struct nfp_flower_tp_ports {

	__be16 port_src;

	__be16 port_dst;

};



/* L3 IPv4 details (3W/12B)

 *    3                   2                   1

 *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |    DSCP   |ECN|   protocol    |           reserved            |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                        ipv4_addr_src                          |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                        ipv4_addr_dst                          |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 */

struct nfp_flower_ipv4 {

	u8 tos;

	u8 proto;

	u8 ttl;

	u8 reserved;

	__be32 ipv4_src;

	__be32 ipv4_dst;

};



/* L3 IPv6 details (10W/40B)

 *    3                   2                   1

 *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |    DSCP   |ECN|   protocol    |          reserved             |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |   ipv6_exthdr   | res |            ipv6_flow_label            |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                  ipv6_addr_src,   31 - 0                      |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                  ipv6_addr_src,  63 - 32                      |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                  ipv6_addr_src,  95 - 64                      |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                  ipv6_addr_src, 127 - 96                      |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                  ipv6_addr_dst,   31 - 0                      |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                  ipv6_addr_dst,  63 - 32                      |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                  ipv6_addr_dst,  95 - 64                      |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 * |                  ipv6_addr_dst, 127 - 96                      |

 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 */

struct nfp_flower_ipv6 {

	u8 tos;

	u8 proto;

	u8 ttl;

	u8 reserved;

	__be32 ipv6_flow_label_exthdr;

	struct in6_addr ipv6_src;

	struct in6_addr ipv6_dst;

};



/* The base header for a control message packet.

 * Defines an 8-bit version, and an 8-bit type, padded

 * to a 32-bit word. Rest of the packet is type-specific.
@@ -55,7 +245,10 @@ struct nfp_flower_cmsg_hdr { 


/* Types defined for port related control messages  */

enum nfp_flower_cmsg_type_port {

	NFP_FLOWER_CMSG_TYPE_FLOW_ADD =		0,

	NFP_FLOWER_CMSG_TYPE_FLOW_DEL =		2,

	NFP_FLOWER_CMSG_TYPE_PORT_MOD =		8,

	NFP_FLOWER_CMSG_TYPE_FLOW_STATS =	15,

	NFP_FLOWER_CMSG_TYPE_PORT_ECHO =	16,

	NFP_FLOWER_CMSG_TYPE_MAX =		32,

};
@@ -110,7 +303,15 @@ nfp_flower_cmsg_pcie_port(u8 nfp_pcie, enum nfp_flower_cmsg_port_vnic_type type, 
			   NFP_FLOWER_CMSG_PORT_TYPE_PCIE_PORT);

}



static inline void *nfp_flower_cmsg_get_data(struct sk_buff *skb)

{

	return (unsigned char *)skb->data + NFP_FLOWER_CMSG_HLEN;

}



int nfp_flower_cmsg_portmod(struct nfp_repr *repr, bool carrier_ok);

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

struct sk_buff *

nfp_flower_cmsg_alloc(struct nfp_app *app, unsigned int size,

		      enum nfp_flower_cmsg_type_port type);



#endif

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

+30 −9
Original line number Diff line number Diff line
@@ -34,10 +34,13 @@ 
#include <linux/etherdevice.h>

#include <linux/pci.h>

#include <linux/skbuff.h>

#include <linux/vmalloc.h>

#include <net/devlink.h>

#include <net/dst_metadata.h>



#include "main.h"

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

#include "../nfpcore/nfp_nffw.h"

#include "../nfpcore/nfp_nsp.h"

#include "../nfp_app.h"

#include "../nfp_main.h"
@@ -46,13 +49,7 @@ 
#include "../nfp_port.h"

#include "./cmsg.h"



/**

 * struct nfp_flower_priv - Flower APP per-vNIC priv data

 * @nn:		     Pointer to vNIC

 */

struct nfp_flower_priv {

	struct nfp_net *nn;

};

#define NFP_FLOWER_ALLOWED_VER 0x0001000000010000UL



static const char *nfp_flower_extra_cap(struct nfp_app *app, struct nfp_net *nn)

{
@@ -313,6 +310,8 @@ static int nfp_flower_vnic_init(struct nfp_app *app, struct nfp_net *nn, 
static int nfp_flower_init(struct nfp_app *app)

{

	const struct nfp_pf *pf = app->pf;

	u64 version;

	int err;



	if (!pf->eth_tbl) {

		nfp_warn(app->cpp, "FlowerNIC requires eth table\n");
@@ -329,16 +328,36 @@ static int nfp_flower_init(struct nfp_app *app) 
		return -EINVAL;

	}



	app->priv = kzalloc(sizeof(struct nfp_flower_priv), GFP_KERNEL);

	version = nfp_rtsym_read_le(app->pf->rtbl, "hw_flower_version", &err);

	if (err) {

		nfp_warn(app->cpp, "FlowerNIC requires hw_flower_version memory symbol\n");

		return err;

	}



	/* We need to ensure hardware has enough flower capabilities. */

	if (version != NFP_FLOWER_ALLOWED_VER) {

		nfp_warn(app->cpp, "FlowerNIC: unsupported firmware version\n");

		return -EINVAL;

	}



	app->priv = vzalloc(sizeof(struct nfp_flower_priv));

	if (!app->priv)

		return -ENOMEM;



	err = nfp_flower_metadata_init(app);

	if (err)

		goto err_free_app_priv;



	return 0;



err_free_app_priv:

	vfree(app->priv);

	return err;

}



static void nfp_flower_clean(struct nfp_app *app)

{

	kfree(app->priv);

	vfree(app->priv);

	app->priv = NULL;

}
@@ -367,4 +386,6 @@ const struct nfp_app_type app_flower = { 


	.eswitch_mode_get  = eswitch_mode_get,

	.repr_get	= nfp_flower_repr_get,



	.setup_tc	= nfp_flower_setup_tc,

};