netdev - [PATCH net-next v5 15/16] selftests/net: Make NetDrvContEnv support queue leasing

lists.openwall.net		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 linux-cve-announce 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]

Message-ID: <20260109212632.146920-16-daniel@iogearbox.net>
Date: Fri,  9 Jan 2026 22:26:31 +0100
From: Daniel Borkmann <daniel@...earbox.net>
To: netdev@...r.kernel.org
Cc: bpf@...r.kernel.org,
	kuba@...nel.org,
	davem@...emloft.net,
	razor@...ckwall.org,
	pabeni@...hat.com,
	willemb@...gle.com,
	sdf@...ichev.me,
	john.fastabend@...il.com,
	martin.lau@...nel.org,
	jordan@...fe.io,
	maciej.fijalkowski@...el.com,
	magnus.karlsson@...el.com,
	dw@...idwei.uk,
	toke@...hat.com,
	yangzhenze@...edance.com,
	wangdongdong.6@...edance.com
Subject: [PATCH net-next v5 15/16] selftests/net: Make NetDrvContEnv support queue leasing

From: David Wei <dw@...idwei.uk>

Add a new parameter `lease` to NetDrvContEnv that sets up queue leasing
in the env.

The NETIF also has some ethtool parameters changed to support memory
provider tests. This is needed in NetDrvContEnv rather than individual
test cases since the cleanup to restore NETIF can't be done, until the
netns in the env is gone.

Signed-off-by: David Wei <dw@...idwei.uk>
Signed-off-by: Daniel Borkmann <daniel@...earbox.net>
---
 .../selftests/drivers/net/lib/py/env.py       | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/drivers/net/lib/py/env.py b/tools/testing/selftests/drivers/net/lib/py/env.py
index 3cc94d1e53ed..705bb09066fb 100644
--- a/tools/testing/selftests/drivers/net/lib/py/env.py
+++ b/tools/testing/selftests/drivers/net/lib/py/env.py
@@ -7,8 +7,9 @@ import time
 from pathlib import Path
 from lib.py import KsftSkipEx, KsftXfailEx
 from lib.py import ksft_setup, wait_file
-from lib.py import cmd, ethtool, ip, CmdExitFailure, bpftool
+from lib.py import cmd, defer, ethtool, ip, CmdExitFailure, bpftool
 from lib.py import NetNS, NetdevSimDev
+from lib.py import NetdevFamily, EthtoolFamily
 from .remote import Remote
 
 
@@ -295,7 +296,7 @@ class NetDrvContEnv(NetDrvEpEnv):
     between the physical interface and a network namespace.
     """
 
-    def __init__(self, src_path, nk_rxqueues=1, **kwargs):
+    def __init__(self, src_path, lease=False, **kwargs):
         super().__init__(src_path, **kwargs)
 
         self.require_ipver("6")
@@ -303,6 +304,9 @@ class NetDrvContEnv(NetDrvEpEnv):
         if not local_prefix:
             raise KsftSkipEx("LOCAL_PREFIX_V6 required")
 
+        self.netdevnl = NetdevFamily()
+        self.ethnl = EthtoolFamily()
+
         local_prefix = local_prefix.rstrip("/64").rstrip("::").rstrip(":")
         self.ipv6_prefix = f"{local_prefix}::"
         self.nk_host_ipv6 = f"{local_prefix}::2:1"
@@ -313,7 +317,11 @@ class NetDrvContEnv(NetDrvEpEnv):
         self._nk_guest_ifname = None
         self._tc_attached = False
         self._bpf_prog_id = None
+        self._lease = lease
 
+        nk_rxqueues = 1
+        if lease:
+            nk_rxqueues = 2
         ip(f"link add type netkit mode l2 forward peer forward numrxqueues {nk_rxqueues}")
 
         all_links = ip("-d link show", json=True)
@@ -330,6 +338,32 @@ class NetDrvContEnv(NetDrvEpEnv):
         self.nk_host_ifindex = netkit_links[1]['ifindex']
         self.nk_guest_ifindex = netkit_links[0]['ifindex']
 
+        if self._lease:
+            channels = self.ethnl.channels_get({'header': {'dev-index': self.ifindex}})
+            channels = channels['combined-count']
+            if channels < 2:
+                raise KsftSkipEx('Test requires NETIF with at least 2 combined channels')
+
+            rings = self.ethnl.rings_get({'header': {'dev-index': self.ifindex}})
+            self._rx_rings = rings['rx']
+            self._hds_thresh = rings.get('hds-thresh', 0)
+            self.ethnl.rings_set({'header': {'dev-index': self.ifindex},
+                                'tcp-data-split': 'enabled',
+                                'hds-thresh': 0,
+                                'rx': 64})
+            self.src_queue = channels - 1
+            bind_result = self.netdevnl.queue_create(
+                {
+                    "ifindex": self.nk_guest_ifindex,
+                    "type": "rx",
+                    "lease": {
+                        "ifindex": self.ifindex,
+                        "queue": {"id": self.src_queue, "type": "rx"},
+                    },
+                }
+            )
+            self.nk_queue = bind_result['id']
+
         self.netns = NetNS()
         ip(f"link set dev {self._nk_guest_ifname} netns {self.netns.name}")
         ip(f"link set dev {self._nk_host_ifname} up")
@@ -389,4 +423,11 @@ class NetDrvContEnv(NetDrvEpEnv):
             del self.netns
             self.netns = None
 
+        if self._lease:
+            self.ethnl.rings_set({'header': {'dev-index': self.ifindex},
+                                  'tcp-data-split': 'unknown',
+                                  'hds-thresh': self._hds_thresh,
+                                  'rx': self._rx_rings})
+            self._lease = False
+
         super().__del__()
-- 
2.43.0