riscv, bpf: Make BPF_CMPXCHG fully ordered
Subsystems (3)
PATCH 1/1 riscv, bpf: Make BPF_CMPXCHG fully ordered
According to the prototype formal BPF memory consistency model discussed e.g. in [1] and following the ordering properties of the C/in-kernel macro atomic_cmpxchg(), a BPF atomic operation with the BPF_CMPXCHG modifier is fully ordered. However, the current RISC-V JIT lowerings fail to meet such memory ordering property. This is illustrated by the following litmus test:
BPF BPF__MP+success_cmpxchg+fence
{
0:r1=x; 0:r3=y; 0:r5=1;
1:r2=y; 1:r4=f; 1:r7=x;
}
P0 | P1 ;
*(u64 *)(r1 + 0) = 1 | r1 = *(u64 *)(r2 + 0) ;
r2 = cmpxchg_64 (r3 + 0, r4, r5) | r3 = atomic_fetch_add((u64 *)(r4 + 0), r5) ;
| r6 = *(u64 *)(r7 + 0) ;exists (1:r1=1 /\ 1:r6=0)
whose "exists" clause is not satisfiable according to the BPF memory model. Using the current RISC-V JIT lowerings, the test can be mapped to the following RISC-V litmus test:
RISCV RISCV__MP+success_cmpxchg+fence
{
0:x1=x; 0:x3=y; 0:x5=1;
1:x2=y; 1:x4=f; 1:x7=x;
}
P0 | P1 ; sd x5, 0(x1) | ld x1, 0(x2) ; L00: | amoadd.d.aqrl x3, x5, 0(x4) ; lr.d x2, 0(x3) | ld x6, 0(x7) ; bne x2, x4, L01 | ; sc.d x6, x5, 0(x3) | ; bne x6, x4, L00 | ; fence rw, rw | ; L01: | ;
exists (1:x1=1 /\ 1:x6=0)
where the two stores in P0 can be reordered. Update the RISC-V JIT lowerings/implementation of BPF_CMPXCHG to emit an SC with RELEASE ("rl") annotation in order to meet the expected memory ordering guarantees. The resulting RISC-V JIT lowerings of BPF_CMPXCHG match the RISC-V lowerings of the C atomic_cmpxchg().
--- arch/riscv/net/bpf_jit_comp64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/net/bpf_jit_comp64.c +2 -2
@@ -548,8 +548,8 @@ static void emit_atomic(u8 rd, u8 rs, s16 off, s32 imm, bool is64, rv_lr_w(r0, 0, rd, 0, 0), ctx); jmp_offset =ninsns_rvoff (8 );emit (rv_bne (RV_REG_T2 , r0, jmp_offset >>1 ), ctx); -emit (is64 ?rv_sc_d (RV_REG_T3 , rs, rd,0 ,0 ) : -rv_sc_w (RV_REG_T3 , rs, rd,0 ,0 ), ctx); +emit (is64 ?rv_sc_d (RV_REG_T3 , rs, rd,0 ,1 ) : +rv_sc_w (RV_REG_T3 , rs, rd,0 ,1 ), ctx); jmp_offset =ninsns_rvoff (-6 );emit (rv_bne (RV_REG_T3 ,0 , jmp_offset >>1 ), ctx);emit (rv_fence (0x3 ,0x3 ), ctx);
Signature · 1 line
2.43.0
Quoted 36 lines · Andrea Parri
According to the prototype formal BPF memory consistency model discussed e.g. in [1] and following the ordering properties of the C/in-kernel macro
atomic_cmpxchg(), a BPF atomic operation with theBPF_CMPXCHGmodifier is fully ordered. However, the current RISC-V JIT lowerings fail to meet such memory ordering property. This is illustrated by the following litmus test:BPF BPF__MP+success_cmpxchg+fence
{
0:r1=x; 0:r3=y; 0:r5=1;
1:r2=y; 1:r4=f; 1:r7=x;
}P0 | P1 ; *(u64 *)(r1 + 0) = 1 | r1 = *(u64 *)(r2 + 0) ; r2 = cmpxchg_64 (r3 + 0, r4, r5) | r3 = atomic_fetch_add((u64 *)(r4 + 0), r5) ; | r6 = *(u64 *)(r7 + 0) ;exists (1:r1=1 /\ 1:r6=0)
whose "exists" clause is not satisfiable according to the BPF memory model. Using the current RISC-V JIT lowerings, the test can be mapped to the following RISC-V litmus test:
RISCV RISCV__MP+success_cmpxchg+fence
{
0:x1=x; 0:x3=y; 0:x5=1;
1:x2=y; 1:x4=f; 1:x7=x;
}P0 | P1 ; sd x5, 0(x1) | ld x1, 0(x2) ; L00: | amoadd.d.aqrl x3, x5, 0(x4) ; lr.d x2, 0(x3) | ld x6, 0(x7) ; bne x2, x4, L01 | ; sc.d x6, x5, 0(x3) | ; bne x6, x4, L00 | ; fence rw, rw | ; L01: | ;
Quoted 7 lines
exists (1:x1=1 /\ 1:x6=0)
where the two stores in P0 can be reordered. Update the RISC-V JIT lowerings/implementation of
BPF_CMPXCHGto emit an SC with RELEASE ("rl") annotation in order to meet the expected memory ordering guarantees. The resulting RISC-V JIT lowerings ofBPF_CMPXCHGmatch the RISC-V lowerings of the Catomic_cmpxchg().
Thanks for fixing this, I fixed all others in:
20a759df3bba ("riscv, bpf: make some atomic operations fully ordered")
Quoted 2 lines
Fixes dd642ccb45ec ("riscv, bpf: Implement more atomic operations for RV64")Signed-off-by Andrea Parri <[email protected]>
Quoted 22 lines
--- arch/riscv/net/bpf_jit_comp64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/riscv/net/bpf_jit_comp64.c +2
-2@@ -548,8 +548,8 @@ static void emit_atomic(u8 rd, u8 rs, s16 off, s32 imm, bool is64, rv_lr_w(r0, 0, rd, 0, 0), ctx); jmp_offset =ninsns_rvoff (8 );emit (rv_bne (RV_REG_T2 , r0, jmp_offset >>1 ), ctx); -emit (is64 ?rv_sc_d (RV_REG_T3 , rs, rd,0 ,0 ) : -rv_sc_w (RV_REG_T3 , rs, rd,0 ,0 ), ctx); +emit (is64 ?rv_sc_d (RV_REG_T3 , rs, rd,0 ,1 ) : +rv_sc_w (RV_REG_T3 , rs, rd,0 ,1 ), ctx); jmp_offset =ninsns_rvoff (-6 );emit (rv_bne (RV_REG_T3 ,0 , jmp_offset >>1 ), ctx);emit (rv_fence (0x3 ,0x3 ), ctx);Signature · 1 line
2.43.0
Thanks, Andrea!
Quoted 46 lines · Puranjay Mohan
Quoted 36 lines · Andrea Parri
According to the prototype formal BPF memory consistency model discussed e.g. in [1] and following the ordering properties of the C/in-kernel macro
atomic_cmpxchg(), a BPF atomic operation with theBPF_CMPXCHGmodifier is fully ordered. However, the current RISC-V JIT lowerings fail to meet such memory ordering property. This is illustrated by the following litmus test:BPF BPF__MP+success_cmpxchg+fence
{
0:r1=x; 0:r3=y; 0:r5=1;
1:r2=y; 1:r4=f; 1:r7=x;
}P0 | P1 ; *(u64 *)(r1 + 0) = 1 | r1 = *(u64 *)(r2 + 0) ; r2 = cmpxchg_64 (r3 + 0, r4, r5) | r3 = atomic_fetch_add((u64 *)(r4 + 0), r5) ; | r6 = *(u64 *)(r7 + 0) ;exists (1:r1=1 /\ 1:r6=0)
whose "exists" clause is not satisfiable according to the BPF memory model. Using the current RISC-V JIT lowerings, the test can be mapped to the following RISC-V litmus test:
RISCV RISCV__MP+success_cmpxchg+fence
{
0:x1=x; 0:x3=y; 0:x5=1;
1:x2=y; 1:x4=f; 1:x7=x;
}P0 | P1 ; sd x5, 0(x1) | ld x1, 0(x2) ; L00: | amoadd.d.aqrl x3, x5, 0(x4) ; lr.d x2, 0(x3) | ld x6, 0(x7) ; bne x2, x4, L01 | ; sc.d x6, x5, 0(x3) | ; bne x6, x4, L00 | ; fence rw, rw | ; L01: | ;Quoted 7 lines
exists (1:x1=1 /\ 1:x6=0)
where the two stores in P0 can be reordered. Update the RISC-V JIT lowerings/implementation of
BPF_CMPXCHGto emit an SC with RELEASE ("rl") annotation in order to meet the expected memory ordering guarantees. The resulting RISC-V JIT lowerings ofBPF_CMPXCHGmatch the RISC-V lowerings of the Catomic_cmpxchg().
Quoted 8 lines
Thanks for fixing this, I fixed all others in:
20a759df3bba("riscv, bpf: make some atomic operations fully ordered")Quoted 2 lines
Fixes dd642ccb45ec ("riscv, bpf: Implement more atomic operations for RV64")Signed-off-by Andrea Parri <[email protected]>Reviewed-by Puranjay Mohan <[email protected]>
This patch was applied to bpf/bpf.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <[email protected]>:
Quoted 8 lines · On Thu, 17 Oct 2024 17:36:28 +0300 you wrote:
According to the prototype formal BPF memory consistency model discussed e.g. in [1] and following the ordering properties of the C/in-kernel macro
atomic_cmpxchg(), a BPF atomic operation with theBPF_CMPXCHGmodifier is fully ordered. However, the current RISC-V JIT lowerings fail to meet such memory ordering property. This is illustrated by the following litmus test:[...]
Here is the summary with links:
- riscv, bpf: Make BPF_CMPXCHG fully ordered
https://git.kernel.org/bpf/bpf/c/98cd61955771
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html