From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f200.google.com (mail-dy1-f200.google.com [74.125.82.200]) (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 871E34FB9B1 for ; Wed, 14 Oct 2026 16:18:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.200 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791994690; cv=none; b=WOiEFEDccXxMgOWnxpsfmRff144KXOVVgz1RN2dOpsASnADIpsWMFb6THim066eB728vfR3dt2dqJIN5PB/IRJxJufe993S3raa3tuBblIPSP16x78UseBZ+wPQJvEuLRmou8WZ1AMT/sjP9mniCJL9AsfT/qArXPj2qz//Ssc8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791994690; c=relaxed/simple; bh=7+ZuMQGm1WqmYa/SemsnkHIbC/OIMDMcJFeU+26oqOg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IhIWzbGVcVeEkNpalTXdGQAFw+mICJfmJzLnBKay7NfO0Hb+52YRzSWwVefD1F1/k2kiaqQPiXlQJZfcf8U4MGgSQys5jrXBvCmp72SjYiOaQwPurXa8Sr/rV+oK6+yBZX1IUv4zxj41ZtHyQ43s/uTBiPf5F+/bTMlMhtkLDuE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ZcYDU7FA; arc=none smtp.client-ip=74.125.82.200 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.b="ZcYDU7FA" Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-35c3c370b17so4033461eec.0 for ; Wed, 14 Oct 2026 09:18:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1791994680; x=1792599480; 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=wON/Y5KE9qpxqraW/pAdp0YZ1NlG3ckfd93a0Oe+XQc=; b=ZcYDU7FA3vQ/qXSKedsmrcEfASZelK9CsRbRfBJQwefOdSk4q+Dn2BIx0mY/asQwtA P1KNsziUhXWv2MxRoiQQcGw9ITe4fBYBkeXibjKfgLAWCfIQfrzKXopJLTUhyU6CxcXZ 3RCMdAsdAfzncmHXTMDHyPBgFvkF7TyBMeQm8EAWevLu6JkFnFeQ8dOxpQ6OTfOoLzaR Asrhc0bc1ebIwO0251LOxCS1Rtx4j1HyX31pt99yyq99LwtjzFsWgCip0VFYtXYuSg8z iRbW4gWZCcsqNIYjwPWGivrfC02kzCxJYWJOus6l0DAnX9ia/eLDR5A5Ke8Mic4g/d/j d0cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791994680; x=1792599480; 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=wON/Y5KE9qpxqraW/pAdp0YZ1NlG3ckfd93a0Oe+XQc=; b=jGlVXiAjIiNIadG+OabBZnXO/ojBOtEdWJgQf1Pm8nTUMUbOOFMPhRLtcZ3nrV1psV H0Z9kGsdRXHM7WGR1xFaoO3cHkQblDhuRWIDJvJn5gQldH/+09hTiq6rpqBjCKyBhF4b aSDNW6WMIzi9wTtD91LIQztpP1V332wMjrrHL0houWC46Uz/P/zshJRpY2cKsKPTnHd/ 8vAIFW8w8gT2jCu5u0HzOQYWe9LETbUbzYBnsKJbIAmixdMp7ModMxxioYuSmdKYubd9 KJmgEttouYD1r9AOJOWLYOCtweB00CcXxxuBUQ4EkRxaIJ+AkZ4Citcu0zofBvjiZ+rI gU9Q== X-Forwarded-Encrypted: i=1; AKwUvByZ2zV0KY194z0usNikcEuJ/jI+ueUYp7PwbhL2Lkj8YGLOfEYzdKissOlwGFYjkUn0cAXRDkk=@vger.kernel.org X-Gm-Message-State: AFq9FYKEVHkjEXy2fMZeXTkukXWv9BFiOWNsGHCoWFSxp3TR5QtUvkUh LDvD/naWiv+udcq4+G5gId41k0gxY0bjVzZ1LKZS/gl3VTPDWDpZHxK4jYyqdsP5Wj1GY5kPSZe M66tOVW3gALwXRmTJq8DPWxpYrA== X-Received: from dybvq12.prod.google.com ([2002:a05:7301:77cc:b0:35d:636:2f60]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:3d10:b0:34d:96cb:d75e with SMTP id 5a478bee46e88-3537e069fb9mr34072614eec.27.1791994679866; Wed, 14 Oct 2026 09:17:59 -0700 (PDT) Date: Wed, 14 Oct 2026 16:17:54 +0000 In-Reply-To: <20261014161754.3782346-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20261014161754.3782346-1-almasrymina@google.com> X-Mailer: git-send-email 2.56.0.176.g3575e65682-goog Message-ID: <20261014161754.3782346-5-almasrymina@google.com> Subject: [PATCH net v3 4/4] selftests: net: add devmem RX and TX netdev unregister tests From: Mina Almasry To: Jakub Kicinski , Mina Almasry , Pavel Begunkov , David Wei , Stanislav Fomichev , Taehee Yoo , Paolo Abeni , Kaiyuan Zhang , Bobby Eshleman , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Simon Horman , Shuah Khan , Sumit Semwal , "=?UTF-8?q?Christian=20K=C3=B6nig?=" , Daniel Borkmann , Nikolay Aleksandrov , Tariq Toukan , Kaifeng Wang , Dragos Tatulea Content-Type: text/plain; charset="UTF-8" Add devmem_bind_rx_unregister_check and devmem_bind_tx_unregister_check to nl_netdev.py to verify that unregistering a netdevsim device while a netlink socket holds an active RX or TX devmem binding synchronously detaches the dma_buf attachment and cleanly closes the netlink socket without use-after-free or page faults. Add the dma-buf, udmabuf and devmem options the tests need to tools/testing/selftests/net/config. Cc: Tariq Toukan Cc: Kaifeng Wang Assisted-by: LLM Signed-off-by: Mina Almasry Reviewed-by: Dragos Tatulea --- v3: - Count attachments of the test's own dma-buf only, and skip instead of passing when debugfs bufinfo is not readable (Sashiko). - Close the netlink socket after removing the device, clean up with defer(), and skip on EOPNOTSUPP from bind-rx/bind-tx (Sashiko). - Replace the hardcoded UDMABUF_CREATE value with a helper that computes it for the running architecture (Sashiko, Dragos), and close the memfd and /dev/udmabuf fds on errors (Sashiko). - Add the needed options to tools/testing/selftests/net/config (Sashiko). --- tools/testing/selftests/net/config | 4 + tools/testing/selftests/net/nl_netdev.py | 125 ++++++++++++++++++++++- 2 files changed, 126 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index 737e7e6327b37..1e21f0055a2c0 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -11,6 +11,7 @@ CONFIG_CRYPTO_ARIA=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SM4_GENERIC=y +CONFIG_DEBUG_FS=y CONFIG_DEBUG_INFO_BTF=y CONFIG_DEBUG_INFO_BTF_MODULES=n CONFIG_DUMMY=y @@ -76,6 +77,7 @@ CONFIG_NET_CLS_BPF=m CONFIG_NET_CLS_FLOWER=m CONFIG_NET_CLS_MATCHALL=m CONFIG_NET_CLS_U32=m +CONFIG_NET_DEVMEM=y CONFIG_NETDEVSIM=m CONFIG_NET_DROP_MONITOR=m CONFIG_NETFILTER=y @@ -120,6 +122,7 @@ CONFIG_OPENVSWITCH=m CONFIG_PAGE_POOL_STATS=y CONFIG_PSAMPLE=m CONFIG_RPS=y +CONFIG_SYNC_FILE=y CONFIG_SYN_COOKIES=y CONFIG_SYSCTL=y CONFIG_SYSFS=y @@ -131,6 +134,7 @@ CONFIG_TEST_BPF=m CONFIG_TLS=m CONFIG_TRACEPOINTS=y CONFIG_TUN=y +CONFIG_UDMABUF=y CONFIG_USER_NS=y CONFIG_VETH=y CONFIG_VLAN_8021Q=y diff --git a/tools/testing/selftests/net/nl_netdev.py b/tools/testing/selftests/net/nl_netdev.py index ceb44c8e1fec5..988878b71358c 100755 --- a/tools/testing/selftests/net/nl_netdev.py +++ b/tools/testing/selftests/net/nl_netdev.py @@ -6,10 +6,14 @@ Tests for the netdev netlink family. """ import errno +import fcntl +import mmap +import os +import struct from os import system -from lib.py import ksft_run, ksft_exit +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 NetdevFamily, NetdevSimDev, NlError, defer, ip +from lib.py import EthtoolFamily, NetdevFamily, NetdevSimDev, NlError, defer, ip def empty_check(nf) -> None: @@ -366,6 +370,119 @@ def page_pool_stats_ifindex_check(nf) -> None: ksft_eq(cm.exception.nl_msg.extack['bad-attr'], '.info.id') +def _udmabuf_create_ioctl() -> int: + """Return UDMABUF_CREATE, _IOW('u', 0x42, struct udmabuf_create).""" + machine = os.uname().machine + if machine.startswith(("alpha", "mips", "ppc", "powerpc", "sparc")): + ioc_write = 4 << 29 + elif machine.startswith("parisc"): + ioc_write = 2 << 30 + else: + ioc_write = 1 << 30 + return ioc_write | 24 << 16 | ord("u") << 8 | 0x42 + + +def _create_udmabuf(num_pages=64) -> int: + """Create a sealed memfd-backed udmabuf fd for devmem tests.""" + if not os.path.exists("/dev/udmabuf"): + raise KsftSkipEx("/dev/udmabuf is not available") + + size = num_pages * mmap.PAGESIZE + memfd = os.memfd_create("devmem-ksft", os.MFD_ALLOW_SEALING) + try: + os.ftruncate(memfd, size) + fcntl.fcntl(memfd, fcntl.F_ADD_SEALS, fcntl.F_SEAL_SHRINK) + devfd = os.open("/dev/udmabuf", os.O_RDWR) + try: + req = bytearray(struct.pack("IIQQ", memfd, 0, 0, size)) + return fcntl.ioctl(devfd, _udmabuf_create_ioctl(), req) + finally: + os.close(devfd) + finally: + os.close(memfd) + + +def _dmabuf_attach_count(dmabuf_fd) -> int: + """Return the number of devices attached to dmabuf_fd, from debugfs.""" + path = "/sys/kernel/debug/dma_buf/bufinfo" + try: + with open(path, "r", encoding="utf-8") as f: + lines = f.read().splitlines() + except OSError as e: + raise KsftSkipEx(f"{path} is not readable: {e}") from e + + ino = os.fstat(dmabuf_fd).st_ino + found = False + for line in lines: + fields = line.split("\t") + if not found: + found = (len(fields) == 7 and fields[5].isdigit() and + int(fields[5]) == ino) + elif line.startswith("Total "): + return int(line.split()[1]) + raise KsftFailEx(f"dma-buf {ino} not found in {path}") + + +def _devmem_bind(bind, attrs) -> 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: + raise KsftSkipEx(f"devmem binding not supported: {e}") from e + raise + + +def devmem_bind_rx_unregister_check(_nf) -> None: + """Verify RX devmem bindings detach dma_buf synchronously on netdev unregister.""" + 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"}) + _devmem_bind(nf_priv.bind_rx, { + "ifindex": nsim.ifindex, + "fd": dmabuf_fd, + "queues": [{"id": 1, "type": "rx"}], + }) + ksft_ge(_dmabuf_attach_count(dmabuf_fd), 1) + + nsimdev.remove() + ksft_eq(_dmabuf_attach_count(dmabuf_fd), 0) + + nf_priv.close() + + +def devmem_bind_tx_unregister_check(_nf) -> None: + """Verify TX devmem bindings detach cleanly on netdev unregister without UAF.""" + 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") + _devmem_bind(nf_priv.bind_tx, { + "ifindex": nsim.ifindex, + "fd": dmabuf_fd, + }) + ksft_ge(_dmabuf_attach_count(dmabuf_fd), 1) + + nsimdev.remove() + ksft_eq(_dmabuf_attach_count(dmabuf_fd), 0) + + nf_priv.close() + + def main() -> None: """ Ksft boiler plate main """ nf = NetdevFamily() @@ -379,7 +496,9 @@ def main() -> None: page_pool_check, page_pool_dump_ifindex, page_pool_ifindex_leak_check, - page_pool_stats_ifindex_check + page_pool_stats_ifindex_check, + devmem_bind_rx_unregister_check, + devmem_bind_tx_unregister_check ], args=(nf, )) ksft_exit() -- 2.56.0.176.g3575e65682-goog