bpf, x86: Support fetching AND/OR/XOR atomics in arena
Subsystems (6)
v4 cover bpf, x86: Support fetching AND/OR/XOR atomics in arena
Changelog:
v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
Changes in v4:
- Patch 1: go back to the v1 lowering, keeping the load of the old value and giving it a second exception table entry, per Tejun's review. v2 and v3 dropped the load so that the CMPXCHG was the only faulting insn, but the first CMPXCHG then almost always loses, so every operation paid for an extra locked CMPXCHG and the fetching insn ended up more expensive on x86 than the load and CMPXCHG loop it is meant to replace. The extra entry is accounted for in bpf_int_jit_compile() again, as in v1. The cleanups from v2 stay.
- Patch 1: refuse these ops when dst_reg is BPF_REG_AX. Accesses through a number (BPF_F_ARENA_SCALAR, which arena_scalar_access() rewrites to use BPF_REG_AX as the address) leave the loop no register to save R0 in, and dropping the bpf_jit_supports_insn() rejection would otherwise let them through. Such programs fail to load, as they did before. This only became reachable after rebasing over BPF_F_ARENA_SCALAR.
- Patch 1: correct the commit message, which claimed to add the reg2pt_regs[BPF_REG_AX] entry that BPF_F_ARENA_SCALAR already added, and update the extable sizing comment.
- Patch 2: keep each *_noreturn_value in its operation's block and the or block's u32s first. v3 grouped them, leaving two 4-byte holes in .addr_space.1 that clang-17 fails to build.
- Patch 2: check the register state after the r0 forms in uaf fault: the fetched register is cleared and the address register is untouched. Use values with high bits set in fetch_r0, and add fetching and/or/xor through a number to verifier_arena_scalar (works on arm64, refused on x86-64). Correct the comment about which spelling selects the non-fetching insn.
- Patch 3: say in the commit message that x86-64 schedulers built from this header need a kernel whose JIT accepts these ops, and that already-set bits now cost a locked write. Describe the comment that is actually being removed.
Changes in v3:
- Patch 2: keep the 32-bit non-fetching and/or/xor as well.
- Patch 2: guard the new uaf asm on __BPF_FEATURE_ADDR_SPACE_CAST, since textual addr_space_cast needs LLVM 19.
- Patch 3: use __sync_fetch_and_or/and in cid.bpf.h and delete the cmpxchg loop, rather than only rewording the comment that justified it.
Changes in v2:
- Patch 1: drop the initial load in the arena lowering instead of adding a second exception table entry (reverted in v4).
- Patch 1: note the dropped bpf_jit_supports_insn() rejection in the changelog, rename the shared "mem32 extable bug" message, let the non-arena caller pass NULL for the out-params, correct the INSN_LEN comment, and drop an unrelated whitespace hunk.
- Patch 2: keep non-fetching coverage, add the R0-aliased forms to uaf, and correct the comment about why arm64 stays out of uaf.
- Patch 3: new.
A fetching AND/OR/XOR against arena memory is rejected on x86-64:
BPF_ATOMIC stores into R1 arena is not allowed
x86-64 has no single instruction for these, so the JIT lowers them to a CMPXCHG loop. The loop performs two memory accesses, the load of the old value and the CMPXCHG itself, and either can fault when the arena page goes away. The verifier reserves one exception table entry per instruction, so there was nowhere to record the second one and bpf_jit_supports_insn() refused the three opcodes instead.
x86-64 is the only architecture that needs this. riscv64 has native AMOAND/AMOOR/AMOXOR with fetch, s390 has LAN/LAO/LAX, and arm64 with LSE has LDCLRAL/LDSETAL/LDEORAL, so these already work in an
arena, as does powerpc64. arm64 without LSE and loongarch reject every arena RMW atomic, CMPXCHG included, so nothing can be lowered there either way.
Patch 1 emits the loop with R12-indexed addressing and gives the load and the CMPXCHG an exception table entry each. Both resume past the whole loop rather than past the faulting instruction, with the fetch destination cleared, so a fault cannot re-enter the loop. The JIT accounts for the extra entry by rescanning the instruction stream in bpf_int_jit_compile() before the extable is sized; s390 does the same in bpf_jit_alloc() for its BPF_XCHG lowering. The resulting code is the same load and CMPXCHG loop as the non-arena lowering, which is what programs hand-roll today, minus the early exit a hand-rolled loop can take when the value is already as wanted. Accesses through a number are the exception: they keep their address in BPF_REG_AX, where the loop would have to save R0, so the JIT refuses them and such programs fail to load, as before the series.
Patch 2 makes the selftests cover this. The existing arena and/or/xor tests discarded the returned value, so clang emitted the non-fetching instruction and the fetching one was never exercised. That was deliberate:
commit 2897b1e2a2f4 ("selftests/bpf: Fix arena_atomics failure due to llvm change") switched them to __c11_atomic_fetch_*() with memory_order_relaxed to dodge the limitation patch 1 removes. They now check the old value via __sync_fetch_and_*(), while keeping a __c11_atomic_fetch_*() of each width per operation with the result discarded so the non-fetching lowering keeps its coverage. A new fetch_r0 test pins the two register assignments the JIT special-cases, and both also go into the uaf test, since the BPF_REG_AX substitution only reaches the exception table when such an access faults. x86 is dropped from the uaf exclusion list.
Patch 3 drops the hand-rolled cmpxchg loop in sched_ext's cid.bpf.h, which only existed because of the x86 restriction patch 1 removes, and uses the fetching atomics directly. The loop was not a portability fallback either:
arm64 without LSE rejects every arena read-modify-write including CMPXCHG, and riscv without Zacas rejects only CMPXCHG, so the loop is strictly worse than a fetching OR there.
Puranjay Mohan (3):
bpf, x86: Support fetching AND/OR/XOR atomics in arena selftests/bpf: Test fetching AND/OR/XOR atomics in arena
sched_ext: Use fetching atomics for cmask instead of a cmpxchg loop
arch/x86/net/bpf_jit_comp.c | 269 +++++++++++++----- tools/sched_ext/include/scx/cid.bpf.h | 79 +---- .../selftests/bpf/prog_tests/arena_atomics.c | 47 +++ .../selftests/bpf/progs/arena_atomics.c | 184 +++++++++--- .../bpf/progs/verifier_arena_scalar.c | 98 +++++++ 5 files changed, 491 insertions(+), 186 deletions(-)
base-commit: 763187dbbf83764a57d5811168ef9de7b9a60e2d
Signature · 1 line
2.53.0-Meta
PATCH v4 1/3 bpf, x86: Support fetching AND/OR/XOR atomics in arena
x86-64 has no single instruction for a fetching AND/OR/XOR, so the JIT lowers them to a CMPXCHG loop. That loop could not be used against arena
memory: it contains two memory accesses, the load of the old value and the CMPXCHG itself, either of which can fault when the arena page goes away, while the verifier reserves only one exception table entry per instruction. bpf_jit_supports_insn() therefore rejected the three opcodes and such programs failed to load with
BPF_ATOMIC stores into R1 arena is not allowed
Emit the same loop with R12-indexed addressing and give each of the two accesses its own exception table entry. The verifier still reserves one per instruction, so the JIT accounts for the extra entry itself by rescanning the instruction stream in bpf_int_jit_compile() before the extable is sized, as s390 does in bpf_jit_alloc() for its BPF_XCHG lowering. The rescan sits after the extra-pass early exit, so a program is counted exactly once. Drop the bpf_jit_supports_insn() rejection.
A loop without the load would need only one entry, since a CMPXCHG that loses the comparison reloads RAX, but its first CMPXCHG would then almost always lose. Every operation would pay for a second locked CMPXCHG, which makes the fetching insn more expensive than the load and CMPXCHG loop programs write by hand today. The second entry is paid for once, in the JIT.
Both entries resume past the whole loop rather than past the faulting instruction alone, with the fetch destination cleared, so a fault cannot re-enter the loop, and both are reported as writes since the BPF insn is a read-modify-write. This repurposes the INSN_LEN field of the fixup as a resume distance rather than an instruction length; a sequence long enough to overflow its 8 bits would first have to exceed BPF_MAX_INSN_SIZE, which do_jit() rejects before the image is used.
The loop needs RAX for CMPXCHG and saves R0 in BPF_REG_AX, which it also substitutes for R0 when either operand is R0. ex_handler_bpf() may then have to name r10 as the register holding the arena address or the one to clear on fault; reg2pt_regs[] already has that entry.
Accesses through a number, made by programs loaded with BPF_F_ARENA_SCALAR, keep their address in BPF_REG_AX themselves (see arena_scalar_access()), which leaves the loop nowhere to save R0. Refuse those in the JIT, since bpf_jit_supports_insn() cannot tell them apart from accesses through an arena pointer. Such programs fail to load, as they did before.
--- arch/x86/net/bpf_jit_comp.c | 269 +++++++++++++++++++++++++----------- 1 file changed, 192 insertions(+), 77 deletions(-)
arch/x86/net/bpf_jit_comp.c +192 -77
@@ -239,6 +239,13 @@ static const int reg2pt_regs[] = { [BPF_REG_AX] = offsetof(struct pt_regs, r10), }; +static bool is_atomic_fetch_op (const struct bpf_insn *insn) +{ +return insn->imm == (BPF_AND |BPF_FETCH ) || + insn->imm == (BPF_OR |BPF_FETCH ) || + insn->imm == (BPF_XOR |BPF_FETCH ); +} +/* * is_ereg() == true if BPF register 'reg' maps to x86-64 r8..r15 * which need extra byte of encoding.
@@ -1680,6 +1687,72 @@ static int emit_atomic_ld_st_index(u8 **pprog, u32 atomic_op, u32 size,return 0 ; } +/* +* A fetching AND/OR/XOR can't be implemented with a single x86 insn, so do a +* CMPXCHG loop. @index_reg is X86_REG_R12 for an arena access or -1 otherwise, +* and @dst_reg/@src_reg are already substituted for R0 by the caller. +* +* Both the load and the CMPXCHG can fault when accessing the arena, so their +* addresses are handed back in @fault[0] and @fault[1]. A fault has to resume +* at @resume, which is past the loop and past the move that delivers the old +* value, but before the R0 restore. Both are NULL for the non-arena case, +* which needs no fixup. +*/ +static int emit_atomic_fetch_rmw (u8 **pprog,struct bpf_insn *insn,u32 dst_reg, +u32 src_reg,int index_reg,u8 **fault, +u8 **resume) +{ +bool is64 =BPF_SIZE (insn->code) ==BPF_DW ; +u8 *branch_target, *prog = *pprog; +int err; + + branch_target = prog; + +/* Load old value */ +if (fault) + fault[0 ] = prog; +if (index_reg <0 ) +emit_ldx (&prog,BPF_SIZE (insn->code),BPF_REG_0 , dst_reg, insn->off); +else +emit_ldx_index (&prog,BPF_SIZE (insn->code),BPF_REG_0 , dst_reg, + index_reg, insn->off); + +/* +* Perform the (commutative) operation locally, put the result in +* the AUX_REG. +*/ +emit_mov_reg (&prog, is64,AUX_REG ,BPF_REG_0 ); +maybe_emit_mod (&prog,AUX_REG , src_reg, is64); +EMIT2 (simple_alu_opcodes[BPF_OP (insn->imm)], +add_2reg (0xC0 ,AUX_REG , src_reg)); + +/* Attempt to swap in new value */ +if (fault) + fault[1 ] = prog; +if (index_reg <0 ) + err =emit_atomic_rmw (&prog,BPF_CMPXCHG , dst_reg,AUX_REG , + insn->off,BPF_SIZE (insn->code)); +else + err =emit_atomic_rmw_index (&prog,BPF_CMPXCHG ,BPF_SIZE (insn->code), + dst_reg,AUX_REG , index_reg, insn->off); +if (WARN_ON (err)) +return err; + +/* ZF tells us whether we won the race. If it's cleared we need to try again. */ +EMIT2 (X86_JNE , -(prog - branch_target) -2 ); +/* Return the pre-modification value */ +emit_mov_reg (&prog, is64, src_reg,BPF_REG_0 ); + +if (resume) + *resume = prog; + +/* Restore R0 after clobbering RAX */ +emit_mov_reg (&prog, true,BPF_REG_0 ,BPF_REG_AX ); + + *pprog = prog; +return 0 ; +} +/* * Metadata encoding for exception handling in JITed code. *
@@ -1693,7 +1766,12 @@ static int emit_atomic_ld_st_index(u8 **pprog, u32 atomic_op, u32 size,* | ARENA_ACC | ARENA_WRITE | Unused | ARENA_REG | DST_REG | INSN_LEN | * +-----------+-------------+--------+-----------+---------+----------+ * -* - INSN_LEN (8 bits): Length of faulting insn (max x86 insn = 15 bytes (fits in 8 bits)). +* - INSN_LEN (8 bits): How far past the faulting insn to resume. That is its own length +* for a single-insn access, but the distance to the end of the whole +* sequence where one BPF insn became several, as for the CMPXCHG loop +* of a fetching AND/OR/XOR. A sequence long enough to overflow this +* field would first have to exceed BPF_MAX_INSN_SIZE, which do_jit() +* rejects with -EFAULT before the image is used. * - DST_REG (8 bits): Offset of dst_reg from reg2pt_regs[] (max offset = 112 (fits in 8 bits)). * This is set to DONT_CLEAR if the insn does not read into a register. * - ARENA_REG (8 bits): Offset of the register that is used to calculate the
@@ -1748,6 +1826,44 @@ bool ex_handler_bpf(const struct exception_table_entry *x, struct pt_regs *regs)return true; } +/* +* Record an arena access that may fault. @fault_ip is the address of the +* faulting insn in the RO image, @resume_off how far past it execution has to +* resume: for a multi-insn lowering that is the end of the whole sequence, not +* the end of the one insn. +*/ +static int emit_arena_exentry (struct bpf_prog *bpf_prog,u8 *image,u8 *rw_image, +int *excnt,u8 *fault_ip,u32 resume_off, +u32 fixup_reg,u32 arena_reg,bool is_write,s16 off) +{ +struct exception_table_entry *ex; +s64 delta; + +if (!bpf_prog->aux->extable) +return 0 ; + +if (*excnt >= bpf_prog->aux->num_exentries) { +pr_err ("arena extable bug\n" ); +return -EFAULT ; + } + ex = &bpf_prog->aux->extable[(*excnt)++]; + + delta = fault_ip - (u8 *)&ex->insn; +/* switch ex to rw buffer for writes */ + ex = (void *)rw_image + ((void *)ex - (void *)image); + + ex->insn = delta; + ex->data =EX_TYPE_BPF |FIELD_PREP (DATA_ARENA_OFFSET_MASK , off); + ex->fixup =FIELD_PREP (FIXUP_INSN_LEN_MASK , resume_off) | +FIELD_PREP (FIXUP_ARENA_REG_MASK , arena_reg) | +FIELD_PREP (FIXUP_REG_MASK , fixup_reg) | +FIXUP_ARENA_ACCESS ; +if (is_write) + ex->fixup |=FIXUP_ARENA_WRITE ; + +return 0 ; +} +static void detect_reg_usage (struct bpf_insn *insn,int insn_cnt,bool *regs_used) {
@@ -2625,28 +2741,8 @@ static int do_jit(struct bpf_verifier_env *env, struct bpf_prog *bpf_prog, int * } populate_extable: { -struct exception_table_entry *ex; -u8 *_insn = image + proglen + (start_of_ldx - temp);u32 arena_reg, fixup_reg;bool is_write; -s64 delta; - -if (!bpf_prog->aux->extable) -break ; - -if (excnt >= bpf_prog->aux->num_exentries) { -pr_err ("mem32 extable bug\n" ); -return -EFAULT ; - } - ex = &bpf_prog->aux->extable[excnt++]; - - delta = _insn - (u8 *)&ex->insn; -/* switch ex to rw buffer for writes */ - ex = (void *)rw_image + ((void *)ex - (void *)image); - - ex->insn = delta; - - ex->data =EX_TYPE_BPF ;/* * src_reg/dst_reg holds the address in the arena region with upper
@@ -2682,14 +2778,12 @@ static int do_jit(struct bpf_verifier_env *env, struct bpf_prog *bpf_prog, int * is_write = true; } - ex->fixup =FIELD_PREP (FIXUP_INSN_LEN_MASK , prog - start_of_ldx) | -FIELD_PREP (FIXUP_ARENA_REG_MASK , arena_reg) | -FIELD_PREP (FIXUP_REG_MASK , fixup_reg); - ex->fixup |=FIXUP_ARENA_ACCESS ; -if (is_write) - ex->fixup |=FIXUP_ARENA_WRITE ; - - ex->data |=FIELD_PREP (DATA_ARENA_OFFSET_MASK , insn->off); + err =emit_arena_exentry (bpf_prog, image, rw_image, &excnt, + image + proglen + (start_of_ldx - temp), + prog - start_of_ldx, fixup_reg, + arena_reg, is_write, insn->off); +if (err) +return err; }break ;
@@ -2841,20 +2935,12 @@ static int do_jit(struct bpf_verifier_env *env, struct bpf_prog *bpf_prog, int * fallthrough;case BPF_STX |BPF_ATOMIC |BPF_W :case BPF_STX |BPF_ATOMIC |BPF_DW : { -bool is64 =BPF_SIZE (insn->code) ==BPF_DW ;u32 real_src_reg = src_reg;u32 real_dst_reg = dst_reg; +bool is_atomic_fetch =is_atomic_fetch_op (insn);u8 *old_prog; -bool is_atomic_fetch = - (insn->imm == (BPF_AND |BPF_FETCH ) || - insn->imm == (BPF_OR |BPF_FETCH ) || - insn->imm == (BPF_XOR |BPF_FETCH )); -if (is_atomic_fetch) { -/* -* Can't be implemented with a single x86 insn. -* Need to do a CMPXCHG loop. -*/ +if (is_atomic_fetch) {/* Will need RAX as a CMPXCHG operand so save R0 */ old_prog = prog;emit_mov_reg (&prog, true,BPF_REG_AX ,BPF_REG_0 );
@@ -2875,34 +2961,11 @@ static int do_jit(struct bpf_verifier_env *env, struct bpf_prog *bpf_prog, int * } }if (is_atomic_fetch) { -u8 *branch_target = prog; -/* Load old value */ -emit_ldx (&prog,BPF_SIZE (insn->code), -BPF_REG_0 , real_dst_reg, insn->off); -/* -* Perform the (commutative) operation locally, -* put the result in the AUX_REG. -*/ -emit_mov_reg (&prog, is64,AUX_REG ,BPF_REG_0 ); -maybe_emit_mod (&prog,AUX_REG , real_src_reg, is64); -EMIT2 (simple_alu_opcodes[BPF_OP (insn->imm)], -add_2reg (0xC0 ,AUX_REG , real_src_reg)); -/* Attempt to swap in new value */ - err =emit_atomic_rmw (&prog,BPF_CMPXCHG , - real_dst_reg,AUX_REG , - insn->off, -BPF_SIZE (insn->code)); -if (WARN_ON (err)) + err =emit_atomic_fetch_rmw (&prog, insn, real_dst_reg, + real_src_reg,-1 ,NULL , +NULL ); +if (err)return err; -/* -* ZF tells us whether we won the race. If it's -* cleared we need to try again. -*/ -EMIT2 (X86_JNE , -(prog - branch_target) -2 ); -/* Return the pre-modification value */ -emit_mov_reg (&prog, is64, real_src_reg,BPF_REG_0 ); -/* Restore R0 after clobbering RAX */ -emit_mov_reg (&prog, true,BPF_REG_0 ,BPF_REG_AX );break ; }
@@ -2926,6 +2989,51 @@ static int do_jit(struct bpf_verifier_env *env, struct bpf_prog *bpf_prog, int * fallthrough;case BPF_STX |BPF_PROBE_ATOMIC |BPF_W :case BPF_STX |BPF_PROBE_ATOMIC |BPF_DW : +if (is_atomic_fetch_op (insn)) { +u32 real_src_reg = src_reg, real_dst_reg = dst_reg; +u8 *fault[2 ], *resume; +int j; + +/* +* An access through a number has its address in +* BPF_REG_AX (see arena_scalar_access()), where the +* loop below has to save R0. +*/ +if (dst_reg ==BPF_REG_AX ) +return -EOPNOTSUPP ; + +/* Will need RAX as a CMPXCHG operand so save R0 */ +emit_mov_reg (&prog, true,BPF_REG_AX ,BPF_REG_0 ); +if (src_reg ==BPF_REG_0 ) + real_src_reg =BPF_REG_AX ; +if (dst_reg ==BPF_REG_0 ) + real_dst_reg =BPF_REG_AX ; + + err =emit_atomic_fetch_rmw (&prog, insn, real_dst_reg, + real_src_reg,X86_REG_R12 , + fault, &resume); +if (err) +return err; + +/* +* The page may be unmapped between the load and the +* CMPXCHG, so both need an entry. Both report a write, +* since the BPF insn is a read-modify-write. +*/ +for (j =0 ; j <2 ; j++) { + err =emit_arena_exentry (bpf_prog, image, rw_image, + &excnt, + image + proglen + + (fault[j] - temp), + resume - fault[j], + reg2pt_regs[real_src_reg], + reg2pt_regs[real_dst_reg], + true, insn->off); +if (err) +return err; + } +break ; + } start_of_ldx = prog;if (bpf_atomic_is_load_store (insn))
@@ -4353,6 +4461,21 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_verifier_env *env, struct bpf_pr padding = true; goto skip_init_addrs; } + +/* +* An arena fetching AND/OR/XOR is lowered to a CMPXCHG loop whose load +* and CMPXCHG can both fault, one more entry than the verifier reserved. +* Only reachable on the first pass, so the count is adjusted once. +*/ +for (i =0 ; prog->aux->arena && i < prog->len; i++) { +const struct bpf_insn *insn = &prog->insnsi[i]; + +if (BPF_CLASS (insn->code) ==BPF_STX && +BPF_MODE (insn->code) ==BPF_PROBE_ATOMIC && +is_atomic_fetch_op (insn)) + prog->aux->num_exentries++; + } + addrs =kvmalloc_objs (*addrs, prog->len +1 );if (!addrs) goto out_addrs;
@@ -4407,7 +4530,9 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_verifier_env *env, struct bpf_pr* The number of entries in extable is the number of BPF_LDX * insns that access kernel memory via "pointer to BTF type". * The verifier changed their opcode from LDX|MEM|size -* to LDX|PROBE_MEM|size to make JITing easier. +* to LDX|PROBE_MEM|size to make JITing easier. Arena +* accesses add one each, and an arena fetching AND/OR/XOR +* one more, see the adjustment of num_exentries above. */ u32 align = __alignof__(struct exception_table_entry ); u32 extable_size = prog->aux->num_exentries *
@@ -4681,16 +4806,6 @@ bool bpf_jit_supports_arena_scalar(void)bool bpf_jit_supports_insn (struct bpf_insn *insn,bool in_arena) { -if (!in_arena) -return true; -switch (insn->code) { -case BPF_STX |BPF_ATOMIC |BPF_W : -case BPF_STX |BPF_ATOMIC |BPF_DW : -if (insn->imm == (BPF_AND |BPF_FETCH ) || - insn->imm == (BPF_OR |BPF_FETCH ) || - insn->imm == (BPF_XOR |BPF_FETCH )) -return false; - }return true; }
Signature · 1 line
2.53.0-Meta
Quoted 5 lines · Puranjay Mohan
arch/x86/net/bpf_jit_comp.c +1
-0@@ -2926,6 +2989,51 @@ static int do_jit(struct bpf_verifier_env *env, struct bpf_prog *bpf_prog, int * fallthrough;case BPF_STX |BPF_PROBE_ATOMIC |BPF_W :case BPF_STX |BPF_PROBE_ATOMIC |BPF_DW : +if (is_atomic_fetch_op (insn)) {
[...]
arch/x86/net/bpf_jit_comp.c static int do_jit(struct bpf_verifier_env *env, struct bpf_prog *bpf_prog, int * · line 3003
Quoted 7 lines
arch/x86/net/bpf_jit_comp.c +7
-0+/* +* An access through a number has its address in +* BPF_REG_AX (see arena_scalar_access()), where the +* loop below has to save R0. +*/ +if (dst_reg ==BPF_REG_AX ) +return -EOPNOTSUPP ;
Reiterating TJ's point differently
can it save R0 with push rax / pop rax in this case, like div/mod do ? When src_reg is R0 the operand is on the stack: 'or r11, [rsp]'.
Every arena access in Rust is through a number, so after this patch fetch_or() works in C and doesn't work in Rust.
It's not "as they did before" either.
The verifier used to say
"BPF_ATOMIC stores into R6 scalar is not allowed".
Now the verifier accepts the prog and the load fails with ENOTSUPP and nothing in the log.
Pls fix and respin patche 1 and 2.
pw-bot: cr
PATCH v4 2/3 selftests/bpf: Test fetching AND/OR/XOR atomics in arena
In reply to Puranjay MohanThe arena and/or/xor tests never exercised the fetching form of the instruction. Commit 2897b1e2a2f4 ("selftests/bpf: Fix arena_atomics failure due to llvm change") deliberately switched them to __c11_atomic_fetch_*() with memory_order_relaxed, which clang lowers to a non-fetching locked instruction when the result is unused, because x86-64 could not JIT the fetching one against an arena.
It can now, so check the returned old value with __sync_fetch_and_*(). Keep a __c11_atomic_fetch_*() of each width per operation with the result
discarded: that spelling is what selects the non-fetching insn, which would otherwise lose its only coverage, on every architecture rather than just x86. Compiling the prog before and after confirms the split: 6 non- fetching and no fetching arena and/or/xor before, 6 and 22 after.
The new globals go in their operation's block, and the or block keeps its u32s first, so .addr_space.1 stays free of the padding holes that clang before 18 cannot fill when it is built without address space casts.
Add a fetch_r0 test for the two register assignments the x86 JIT has to special-case, where the operand and where the arena pointer is R0 and BPF_REG_AX is substituted for it. Clang picks its own registers and will not reliably produce either, so spell the instructions out. The values have bits set above 32 so that a truncating move on that path shows up. Add both forms to the uaf test as well, since the substitution only reaches the exception table when such an access faults, and check that the fault cleared the fetched register and left the address alone.
Both spell addr_space_cast textually, which needs LLVM 19, so uaf gains the __BPF_FEATURE_ADDR_SPACE_CAST guard that every other textual use in the file already has. It was plain C before and built on older clang.
Drop x86 from the exclusion list of the uaf test, which covers the fault path. Its page is gone before the first access, so it faults on the load; the CMPXCHG entry is only reached when the page goes away between the two accesses, which a test cannot arrange.
Finally cover fetching AND/OR/XOR through a number inverifier_arena_scalar: they work on arm64, and x86-64 refuses them.
--- .../selftests/bpf/prog_tests/arena_atomics.c | 47 +++++ .../selftests/bpf/progs/arena_atomics.c | 184 ++++++++++++++---- .../bpf/progs/verifier_arena_scalar.c | 98 ++++++++++ 3 files changed, 291 insertions(+), 38 deletions(-)
tools/testing/selftests/bpf/prog_tests/arena_atomics.c +47 -0
@@ -68,6 +68,12 @@ static void test_and(struct arena_atomics *skel)ASSERT_EQ (skel->arena->and64_value,0x010ull <<32 ,"and64_value" );ASSERT_EQ (skel->arena->and32_value,0x010 ,"and32_value" ); + +ASSERT_EQ (skel->arena->and64_result,0x110ull <<32 ,"and64_result" ); +ASSERT_EQ (skel->arena->and32_result,0x110 ,"and32_result" ); + +ASSERT_EQ (skel->arena->and64_noreturn_value,0x010ull <<32 ,"and64_noreturn_value" ); +ASSERT_EQ (skel->arena->and32_noreturn_value,0x010 ,"and32_noreturn_value" ); }static void test_or (struct arena_atomics *skel)
@@ -85,6 +91,12 @@ static void test_or(struct arena_atomics *skel)ASSERT_EQ (skel->arena->or64_value,0x111ull <<32 ,"or64_value" );ASSERT_EQ (skel->arena->or32_value,0x111 ,"or32_value" ); + +ASSERT_EQ (skel->arena->or64_result,0x110ull <<32 ,"or64_result" ); +ASSERT_EQ (skel->arena->or32_result,0x110 ,"or32_result" ); + +ASSERT_EQ (skel->arena->or64_noreturn_value,0x111ull <<32 ,"or64_noreturn_value" ); +ASSERT_EQ (skel->arena->or32_noreturn_value,0x111 ,"or32_noreturn_value" ); }static void test_xor (struct arena_atomics *skel)
@@ -102,6 +114,12 @@ static void test_xor(struct arena_atomics *skel)ASSERT_EQ (skel->arena->xor64_value,0x101ull <<32 ,"xor64_value" );ASSERT_EQ (skel->arena->xor32_value,0x101 ,"xor32_value" ); + +ASSERT_EQ (skel->arena->xor64_result,0x110ull <<32 ,"xor64_result" ); +ASSERT_EQ (skel->arena->xor32_result,0x110 ,"xor32_result" ); + +ASSERT_EQ (skel->arena->xor64_noreturn_value,0x101ull <<32 ,"xor64_noreturn_value" ); +ASSERT_EQ (skel->arena->xor32_noreturn_value,0x101 ,"xor32_noreturn_value" ); }static void test_cmpxchg (struct arena_atomics *skel)
@@ -146,6 +164,27 @@ static void test_xchg(struct arena_atomics *skel)ASSERT_EQ (skel->arena->xchg32_result,1 ,"xchg32_result" ); } +static void test_fetch_r0 (struct arena_atomics *skel) +{ +LIBBPF_OPTS (bpf_test_run_opts, topts); +int err, prog_fd; + +/* No need to attach it, just run it directly */ + prog_fd =bpf_program__fd (skel->progs.fetch_r0); + err =bpf_prog_test_run_opts (prog_fd, &topts); +if (!ASSERT_OK (err,"test_run_opts err" )) +return ; +if (!ASSERT_OK (topts.retval,"test_run_opts retval" )) +return ; + +ASSERT_EQ (skel->arena->fetch_src_r0_value,0x11100000111ull ,"fetch_src_r0_value" ); +ASSERT_EQ (skel->arena->fetch_src_r0_result,0x11000000110ull ,"fetch_src_r0_result" ); + +ASSERT_EQ (skel->arena->fetch_dst_r0_value,0x11100000111ull ,"fetch_dst_r0_value" ); +ASSERT_EQ (skel->arena->fetch_dst_r0_result,0x11000000110ull ,"fetch_dst_r0_result" ); +ASSERT_EQ (skel->arena->fetch_dst_r0_readback,0x11100000111ull ,"fetch_dst_r0_readback" ); +} +static void test_uaf (struct arena_atomics *skel) {LIBBPF_OPTS (bpf_test_run_opts, topts);
@@ -160,6 +199,12 @@ static void test_uaf(struct arena_atomics *skel)return ;ASSERT_EQ (skel->arena->uaf_recovery_fails,0 ,"uaf_recovery_fails" ); + +/* A fault clears the fetched register and leaves the address alone */ +ASSERT_EQ (skel->arena->uaf_r1_after_dst_r0,0 ,"uaf_r1_after_dst_r0" ); +ASSERT_EQ (skel->arena->uaf_r0_after_dst_r0, skel->arena->uaf_r0_before_dst_r0, +"uaf_r0_after_dst_r0" ); +ASSERT_EQ (skel->arena->uaf_r0_after_src_r0,0 ,"uaf_r0_after_src_r0" ); }static void test_load_acquire (struct arena_atomics *skel)
@@ -256,6 +301,8 @@ void serial_test_arena_atomics(void)test_cmpxchg (skel);if (test__start_subtest ("xchg" ))test_xchg (skel); +if (test__start_subtest ("fetch_r0" )) +test_fetch_r0 (skel);if (test__start_subtest ("uaf" ))test_uaf (skel);if (test__start_subtest ("load_acquire" ))
tools/testing/selftests/bpf/progs/arena_atomics.c +146 -38
251 lines not on this page · raw message
tools/testing/selftests/bpf/progs/verifier_arena_scalar.c +98 -0
104 lines not on this page · raw message
Signature · 1 line
2.53.0-Meta
PATCH v4 3/3 sched_ext: Use fetching atomics for cmask instead of a cmpxchg loop
In reply to Puranjay Mohancid.bpf.h implements cmask_set(), cmask_clear() and the test_and_ variants with a bounded cmpxchg loop, because the x86 BPF JIT used to reject BPF_OR | BPF_FETCH and BPF_AND | BPF_FETCH on arena pointers.
The x86 JIT accepts them now, and the loop was only ever an x86 workaround, not a fallback for the JITs that still reject these. arm64 without LSE rejects every arena read-modify-write, CMPXCHG included, and riscv without Zacas rejects only CMPXCHG, where a fetching OR or AND is accepted and the loop is not.
Use the fetching atomics directly, and drop CMASK_CAS_TRIES along with the error paths that could only be reached from the loop.
Clang emits the fetching form even when the result is unused, so all four helpers now need an x86-64 kernel whose JIT accepts fetching AND/OR/XOR in an arena; schedulers built from this header no longer load on older x86-64 kernels. When the bit is already as wanted, the helpers now also do a locked write of the unchanged value where the loop returned after a plain load.
--- tools/sched_ext/include/scx/cid.bpf.h | 79 +++------------------------ 1 file changed, 8 insertions(+), 71 deletions(-)
tools/sched_ext/include/scx/cid.bpf.h +8 -71
@@ -3,8 +3,8 @@* BPF-side helpers for cids and cmasks. See kernel/sched/ext/cid.h for the * authoritative layout and semantics. The BPF-side helpers use the cmask_* * naming (no scx_ prefix); cmask is the SCX bitmap type so the prefix is -* redundant in BPF code. Atomics use __sync_val_compare_and_swap and every -* helper is inline (no .c counterpart). +* redundant in BPF code. Atomics use the __sync_* builtins and every helper +* is inline (no .c counterpart). * * Included by scx/common.bpf.h; don't include directly. *
@@ -129,101 +129,38 @@ static __always_inline bool cmask_test(u32 cid, const struct scx_cmask __arena *return *__cmask_word (cid, m) &BIT_U64 (cid &63 ); } -/* -* x86 BPF JIT rejects BPF_OR | BPF_FETCH and BPF_AND | BPF_FETCH on arena -* pointers (see bpf_jit_supports_insn() in arch/x86/net/bpf_jit_comp.c). Only -* BPF_CMPXCHG / BPF_XCHG / BPF_ADD with FETCH are allowed. Implement -* test_and_{set,clear} and the atomic set/clear via a cmpxchg loop. -* -* CMASK_CAS_TRIES is sized so exhausting it means seconds of real spinning -* on one word - past any plausible contention. Abort hard. -*/ -#define CMASK_CAS_TRIES (1U << 23) - static __always_inline void cmask_set(u32 cid, struct scx_cmask __arena *m) { - u64 __arena *w; -u64 bit, old, new; -u32 i; -if (!__cmask_contains (cid, m))return ; - w =__cmask_word (cid, m); - bit =BIT_U64 (cid &63 ); - bpf_for(i, 0, CMASK_CAS_TRIES) { - old = *w; -if (old & bit) -return ; - new = old | bit; -if (__sync_val_compare_and_swap (w, old, new) == old) -return ; - } -scx_bpf_error ("cmask_set CAS exhausted at cid %u" , cid); +__sync_fetch_and_or (__cmask_word (cid, m),BIT_U64 (cid &63 )); } static __always_inline void cmask_clear(u32 cid, struct scx_cmask __arena *m) { - u64 __arena *w; -u64 bit, old, new; -u32 i; -if (!__cmask_contains (cid, m))return ; - w =__cmask_word (cid, m); - bit =BIT_U64 (cid &63 ); - bpf_for(i, 0, CMASK_CAS_TRIES) { - old = *w; -if (!(old & bit)) -return ; - new = old & ~bit; -if (__sync_val_compare_and_swap (w, old, new) == old) -return ; - } -scx_bpf_error ("cmask_clear CAS exhausted at cid %u" , cid); +__sync_fetch_and_and (__cmask_word (cid, m), ~BIT_U64 (cid &63 )); } static __always_inline bool cmask_test_and_set(u32 cid, struct scx_cmask __arena *m) { - u64 __arena *w; -u64 bit, old, new; -u32 i; +u64 bit;if (!__cmask_contains (cid, m))return false; - w =__cmask_word (cid, m); bit =BIT_U64 (cid &63 ); - bpf_for(i, 0, CMASK_CAS_TRIES) { - old = *w; -if (old & bit) -return true; - new = old | bit; -if (__sync_val_compare_and_swap (w, old, new) == old) -return false; - } -scx_bpf_error ("cmask_test_and_set CAS exhausted at cid %u" , cid); -return false; +return __sync_fetch_and_or (__cmask_word (cid, m), bit) & bit; } static __always_inline bool cmask_test_and_clear(u32 cid, struct scx_cmask __arena *m) { - u64 __arena *w; -u64 bit, old, new; -u32 i; +u64 bit;if (!__cmask_contains (cid, m))return false; - w =__cmask_word (cid, m); bit =BIT_U64 (cid &63 ); - bpf_for(i, 0, CMASK_CAS_TRIES) { - old = *w; -if (!(old & bit)) -return false; - new = old & ~bit; -if (__sync_val_compare_and_swap (w, old, new) == old) -return true; - } -scx_bpf_error ("cmask_test_and_clear CAS exhausted at cid %u" , cid); -return false; +return __sync_fetch_and_and (__cmask_word (cid, m), ~bit) & bit; } static __always_inline void __cmask_set(u32 cid, struct scx_cmask __arena *m)
Signature · 1 line
2.53.0-Meta
[email protected]
AI reviewRe: [PATCH bpf-next v4 3/3] sched_ext: Use fetching atomics for cmask instead of a cmpxchg loop
TL;DR: Commit message only: the riscv-without-Zacas claim looks impossible since arena needs Zacas, and "all four helpers" needing new JIT support holds only for LLVM >= 20.
Quoted 1 line
sched_ext: Use fetching atomics for cmask instead of a cmpxchg loop
TL;DR: Commit message only: the riscv-without-Zacas claim looks impossible since arena needs Zacas, and "all four helpers" needing new JIT support holds only for LLVM >= 20.
Quoted 15 lines
sched_ext: Use fetching atomics for cmask instead of a cmpxchg loop
cid.bpf.himplementscmask_set(),cmask_clear()and thetest_and_variants with a bounded cmpxchg loop, because the x86 BPF JIT used to rejectBPF_OR|BPF_FETCHandBPF_AND|BPF_FETCHon arena pointers.The x86 JIT accepts them now, and the loop was only ever an x86 workaround, not a fallback for the JITs that still reject these. arm64 without LSE rejects every arena read-modify-write, CMPXCHG included, and riscv without Zacas rejects only CMPXCHG, where a fetching OR or AND is accepted and the loop is not.
Use the fetching atomics directly, and drop
CMASK_CAS_TRIESalong with the error paths that could only be reached from the loop.
Quoted 8 lines
Clang emits the fetching form even when the result is unused, so all four helpers now need an x86-64 kernel whose JIT accepts fetching AND/OR/XOR in an arena; schedulers built from this header no longer load on older x86-64 kernels. When the bit is already as wanted, the helpers now also do a locked write of the unchanged value where the loop returned after a plain load.
Signed-off-by Puranjay Mohan <[email protected]>
The changelog says "riscv without Zacas rejects only CMPXCHG, where a fetching OR or AND is accepted and the loop is not." Can that configuration exist?
On riscv, bpf_jit_supports_arena() returns system_has_cmpxchg128(), which is only defined with CONFIG_RISCV_ISA_ZACAS && CONFIG_TOOLCHAIN_HAS_ZACAS and expands to riscv_has_extension_unlikely(RISCV_ISA_EXT_ZACAS). Since commit 536b523b4073 ("bpf, riscv: Make arena support depend on ZACAS"), without Zacas arena_map_alloc() returns -EOPNOTSUPP and the verifier rejects the program with "JIT doesn't support arena".
Before that commit, arena creation on non-Zacas riscv already failed with -ENOMEM because of f8c67d8550ee ("bpf: Use kmalloc_nolock() in range tree"). That predates the cmask helpers (a58e6b79b432), so no arena program loads on riscv without Zacas, and a fetching OR or AND is not accepted there either.
The "if (insn->imm == BPF_CMPXCHG) return rv_ext_enabled(ZACAS);" check in riscv's bpf_jit_supports_insn() tests the same extension, so it cannot reject an arena CMPXCHG once arena is available.
The main point, that the loop was never a fallback for other JITs, still looks right. Should the riscv sentence be dropped, or reworded to say that riscv needs Zacas for arena at all?
The changelog also says "Clang emits the fetching form even when the result is unused, so all four helpers now need an x86-64 kernel whose JIT accepts fetching AND/OR/XOR in an arena." Is that true for every supported clang?
Commit 2897b1e2a2f4 ("selftests/bpf: Fix arena_atomics failure due to llvm change") records that only LLVM PR 106494 (LLVM 20) made __sync_fetch_and_{and,or,xor}() emit atomic_fetch_*() when the return value is unused. Older LLVM, including LLVM 19 which already has the addr_space_cast support that __arena needs, rewrites unused-result fetches into the non-fetching BPF_AND/BPF_OR atomics, and tools/sched_ext/README.md still lists clang >= 16.0.0.
With such a clang, cmask_set() and cmask_clear() would compile to the non-fetching form:
__sync_fetch_and_or(__cmask_word(cid, m), BIT_U64(cid & 63));
which the x86 JIT already accepted in an arena before this series. Only the test_and_set and test_and_clear helpers would strictly need the new JIT support on those toolchains.
The "schedulers no longer load on older x86-64 kernels" conclusion still holds for scx_qmap, which uses cmask_test_and_clear() in pick_direct_dispatch_cid(). Would it be more accurate to say "with LLVM >= 20" before "all four helpers"?
---
AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
CI run summary: https://github.com/kernel-patches/bpf/actions/runs/38567454417
Re: [PATCH bpf-next v4 3/3] sched_ext: Use fetching atomics for cmask instead of a cmpxchg loop
Quoted 6 lines · On Wed, Oct 14, 2026 at 2:23 PM <[email protected]> wrote:
Quoted 2 lines
sched_ext: Use fetching atomics for cmask instead of a cmpxchg loopTL;DR: Commit message only: the riscv-without-Zacas claim looks impossible since arena needs Zacas, and "all four helpers" needing new JIT support holds only for LLVM >= 20.
LLVM >= 20 is expected now.
Hello, Puranjay.
Quoted 3 lines · Puranjay Mohan
A fetching AND/OR/XOR against arena memory is rejected on x86-64:
BPF_ATOMICstores into R1 arena is not allowed
- 1/3: A fetching atomic through a number now fails to load with an empty verifier log, where it used to get the message above. That seems problematic. Can that case keep an error message?
- 3/3: sched_ext/for-7.4 already synced a cid.bpf.h from scx which probes for the fetching atomics and keeps the CAS loop as the old-kernel fallback, so this conflicts with it. I'll pull bpf/for-next into sched_ext/for-7.4 and we can do the modifications on top.
For 1/3 and 2/3,
Thanks.
Signature · 1 line
tejun