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

Commit af93d15a authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

nfp: hand over to BPF offload app at coarser granularity 



Instead of having an app callback per message type hand off
all offload-related handling to apps with one "rest of ndo_bpf"
callback.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent e84797fe

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

+1 −4
Original line number Diff line number Diff line
@@ -345,9 +345,6 @@ const struct nfp_app_type app_bpf = { 


	.setup_tc	= nfp_bpf_setup_tc,

	.tc_busy	= nfp_bpf_tc_busy,

	.bpf		= nfp_ndo_bpf,

	.xdp_offload	= nfp_bpf_xdp_offload,



	.bpf_verifier_prep	= nfp_bpf_verifier_prep,

	.bpf_translate		= nfp_bpf_translate,

	.bpf_destroy		= nfp_bpf_destroy,

};

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

+2 −6
Original line number Diff line number Diff line
@@ -256,15 +256,11 @@ struct netdev_bpf; 
struct nfp_app;

struct nfp_net;



int nfp_ndo_bpf(struct nfp_app *app, struct nfp_net *nn,

		struct netdev_bpf *bpf);

int nfp_net_bpf_offload(struct nfp_net *nn, struct bpf_prog *prog,

			bool old_prog);



int nfp_bpf_verifier_prep(struct nfp_app *app, struct nfp_net *nn,

			  struct netdev_bpf *bpf);

int nfp_bpf_translate(struct nfp_app *app, struct nfp_net *nn,

		      struct bpf_prog *prog);

int nfp_bpf_destroy(struct nfp_app *app, struct nfp_net *nn,

		    struct bpf_prog *prog);

struct nfp_insn_meta *

nfp_bpf_goto_meta(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta,

		  unsigned int insn_idx, unsigned int n_insns);

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

+19 −6
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ static void nfp_prog_free(struct nfp_prog *nfp_prog) 
	kfree(nfp_prog);

}



