mbox series

[bpf-next,v4,0/4] bpf, arm64: support more atomic ops

Message ID 20220217072232.1186625-1-houtao1@huawei.com (mailing list archive)
Headers show
Series bpf, arm64: support more atomic ops | expand

Message

Hou Tao Feb. 17, 2022, 7:22 a.m. UTC
Hi,

Atomics support in bpf has already been done by "Atomics for eBPF"
patch series [1], but it only adds support for x86, and this patchset
adds support for arm64.

Patch #1 & patch #2 are arm64 related. Patch #1 moves the common used
macro AARCH64_BREAK_FAULT into insn-def.h for insn.h. Patch #2 adds
necessary encoder helpers for atomic operations.

Patch #3 implements atomic[64]_fetch_add, atomic[64]_[fetch_]{and,or,xor}
and atomic[64]_{xchg|cmpxchg} for arm64 bpf. Patch #4 changes the type of
test program from fentry/ to raw_tp/ for atomics test.

For cpus_have_cap(ARM64_HAS_LSE_ATOMICS) case and no-LSE-ATOMICS case,
./test_verifier, "./test_progs -t atomic", and "insmod ./test_bpf.ko"
are exercised and passed correspondingly.

Comments are always welcome.

Regards,
Tao

[1]: https://lore.kernel.org/bpf/20210114181751.768687-2-jackmanb@google.com/

Change Log:
v4:
 * patch #2: update A64_STADD() accordingly to fix build failure after
   applying patch #1 & patch #2.

v3: https://lore.kernel.org/bpf/20220129220452.194585-1-houtao1@huawei.com/
 * split arm64 insn related code into a separated patch (from Mark)
 * update enum name in aarch64_insn_mem_atomic_op (from Mark)
 * consider all cases for aarch64_insn_mem_order_type and
   aarch64_insn_mb_type (from Mark)
 * exercise and pass "insmod ./test_bpf.ko" test (suggested by Daniel)
 * remove aarch64_insn_gen_store_release_ex() and extend
   aarch64_insn_ldst_type instead
 * compile aarch64_insn_gen_atomic_ld_op(), aarch64_insn_gen_cas() and
   emit_lse_atomic() out when CONFIG_ARM64_LSE_ATOMICS is disabled.

v2: https://lore.kernel.org/bpf/20220127075322.675323-1-houtao1@huawei.com/
  * patch #1: use two separated ASSERT_OK() instead of ASSERT_TRUE()
  * add Acked-by tag for both patches

v1: https://lore.kernel.org/bpf/20220121135632.136976-1-houtao1@huawei.com

Hou Tao (4):
  arm64: move AARCH64_BREAK_FAULT into insn-def.h
  arm64: insn: add encoders for atomic operations
  bpf, arm64: support more atomic operations
  selftests/bpf: use raw_tp program for atomic test

 arch/arm64/include/asm/debug-monitors.h       |  12 -
 arch/arm64/include/asm/insn-def.h             |  14 ++
 arch/arm64/include/asm/insn.h                 |  80 ++++++-
 arch/arm64/lib/insn.c                         | 185 +++++++++++++--
 arch/arm64/net/bpf_jit.h                      |  44 +++-
 arch/arm64/net/bpf_jit_comp.c                 | 223 ++++++++++++++----
 .../selftests/bpf/prog_tests/atomics.c        |  91 ++-----
 tools/testing/selftests/bpf/progs/atomics.c   |  28 +--
 8 files changed, 517 insertions(+), 160 deletions(-)

Comments

Will Deacon Feb. 22, 2022, 10:38 p.m. UTC | #1
On Thu, 17 Feb 2022 15:22:28 +0800, Hou Tao wrote:
> Atomics support in bpf has already been done by "Atomics for eBPF"
> patch series [1], but it only adds support for x86, and this patchset
> adds support for arm64.
> 
> Patch #1 & patch #2 are arm64 related. Patch #1 moves the common used
> macro AARCH64_BREAK_FAULT into insn-def.h for insn.h. Patch #2 adds
> necessary encoder helpers for atomic operations.
> 
> [...]

Applied to arm64 (for-next/insn), thanks!

[1/4] arm64: move AARCH64_BREAK_FAULT into insn-def.h
      https://git.kernel.org/arm64/c/97e58e395e9c
[2/4] arm64: insn: add encoders for atomic operations
      https://git.kernel.org/arm64/c/fa1114d9eba5
[3/4] bpf, arm64: support more atomic operations
      (no commit info)
[4/4] selftests/bpf: use raw_tp program for atomic test
      (no commit info)

Cheers,
Will Deacon Feb. 22, 2022, 10:42 p.m. UTC | #2
On Tue, Feb 22, 2022 at 10:38:02PM +0000, Will Deacon wrote:
> On Thu, 17 Feb 2022 15:22:28 +0800, Hou Tao wrote:
> > Atomics support in bpf has already been done by "Atomics for eBPF"
> > patch series [1], but it only adds support for x86, and this patchset
> > adds support for arm64.
> > 
> > Patch #1 & patch #2 are arm64 related. Patch #1 moves the common used
> > macro AARCH64_BREAK_FAULT into insn-def.h for insn.h. Patch #2 adds
> > necessary encoder helpers for atomic operations.
> > 
> > [...]
> 
> Applied to arm64 (for-next/insn), thanks!
> 
> [1/4] arm64: move AARCH64_BREAK_FAULT into insn-def.h
>       https://git.kernel.org/arm64/c/97e58e395e9c
> [2/4] arm64: insn: add encoders for atomic operations
>       https://git.kernel.org/arm64/c/fa1114d9eba5

Daniel -- let's give this a day or so in -next, then if nothing catches
fire you're more than welcome to pull this branch as a base for the rest
of the series.

Cheers,

Will
Daniel Borkmann Feb. 28, 2022, 3:36 p.m. UTC | #3
On 2/22/22 11:42 PM, Will Deacon wrote:
> On Tue, Feb 22, 2022 at 10:38:02PM +0000, Will Deacon wrote:
>> On Thu, 17 Feb 2022 15:22:28 +0800, Hou Tao wrote:
>>> Atomics support in bpf has already been done by "Atomics for eBPF"
>>> patch series [1], but it only adds support for x86, and this patchset
>>> adds support for arm64.
>>>
>>> Patch #1 & patch #2 are arm64 related. Patch #1 moves the common used
>>> macro AARCH64_BREAK_FAULT into insn-def.h for insn.h. Patch #2 adds
>>> necessary encoder helpers for atomic operations.
>>>
>>> [...]
>>
>> Applied to arm64 (for-next/insn), thanks!
>>
>> [1/4] arm64: move AARCH64_BREAK_FAULT into insn-def.h
>>        https://git.kernel.org/arm64/c/97e58e395e9c
>> [2/4] arm64: insn: add encoders for atomic operations
>>        https://git.kernel.org/arm64/c/fa1114d9eba5
> 
> Daniel -- let's give this a day or so in -next, then if nothing catches
> fire you're more than welcome to pull this branch as a base for the rest
> of the series.

Thanks Will! Pulled and applied the rest to bpf-next, thanks everyone!