From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.72 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795153808; b=ehTsHYtGCa2vgxZ/0iRQNJjKkhZnlBM7LBsAQjaTMnwHRMcVJU+wRToVz6gJn/Wg3PeY US2MvcX4VPvRJ3BK/gfk8dVcl1w4WlmW8D4hTdBayCeTUszziX8pD3iPBV+rrke9SUxVl NSM+cufoB4I2O74FJG73fgi9jQnGvBsj0OCGq0XCwIyIaXT9bwFXdkUHj8S7JBGpKz0Lp aOUQMeAAOwX5PSnBBlxFrrK5tIsKIsYsa9JgKYWD/teyFl2+I7BNEsRRiVIak2eUm+BYP Q5j3zGSR8dpYPPHdt34vFI2YT7+Gt+8JX04WWeQjj/AsDoRxsiasQvPFF3v5HicEFAQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795153808; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Received:Date:In-Reply-To:Mime-Version: References:X-Mailer:Message-ID:Subject:From:To:Cc:Content-Type; bh=7d/1HgJURULJVumT0wvLHjEI3D13OW8Hn3TBUynGK50=; b=IIlkP31Y6dX8LKncLirZSmM9IA3LCEMwJWj5LIf8yHmoaX8WzhEm0iF4HZ/EidX7WyHA Vh+1Asa2o3jEamAt+AZAf/UFRjAAoWJnOS/FudhVEopeT6SCAOjTg00+LKCNLrZ89BaN3 WVt3TQEU5825BQytSExFXuXlbu/pYiS2BIUbFU5XiJQGtGaZqVHhgKBJ443KdO544WZgj p2IuThtLUbp86E7zRR4lA14ss1RTlvNNabvU81+VETDq7pDllSat9KVWwfvXeZ9YgplvT liIMU06Ufl0ufbnQdH9PO46pNw4PMMZ8CRrxPApthQvFBvV63MXyPvZuo2QlIoVsVtQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=JDteBG5R; arc=none smtp.remote-ip=74.125.82.72 Received: from mail-dl1-f72.google.com (mail-dl1-f72.google.com [74.125.82.72]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10750606A333 for ; Fri, 20 Nov 2026 05:50:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 10750606A333 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=JDteBG5R Received: by mail-dl1-f72.google.com with SMTP id a92af1059eb24-1a5005fd0f8so1123554c88.0 for ; Thu, 19 Nov 2026 21:50:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795153807; x=1795758607; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=7d/1HgJURULJVumT0wvLHjEI3D13OW8Hn3TBUynGK50=; b=JDteBG5RlJEjSkjK7EPbD63yXntVNktOmqe75dO9NMo0J905CVYWFc95Zgcu6gbNaW LI1Fo2TQrPBDRaVvir3Eu4ftUHM04Pt7xxLp7o/vhZepSLYQqzYXZoBv8xJoE3eJoU6b RmVfns24DmqPRRKjQk3pEyqjBwGDqZg2mkN8kpJdS+FilGqA33KwVFG8r2MiLG2xAo8f VyuAGCs2YODXCGTKmwQT44H1SSFL8GztVuIvoFS5HMhfD0sSHGqUle9SQq2+kz/mbM8K enRjAIUCHIfcf4lmVPC0FHkRRyDLMQGaPkt9qQUiRq/37uXFV3Q667e1mZ23VfEm6utq bnyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795153807; x=1795758607; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=7d/1HgJURULJVumT0wvLHjEI3D13OW8Hn3TBUynGK50=; b=JjTnNkrDCQzqGLSIRxgeCvKLbasFSKtXLvJnlKKKInmNrPiLRcJhavif2R5LGTObBF GIfOU9B9MxwmH3MCJbNLEzeidFzrGsQm7lXD1O7BQioC91WtWaWRBk973CIYi5eq7bU3 p2uhu+RKHU3bRxN8OJ4hthiAOOmWs6w0ffPjcFXN5CHVYquQ0AE0k4NXMGtiQzl8p3LP FvMzSsTiRL4osul4Hg9p4y8h0qQfxfzpCTykZBF2P8YR7vMAdkutMw8rNTb+bJjaDP8i k7otIIuSrgNiTAMJftSBZEVI7qUu2+03i0Ljf8Mt+0RAwGEuykxukW4z14bVvhBs9+zE 1Q2A== X-Gm-Message-State: APuU4Z9QUlKEuxruz6eoA9y82Wcx4HURmu7CoP7EgTn69yPfUFDyPI8L 7kmPFoWmZ4TdufSkfl0MM+565o3VBA9+DxZ6nf/ZCvLVMr6i+BK5Ye081oBcPeL1NmgRnlHaXzW YGl2Pv3McLUB3LikJOvhl0nJlFhdkPVp+5fJDODU7gBUkCVFQfFAP/j6CBb4gWhtTqtR7ehttx4 repvSumQAmxwtq0QjuRs/XJP9zq/39iZBHIMCMyLKa3YxXMB7DWbFiQi1/ZWZAbq4= X-Received: from dli13-n2.prod.google.com ([2002:a05:7022:28d:20b0:19a:484d:c761]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:ea45:b0:1b5:31db:cc3e with SMTP id a92af1059eb24-1b5568b2b4bmr1742533c88.11.1795153806448; Thu, 19 Nov 2026 21:50:06 -0800 (PST) Date: Fri, 20 Nov 2026 04:59:18 +0000 In-Reply-To: <20261120045918.1239746-1-almasrymina@google.com> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261120045918.1239746-1-almasrymina@google.com> X-Mailer: git-send-email 2.56.1.750.gf70dc682cf-goog Message-ID: <20261120045918.1239746-8-almasrymina@google.com> Subject: [PATCH net-next v4 7/7] selftests: net: add leased devmem RX and TX netdev unregister tests From: Mina Almasry To: netdev@vger.kernel.org Cc: Mina Almasry , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , linux-kselftest@vger.kernel.org, Weiming Shi , Daniel Borkmann , Nikolay Aleksandrov , David Wei , Stanislav Fomichev , Bobby Eshleman , Dragos Tatulea Content-Type: text/plain; charset="UTF-8" Extend nl_netdev.py to cover netdev unregistration while devmem RX and TX bindings are active on a virtual netkit device leasing an RX queue from netdevsim: 1. devmem_lease_bind_rx_unregister_check: binds an RX dmabuf to a netkit device backed by a leased netdevsim queue and verifies clean teardown both when the virtual netkit device is deleted first (unleasing the queue while netdevsim remains up) and when the underlying netdevsim device is unregistered directly (which uninstalls the physical queue memory provider and cascades unregistration to the leasing netkit). 2. devmem_lease_bind_tx_unregister_check: binds a TX dmabuf to a netkit device backed by a leased netdevsim queue and verifies clean teardown both when the virtual netkit device is deleted first and when the underlying netdevsim device is unregistered directly. Reviewed-by: Dragos Tatulea Signed-off-by: Mina Almasry --- tools/testing/selftests/net/nl_netdev.py | 159 ++++++++++++++++++++++- 1 file changed, 155 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/nl_netdev.py b/tools/testing/selftests/net/nl_netdev.py index dd0321c0b463a..2e4e34257e873 100755 --- a/tools/testing/selftests/net/nl_netdev.py +++ b/tools/testing/selftests/net/nl_netdev.py @@ -12,8 +12,10 @@ import os import struct from os import system from lib.py import ksft_run, ksft_exit, KsftFailEx, KsftSkipEx -from lib.py import ksft_eq, ksft_ge, ksft_ne, ksft_raises, ksft_busy_wait -from lib.py import EthtoolFamily, NetdevFamily, NetdevSimDev, NlError, defer, ip +from lib.py import ksft_eq, ksft_ge, ksft_in, ksft_ne, ksft_not_in +from lib.py import ksft_raises, ksft_busy_wait +from lib.py import EthtoolFamily, NetdevFamily, NetdevSimDev, Netlink +from lib.py import NlError, RtnlFamily, cmd, defer, ip def empty_check(nf) -> None: @@ -423,12 +425,22 @@ def _dmabuf_attach_count(dmabuf_fd) -> int: raise KsftFailEx(f"dma-buf {ino} not found in {path}") -def _devmem_bind(bind, attrs) -> None: +def _devmem_bind(bind, attrs, phys_attrs=None) -> None: """Run a devmem bind op, skip the test if the device can't do devmem.""" try: bind(attrs) except NlError as e: if e.error == errno.EOPNOTSUPP: + if phys_attrs is not None: + try: + bind(phys_attrs) + except NlError as probe_e: + if probe_e.error == errno.EOPNOTSUPP: + raise KsftSkipEx( + f"devmem binding not supported: {probe_e}" + ) from probe_e + raise e from probe_e + raise raise KsftSkipEx(f"devmem binding not supported: {e}") from e raise @@ -483,6 +495,143 @@ def devmem_bind_tx_unregister_check(_nf) -> None: nf_priv.close() +def _create_netkit_single(rxqueues=2): + """Create a single-device netkit interface for queue lease tests.""" + ifname = f"nk{os.getpid()}" + try: + with RtnlFamily() as rtnl: + rtnl.newlink( + { + "ifname": ifname, + "linkinfo": { + "kind": "netkit", + "data": { + "mode": "l2", + "pairing": "single", + }, + }, + "num-rx-queues": rxqueues, + }, + flags=[Netlink.NLM_F_CREATE, Netlink.NLM_F_EXCL], + ) + except NlError as e: + if e.error in (errno.EOPNOTSUPP, errno.ENOENT): + raise KsftSkipEx(f"netkit single mode not supported: {e}") from e + raise + defer(cmd, f"ip link del dev {ifname}", fail=False) + + link = ip(f"-d link show dev {ifname}", json=True)[0] + return ifname, link["ifindex"] + + +def _queue_lease(nf, nk_ifindex, phys_ifindex, phys_qid=1): + try: + return nf.queue_create({ + "ifindex": nk_ifindex, + "type": "rx", + "lease": { + "ifindex": phys_ifindex, + "queue": {"id": phys_qid, "type": "rx"}, + }, + }) + except NlError as e: + if e.error == errno.EOPNOTSUPP: + raise KsftSkipEx(f"queue lease not supported: {e}") from e + raise + + +def devmem_lease_bind_rx_unregister_check(nf) -> None: + """Verify leased RX devmem bindings detach cleanly on virt/phys unregister.""" + for remove_virt_first in (False, True): + dmabuf_fd = _create_udmabuf() + defer(os.close, dmabuf_fd) + nf_priv = NetdevFamily() + defer(nf_priv.close) + nsimdev = NetdevSimDev(queue_count=2) + defer(nsimdev.remove) + nsim = nsimdev.nsims[0] + + ip(f"link set dev {nsim.ifname} up") + with EthtoolFamily() as ef: + ef.rings_set({"header": {"dev-index": nsim.ifindex}, + "tcp-data-split": "enabled"}) + + nk_ifname, nk_ifindex = _create_netkit_single(rxqueues=2) + ip(f"link set dev {nk_ifname} up") + + res = _queue_lease(nf, nk_ifindex, nsim.ifindex) + + _devmem_bind(nf_priv.bind_rx, { + "ifindex": nk_ifindex, + "fd": dmabuf_fd, + "queues": [{"id": res["id"], "type": "rx"}], + }, phys_attrs={ + "ifindex": nsim.ifindex, + "fd": dmabuf_fd, + "queues": [{"id": 0, "type": "rx"}], + }) + ksft_ge(_dmabuf_attach_count(dmabuf_fd), 1) + phys_q = nf.queue_get({"ifindex": nsim.ifindex, "id": 1, "type": "rx"}) + ksft_in("dmabuf", phys_q) + ksft_in("lease", phys_q) + + if remove_virt_first: + ip(f"link del dev {nk_ifname}") + phys_q = nf.queue_get({"ifindex": nsim.ifindex, "id": 1, + "type": "rx"}) + ksft_not_in("dmabuf", phys_q) + ksft_not_in("lease", phys_q) + ksft_ge(_dmabuf_attach_count(dmabuf_fd), 1) + nsimdev.remove() + else: + nsimdev.remove() + ksft_ne(cmd(f"ip link show dev {nk_ifname}", fail=False).ret, 0) + cmd(f"ip link del dev {nk_ifname}", fail=False) + ksft_eq(_dmabuf_attach_count(dmabuf_fd), 0) + + nf_priv.close() + + +def devmem_lease_bind_tx_unregister_check(nf) -> None: + """Verify leased TX devmem bindings detach cleanly on virt/phys unregister.""" + for remove_virt_first in (False, True): + dmabuf_fd = _create_udmabuf() + defer(os.close, dmabuf_fd) + nf_priv = NetdevFamily() + defer(nf_priv.close) + nsimdev = NetdevSimDev(queue_count=2) + defer(nsimdev.remove) + nsim = nsimdev.nsims[0] + + ip(f"link set dev {nsim.ifname} up") + + nk_ifname, nk_ifindex = _create_netkit_single(rxqueues=2) + ip(f"link set dev {nk_ifname} up") + + _queue_lease(nf, nk_ifindex, nsim.ifindex) + + _devmem_bind(nf_priv.bind_tx, { + "ifindex": nk_ifindex, + "fd": dmabuf_fd, + }, phys_attrs={ + "ifindex": nsim.ifindex, + "fd": dmabuf_fd, + }) + ksft_ge(_dmabuf_attach_count(dmabuf_fd), 1) + + if remove_virt_first: + ip(f"link del dev {nk_ifname}") + ksft_ge(_dmabuf_attach_count(dmabuf_fd), 1) + nsimdev.remove() + else: + nsimdev.remove() + ksft_ne(cmd(f"ip link show dev {nk_ifname}", fail=False).ret, 0) + cmd(f"ip link del dev {nk_ifname}", fail=False) + ksft_eq(_dmabuf_attach_count(dmabuf_fd), 0) + + nf_priv.close() + + def main() -> None: """ Ksft boiler plate main """ nf = NetdevFamily() @@ -498,7 +647,9 @@ def main() -> None: page_pool_ifindex_leak_check, page_pool_stats_ifindex_check, devmem_bind_rx_unregister_check, - devmem_bind_tx_unregister_check + devmem_bind_tx_unregister_check, + devmem_lease_bind_rx_unregister_check, + devmem_lease_bind_tx_unregister_check ], args=(nf, )) ksft_exit() -- 2.56.1.750.gf70dc682cf-goog