riscv, bpf: Support sign-extension load insns

Add Support sign-extension load instructions for RV64.

Signed-off-by: Pu Lehui <pulehui@huawei.com>
Acked-by: Björn Töpel <bjorn@kernel.org>
Link: https://lore.kernel.org/r/20230824095001.3408573-3-pulehui@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/arch/riscv/net/bpf_jit.h b/arch/riscv/net/bpf_jit.h
index 2717f549042870cb020d90cbbd941cde490eb667..a52a3dda18c3098ab59ff542bb80b0081771560c 100644 (file)
--- a/arch/riscv/net/bpf_jit.h
+++ b/arch/riscv/net/bpf_jit.h
@@ -501,6 +501,16 @@ static inline u32 rv_ble(u8 rs1, u8 rs2, u16 imm12_1)
        return rv_bge(rs2, rs1, imm12_1);
 }
 
+static inline u32 rv_lb(u8 rd, u16 imm11_0, u8 rs1)
+{
+       return rv_i_insn(imm11_0, rs1, 0, rd, 0x03);
+}
+
+static inline u32 rv_lh(u8 rd, u16 imm11_0, u8 rs1)
+{
+       return rv_i_insn(imm11_0, rs1, 1, rd, 0x03);
+}
+
 static inline u32 rv_lw(u8 rd, u16 imm11_0, u8 rs1)
 {
        return rv_i_insn(imm11_0, rs1, 2, rd, 0x03);

diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
index f2644e7ea6b590a00bea72d03a23055ccef21c6d..fd36cb17101aa4480327a3789eab48ccf157ab18 100644 (file)
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -580,7 +580,8 @@ static int add_exception_handler(const struct bpf_insn *insn,
        unsigned long pc;
        off_t offset;
 
-       if (!ctx->insns || !ctx->prog->aux->extable || BPF_MODE(insn->code) != BPF_PROBE_MEM)
+       if (!ctx->insns || !ctx->prog->aux->extable ||
+           (BPF_MODE(insn->code) != BPF_PROBE_MEM && BPF_MODE(insn->code) != BPF_PROBE_MEMSX))
                return 0;
 
        if (WARN_ON_ONCE(ctx->nexentries >= ctx->prog->aux->num_exentries))
@@ -1486,7 +1487,7 @@ out_be:
                return 1;
        }
 
-       /* LDX: dst = *(size *)(src + off) */
+       /* LDX: dst = *(unsigned size *)(src + off) */
        case BPF_LDX | BPF_MEM | BPF_B:
        case BPF_LDX | BPF_MEM | BPF_H:
        case BPF_LDX | BPF_MEM | BPF_W:
@@ -1495,14 +1496,28 @@ out_be:
        case BPF_LDX | BPF_PROBE_MEM | BPF_H:
        case BPF_LDX | BPF_PROBE_MEM | BPF_W:
        case BPF_LDX | BPF_PROBE_MEM | BPF_DW:
+       /* LDSX: dst = *(signed size *)(src + off) */
+       case BPF_LDX | BPF_MEMSX | BPF_B:
+       case BPF_LDX | BPF_MEMSX | BPF_H:
+       case BPF_LDX | BPF_MEMSX | BPF_W:
+       case BPF_LDX | BPF_PROBE_MEMSX | BPF_B:
+       case BPF_LDX | BPF_PROBE_MEMSX | BPF_H:
+       case BPF_LDX | BPF_PROBE_MEMSX | BPF_W:
        {
                int insn_len, insns_start;
+               bool sign_ext;
+
+               sign_ext = BPF_MODE(insn->code) == BPF_MEMSX ||
+                          BPF_MODE(insn->code) == BPF_PROBE_MEMSX;
 
                switch (BPF_SIZE(code)) {
                case BPF_B:
                        if (is_12b_int(off)) {
                                insns_start = ctx->ninsns;
-                               emit(rv_lbu(rd, off, rs), ctx);
+                               if (sign_ext)
+                                       emit(rv_lb(rd, off, rs), ctx);
+                               else
+                                       emit(rv_lbu(rd, off, rs), ctx);
                                insn_len = ctx->ninsns - insns_start;
                                break;
                        }
@@ -1510,13 +1525,19 @@ out_be:
                        emit_imm(RV_REG_T1, off, ctx);
                        emit_add(RV_REG_T1, RV_REG_T1, rs, ctx);
                        insns_start = ctx->ninsns;
-                       emit(rv_lbu(rd, 0, RV_REG_T1), ctx);
+                       if (sign_ext)
+                               emit(rv_lb(rd, 0, RV_REG_T1), ctx);
+                       else
+                               emit(rv_lbu(rd, 0, RV_REG_T1), ctx);
                        insn_len = ctx->ninsns - insns_start;
                        break;
                case BPF_H:
                        if (is_12b_int(off)) {
                                insns_start = ctx->ninsns;
-                               emit(rv_lhu(rd, off, rs), ctx);
+                               if (sign_ext)
+                                       emit(rv_lh(rd, off, rs), ctx);
+                               else
+                                       emit(rv_lhu(rd, off, rs), ctx);
                                insn_len = ctx->ninsns - insns_start;
                                break;
                        }
@@ -1524,13 +1545,19 @@ out_be:
                        emit_imm(RV_REG_T1, off, ctx);
                        emit_add(RV_REG_T1, RV_REG_T1, rs, ctx);
                        insns_start = ctx->ninsns;
-                       emit(rv_lhu(rd, 0, RV_REG_T1), ctx);
+                       if (sign_ext)
+                               emit(rv_lh(rd, 0, RV_REG_T1), ctx);
+                       else
+                               emit(rv_lhu(rd, 0, RV_REG_T1), ctx);
                        insn_len = ctx->ninsns - insns_start;
                        break;
                case BPF_W:
                        if (is_12b_int(off)) {
                                insns_start = ctx->ninsns;
-                               emit(rv_lwu(rd, off, rs), ctx);
+                               if (sign_ext)
+                                       emit(rv_lw(rd, off, rs), ctx);
+                               else
+                                       emit(rv_lwu(rd, off, rs), ctx);
                                insn_len = ctx->ninsns - insns_start;
                                break;
                        }
@@ -1538,7 +1565,10 @@ out_be:
                        emit_imm(RV_REG_T1, off, ctx);
                        emit_add(RV_REG_T1, RV_REG_T1, rs, ctx);
                        insns_start = ctx->ninsns;
-                       emit(rv_lwu(rd, 0, RV_REG_T1), ctx);
+                       if (sign_ext)
+                               emit(rv_lw(rd, 0, RV_REG_T1), ctx);
+                       else
+                               emit(rv_lwu(rd, 0, RV_REG_T1), ctx);
                        insn_len = ctx->ninsns - insns_start;
                        break;
                case BPF_DW: