Message ID | 20250318143318.656785-10-aspsk@isovalent.com (mailing list archive) |
---|---|
State | RFC |
Delegated to: | BPF |
Headers | show |
Series | instruction sets and static keys | expand |
Context | Check | Description |
---|---|---|
bpf/vmtest-bpf-next-VM_Test-0 | success | Logs for Lint |
bpf/vmtest-bpf-next-VM_Test-1 | success | Logs for ShellCheck |
bpf/vmtest-bpf-next-VM_Test-2 | success | Logs for Unittests |
bpf/vmtest-bpf-next-VM_Test-3 | success | Logs for Validate matrix.py |
bpf/vmtest-bpf-next-PR | fail | PR summary |
bpf/vmtest-bpf-next-VM_Test-6 | success | Logs for aarch64-gcc / build-release |
bpf/vmtest-bpf-next-VM_Test-7 | success | Logs for aarch64-gcc / veristat-kernel |
bpf/vmtest-bpf-next-VM_Test-8 | success | Logs for aarch64-gcc / veristat-meta |
bpf/vmtest-bpf-next-VM_Test-9 | success | Logs for s390x-gcc / GCC BPF |
bpf/vmtest-bpf-next-VM_Test-10 | fail | Logs for s390x-gcc / build / build for s390x with gcc |
bpf/vmtest-bpf-next-VM_Test-11 | success | Logs for s390x-gcc / build-release |
bpf/vmtest-bpf-next-VM_Test-12 | success | Logs for s390x-gcc / veristat-kernel |
bpf/vmtest-bpf-next-VM_Test-4 | success | Logs for aarch64-gcc / GCC BPF |
bpf/vmtest-bpf-next-VM_Test-5 | fail | Logs for aarch64-gcc / build / build for aarch64 with gcc |
bpf/vmtest-bpf-next-VM_Test-13 | success | Logs for s390x-gcc / veristat-meta |
bpf/vmtest-bpf-next-VM_Test-14 | success | Logs for set-matrix |
bpf/vmtest-bpf-next-VM_Test-15 | success | Logs for test |
bpf/vmtest-bpf-next-VM_Test-16 | success | Logs for test |
bpf/vmtest-bpf-next-VM_Test-17 | success | Logs for test |
bpf/vmtest-bpf-next-VM_Test-18 | success | Logs for test |
bpf/vmtest-bpf-next-VM_Test-19 | success | Logs for test |
bpf/vmtest-bpf-next-VM_Test-20 | success | Logs for x86_64-gcc / GCC BPF |
bpf/vmtest-bpf-next-VM_Test-21 | fail | Logs for x86_64-gcc / build / build for x86_64 with gcc |
bpf/vmtest-bpf-next-VM_Test-22 | success | Logs for x86_64-gcc / build-release |
bpf/vmtest-bpf-next-VM_Test-23 | success | Logs for x86_64-gcc / veristat-kernel |
bpf/vmtest-bpf-next-VM_Test-24 | success | Logs for x86_64-gcc / veristat-meta |
bpf/vmtest-bpf-next-VM_Test-25 | success | Logs for x86_64-llvm-17 / GCC BPF |
bpf/vmtest-bpf-next-VM_Test-26 | fail | Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17 |
bpf/vmtest-bpf-next-VM_Test-27 | fail | Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2 |
bpf/vmtest-bpf-next-VM_Test-28 | success | Logs for x86_64-llvm-17 / veristat-kernel |
bpf/vmtest-bpf-next-VM_Test-29 | success | Logs for x86_64-llvm-17 / veristat-meta |
bpf/vmtest-bpf-next-VM_Test-30 | success | Logs for x86_64-llvm-18 / GCC BPF |
bpf/vmtest-bpf-next-VM_Test-31 | fail | Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18 |
bpf/vmtest-bpf-next-VM_Test-32 | fail | Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2 |
bpf/vmtest-bpf-next-VM_Test-33 | success | Logs for x86_64-llvm-18 / veristat-kernel |
bpf/vmtest-bpf-next-VM_Test-34 | success | Logs for x86_64-llvm-18 / veristat-meta |
diff --git a/tools/testing/selftests/bpf/bpf_arena_spin_lock.h b/tools/testing/selftests/bpf/bpf_arena_spin_lock.h index fb8dc0768999..d60d899dd9da 100644 --- a/tools/testing/selftests/bpf/bpf_arena_spin_lock.h +++ b/tools/testing/selftests/bpf/bpf_arena_spin_lock.h @@ -95,8 +95,13 @@ struct arena_qnode { #define _Q_LOCKED_VAL (1U << _Q_LOCKED_OFFSET) #define _Q_PENDING_VAL (1U << _Q_PENDING_OFFSET) +#ifndef likely #define likely(x) __builtin_expect(!!(x), 1) +#endif + +#ifndef unlikely #define unlikely(x) __builtin_expect(!!(x), 0) +#endif struct arena_qnode __arena qnodes[_Q_MAX_CPUS][_Q_MAX_NODES]; diff --git a/tools/testing/selftests/bpf/progs/iters.c b/tools/testing/selftests/bpf/progs/iters.c index 427b72954b87..1b9a908f2607 100644 --- a/tools/testing/selftests/bpf/progs/iters.c +++ b/tools/testing/selftests/bpf/progs/iters.c @@ -7,7 +7,9 @@ #include "bpf_misc.h" #include "bpf_compiler.h" +#ifndef unlikely #define unlikely(x) __builtin_expect(!!(x), 0) +#endif static volatile int zero = 0;
Add guard macros around likely/unlikely definitions such that, if defined previously, the compilation doesn't break. (Those macros, actually, will be defined in libbpf in a consequent commit.) Signed-off-by: Anton Protopopov <aspsk@isovalent.com> --- tools/testing/selftests/bpf/bpf_arena_spin_lock.h | 5 +++++ tools/testing/selftests/bpf/progs/iters.c | 2 ++ 2 files changed, 7 insertions(+)