nfp: bpf: add signed jump insns

This patch adds signed jump instructions (jsgt, jsge, jslt, jsle)
to the nfp jit. As well as adding the additional required raw
assembler branch mask to nfp_asm.h

Signed-off-by: Nic Viljoen <nick.viljoen@netronome.com>
Reviewed-by: Jiong Wang <jiong.wang@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

2 files changed, 49 insertions, 0 deletions

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
index b4ed6bca4ea9..47c5224f8d6f 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
@@ -1914,6 +1914,26 @@ static int jle_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
         return wrp_cmp_imm(nfp_prog, meta, BR_BHS, true);
 }
 
+static int jsgt_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
+{
+        return wrp_cmp_imm(nfp_prog, meta, BR_BLT, true);
+}
+
+static int jsge_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
+{
+        return wrp_cmp_imm(nfp_prog, meta, BR_BGE, false);
+}
+
+static int jslt_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
+{
+        return wrp_cmp_imm(nfp_prog, meta, BR_BLT, false);
+}
+
+static int jsle_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
+{
+        return wrp_cmp_imm(nfp_prog, meta, BR_BGE, true);
+}
+
 static int jset_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
 {
         const struct bpf_insn *insn = &meta->insn;
@@ -2003,6 +2023,26 @@ static int jle_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
         return wrp_cmp_reg(nfp_prog, meta, BR_BHS, true);
 }
 
+static int jsgt_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
+{
+        return wrp_cmp_reg(nfp_prog, meta, BR_BLT, true);
+}
+
+static int jsge_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
+{
+        return wrp_cmp_reg(nfp_prog, meta, BR_BGE, false);
+}
+
+static int jslt_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
+{
+        return wrp_cmp_reg(nfp_prog, meta, BR_BLT, false);
+}
+
+static int jsle_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
+{
+        return wrp_cmp_reg(nfp_prog, meta, BR_BGE, true);
+}
+
 static int jset_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
 {
         return wrp_test_reg(nfp_prog, meta, ALU_OP_AND, BR_BNE);
@@ -2087,6 +2127,10 @@ static const instr_cb_t instr_cb[256] = {
         [BPF_JMP | BPF_JGE | BPF_K] =   jge_imm,
         [BPF_JMP | BPF_JLT | BPF_K] =   jlt_imm,
         [BPF_JMP | BPF_JLE | BPF_K] =   jle_imm,
+        [BPF_JMP | BPF_JSGT | BPF_K] =  jsgt_imm,
+        [BPF_JMP | BPF_JSGE | BPF_K] =  jsge_imm,
+        [BPF_JMP | BPF_JSLT | BPF_K] =  jslt_imm,
+        [BPF_JMP | BPF_JSLE | BPF_K] =  jsle_imm,
         [BPF_JMP | BPF_JSET | BPF_K] =  jset_imm,
         [BPF_JMP | BPF_JNE | BPF_K] =   jne_imm,
         [BPF_JMP | BPF_JEQ | BPF_X] =   jeq_reg,
@@ -2094,6 +2138,10 @@ static const instr_cb_t instr_cb[256] = {
         [BPF_JMP | BPF_JGE | BPF_X] =   jge_reg,
         [BPF_JMP | BPF_JLT | BPF_X] =   jlt_reg,
         [BPF_JMP | BPF_JLE | BPF_X] =   jle_reg,
+        [BPF_JMP | BPF_JSGT | BPF_X] =  jsgt_reg,
+        [BPF_JMP | BPF_JSGE | BPF_X] =  jsge_reg,
+        [BPF_JMP | BPF_JSLT | BPF_X] =  jslt_reg,
+        [BPF_JMP | BPF_JSLE | BPF_X] =  jsle_reg,
         [BPF_JMP | BPF_JSET | BPF_X] =  jset_reg,
         [BPF_JMP | BPF_JNE | BPF_X] =   jne_reg,
         [BPF_JMP | BPF_CALL] =          call,
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_asm.h b/drivers/net/ethernet/netronome/nfp/nfp_asm.h
index a50240ab0ce2..20e51cb60e69 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_asm.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_asm.h
@@ -81,6 +81,7 @@ enum br_mask {
         BR_BHS = 0x04,
         BR_BLO = 0x05,
         BR_BGE = 0x08,
+        BR_BLT = 0x09,
         BR_UNC = 0x18,
 };