lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Thu, 03 Dec 2020 22:35:24 +0100
From:   Toke Høiland-Jørgensen <>
To:     Jakub Kicinski <>
Cc:     "David S. Miller" <>,
        Daniel Borkmann <>,
        Alexei Starovoitov <>,
        Andrii Nakryiko <>,
        Martin KaFai Lau <>,
        Song Liu <>, Yonghong Song <>,
        John Fastabend <>,
        KP Singh <>,
        Jesper Dangaard Brouer <>,
        "Michael S. Tsirkin" <>,
        Romain Perier <>,
        Allen Pais <>,
        Grygorii Strashko <>,
        Simon Horman <>,
        "Gustavo A. R. Silva" <>,
        Lorenzo Bianconi <>,
        Wei Yongjun <>,
        Jiri Benc <>,,,,
Subject: [PATCH bpf 7/7] selftests/bpf/ filter bpftool
 internal map when counting maps

From: Toke Høiland-Jørgensen <>

A few of the tests in expects to see a certain number of
maps created, and checks this by counting the number of maps returned by
bpftool. There is already a filter that will remove any maps already there
at the beginning of the test, but bpftool now creates a map for the PID
iterator rodata on each invocation, which makes the map count wrong. Fix
this by also filtering the pid_iter.rodata map by name when counting.

Signed-off-by: Toke Høiland-Jørgensen <>
 tools/testing/selftests/bpf/ |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/bpf/ b/tools/testing/selftests/bpf/
index f861503433c9..be2c7e3f57c4 100755
--- a/tools/testing/selftests/bpf/
+++ b/tools/testing/selftests/bpf/
@@ -184,9 +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
-    for m in base_maps:
-        if m in maps:
-            maps.remove(m)
+    maps = [m for m in maps if m not in base_maps 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" %
@@ -764,6 +762,9 @@ ret, progs = bpftool("prog", fail=False)
 skip(ret != 0, "bpftool not installed")
 base_progs = progs
 _, base_maps = bpftool("map")
+base_map_names = [
+    'pid_iter.rodata' # created on each bpftool invocation
 # Check netdevsim
 ret, out = cmd("modprobe netdevsim", fail=False)

Powered by blists - more mailing lists