Skip to contentSkip to conversation

selftests/bpf: Bring test_offload.py back to life

PATCH Applied Stanislav Fomichev 2 participants 2 messages Dec 6, 2022 – Dec 8, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 selftests/bpf: Bring test_offload.py back to life

Bpftool has new extra libbpf_det_bind probing map we need to exclude. Also skip trying to load netdevsim modules if it's already loaded (builtin).

v2:
- drop iproute2->bpftool changes (Toke)

Cc Jakub Kicinski <[email protected]>
Cc Toke Høiland-Jørgensen <[email protected]>
---
 tools/testing/selftests/bpf/test_offload.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/test_offload.py +5 -3
index 7fc15e0d24a9..7cb1bc05e5cf 100755
@@ -769,12 +769,14 @@ skip(ret != 0, "bpftool not installed")
 base_progs = progs
 _, base_maps = bpftool("map")
 base_map_names = [
-    'pid_iter.rodata' # created on each bpftool invocation
+    'pid_iter.rodata', # created on each bpftool invocation
+    'libbpf_det_bind', # created on each bpftool invocation
 ]
 
 # Check netdevsim
-ret, out = cmd("modprobe netdevsim", fail=False)
-skip(ret != 0, "netdevsim module could not be loaded")
+if not os.path.isdir("/sys/bus/netdevsim/"):
+    ret, out = cmd("modprobe netdevsim", fail=False)
+    skip(ret != 0, "netdevsim module could not be loaded")
 
 # Check debugfs
 _, out = cmd("mount")
Signature · 1 line
2.39.0.rc0.267.gcb52ba06e7-goog
#1 lore raw
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Quoted 11 lines · On Tue, 6 Dec 2022 15:27:39 -0800 you wrote:

Bpftool has new extra libbpf_det_bind probing map we need to exclude. Also skip trying to load netdevsim modules if it's already loaded (builtin).

v2:
- drop iproute2->bpftool changes (Toke)

Cc Jakub Kicinski <[email protected]>
Cc Toke Høiland-Jørgensen <[email protected]>

[...]

Here is the summary with links:
- [bpf-next,v2] selftests/bpf: Bring test_offload.py back to life

    https://git.kernel.org/bpf/bpf-next/c/e60db051a4a7

You are awesome, thank you!

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