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

Merge branch 'nfp-bpf-ABIv2-and-multi-port' 



Jakub Kicinski says:

====================
nfp: bpf ABIv2 and multi port

This series migrates our eBPF offload from old PoC firmware to
a redesigned, faster and more feature rich FW.  Marking support
is dropped for now.  We have to teach the JIT about encoding
local memory accesses (one of NFP memory types).  There is also
code to populate the ECC of instructions (PoC had ECC protection
on instruction store disabled).  There is also a minor ld_field
fix and all 64 bit shifts can now be encoded.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1c3dc891 2de1be1d

drivers/net/ethernet/netronome/nfp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ nfp-objs := \ 
	    nfpcore/nfp_resource.o \

	    nfpcore/nfp_rtsym.o \

	    nfpcore/nfp_target.o \

	    nfp_asm.o \

	    nfp_app.o \

	    nfp_app_nic.o \

	    nfp_devlink.o \

drivers/net/ethernet/netronome/nfp/bpf/jit.c

+145 −258

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −8
Original line number Diff line number Diff line
@@ -89,14 +89,6 @@ nfp_bpf_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, unsigned int id) 
	struct nfp_net_bpf_priv *priv;

	int ret;



	/* Limit to single port, otherwise it's just a NIC */

	if (id > 0) {

		nfp_warn(app->cpp,

			 "BPF NIC doesn't support more than one port right now\n");

		nn->port = nfp_port_alloc(app, NFP_PORT_INVALID, nn->dp.netdev);

		return PTR_ERR_OR_ZERO(nn->port);

	}



	priv = kmalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;

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

+16 −33
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/list.h>

#include <linux/types.h>



#include "../nfp_asm.h"

#include "../nfp_net.h"



/* For branch fixup logic use up-most byte of branch instruction as scratch
@@ -53,9 +54,13 @@ enum br_special { 
};



enum static_regs {

	STATIC_REG_PKT		= 1,

#define REG_PKT_BANK	ALU_DST_A

	STATIC_REG_IMM		= 2, /* Bank AB */

	STATIC_REG_IMM		= 21, /* Bank AB */

	STATIC_REG_PKT_LEN	= 22, /* Bank B */

};



enum pkt_vec {

	PKT_VEC_PKT_LEN		= 0,

	PKT_VEC_PKT_PTR		= 2,

};



enum nfp_bpf_action_type {
@@ -65,39 +70,17 @@ enum nfp_bpf_action_type { 
	NN_ACT_XDP,

};



/* Software register representation, hardware encoding in asm.h */

#define NN_REG_TYPE	GENMASK(31, 24)

#define NN_REG_VAL	GENMASK(7, 0)



enum nfp_bpf_reg_type {

	NN_REG_GPR_A =	BIT(0),

	NN_REG_GPR_B =	BIT(1),

	NN_REG_NNR =	BIT(2),

	NN_REG_XFER =	BIT(3),

	NN_REG_IMM =	BIT(4),

	NN_REG_NONE =	BIT(5),

};



#define NN_REG_GPR_BOTH	(NN_REG_GPR_A | NN_REG_GPR_B)



#define reg_both(x)	((x) | FIELD_PREP(NN_REG_TYPE, NN_REG_GPR_BOTH))

#define reg_a(x)	((x) | FIELD_PREP(NN_REG_TYPE, NN_REG_GPR_A))

#define reg_b(x)	((x) | FIELD_PREP(NN_REG_TYPE, NN_REG_GPR_B))

#define reg_nnr(x)	((x) | FIELD_PREP(NN_REG_TYPE, NN_REG_NNR))

#define reg_xfer(x)	((x) | FIELD_PREP(NN_REG_TYPE, NN_REG_XFER))

#define reg_imm(x)	((x) | FIELD_PREP(NN_REG_TYPE, NN_REG_IMM))

#define reg_none()	(FIELD_PREP(NN_REG_TYPE, NN_REG_NONE))

#define pv_len(np)	reg_lm(1, PKT_VEC_PKT_LEN)

#define pv_ctm_ptr(np)	reg_lm(1, PKT_VEC_PKT_PTR)



#define pkt_reg(np)	reg_a((np)->regs_per_thread - STATIC_REG_PKT)

#define imm_a(np)	reg_a((np)->regs_per_thread - STATIC_REG_IMM)

#define imm_b(np)	reg_b((np)->regs_per_thread - STATIC_REG_IMM)

#define imm_both(np)	reg_both((np)->regs_per_thread - STATIC_REG_IMM)

#define plen_reg(np)	reg_b(STATIC_REG_PKT_LEN)

#define pptr_reg(np)	pv_ctm_ptr(np)

#define imm_a(np)	reg_a(STATIC_REG_IMM)

#define imm_b(np)	reg_b(STATIC_REG_IMM)

#define imm_both(np)	reg_both(STATIC_REG_IMM)



#define NFP_BPF_ABI_FLAGS	reg_nnr(0)

#define NFP_BPF_ABI_FLAGS	reg_imm(0)

#define   NFP_BPF_ABI_FLAG_MARK	1

#define NFP_BPF_ABI_MARK	reg_nnr(1)

#define NFP_BPF_ABI_PKT		reg_nnr(2)

#define NFP_BPF_ABI_LEN		reg_nnr(3)



struct nfp_prog;

struct nfp_insn_meta;

drivers/net/ethernet/netronome/nfp/nfp_app.h

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 


#include <net/devlink.h>



#include <trace/events/devlink.h>



#include "nfp_net_repr.h"



struct bpf_prog;
@@ -271,11 +273,17 @@ static inline int nfp_app_xdp_offload(struct nfp_app *app, struct nfp_net *nn, 


static inline bool nfp_app_ctrl_tx(struct nfp_app *app, struct sk_buff *skb)

{

	trace_devlink_hwmsg(priv_to_devlink(app->pf), false, 0,

			    skb->data, skb->len);



	return nfp_ctrl_tx(app->ctrl, skb);

}



static inline void nfp_app_ctrl_rx(struct nfp_app *app, struct sk_buff *skb)

{

	trace_devlink_hwmsg(priv_to_devlink(app->pf), true, 0,

			    skb->data, skb->len);



	app->type->ctrl_msg_rx(app, skb);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE