OSDN Git Service

bpf, riscv: clear target register high 32-bits for and/or/xor on ALU32
authorBjörn Töpel <bjorn.topel@gmail.com>
Tue, 21 May 2019 13:46:22 +0000 (15:46 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 23 May 2019 13:53:55 +0000 (15:53 +0200)
commitfe121ee531d1362810bfd30f38a1b88b1d3d376c
tree76cf52348e4c0ae2dae7e808c376d68b65b1e0df
parenta195cefff49f60054998333e81ee95170ce8bf92
bpf, riscv: clear target register high 32-bits for and/or/xor on ALU32

When using 32-bit subregisters (ALU32), the RISC-V JIT would not clear
the high 32-bits of the target register and therefore generate
incorrect code.

E.g., in the following code:

  $ cat test.c
  unsigned int f(unsigned long long a,
          unsigned int b)
  {
   return (unsigned int)a & b;
  }

  $ clang-9 -target bpf -O2 -emit-llvm -S test.c -o - | \
   llc-9 -mattr=+alu32 -mcpu=v3
   .text
   .file "test.c"
   .globl f
   .p2align 3
   .type f,@function
  f:
   r0 = r1
   w0 &= w2
   exit
  .Lfunc_end0:
   .size f, .Lfunc_end0-f

The JIT would not clear the high 32-bits of r0 after the
and-operation, which in this case might give an incorrect return
value.

After this patch, that is not the case, and the upper 32-bits are
cleared.

Reported-by: Jiong Wang <jiong.wang@netronome.com>
Fixes: 2353ecc6f91f ("bpf, riscv: add BPF JIT for RV64G")
Signed-off-by: Björn Töpel <bjorn.topel@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
arch/riscv/net/bpf_jit_comp.c