bpf,riscv: Add support for BPF Arena
Subsystems (4)
v4 cover bpf,riscv: Add support for BPF Arena
Changes in V4:
V3: https://lore.kernel.org/all/[email protected]/
- Fix some style issues.
- Add Tested-by: and Reviewed-by: tags by Pu Lehui and Björn
Changes in V3
V2: https://lore.kernel.org/bpf/[email protected]/
- Use REG_DONT_CLEAR_MARKER in place of DONT_CLEAR as the name.
- Use RV_REG_ZERO for the above as it is guaranteed to be never used in as dst/src register in BPF LDX/STX/ST instructions.
- Use #define RV_REG_ARENA for RV_REG_S7
Changes in V2
V1: https://lore.kernel.org/bpf/[email protected]/
- Used S7 in place of S11 for storing the kernel_vm_start
- Used 17 in place of 16 for DONT_CLEAR marker
- Remove an unused variable
- Removed some misleading information from the commit message.
This series adds the support for PROBE_MEM32 and bpf_addr_space_cast instructions to the RISCV BPF JIT. These two instructions allow the enablement of BPF Arena.
All arena related selftests are passing:
root@rv-tester:~/bpf# uname -p riscv64 root@rv-tester:~/bpf# ./test_progs -a "*arena*" #3/1 arena_htab/arena_htab_llvm:OK #3/2 arena_htab/arena_htab_asm:OK #3 arena_htab:OK #4/1 arena_list/arena_list_1:OK #4/2 arena_list/arena_list_1000:OK #4 arena_list:OK #434/1 verifier_arena/basic_alloc1:OK #434/2 verifier_arena/basic_alloc2:OK #434/3 verifier_arena/basic_alloc3:OK #434/4 verifier_arena/iter_maps1:OK #434/5 verifier_arena/iter_maps2:OK #434/6 verifier_arena/iter_maps3:OK #434 verifier_arena:OK Summary: 3/10 PASSED, 0 SKIPPED, 0 FAILED
Puranjay Mohan (2):
bpf,riscv: Implement PROBE_MEM32 pseudo instructions bpf,riscv: Implement bpf_addr_space_cast instruction
arch/riscv/net/bpf_jit.h | 2 + arch/riscv/net/bpf_jit_comp64.c | 203 +++++++++++++++++++++++++++++++- arch/riscv/net/bpf_jit_core.c | 2 + 3 files changed, 205 insertions(+), 2 deletions(-)
Signature · 1 line
2.40.1
PATCH v4 1/2 bpf,riscv: Implement PROBE_MEM32 pseudo instructions
Add support for [LDX | STX | ST], PROBE_MEM32, [B | H | W | DW] instructions. They are similar to PROBE_MEM instructions with the following differences:
- PROBE_MEM32 supports store.
- PROBE_MEM32 relies on the verifier to clear upper 32-bit of the src/dst register
- PROBE_MEM32 adds 64-bit kern_vm_start address (which is stored in S7 in the prologue). Due to bpf_arena constructions such S7 + reg + off16 access is guaranteed to be within arena virtual range, so no address check at run-time.
- S11 is a free callee-saved register, so it is used to store kern_vm_start
- PROBE_MEM32 allows STX and ST. If they fault the store is a nop. When LDX faults the destination register is zeroed.
To support these on riscv, we do tmp = S7 + src/dst reg and then use tmp2 as the new src/dst register. This allows us to reuse most of the code for normal [LDX | STX | ST].
--- arch/riscv/net/bpf_jit.h | 1 + arch/riscv/net/bpf_jit_comp64.c | 189 +++++++++++++++++++++++++++++++- arch/riscv/net/bpf_jit_core.c | 1 + 3 files changed, 189 insertions(+), 2 deletions(-)
arch/riscv/net/bpf_jit.h +1 -0
@@ -81,6 +81,7 @@ struct rv_jit_context {int nexentries;unsigned long flags;int stack_size; +u64 arena_vm_start; };/* Convert from ninsns to bytes. */
arch/riscv/net/bpf_jit_comp64.c +187 -2
261 lines not on this page · raw message
arch/riscv/net/bpf_jit_core.c +1 -0
@@ -80,6 +80,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) goto skip_init_ctx; } + ctx->arena_vm_start =bpf_arena_get_kern_vm_start (prog->aux->arena); ctx->prog = prog; ctx->offset =kcalloc (prog->len,sizeof (int ),GFP_KERNEL );if (!ctx->offset) {
Signature · 1 line
2.40.1
PATCH v4 2/2 bpf,riscv: Implement bpf_addr_space_cast instruction
In reply to Puranjay MohanLLVM generates bpf_addr_space_cast instruction while translating pointers between native (zero) address space and __attribute__((address_space(N))). The addr_space=0 is reserved as bpf_arena address space.
rY = addr_space_cast(rX, 0, 1) is processed by the verifier and converted to normal 32-bit move: wX = wY
rY = addr_space_cast(rX, 1, 0) has to be converted by JIT.
--- arch/riscv/net/bpf_jit.h | 1 + arch/riscv/net/bpf_jit_comp64.c | 14 ++++++++++++++ arch/riscv/net/bpf_jit_core.c | 1 + 3 files changed, 16 insertions(+)
arch/riscv/net/bpf_jit.h +1 -0
@@ -82,6 +82,7 @@ struct rv_jit_context {unsigned long flags;int stack_size;u64 arena_vm_start; +u64 user_vm_start; };/* Convert from ninsns to bytes. */
arch/riscv/net/bpf_jit_comp64.c +14 -0
@@ -1081,6 +1081,15 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,/* dst = src */ case BPF_ALU |BPF_MOV |BPF_X :case BPF_ALU64 |BPF_MOV |BPF_X : +if (insn_is_cast_user (insn)) { +emit_mv (RV_REG_T1 , rs, ctx); +emit_zextw (RV_REG_T1 ,RV_REG_T1 , ctx); +emit_imm (rd, (ctx->user_vm_start >>32 ) <<32 , ctx); +emit (rv_beq (RV_REG_T1 ,RV_REG_ZERO ,4 ), ctx); +emit_or (RV_REG_T1 , rd,RV_REG_T1 , ctx); +emit_mv (rd,RV_REG_T1 , ctx); +break ; + }if (imm ==1 ) {/* Special mov32 for zext */ emit_zextw (rd, rd, ctx);
@@ -2024,3 +2033,8 @@ bool bpf_jit_supports_ptr_xchg(void) {return true; } + +bool bpf_jit_supports_arena (void ) +{ +return true; +}
arch/riscv/net/bpf_jit_core.c +1 -0
@@ -81,6 +81,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) } ctx->arena_vm_start =bpf_arena_get_kern_vm_start (prog->aux->arena); + ctx->user_vm_start =bpf_arena_get_user_vm_start (prog->aux->arena); ctx->prog = prog; ctx->offset =kcalloc (prog->len,sizeof (int ),GFP_KERNEL );if (!ctx->offset) {
Signature · 1 line
2.40.1
This series was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 5 lines · On Thu, 4 Apr 2024 11:42:01 +0000 you wrote:
Changes in V4:
V3: https://lore.kernel.org/all/[email protected]/
- Fix some style issues.
- Add Tested-by: and Reviewed-by: tags by Pu Lehui and Björn
Quoted 8 lines
Changes in V3
V2: https://lore.kernel.org/bpf/[email protected]/
- UseREG_DONT_CLEAR_MARKERin place ofDONT_CLEARas the name.
- UseRV_REG_ZEROfor the above as it is guaranteed to be never used in as dst/src register in BPF LDX/STX/ST instructions.
- Use #defineRV_REG_ARENAforRV_REG_S7[...]
Here is the summary with links:
- [bpf-next,v4,1/2] bpf,riscv: Implement PROBE_MEM32 pseudo instructions
https://git.kernel.org/bpf/bpf-next/c/633a6e01d1a2 - [bpf-next,v4,2/2] bpf,riscv: Implement bpf_addr_space_cast instruction https://git.kernel.org/bpf/bpf-next/c/21ab0b6d0cfc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html