Skip to content

Commit 1bfe7f6

Browse files
peilin-yeAlexei Starovoitov
authored andcommitted
bpf, arm64: Support load-acquire and store-release instructions
Support BPF load-acquire (BPF_LOAD_ACQ) and store-release (BPF_STORE_REL) instructions in the arm64 JIT compiler. For example (assuming little-endian): db 10 00 00 00 01 00 00 r0 = load_acquire((u64 *)(r1 + 0x0)) 95 00 00 00 00 00 00 00 exit opcode (0xdb): BPF_ATOMIC | BPF_DW | BPF_STX imm (0x00000100): BPF_LOAD_ACQ The JIT compiler would emit an LDAR instruction for the above, e.g.: ldar x7, [x0] Similarly, consider the following 16-bit store-release: cb 21 00 00 10 01 00 00 store_release((u16 *)(r1 + 0x0), w2) 95 00 00 00 00 00 00 00 exit opcode (0xcb): BPF_ATOMIC | BPF_H | BPF_STX imm (0x00000110): BPF_STORE_REL An STLRH instruction would be emitted, e.g.: stlrh w1, [x0] For a complete mapping: load-acquire 8-bit LDARB (BPF_LOAD_ACQ) 16-bit LDARH 32-bit LDAR (32-bit) 64-bit LDAR (64-bit) store-release 8-bit STLRB (BPF_STORE_REL) 16-bit STLRH 32-bit STLR (32-bit) 64-bit STLR (64-bit) Arena accesses are supported. bpf_jit_supports_insn(..., /*in_arena=*/true) always returns true for BPF_LOAD_ACQ and BPF_STORE_REL instructions, as they don't depend on ARM64_HAS_LSE_ATOMICS. Acked-by: Xu Kuohai <[email protected]> Signed-off-by: Peilin Ye <[email protected]> Link: https://lore.kernel.org/r/51664a1300710238ba2d4d95142b57a52c4f0cae.1741049567.git.yepeilin@google.com Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 248b190 commit 1bfe7f6

File tree

2 files changed

+104
-6
lines changed

2 files changed

+104
-6
lines changed

arch/arm64/net/bpf_jit.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,26 @@
119119
aarch64_insn_gen_load_store_ex(Rt, Rn, Rs, A64_SIZE(sf), \
120120
AARCH64_INSN_LDST_STORE_REL_EX)
121121

