From patchwork Wed Dec 9 13:57:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 341729 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06912C433FE for ; Wed, 9 Dec 2020 14:08:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C27D123B40 for ; Wed, 9 Dec 2020 14:08:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732932AbgLIOIk (ORCPT ); Wed, 9 Dec 2020 09:08:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59082 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729074AbgLIOIe (ORCPT ); Wed, 9 Dec 2020 09:08:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607522827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rdg7j0aoyv9xFKjTcy/3BS13uPnBUVbkHjhjaK6AxE0=; b=Xg41ROUCHLS7Bhhv/hudL8m8WLpA0gIoRAw/pSIwCpeJhnvzyztaYhU10iJm2arJWECW4K oAMCq4zkEPt+dfMMl4WTJHAhqgZthZ/Rj/o7qMSG7ptswqqtSpLtyQ19bTv7Y1tk8dHKi6 4WSw2Kfg2uZz4H4y3ttA0wQF1NqyGDc= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-256-dx8O8_hCPJ-0dOqWfL-AeQ-1; Wed, 09 Dec 2020 09:07:05 -0500 X-MC-Unique: dx8O8_hCPJ-0dOqWfL-AeQ-1 Received: by mail-wr1-f72.google.com with SMTP id v5so716320wrr.0 for ; Wed, 09 Dec 2020 06:07:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=rdg7j0aoyv9xFKjTcy/3BS13uPnBUVbkHjhjaK6AxE0=; b=ReX0QCWE6OQ56j5dEYIp3n4O41+Okqk11X4ZP6AMpgbk2gwGqWNzVQTYHJlBAiiUh8 3zDIjNnY0w3tmHNDUouHiea7khp03vGr4ujpuv6G88P70hpe16qsU/xs6x75JSK4aX/P wZ7ZTUPgJrrTqVcnaqb2n89lBW4RPU4QsZePNavveodgYGoOZskSOYCgah2xHVH0KZbE IGl5YbXGoBRgNpNJqq1EAW6EjVZw0IvNmIRh81uJaZDNT//5YDIQ6qkOO4UXdNM4aSQK UGGUgUynGy6JaYoOSZ5RkexRwVGGk/B0w1Bhh27rOsbbDelocyMo8E3+gZRuV8eD/DFi nZMw== X-Gm-Message-State: AOAM531Edp25nT3grrSjuUa7IWIXzWF/uwQduCKeAnSYf+ta8+Xs8lWh wLWQL2WoTm/Hv74MEbU6JHRWhALzuixwVOi/gVa5gAQr4NSlal+pDIOu6J84hEzfIXoxTEOlAbb xolsr8NhccBxDne9h X-Received: by 2002:a1c:46c5:: with SMTP id t188mr3013067wma.3.1607522823813; Wed, 09 Dec 2020 06:07:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+Ew79AWAb2eVVXBNYJt577k9hNL/BcjdQGZ+/GFKRTnBKgZn2s6FjYBgEED9OemSjK1JRAA== X-Received: by 2002:a1c:46c5:: with SMTP id t188mr3013003wma.3.1607522823228; Wed, 09 Dec 2020 06:07:03 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id g192sm3570968wme.48.2020.12.09.06.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 06:07:02 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id E2915180004; Wed, 9 Dec 2020 14:57:43 +0100 (CET) Subject: [PATCH bpf v4 7/7] selftests/bpf/test_offload.py: filter bpftool internal map when counting maps From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= 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 , oss-drivers@netronome.com, linux-omap@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Date: Wed, 09 Dec 2020 14:57:43 +0100 Message-ID: <160752226387.110217.9887866138149423444.stgit@toke.dk> In-Reply-To: <160752225643.110217.4104692937165406635.stgit@toke.dk> References: <160752225643.110217.4104692937165406635.stgit@toke.dk> User-Agent: StGit/0.23 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Toke Høiland-Jørgensen A few of the tests in test_offload.py 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. Fixes: d53dee3fe013 ("tools/bpftool: Show info for processes holding BPF map/prog/link/btf FDs") Signed-off-by: Toke Høiland-Jørgensen --- tools/testing/selftests/bpf/test_offload.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py index 2128fbd8414b..b99bb8ed3ed4 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -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" % @@ -770,6 +768,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)