Skip to contentSkip to conversation

selftests/bpf: ensure all CI arches set CONFIG_BPF_KPROBE_OVERRIDE=y

PATCH Applied Andrii Nakryiko 2 participants 2 messages Sep 12, 2023

Subsystems (3)
lore
Share & tools
lore

Andrii Nakryiko

author maintainer
#0 lore raw

PATCH 1/1 selftests/bpf: ensure all CI arches set CONFIG_BPF_KPROBE_OVERRIDE=y

Turns out CONFIG_BPF_KPROBE_OVERRIDE=y is only enabled in x86-64 CI, but is not set on aarch64, causing CI failures ([0]).

Move CONFIG_BPF_KPROBE_OVERRIDE=y to arch-agnostic CI config.

[0] https://github.com/kernel-patches/bpf/actions/runs/6122324047/job/16618390535

Fixes 7182e56411b9 ("selftests/bpf: Add kprobe_multi override test")
---
 tools/testing/selftests/bpf/config        | 1 +
 tools/testing/selftests/bpf/config.x86_64 | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/config +1 -0
index 1c7584e8dd9e..e41eb33b2704 100644
@@ -4,6 +4,7 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 CONFIG_BPF=y
 CONFIG_BPF_EVENTS=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_LIRC_MODE2=y
 CONFIG_BPF_LSM=y
 CONFIG_BPF_STREAM_PARSER=y
tools/testing/selftests/bpf/config.x86_64 +0 -1
index b650b2e617b8..2e70a6048278 100644
@@ -20,7 +20,6 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BONDING=y
 CONFIG_BOOTTIME_TRACING=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_PRELOAD_UMD=y
 CONFIG_BPFILTER=y
Signature · 1 line
2.34.1
#1 lore raw
This patch was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

This patch was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:

Quoted 8 lines · On Mon, 11 Sep 2023 22:59:28 -0700 you wrote:

Turns out CONFIG_BPF_KPROBE_OVERRIDE=y is only enabled in x86-64 CI, but is not set on aarch64, causing CI failures ([0]).

Move CONFIG_BPF_KPROBE_OVERRIDE=y to arch-agnostic CI config.

[0] https://github.com/kernel-patches/bpf/actions/runs/6122324047/job/16618390535

[...]

Here is the summary with links:
- [bpf] selftests/bpf: ensure all CI arches set CONFIG_BPF_KPROBE_OVERRIDE=y

    https://git.kernel.org/bpf/bpf/c/4eb94a779307

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html