Browse Source

nfp: bpf: don't do ld/shifts combination if shifts are jump destination

If any of the shift insns in the ld/shift sequence is jump destination,
don't do combination.

Signed-off-by: Jiong Wang <jiong.wang@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Jiong Wang 7 năm trước cách đây
mục cha
commit
29fe46efba

+ 4 - 0
drivers/net/ethernet/netronome/nfp/bpf/jit.c

@@ -2181,6 +2181,10 @@ static void nfp_bpf_opt_ld_shift(struct nfp_prog *nfp_prog)
 		if (next1.imm != 0x20 || next2.imm != 0x20)
 		if (next1.imm != 0x20 || next2.imm != 0x20)
 			continue;
 			continue;
 
 
+		if (meta2->flags & FLAG_INSN_IS_JUMP_DST ||
+		    meta3->flags & FLAG_INSN_IS_JUMP_DST)
+			continue;
+
 		meta2->skip = true;
 		meta2->skip = true;
 		meta3->skip = true;
 		meta3->skip = true;
 	}
 	}