Skip to content

bpf, test_offload.py: Skip base maps without names

Felix Maurer requested to merge fmaurer-rh/centos-stream-9:bz2076961 into main

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2076961
Upstream Status: bpf-next

commit 891663ace74c23321a40f4bae13e45a1803d5e20
Author: Yauheni Kaliuta ykaliuta@redhat.com
Date: Tue Mar 29 11:11:00 2022 +0300

bpf, test_offload.py: Skip base maps without names  

The test fails:  
  [...]  
  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 [0]. So, just skip the unnamed maps.  

  [0] https://lore.kernel.org/bpf/CAEf4BzY66WPKQbDe74AKZ6nFtZjq5e+G3Ji2egcVytB9R6_sGQ@mail.gmail.com/  

Signed-off-by: Yauheni Kaliuta <ykaliuta@redhat.com>  
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>  
Acked-by: Quentin Monnet <quentin@isovalent.com>  
Link: https://lore.kernel.org/bpf/20220329081100.9705-1-ykaliuta@redhat.com  

Signed-off-by: Felix Maurer fmaurer@redhat.com

Edited by Felix Maurer

Merge request reports