int nfp_bpf_verifier_prep(struct nfp_app *app, struct nfp_net *nn,

static int

nfp_bpf_verifier_prep(struct nfp_app *app, struct nfp_net *nn,

		      struct netdev_bpf *bpf)

{

	struct bpf_prog *prog = bpf->verifier.prog;
@@ -118,8 +119,7 @@ int nfp_bpf_verifier_prep(struct nfp_app *app, struct nfp_net *nn, 
	return ret;

}



int nfp_bpf_translate(struct nfp_app *app, struct nfp_net *nn,

		      struct bpf_prog *prog)

static int nfp_bpf_translate(struct nfp_net *nn, struct bpf_prog *prog)

{

	struct nfp_prog *nfp_prog = prog->aux->offload->dev_priv;

	unsigned int stack_size;
@@ -143,8 +143,7 @@ int nfp_bpf_translate(struct nfp_app *app, struct nfp_net *nn, 
	return nfp_bpf_jit(nfp_prog);

}



int nfp_bpf_destroy(struct nfp_app *app, struct nfp_net *nn,

		    struct bpf_prog *prog)

static int nfp_bpf_destroy(struct nfp_net *nn, struct bpf_prog *prog)

{

	struct nfp_prog *nfp_prog = prog->aux->offload->dev_priv;
@@ -154,6 +153,20 @@ int nfp_bpf_destroy(struct nfp_app *app, struct nfp_net *nn, 
	return 0;

}



int nfp_ndo_bpf(struct nfp_app *app, struct nfp_net *nn, struct netdev_bpf *bpf)

{

	switch (bpf->command) {

	case BPF_OFFLOAD_VERIFIER_PREP:

		return nfp_bpf_verifier_prep(app, nn, bpf);

	case BPF_OFFLOAD_TRANSLATE:

		return nfp_bpf_translate(nn, bpf->offload.prog);

	case BPF_OFFLOAD_DESTROY:

		return nfp_bpf_destroy(nn, bpf->offload.prog);

	default:

		return -EINVAL;

	}

}



static int nfp_net_bpf_load(struct nfp_net *nn, struct bpf_prog *prog)

{

	struct nfp_prog *nfp_prog = prog->aux->offload->dev_priv;

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

+11 −36
Original line number Diff line number Diff line
@@ -89,10 +89,8 @@ extern const struct nfp_app_type app_flower; 
 * @ctrl_msg_rx:    control message handler

 * @setup_tc:	setup TC ndo

 * @tc_busy:	TC HW offload busy (rules loaded)

 * @bpf:	BPF ndo offload-related calls

 * @xdp_offload:    offload an XDP program

 * @bpf_verifier_prep:	verifier prep for dev-specific BPF programs

 * @bpf_translate:	translate call for dev-specific BPF programs

 * @bpf_destroy:	destroy for dev-specific BPF programs

 * @eswitch_mode_get:    get SR-IOV eswitch mode

 * @sriov_enable: app-specific sriov initialisation

 * @sriov_disable: app-specific sriov clean-up
@@ -133,14 +131,10 @@ struct nfp_app_type { 
	int (*setup_tc)(struct nfp_app *app, struct net_device *netdev,

			enum tc_setup_type type, void *type_data);

	bool (*tc_busy)(struct nfp_app *app, struct nfp_net *nn);

	int (*bpf)(struct nfp_app *app, struct nfp_net *nn,

		   struct netdev_bpf *xdp);

	int (*xdp_offload)(struct nfp_app *app, struct nfp_net *nn,

			   struct bpf_prog *prog);

	int (*bpf_verifier_prep)(struct nfp_app *app, struct nfp_net *nn,

				 struct netdev_bpf *bpf);

	int (*bpf_translate)(struct nfp_app *app, struct nfp_net *nn,

			     struct bpf_prog *prog);

	int (*bpf_destroy)(struct nfp_app *app, struct nfp_net *nn,

			   struct bpf_prog *prog);



	int (*sriov_enable)(struct nfp_app *app, int num_vfs);

	void (*sriov_disable)(struct nfp_app *app);
@@ -316,39 +310,20 @@ static inline int nfp_app_setup_tc(struct nfp_app *app, 
	return app->type->setup_tc(app, netdev, type, type_data);

}



static inline int nfp_app_xdp_offload(struct nfp_app *app, struct nfp_net *nn,

				      struct bpf_prog *prog)

{

	if (!app || !app->type->xdp_offload)

		return -EOPNOTSUPP;

	return app->type->xdp_offload(app, nn, prog);

}



static inline int

nfp_app_bpf_verifier_prep(struct nfp_app *app, struct nfp_net *nn,

static inline int nfp_app_bpf(struct nfp_app *app, struct nfp_net *nn,

			      struct netdev_bpf *bpf)

{

	if (!app || !app->type->bpf_verifier_prep)

		return -EOPNOTSUPP;

	return app->type->bpf_verifier_prep(app, nn, bpf);

}



static inline int

nfp_app_bpf_translate(struct nfp_app *app, struct nfp_net *nn,

		      struct bpf_prog *prog)

{

	if (!app || !app->type->bpf_translate)

		return -EOPNOTSUPP;

	return app->type->bpf_translate(app, nn, prog);

	if (!app || !app->type->bpf)

		return -EINVAL;

	return app->type->bpf(app, nn, bpf);

}



static inline int

nfp_app_bpf_destroy(struct nfp_app *app, struct nfp_net *nn,

static inline int nfp_app_xdp_offload(struct nfp_app *app, struct nfp_net *nn,

				      struct bpf_prog *prog)

{

	if (!app || !app->type->bpf_destroy)

	if (!app || !app->type->xdp_offload)

		return -EOPNOTSUPP;

	return app->type->bpf_destroy(app, nn, prog);

	return app->type->xdp_offload(app, nn, prog);

}



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

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+1 −9
Original line number Diff line number Diff line
@@ -3414,16 +3414,8 @@ static int nfp_net_xdp(struct net_device *netdev, struct netdev_bpf *xdp) 
		xdp->prog_id = nn->xdp_prog ? nn->xdp_prog->aux->id : 0;

		xdp->prog_flags = nn->xdp_prog ? nn->xdp_flags : 0;

		return 0;

	case BPF_OFFLOAD_VERIFIER_PREP:

		return nfp_app_bpf_verifier_prep(nn->app, nn, xdp);

	case BPF_OFFLOAD_TRANSLATE:

		return nfp_app_bpf_translate(nn->app, nn,

					     xdp->offload.prog);

	case BPF_OFFLOAD_DESTROY:

		return nfp_app_bpf_destroy(nn->app, nn,

					   xdp->offload.prog);

	default:

		return -EINVAL;

		return nfp_app_bpf(nn->app, nn, xdp);

	}

}