From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.229.7 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793749925; b=ms2To5x5zvPL1KXyhrCAy3jJu3L36a+rSYFKqJNRrTD4GPnBpxqDxZ4EIvD369SO80Db /V/V7HGFFu/wTptGbdpIqfUlU8hEg5fpZa89uiCw98F3SIkEHp+G+ldADLcRvKYB4GJBZ e0bcWA6hs5Qj22TH0eDZZ/c7mE6g3lKkrWHRFVfNF0/n5kBjPm0O3zJv9DalbcQlYRGAo zKjNFVT5kx9A7eeKhNSK1pOyHo4v7IeNmjmDVKTVzRnG4yjPmFDH7XHxX4ZOE0vfGeh6S 7jqFR5e4rXGNKRC2RQKP/E+XqlAkFCtxjZu07GQ575FbcyflJ9KZ/F+JbSuMJ77Q9Zw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793749925; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:X-Google-Original-From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=vBGiLdfaTr9hhPWxjFFaBCZdoDd+HhXRj6UFEZuYlTU=; b=QznHjpNlGK9Ht1F7qbuPVus16jzbXQc8rUomodPa7e8PKdQ0ltTinzzryeF4YEWFcHB3 45ec8oyxjgmbuwpxFgaAbdUEYIVzbAd9BzdcfumbTKpPEUJMSKe8KdK59Uc6N6K2+9/cS qR2L9hu45mhwcqkMu1aOKVAP7bpHwJwXYWaQwYkyjOziFFCvB44dybAHx6YIs6z/rdVdh cM6Go0OsMf0Lhu0msk0vtrKJlPd7YA7+/oLx1j+geEKv0UmICNKm+1z1sLBjE73Uobba/ KWNz3hVvteJmEjCLGx8jtOkKYB0FMQv0Vl0G339P28w7FLLaG5fd52tXIsGElr+JZUQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=WDRMCzvo; arc=none smtp.remote-ip=74.125.229.7 Received: from mail-dy2-f7.google.com (mail-dy2-f7.google.com [74.125.229.7]) (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 89000606EEB7 for ; Tue, 3 Nov 2026 23:52:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 89000606EEB7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=WDRMCzvo Received: by mail-dy2-f7.google.com with SMTP id 5a478bee46e88-33e5ae86ff2so50051eec.0 for ; Tue, 03 Nov 2026 15:52:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793749924; x=1794354724; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=vBGiLdfaTr9hhPWxjFFaBCZdoDd+HhXRj6UFEZuYlTU=; b=WDRMCzvod3HTozLLjk/B48nlT5cptk0mG/sIVgS5fVibcDhNkbqVIc4w215KyXlFJB 8AhyQQNckQBGcIHaAWxZbp79JwSImP/0XQz/+I9czi1M7oW17k69Vvik8+bY6fANKB75 65lr4qomcTlEG78i2sivwZRKMqY9VdmO8ELlaYv4gqNTtMyL+jZ2n14C5nPZAXsV1nuy 6m9+1lc0SUwbkZnoxKUUsG15Lam+sYfnLIVUtYSYGppQ1GBLjHMCdN9+zTwtO4aQL/XE 7TKqA770YIdt++Fuya9qB6Ct3MkoQBn0easqqLQR+n4kxdMQZ0mFlsagH6+gtpq51bQa eCZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793749924; x=1794354724; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=vBGiLdfaTr9hhPWxjFFaBCZdoDd+HhXRj6UFEZuYlTU=; b=Q3zUEFcHG5SKxGmiR5T8wr1XV3r9I5G00QPs9uTReHntd/DLon6ZXUshlam6mv8iIS A2d1dbvoeppL9nlJCL54mImJ7o7oQb0euxT7kgiOpYZODMGy0QeqAijUZJ6zjsNVqwPD 8og28oF3wzTNn4345V6oT9Sz7kaYp0oDubh8Z5L9W5BbZNIaE9y39+8cZLK9FAySS/Cj Pkj0Oj5ZLVdWsF0bHZ3T+MZEa0A0A4c8T5F12pgt+qbHAsTHhPgXjBxe+uU/ezKE82Nv lieMdfTQbNT1CkvM4l/D5GBNLvWNPoJbnY8E9oFU7Y6MzTgy01bJ5KCdK2geMA3Bvxvq cNUw== X-Forwarded-Encrypted: i=1; AKwUvBwGuHzOr5SDjxyo54tFZ8tyWIyCsPtuk0+JDNNK9cflu2kI/62rzOBA6bAHxL9ggILChLQ21OAI/NprPT4=@vger.kernel.org X-Gm-Message-State: APuU4Z++tDVOW+G9cu7NOF8VDkaKxkxRgPiBK1Bn8RKv8AR948K8v2Kd ZpKrV3yvmn+ShU+O5bZo1zlWxMVZaPLFcYuPmwudCInvjdcIiYWPTVm8 X-Gm-Gg: AYBFou2e1jPUNsNMUUfIoIrZzY0KHCTaB6yd1NuPHk9BvGuep5eGU2PNehodhcI/hrM +2QxyKS4HVk9K1LRmya8QJngDJIOx6jxTSYtcH3koiic6XpwUuqm3v0zatIeWH1Q31x7mdeF4U+ e7sfMAAMELJ6jALgpUXcP2cP6IUQ8GidQOAPeGwU0IfigsO5OzOrV3fY/UEgkJSZvyaRl5CD9iD 8AM2umawzqiUIPXDG9qw8SZg2ok10aDu2foF2P+2FeKCXTTBS02FD/J9FzVXPl/AbwyRIM6SfHy Z1LYaTHd9wGGjwvZw1u7n2oy6IrQ2COLUxZGMd9GTbYER0ZNdk62YoRUzOJFetUijdgTpmM70NT AExdt9ESdrv16cJVSms5Dgiw/XEH/7GZCtXXGKoomVN1tVq5/ga7j+Dcg8/xRbX29M2huZ95vrD 07yYou83zO5lcNQJ95QsO/kBydzA74y5RVGVSlXTghBVlY88MbUI7XCDWH3TiGVS92sNRXHb1+H V2uQGdam4+OyJMEE477JFF30P2OaNWhHb/crq0flxU+97QsS1ctGZLzb14A4KyRNXt/H0nZaxLT fDTr93cKmyLbiRVQgYn3tCA= X-Received: by 2002:a05:693c:88d7:10b0:36a:1f8:a589 with SMTP id 5a478bee46e88-36a4240abf8mr21688235eec.27.1793749923582; Tue, 03 Nov 2026 15:52:03 -0800 (PST) Received: from localhost ([2a03:2880:9ff:73::]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36ca3989670sm1929806eec.25.2026.11.03.15.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2026 15:52:03 -0800 (PST) From: Stanislav Fomichev X-Google-Original-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, edumazet@kernel.org, horms@kernel.org, corbet@lwn.net, skhan@linuxfoundation.org, rdunlap@infradead.org, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, sdf@fomichev.me, almasrymina@google.com, bobbyeshleman@meta.com, asml.silence@gmail.com, razor@blackwall.org, daniel@iogearbox.net, leitao@debian.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH net-next v2 7/7] selftests: drv-net: devmem: TX from a hugepage-backed dmabuf Date: Tue, 3 Nov 2026 15:51:52 -0800 Message-ID: <20261103235152.1904727-8-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261103235152.1904727-1-sdf@fomichev.me> References: <20261103235152.1904727-1-sdf@fomichev.me> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit TX net_iovs are now sized from the dmabuf layout, but the TX tests use a regular memfd, which usually keeps them small. Add -H to ncdevmem to back the udmabuf with 2MB hugepages and a TX test which sends a 3MB buffer from it, so that frags end at and continue past the 2MB net_iov boundary. The payload has a 7 byte period to catch offset errors. Signed-off-by: Stanislav Fomichev Acked-by: Mina Almasry --- .../selftests/drivers/net/hw/devmem.py | 10 ++++- .../selftests/drivers/net/hw/devmem_lib.py | 43 +++++++++++++++++-- .../selftests/drivers/net/hw/ncdevmem.c | 8 +++- .../selftests/drivers/net/hw/nk_devmem.py | 11 ++++- 4 files changed, 63 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/devmem.py b/tools/testing/selftests/drivers/net/hw/devmem.py index 82c11ffc4add..aa7141fb36f7 100755 --- a/tools/testing/selftests/drivers/net/hw/devmem.py +++ b/tools/testing/selftests/drivers/net/hw/devmem.py @@ -3,7 +3,7 @@ from os import path from devmem_lib import (setup_test, run_rx, run_tx, run_tx_chunks, run_rx_hds, - run_rx_large_niov) + run_rx_large_niov, run_tx_large_niov) from lib.py import ksft_run, ksft_exit, ksft_disruptive from lib.py import NetDrvEpEnv @@ -36,12 +36,18 @@ from lib.py import NetDrvEpEnv run_rx_large_niov(cfg) +@ksft_disruptive +def check_tx_large_niov(cfg) -> None: + """Run the devmem TX test from a hugepage-backed dmabuf.""" + run_tx_large_niov(cfg) + + def main() -> None: """Run the devmem test cases.""" with NetDrvEpEnv(__file__) as cfg: setup_test(cfg, path.abspath(path.dirname(__file__) + "/ncdevmem")) ksft_run([check_rx, check_tx, check_tx_chunks, check_rx_hds, - check_rx_large_niov], + check_rx_large_niov, check_tx_large_niov], args=(cfg,)) ksft_exit() diff --git a/tools/testing/selftests/drivers/net/hw/devmem_lib.py b/tools/testing/selftests/drivers/net/hw/devmem_lib.py index 71b916c16196..8058fd1ddd50 100644 --- a/tools/testing/selftests/drivers/net/hw/devmem_lib.py +++ b/tools/testing/selftests/drivers/net/hw/devmem_lib.py @@ -2,6 +2,7 @@ # pylint: disable=invalid-name,too-many-arguments """Shared helpers for devmem TCP selftests.""" +import hashlib import os import re @@ -42,15 +43,17 @@ NR_HUGEPAGES_FILE = "/proc/sys/vm/nr_hugepages" defer(_restore_nr_hugepages, nr_hugepages) -def _probe_devmem(cfg, rx_page_size): +def _probe_devmem(cfg, rx_page_size, hugepages=False): """Return True if ncdevmem can bind cfg.ifname at @rx_page_size.""" probe_command = f"{cfg.bin_local} -f {cfg.ifname}" if rx_page_size != RX_PAGE_SIZE_DEFAULT: probe_command += f" -b {rx_page_size}" + if hugepages: + probe_command += " -H" return cmd(probe_command, fail=False, shell=True).ret == 0 -def require_devmem(cfg, rx_page_size=RX_PAGE_SIZE_DEFAULT): +def require_devmem(cfg, rx_page_size=RX_PAGE_SIZE_DEFAULT, hugepages=False): """Probe ncdevmem on cfg.ifname and SKIP the test if devmem isn't supported.""" if rx_page_size not in PROBE_RX_PAGE_SIZES: raise RuntimeError( @@ -63,10 +66,15 @@ NR_HUGEPAGES_FILE = "/proc/sys/vm/nr_hugepages" # ncdevmem's queue range and cause the probe to fail. cfg.devmem_supported = {size: _probe_devmem(cfg, size) for size in PROBE_RX_PAGE_SIZES} + cfg.devmem_hugepages = _probe_devmem(cfg, RX_PAGE_SIZE_DEFAULT, + hugepages=True) if not cfg.devmem_supported[RX_PAGE_SIZE_DEFAULT]: raise KsftSkipEx("Test requires devmem support") + if hugepages and not cfg.devmem_hugepages: + raise KsftSkipEx("Test requires a 2MB hugepage-backed dmabuf") + if rx_page_size != RX_PAGE_SIZE_DEFAULT: page_size = os.sysconf("SC_PAGE_SIZE") if not _is_aligned(rx_page_size, page_size): @@ -169,7 +177,7 @@ def ncdevmem_rx(cfg, port, verify=True, fail_on_linear=False, flow_steer=False, return " ".join(parts) -def ncdevmem_tx(cfg, port, chunk_size=0): +def ncdevmem_tx(cfg, port, chunk_size=0, hugepages=False): """Build the ncdevmem TX send command.""" if hasattr(cfg, 'netns'): ifname = cfg.nk_guest_ifname @@ -182,6 +190,8 @@ def ncdevmem_rx(cfg, port, verify=True, fail_on_linear=False, flow_steer=False, if chunk_size: extras.append(f"-z {chunk_size}") + if hugepages: + extras.append("-H") parts = [cfg.bin_local, f"-f {ifname}", f"-s {addr}", f"-p {port}", *extras] @@ -269,6 +279,33 @@ def ncdevmem_rx(cfg, port, verify=True, fail_on_linear=False, flow_steer=False, ksft_eq(socat.stdout.strip(), "hello\nworld") +def run_tx_large_niov(cfg): + """Run the devmem TX test from a 2MB hugepage-backed dmabuf. + + The kernel sizes TX niovs from the dmabuf layout. Send a single buffer + larger than a hugepage so that frags end at and continue past the niov + boundary. + """ + require_devmem(cfg, hugepages=True) + _reserve_hugepages() + configure_nic(cfg) + netns = getattr(cfg, "netns", None) + port = rand_port() + size = 3 * 1024 * 1024 + pattern = "abcdefg" + expected = (pattern * (size // len(pattern) + 1))[:size] + tx_cmd = ncdevmem_tx(cfg, port, hugepages=True) + # Hash on the remote, bkg() only drains stdout once the command exits. + listen_cmd = f"{socat_listen(cfg, port)} | sha256sum" + + with bkg(listen_cmd, host=cfg.remote, exit_wait=True) as socat: + wait_port_listen(port, host=cfg.remote) + cmd(f"bash -c 'yes {pattern} | tr -d \"\\n\" | head -c {size} | {tx_cmd}'", + ns=netns, shell=True) + ksft_eq(socat.stdout.split()[0], + hashlib.sha256(expected.encode()).hexdigest()) + + def run_rx_large_niov(cfg): """Run the devmem RX test with a large niov (rx-page-size > PAGE_SIZE). diff --git a/tools/testing/selftests/drivers/net/hw/ncdevmem.c b/tools/testing/selftests/drivers/net/hw/ncdevmem.c index 918e3b51f3b8..e29ff27087e7 100644 --- a/tools/testing/selftests/drivers/net/hw/ncdevmem.c +++ b/tools/testing/selftests/drivers/net/hw/ncdevmem.c @@ -104,6 +104,7 @@ static uint32_t tx_dmabuf_id; static int waittime_ms = 500; static bool fail_on_linear; static uint32_t rx_page_size; +static bool use_hugepages; /* System state loaded by current_config_load() */ #define MAX_FLOWS 8 @@ -162,7 +163,7 @@ static struct memory_buffer *udmabuf_alloc(size_t size) } memfd_flags = MFD_ALLOW_SEALING; - if (rx_page_size > getpagesize()) + if (use_hugepages || rx_page_size > getpagesize()) memfd_flags |= MFD_HUGETLB | MFD_HUGE_2MB; ctx->memfd = memfd_create("udmabuf-test", memfd_flags); @@ -1428,11 +1429,14 @@ int main(int argc, char *argv[]) int is_server = 0, opt; int ret, err = 1; - while ((opt = getopt(argc, argv, "Lls:c:p:v:q:t:f:z:nb:")) != -1) { + while ((opt = getopt(argc, argv, "Lls:c:p:v:q:t:f:z:nb:H")) != -1) { switch (opt) { case 'L': fail_on_linear = true; break; + case 'H': + use_hugepages = true; + break; case 'l': is_server = 1; break; diff --git a/tools/testing/selftests/drivers/net/hw/nk_devmem.py b/tools/testing/selftests/drivers/net/hw/nk_devmem.py index 61c6f31f01e5..799030db7c12 100755 --- a/tools/testing/selftests/drivers/net/hw/nk_devmem.py +++ b/tools/testing/selftests/drivers/net/hw/nk_devmem.py @@ -4,7 +4,7 @@ import os from devmem_lib import (setup_test, run_rx, run_tx, run_tx_chunks, run_rx_hds, - run_rx_large_niov) + run_rx_large_niov, run_tx_large_niov) from lib.py import ksft_run, ksft_exit, ksft_disruptive from lib.py import NetDrvContEnv @@ -37,6 +37,12 @@ from lib.py import NetDrvContEnv run_rx_large_niov(cfg) +@ksft_disruptive +def check_nk_tx_large_niov(cfg) -> None: + """Run the devmem TX large-niov test through netkit.""" + run_tx_large_niov(cfg) + + def main() -> None: """Run the netkit devmem test cases.""" with NetDrvContEnv(__file__, rxqueues=2, primary_rx_redirect=True) as cfg: @@ -44,7 +50,8 @@ from lib.py import NetDrvContEnv os.path.join(os.path.dirname(os.path.abspath(__file__)), "ncdevmem")) ksft_run([check_nk_rx, check_nk_tx, check_nk_tx_chunks, - check_nk_rx_hds, check_nk_rx_large_niov], args=(cfg,)) + check_nk_rx_hds, check_nk_rx_large_niov, + check_nk_tx_large_niov], args=(cfg,)) ksft_exit() -- 2.53.0-Meta