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

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

nfp: bpf: move jump resolution to jit.c 



Jump target resolution should be in jit.c not offload.c.
No functional changes.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarJiong Wang <jiong.wang@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent a0f30c97

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

+23 −0
Original line number Diff line number Diff line
@@ -2742,3 +2742,26 @@ int nfp_bpf_jit(struct nfp_prog *nfp_prog) 


	return nfp_bpf_ustore_calc(nfp_prog, (__force __le64 *)nfp_prog->prog);

}



void nfp_bpf_jit_prepare(struct nfp_prog *nfp_prog, unsigned int cnt)

{

	struct nfp_insn_meta *meta;



	/* Another pass to record jump information. */

	list_for_each_entry(meta, &nfp_prog->insns, l) {

		u64 code = meta->insn.code;



		if (BPF_CLASS(code) == BPF_JMP && BPF_OP(code) != BPF_EXIT &&

		    BPF_OP(code) != BPF_CALL) {

			struct nfp_insn_meta *dst_meta;

			unsigned short dst_indx;



			dst_indx = meta->n + 1 + meta->insn.off;

			dst_meta = nfp_bpf_goto_meta(nfp_prog, meta, dst_indx,

						     cnt);



			meta->jmp_dst = dst_meta;

			dst_meta->flags |= FLAG_INSN_IS_JUMP_DST;

		}

	}

}

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

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ struct nfp_bpf_vnic { 
	struct bpf_prog *tc_prog;

};



void nfp_bpf_jit_prepare(struct nfp_prog *nfp_prog, unsigned int cnt);

int nfp_bpf_jit(struct nfp_prog *prog);



extern const struct bpf_prog_offload_ops nfp_bpf_analyzer_ops;

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

+1 −17
Original line number Diff line number Diff line
@@ -70,23 +70,7 @@ nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog, 
		list_add_tail(&meta->l, &nfp_prog->insns);

	}



	/* Another pass to record jump information. */

	list_for_each_entry(meta, &nfp_prog->insns, l) {

		u64 code = meta->insn.code;



		if (BPF_CLASS(code) == BPF_JMP && BPF_OP(code) != BPF_EXIT &&

		    BPF_OP(code) != BPF_CALL) {

			struct nfp_insn_meta *dst_meta;

			unsigned short dst_indx;



			dst_indx = meta->n + 1 + meta->insn.off;

			dst_meta = nfp_bpf_goto_meta(nfp_prog, meta, dst_indx,

						     cnt);



			meta->jmp_dst = dst_meta;

			dst_meta->flags |= FLAG_INSN_IS_JUMP_DST;

		}

	}

	nfp_bpf_jit_prepare(nfp_prog, cnt);



	return 0;

}