| Message ID | 20220329081100.9705-1-ykaliuta@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 891663ace74c23321a40f4bae13e45a1803d5e20 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] bpf: test_offload.py: skip base maps without names | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <daniel@iogearbox.net>: On Tue, 29 Mar 2022 11:11:00 +0300 you wrote: > The test fails: > > # ./test_offload.py > ... > Test bpftool bound info reporting (own ns)... > FAIL: 3 BPF maps loaded, expected 2 > File "/root/bpf-next/tools/testing/selftests/bpf/./test_offload.py", line 1177, in <module> > check_dev_info(False, "") > File "/root/bpf-next/tools/testing/selftests/bpf/./test_offload.py", line 645, in check_dev_info > maps = bpftool_map_list(expected=2, ns=ns) > File "/root/bpf-next/tools/testing/selftests/bpf/./test_offload.py", line 190, in bpftool_map_list > fail(True, "%d BPF maps loaded, expected %d" % > File "/root/bpf-next/tools/testing/selftests/bpf/./test_offload.py", line 86, in fail > tb = "".join(traceback.extract_stack().format()) > > [...] Here is the summary with links: - [bpf-next] bpf: test_offload.py: skip base maps without names https://git.kernel.org/bpf/bpf-next/c/891663ace74c You are awesome, thank you!
diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py index edaffd43da83..6cd6ef9fc20b 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -184,7 +184,7 @@ def bpftool_prog_list(expected=None, ns=""): def bpftool_map_list(expected=None, ns=""): _, maps = bpftool("map show", JSON=True, ns=ns, fail=True) # Remove the base maps - maps = [m for m in maps if m not in base_maps and m.get('name') not in base_map_names] + maps = [m for m in maps if m not in base_maps and m.get('name') and m.get('name') not in base_map_names] if expected is not None: if len(maps) != expected: fail(True, "%d BPF maps loaded, expected %d" %
The test fails: # ./test_offload.py ... Test bpftool bound info reporting (own ns)... FAIL: 3 BPF maps loaded, expected 2 File "/root/bpf-next/tools/testing/selftests/bpf/./test_offload.py", line 1177, in <module> check_dev_info(False, "") File "/root/bpf-next/tools/testing/selftests/bpf/./test_offload.py", line 645, in check_dev_info maps = bpftool_map_list(expected=2, ns=ns) File "/root/bpf-next/tools/testing/selftests/bpf/./test_offload.py", line 190, in bpftool_map_list fail(True, "%d BPF maps loaded, expected %d" % File "/root/bpf-next/tools/testing/selftests/bpf/./test_offload.py", line 86, in fail tb = "".join(traceback.extract_stack().format()) Some base maps do not have names and they cannot be added due to compatibility with older kernels, see https://lore.kernel.org/bpf/CAEf4BzY66WPKQbDe74AKZ6nFtZjq5e+G3Ji2egcVytB9R6_sGQ@mail.gmail.com/ So, just skip the unnamed maps. Signed-off-by: Yauheni Kaliuta <ykaliuta@redhat.com> --- tools/testing/selftests/bpf/test_offload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)