122+
/* Load-acquire & store-release */
123+
#define A64_LDAR(Rt, Rn, size) \
124+
aarch64_insn_gen_load_acq_store_rel(Rt, Rn, AARCH64_INSN_SIZE_##size, \
125+
AARCH64_INSN_LDST_LOAD_ACQ)
126+
#define A64_STLR(Rt, Rn, size) \
127+
aarch64_insn_gen_load_acq_store_rel(Rt, Rn, AARCH64_INSN_SIZE_##size, \
128+
AARCH64_INSN_LDST_STORE_REL)
129+
130+
/* Rt = [Rn] (load acquire) */
131+
#define A64_LDARB(Wt, Xn) A64_LDAR(Wt, Xn, 8)
132+
#define A64_LDARH(Wt, Xn) A64_LDAR(Wt, Xn, 16)
133+
#define A64_LDAR32(Wt, Xn) A64_LDAR(Wt, Xn, 32)
134+
#define A64_LDAR64(Xt, Xn) A64_LDAR(Xt, Xn, 64)
135+
136+
/* [Rn] = Rt (store release) */
137+
#define A64_STLRB(Wt, Xn) A64_STLR(Wt, Xn, 8)
138+
#define A64_STLRH(Wt, Xn) A64_STLR(Wt, Xn, 16)
139+
#define A64_STLR32(Wt, Xn) A64_STLR(Wt, Xn, 32)
140+
#define A64_STLR64(Xt, Xn) A64_STLR(Xt, Xn, 64)
141+
122142
/*
123143
* LSE atomics
124144
*

arch/arm64/net/bpf_jit_comp.c

Lines changed: 84 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,81 @@ static int emit_bpf_tail_call(struct jit_ctx *ctx)
647647
return 0;
648648
}
649649

650+
static int emit_atomic_ld_st(const struct bpf_insn *insn, struct jit_ctx *ctx)
651+
{
652+
const s32 imm = insn->imm;
653+
const s16 off = insn->off;
654+
const u8 code = insn->code;
655+
const bool arena = BPF_MODE(code) == BPF_PROBE_ATOMIC;
656+
const u8 arena_vm_base = bpf2a64[ARENA_VM_START];
657+
const u8 dst = bpf2a64[insn->dst_reg];
658+
const u8 src = bpf2a64[insn->src_reg];
659+
const u8 tmp = bpf2a64[TMP_REG_1];
660+
u8 reg;
661+
662+
switch (imm) {
663+
case BPF_LOAD_ACQ:
664+
reg = src;
665+
break;
666+
case BPF_STORE_REL:
667+
reg = dst;
668+
break;
669+
default:
670+
pr_err_once("unknown atomic load/store op code %02x\n", imm);
671+
return -EINVAL;
672+
}
673+
674+
if (off) {
675+
emit_a64_add_i(1, tmp, reg, tmp, off, ctx);
676+
reg = tmp;
677+
}
678+
if (arena) {
679+
emit(A64_ADD(1, tmp, reg, arena_vm_base), ctx);
680+
reg = tmp;
681+
}
682+
683+
switch (imm) {
684+
case BPF_LOAD_ACQ:
685+
switch (BPF_SIZE(code)) {
686+
case BPF_B:
687+
emit(A64_LDARB(dst, reg), ctx);
688+
break;
689+
case BPF_H:
690+
emit(A64_LDARH(dst, reg), ctx);
691+
break;
692+
case BPF_W:
693+
emit(A64_LDAR32(dst, reg), ctx);
694+
break;
695+
case BPF_DW:
696+
emit(A64_LDAR64(dst, reg), ctx);
697+
break;
698+
}
699+
break;
700+
case BPF_STORE_REL:
701+
switch (BPF_SIZE(code)) {
702+
case BPF_B:
703+
emit(A64_STLRB(src, reg), ctx);
704+
break;
705+
case BPF_H:
706+
emit(A64_STLRH(src, reg), ctx);
707+
break;
708+
case BPF_W:
709+
emit(A64_STLR32(src, reg), ctx);
710+
break;
711+
case BPF_DW:
712+
emit(A64_STLR64(src, reg), ctx);
713+
break;
714+
}
715+
break;
716+
default:
717+
pr_err_once("unexpected atomic load/store op code %02x\n",
718+
imm);
719+
return -EINVAL;
720+
}
721+
722+
return 0;
723+
}
724+
650725
#ifdef CONFIG_ARM64_LSE_ATOMICS
651726
static int emit_lse_atomic(const struct bpf_insn *insn, struct jit_ctx *ctx)
652727
{
@@ -1641,11 +1716,17 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
16411716
return ret;
16421717
break;
16431718

1719+
case BPF_STX | BPF_ATOMIC | BPF_B:
1720+
case BPF_STX | BPF_ATOMIC | BPF_H:
16441721
case BPF_STX | BPF_ATOMIC | BPF_W:
16451722
case BPF_STX | BPF_ATOMIC | BPF_DW:
1723+
case BPF_STX | BPF_PROBE_ATOMIC | BPF_B:
1724+
case BPF_STX | BPF_PROBE_ATOMIC | BPF_H:
16461725
case BPF_STX | BPF_PROBE_ATOMIC | BPF_W:
16471726
case BPF_STX | BPF_PROBE_ATOMIC | BPF_DW:
1648-
if (cpus_have_cap(ARM64_HAS_LSE_ATOMICS))
1727+
if (bpf_atomic_is_load_store(insn))
1728+
ret = emit_atomic_ld_st(insn, ctx);
1729+
else if (cpus_have_cap(ARM64_HAS_LSE_ATOMICS))
16491730
ret = emit_lse_atomic(insn, ctx);
16501731
else
16511732
ret = emit_ll_sc_atomic(insn, ctx);
@@ -2667,13 +2748,10 @@ bool bpf_jit_supports_insn(struct bpf_insn *insn, bool in_arena)
26672748
if (!in_arena)
26682749
return true;
26692750
switch (insn->code) {
2670-
case BPF_STX | BPF_ATOMIC | BPF_B:
2671-
case BPF_STX | BPF_ATOMIC | BPF_H:
26722751
case BPF_STX | BPF_ATOMIC | BPF_W:
26732752
case BPF_STX | BPF_ATOMIC | BPF_DW:
2674-
if (bpf_atomic_is_load_store(insn))
2675-
return false;
2676-
if (!cpus_have_cap(ARM64_HAS_LSE_ATOMICS))
2753+
if (!bpf_atomic_is_load_store(insn) &&
2754+
!cpus_have_cap(ARM64_HAS_LSE_ATOMICS))
26772755
return false;
26782756
}
26792757
return true;

0 commit comments

Comments
 (0)