From: Jiong Wang <jiong.wang@netronome.com>
Date: Fri, 1 Dec 2017 05:32:52 +0000 (-0800)
Subject: nfp: bpf: don't do ld/mask combination if mask is jump destination
X-Git-Tag: v4.16-rc1~123^2~431^2~1^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1266f5d6559e30e9afdebfff60d60ab86a8da77b;p=users%2Fjedix%2Flinux-maple.git

nfp: bpf: don't do ld/mask combination if mask is jump destination

If the mask insn in the ld/mask pair is jump destination, then 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>
---

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
index f76659ecb654..f2317b764222 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
@@ -2142,6 +2142,9 @@ static void nfp_bpf_opt_ld_mask(struct nfp_prog *nfp_prog)
 		if (next.src_reg || next.dst_reg)
 			continue;
 
+		if (meta2->flags & FLAG_INSN_IS_JUMP_DST)
+			continue;
+
 		meta2->skip = true;
 	}
 }