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

Commit c1c88eae authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: bpf: move program prepare and free into offload.c 



Most of offload/translation prepare logic will be moved to
offload.c.  To help git generate more reasonable diffs
move nfp_prog_prepare() and nfp_prog_free() functions
there as a first step.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4a91cd5

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

+0 −33
Original line number Original line Diff line number Diff line
@@ -77,17 +77,6 @@ nfp_meta_has_prev(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 
	return meta->l.prev != &nfp_prog->insns;

	return meta->l.prev != &nfp_prog->insns;

}

}





static void nfp_prog_free(struct nfp_prog *nfp_prog)

{

	struct nfp_insn_meta *meta, *tmp;



	list_for_each_entry_safe(meta, tmp, &nfp_prog->insns, l) {

		list_del(&meta->l);

		kfree(meta);

	}

	kfree(nfp_prog);

}



static void nfp_prog_push(struct nfp_prog *nfp_prog, u64 insn)

static void nfp_prog_push(struct nfp_prog *nfp_prog, u64 insn)

{

{

	if (nfp_prog->__prog_alloc_len == nfp_prog->prog_len) {

	if (nfp_prog->__prog_alloc_len == nfp_prog->prog_len) {
@@ -2127,28 +2116,6 @@ static int nfp_translate(struct nfp_prog *nfp_prog) 
	return nfp_fixup_branches(nfp_prog);

	return nfp_fixup_branches(nfp_prog);

}

}





static int

nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog,

		 unsigned int cnt)

{

	unsigned int i;



	for (i = 0; i < cnt; i++) {

		struct nfp_insn_meta *meta;



		meta = kzalloc(sizeof(*meta), GFP_KERNEL);

		if (!meta)

			return -ENOMEM;



		meta->insn = prog[i];

		meta->n = i;



		list_add_tail(&meta->l, &nfp_prog->insns);

	}



	return 0;

}



/* --- Optimizations --- */

/* --- Optimizations --- */

static void nfp_bpf_opt_reg_init(struct nfp_prog *nfp_prog)

static void nfp_bpf_opt_reg_init(struct nfp_prog *nfp_prog)

{

{

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,11 @@ struct nfp_bpf_result { 
	unsigned int n_instr;

	unsigned int n_instr;

};

};





int

nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog,

		 unsigned int cnt);

void nfp_prog_free(struct nfp_prog *nfp_prog);



int

int

nfp_bpf_jit(struct bpf_prog *filter, void *prog,

nfp_bpf_jit(struct bpf_prog *filter, void *prog,

	    unsigned int prog_start, unsigned int prog_done,

	    unsigned int prog_start, unsigned int prog_done,

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

+33 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,39 @@ 
#include "../nfp_net_ctrl.h"

#include "../nfp_net_ctrl.h"

#include "../nfp_net.h"

#include "../nfp_net.h"





int

nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog,

		 unsigned int cnt)

{

	unsigned int i;



	for (i = 0; i < cnt; i++) {

		struct nfp_insn_meta *meta;



		meta = kzalloc(sizeof(*meta), GFP_KERNEL);

		if (!meta)

			return -ENOMEM;



		meta->insn = prog[i];

		meta->n = i;



		list_add_tail(&meta->l, &nfp_prog->insns);

	}



	return 0;

}



void nfp_prog_free(struct nfp_prog *nfp_prog)

{

	struct nfp_insn_meta *meta, *tmp;



	list_for_each_entry_safe(meta, tmp, &nfp_prog->insns, l) {

		list_del(&meta->l);

		kfree(meta);

	}

	kfree(nfp_prog);

}



static int

static int

nfp_net_bpf_offload_prepare(struct nfp_net *nn, struct bpf_prog *prog,

nfp_net_bpf_offload_prepare(struct nfp_net *nn, struct bpf_prog *prog,

			    struct nfp_bpf_result *res,

			    struct nfp_bpf_result *res,