Commit e90287f3 authored Jan 22, 2019 by Jakub Kicinski Committed by Alexei Starovoitov Jan 23, 2019

nfp: bpf: don't use instruction number for jump target



Instruction number is meaningless at code gen phase.  The target
of the instruction is overwritten by nfp_fixup_branches().  The
convention is to put the raw offset in target address as a place
holder.  See cmp_* functions.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parent 08ca90af

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3182,7 +3182,7 @@ bpf_to_bpf_call(struct nfp_prog nfp_prog, struct nfp_insn_meta meta)
		wrp_immed_relo(nfp_prog, imm_b(nfp_prog), 0, RELO_IMMED_REL);
		} else {
		ret_tgt = nfp_prog_current_offset(nfp_prog) + 2;
		emit_br(nfp_prog, BR_UNC, meta->n + 1 + meta->insn.imm, 1);
		emit_br(nfp_prog, BR_UNC, meta->insn.imm, 1);
		offset_br = nfp_prog_current_offset(nfp_prog);
		}
		wrp_immed_relo(nfp_prog, ret_reg(nfp_prog), ret_tgt, RELO_IMMED_REL);

Admin message