nfp: bpf: fix code-gen bug on BPF_ALU | BPF_XOR | BPF_K

Jiong Wang · borkmann · commit 71c190249f0c · 2019-02-23T00:07:47.000+01:00
The intended optimization should be A ^ 0 = A, not A ^ -1 = A. Fixes: cd7df56 ("nfp: add BPF to NFP code translator") Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: Jiong Wang <jiong.wang@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
@@ -2309,7 +2309,7 @@ static int xor_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
 
 static int xor_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
 {
-	return wrp_alu32_imm(nfp_prog, meta, ALU_OP_XOR, !~meta->insn.imm);
+	return wrp_alu32_imm(nfp_prog, meta, ALU_OP_XOR, !meta->insn.imm);
 }
 
 static int and_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)

Original file line number	Diff line number	Diff line change
`@@ -2309,7 +2309,7 @@ static int xor_reg(struct nfp_prog nfp_prog, struct nfp_insn_meta meta)`
`2309`	`2309`
`2310`	`2310`	`static int xor_imm(struct nfp_prog nfp_prog, struct nfp_insn_meta meta)`
`2311`	`2311`	`{`
`2312`		`- return wrp_alu32_imm(nfp_prog, meta, ALU_OP_XOR, !~meta->insn.imm);`
	`2312`	`+ return wrp_alu32_imm(nfp_prog, meta, ALU_OP_XOR, !meta->insn.imm);`
`2313`	`2313`	`}`
`2314`	`2314`
`2315`	`2315`	`static int and_reg(struct nfp_prog nfp_prog, struct nfp_insn_meta meta)`