From nobody Fri Dec 19 10:48:39 2025 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A11227702A for ; Thu, 9 Oct 2025 20:56:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760043395; cv=none; b=MKyHDsUbUNdhpObj2qAwpB6+pqNNx/FoZBlFlzPTK4tVH1vDbXXHogtUS3eyeVYRqpMBPEqu+NqWVCAHCOgMKqNv21AUvWP9v075Ua23OsvJA48LxLGcZYCbVvStOjuSILkcJ6fyAHR/fQ7Tj6lm1+0YElMDwJPV4U3gmckMcIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760043395; c=relaxed/simple; bh=OKcuUIR8qRa8Y6op7yrZ3hdVvWjJUQNXbCaiGsoKxiM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=eQJXdlgMR2lkhNgUpp7ptMaPEYWbfiLBP8EKK5MXd6pGGainYBbESPxefen78D+t1EPV8vrFsaUxzD82L9+WpEUPUKR1AYwItk4Vt1UH3byUz1gxlBVOccR+/P2Yu8XdQm3Do94jXFCUaWC8RNedmODLCnrXpTj/Bzgr4jFkL4k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-279e2554c8fso13874625ad.2 for ; Thu, 09 Oct 2025 13:56:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760043391; x=1760648191; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qYE1BgboSbVTbjIomRAB1FILfSiVVmoES/QvHMfnTxk=; b=LfP4kjovapyUXNdYUMsoXSwFpVIbVO/ZPvY2myAMkz6o3zQ6dpWy9KgEYNSwIF2BcM uS4F8MC95atNYMnJlnz4RZV7Kdt+D7K7S9C6VX4Y3Kuclw2NYX8uqKlERuPQ3jyOxujI od1nvpMIpWIRAojng3KbCO9YXNPqleQLG4ssA5R02b+Ycy1GMo/HRwCCEBFiyaK7RID9 9y6/8XNfH6N/Cj0UJxXOVPfKYVtsrvo0gvPjytKA5vlHtSTlgdAbCZGy9G4m9MKl+ng2 lS4soYwISdzXLfDE70XEmAN4e9wO0Vi08/OA53+obnEYJE14VUDdrEzciIynLXGi/aQK OSvw== X-Forwarded-Encrypted: i=1; AJvYcCXJpbC1j5s+4wIglSJGGTkCPlgypr6GKunOg5GMwpsexAqyxdKRURqJKwbqWwFuYhddaVAj+Z+lni0hrOE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz58Sf6kBK3c2BXJyAAjYtJhOhUve/Hf4MAA964JzrfzBU3ua6Y 0CXEJYBC8ERza0VnDjFoXisLhQYniF/sPBjOmvMt3NkeZQ66IXQDtyc= X-Gm-Gg: ASbGncsx/FaMj44ovTXsmIASE4TFgE9y10AnwT1TqWMrxhqb3ppka1SPQ5hF2HqePwz Z0OYCQLqL100138TOGgZLzCERIg2K4v2lRhe0VvwGRMBY9ZwIrsKVt8IUJ5lt5eiTW2t1r/TqAm DGr4pPMW9R6yLSEQKhqNoKkbdO+UpcGOdBUwFZtJJq3ym0q7rsIsASLalyK2hOrjTua22NdLNUT MmkJkInxSuLijD1Tun6AlXr3JRqwyjqC88lBnmvuXOjrqOmu1aZrz6lZNZd8o6kfO3yWKYaoHXf jANSqGCAhsK4Ffv+2oniR8wfiSPZxbQ7Ty2KVyQbyfqi0xHrvmLeE1pv+/1IZ4fDYvsTHYI6/Qz 6tXMT0DKBVlc+LGZzDYUO8ng8ixXpUTpIJnE19qE1RD+QMaqIfyKEgopwICHTDGjHn3ZZVqyeny tJ5zXqRtw8wtziXHsX0Ujn8WrtqUMDuKhfqOru9dzXeBHSrdr/p+1MBrRZ8RZbjKqd4gLw0iYG6 uJ26WfVn4FB5V54ASWL3Mwhtfdh9w== X-Google-Smtp-Source: AGHT+IH5AxKfshPts4pTtQwKmGkpjIsewTbnycEsHCmNCVK5pu4wYVP7nvHlRvF2DL1tnlygVBI93g== X-Received: by 2002:a17:903:1b26:b0:248:e3fb:4dc8 with SMTP id d9443c01a7336-290272c045bmr115341075ad.39.1760043390736; Thu, 09 Oct 2025 13:56:30 -0700 (PDT) Received: from localhost (c-73-158-218-242.hsd1.ca.comcast.net. [73.158.218.242]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-29034de54d2sm37730755ad.12.2025.10.09.13.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Oct 2025 13:56:30 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, shuah@kernel.org, horms@kernel.org, willemb@google.com, daniel.zahka@gmail.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v3] selftests: drv-net: update remaining Python init files Date: Thu, 9 Oct 2025 13:56:29 -0700 Message-ID: <20251009205629.379829-1-sdf@fomichev.me> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jakub Kicinski Convert remaining __init__ files similar to what we did in commit b615879dbfea ("selftests: drv-net: make linters happy with our impor= ts") Signed-off-by: Jakub Kicinski Signed-off-by: Stanislav Fomichev Reviewed-by: Simon Horman --- v3: - add my SoB (sending on behalf of Jakub) v2: - remove tool from imports in driver __init__s it's not actually used v1: https://lore.kernel.org/20251007144326.1763309-1-kuba@kernel.org CC: shuah@kernel.org CC: willemb@google.com CC: daniel.zahka@gmail.com CC: linux-kselftest@vger.kernel.org --- .../drivers/net/hw/lib/py/__init__.py | 40 ++++++++++++++----- .../selftests/drivers/net/lib/py/__init__.py | 4 +- .../testing/selftests/net/lib/py/__init__.py | 29 ++++++++++++-- 3 files changed, 57 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/lib/py/__init__.py b/to= ols/testing/selftests/drivers/net/hw/lib/py/__init__.py index 0ceb297e7757..fb010a48a5a1 100644 --- a/tools/testing/selftests/drivers/net/hw/lib/py/__init__.py +++ b/tools/testing/selftests/drivers/net/hw/lib/py/__init__.py @@ -1,5 +1,13 @@ # SPDX-License-Identifier: GPL-2.0 =20 +""" +Driver test environment (hardware-only tests). +NetDrvEnv and NetDrvEpEnv are the main environment classes. +Former is for local host only tests, latter creates / connects +to a remote endpoint. See NIPA wiki for more information about +running and writing driver tests. +""" + import sys from pathlib import Path =20 @@ -8,26 +16,36 @@ KSFT_DIR =3D (Path(__file__).parent / "../../../../..").= resolve() try: sys.path.append(KSFT_DIR.as_posix()) =20 - from net.lib.py import * - from drivers.net.lib.py import * - # Import one by one to avoid pylint false positives + from net.lib.py import NetNS, NetNSEnter, NetdevSimDev from net.lib.py import EthtoolFamily, NetdevFamily, NetshaperFamily, \ NlError, RtnlFamily, DevlinkFamily, PSPFamily from net.lib.py import CmdExitFailure - from net.lib.py import bkg, cmd, defer, ethtool, fd_read_timeout, ip, \ - rand_port, tool, wait_port_listen - from net.lib.py import fd_read_timeout + from net.lib.py import bkg, cmd, bpftool, bpftrace, defer, ethtool, \ + fd_read_timeout, ip, rand_port, wait_port_listen, wait_file from net.lib.py import KsftSkipEx, KsftFailEx, KsftXfailEx from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \ ksft_setup from net.lib.py import ksft_eq, ksft_ge, ksft_in, ksft_is, ksft_lt, \ ksft_ne, ksft_not_in, ksft_raises, ksft_true, ksft_gt, ksft_not_no= ne - from net.lib.py import NetNSEnter - from drivers.net.lib.py import GenerateTraffic + from drivers.net.lib.py import GenerateTraffic, Remote from drivers.net.lib.py import NetDrvEnv, NetDrvEpEnv + + __all__ =3D ["NetNS", "NetNSEnter", "NetdevSimDev", + "EthtoolFamily", "NetdevFamily", "NetshaperFamily", + "NlError", "RtnlFamily", "DevlinkFamily", "PSPFamily", + "CmdExitFailure", + "bkg", "cmd", "bpftool", "bpftrace", "defer", "ethtool", + "fd_read_timeout", "ip", "rand_port", + "wait_port_listen", "wait_file", + "KsftSkipEx", "KsftFailEx", "KsftXfailEx", + "ksft_disruptive", "ksft_exit", "ksft_pr", "ksft_run", + "ksft_setup", + "ksft_eq", "ksft_ge", "ksft_in", "ksft_is", "ksft_lt", + "ksft_ne", "ksft_not_in", "ksft_raises", "ksft_true", "ksft= _gt", + "ksft_not_none", "ksft_not_none", + "NetDrvEnv", "NetDrvEpEnv", "GenerateTraffic", "Remote"] except ModuleNotFoundError as e: - ksft_pr("Failed importing `net` library from kernel sources") - ksft_pr(str(e)) - ktap_result(True, comment=3D"SKIP") + print("Failed importing `net` library from kernel sources") + print(str(e)) sys.exit(4) diff --git a/tools/testing/selftests/drivers/net/lib/py/__init__.py b/tools= /testing/selftests/drivers/net/lib/py/__init__.py index e6c070f32f51..b0c6300150fb 100644 --- a/tools/testing/selftests/drivers/net/lib/py/__init__.py +++ b/tools/testing/selftests/drivers/net/lib/py/__init__.py @@ -22,7 +22,7 @@ KSFT_DIR =3D (Path(__file__).parent / "../../../..").reso= lve() NlError, RtnlFamily, DevlinkFamily, PSPFamily from net.lib.py import CmdExitFailure from net.lib.py import bkg, cmd, bpftool, bpftrace, defer, ethtool, \ - fd_read_timeout, ip, rand_port, tool, wait_port_listen, wait_file + fd_read_timeout, ip, rand_port, wait_port_listen, wait_file from net.lib.py import KsftSkipEx, KsftFailEx, KsftXfailEx from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \ ksft_setup @@ -34,7 +34,7 @@ KSFT_DIR =3D (Path(__file__).parent / "../../../..").reso= lve() "NlError", "RtnlFamily", "DevlinkFamily", "PSPFamily", "CmdExitFailure", "bkg", "cmd", "bpftool", "bpftrace", "defer", "ethtool", - "fd_read_timeout", "ip", "rand_port", "tool", + "fd_read_timeout", "ip", "rand_port", "wait_port_listen", "wait_file", "KsftSkipEx", "KsftFailEx", "KsftXfailEx", "ksft_disruptive", "ksft_exit", "ksft_pr", "ksft_run", diff --git a/tools/testing/selftests/net/lib/py/__init__.py b/tools/testing= /selftests/net/lib/py/__init__.py index 997b85cc216a..97b7cf2b20eb 100644 --- a/tools/testing/selftests/net/lib/py/__init__.py +++ b/tools/testing/selftests/net/lib/py/__init__.py @@ -1,9 +1,32 @@ # SPDX-License-Identifier: GPL-2.0 =20 +""" +Python selftest helpers for netdev. +""" + from .consts import KSRC -from .ksft import * +from .ksft import KsftFailEx, KsftSkipEx, KsftXfailEx, ksft_pr, ksft_eq, \ + ksft_ne, ksft_true, ksft_not_none, ksft_in, ksft_not_in, ksft_is, \ + ksft_ge, ksft_gt, ksft_lt, ksft_raises, ksft_busy_wait, \ + ktap_result, ksft_disruptive, ksft_setup, ksft_run, ksft_exit from .netns import NetNS, NetNSEnter -from .nsim import * -from .utils import * +from .nsim import NetdevSim, NetdevSimDev +from .utils import CmdExitFailure, fd_read_timeout, cmd, bkg, defer, \ + bpftool, ip, ethtool, bpftrace, rand_port, wait_port_listen, wait_file from .ynl import NlError, YnlFamily, EthtoolFamily, NetdevFamily, RtnlFami= ly, RtnlAddrFamily from .ynl import NetshaperFamily, DevlinkFamily, PSPFamily + +__all__ =3D ["KSRC", + "KsftFailEx", "KsftSkipEx", "KsftXfailEx", "ksft_pr", "ksft_eq", + "ksft_ne", "ksft_true", "ksft_not_none", "ksft_in", "ksft_not_i= n", + "ksft_is", "ksft_ge", "ksft_gt", "ksft_lt", "ksft_raises", + "ksft_busy_wait", "ktap_result", "ksft_disruptive", "ksft_setup= ", + "ksft_run", "ksft_exit", + "NetNS", "NetNSEnter", + "CmdExitFailure", "fd_read_timeout", "cmd", "bkg", "defer", + "bpftool", "ip", "ethtool", "bpftrace", "rand_port", + "wait_port_listen", "wait_file", + "NetdevSim", "NetdevSimDev", + "NetshaperFamily", "DevlinkFamily", "PSPFamily", "NlError", + "YnlFamily", "EthtoolFamily", "NetdevFamily", "RtnlFamily", + "RtnlAddrFamily"] --=20 2.51.0