From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) (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 886E9369D59 for ; Thu, 11 Jun 2026 21:23:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.66 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781213018; cv=none; b=fVkeRYHKlBkCTa6w4bo4mirl7BVO7JgP/ZL03nbaC3EwON9RhewyFe7OD5XhZgCks1b3HVNAfWVKdsQJccDuuObc+F6LAdi6xrIWuMRIwEU5keuAJ/c5i9UkmQNsCIRdM5MYP82NsAHcx0yQbB8795BFX21bAAMqpjAnmY5OubI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781213018; c=relaxed/simple; bh=oW4BQVUMFiOSZ6wG+yY+yDEPmzWrRE0msdDCfL+5TSo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=HA3bXPL1StCv5VzGKtS+pNBIATiji/eFtBtfy8bQqcxRMbUQuNbcSrUFgrOEfpzAgnj7VyMd5CsenIga5JKXA7dXTBJznvtu66X4glhZy7fA9E7tIKmOH4BHbI31KqWG+jeROIBpmQNPQMrlNpR3+BYpFyJ0JEWKH3Hagr7bW7c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=H6dG2yl2; arc=none smtp.client-ip=209.85.216.66 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) header.d=gmail.com header.i=@gmail.com header.b="H6dG2yl2" Received: by mail-pj1-f66.google.com with SMTP id 98e67ed59e1d1-36bcf3d2565so292834a91.3 for ; Thu, 11 Jun 2026 14:23:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781213016; x=1781817816; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=SYDMbx/NSE1Ez69WzG00jvFaSdDUPkagmOI6dnx+MPA=; b=H6dG2yl2zJV/oKbbYQu6GCcipBPkFdU0M68TUvQ+4rx9XybSeI9BJAXpBU2r1Y8Bhx JEaawpzprqlLju87kM56ITzt9zRv9vjRL2nXeSY2adcsPsLaTrvLjp7BEuUNzyWRe2sI C59Qzk3EUF0uOJ0iseAeGFQYGYnVO9UlF1vpdXsTFTSDeY1L4tArl3CGZGC70uhQHfZ9 DJmL5kiCn55IVQ3mhMvolHfzns9+IYocS58XvL6dD0znBsMxC6O3qoiu5VexSful6n53 NrZ0rzuA7lBn3bA9XI1oZDj/rry8cvGrRNlhPW6vv0x57gu8JR5qTbRu8kyRz916ke6k I4zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781213016; x=1781817816; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SYDMbx/NSE1Ez69WzG00jvFaSdDUPkagmOI6dnx+MPA=; b=Cc4J0Y9+3avVJkCdL5L6lLubf9pjIzHhaIxPJ5bvIqVokXRUbPBwUJTu7Gu9s9hMjl cd/SrhKaQSNDQrm+Abm80Cs7ZpsG/o5VY8jm6zRahGzibjpzpqxWD6MHU7bz6UDDhuV1 jN5EV+zXsbxW+h0nvq4dQyC8C7f0htUvkxvxgKTRzRFkNTc4O1Ls9U+G/T4HlwfqQZFH gJ8h1Lol5hxqUKDzdkHeFZR2jEmtnzzcG8bTMxuEF13uJl1z4KsHT1dIEMuEuYxi57VD Ge6zBGriZm+z0MYdV/Z5vIbyIU5OwB98sVoKyK/y/2a4ENp3Wch2uuKHbNfNE9yoJaQL 3+LQ== X-Forwarded-Encrypted: i=1; AFNElJ9swAKLfqYbeDypt2W8PTKPjht6TvwtOJwelLYmLy5C0ioLpbWakVA2Oa6mXmYCE+gHNICSPAQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yzb+ZlqYOSZSsqQxJ8EWsDz3C7x2mhknKgFE+eNOOr+EYiojtl7 DBZw8/Vgie0TArym0OoDNynMkGFgJc4A56MrW0sArWHLIYYddygE1I2T X-Gm-Gg: Acq92OFLD4gDDcLjxjFXAkaz18BB8llDKlzkBNA7s/g8A3YBN754wuWSpwiDb7cT4WY ynueHxH+Qntd1RwxH4r8SLTkD5zHP/VXde51IFuejzHtQTGfDuMEQBcMOx/n694mURxWrGVGRpw PloPNhPNfIHOnjIIrQ8hOVbIrHELsp79pqiW15knHXTd5Firjf5AJiszdfvtL/rFsF+NbWg9dr9 P80GwUdG3lt2c6FF9uBBOkPpUUppcqI54tZxGKkKA5eQT8LezOxWipRKkuOtYmnlXXRO0sBy3Il nceTMsTJ3NPCzDbWDNWu2f4hwWUW3kMmZ80+Av5/kJSNMPF6lbQUb0u09LVOWuC453YEDjs7XdQ ORGhofXZTx4JA/Oy1WcWyYWwU4URnzzwiRWLAOBSfnA3iNG/NU3qMVqdfO8IEivWRLMMsmt4DED rjfpW8Q9rFggPOOnM= X-Received: by 2002:a17:90b:2c8d:b0:36b:91a3:6af3 with SMTP id 98e67ed59e1d1-37a01c350c5mr145061a91.7.1781213015970; Thu, 11 Jun 2026 14:23:35 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:9::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3774f99cf24sm3481176a91.0.2026.06.11.14.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 14:23:35 -0700 (PDT) Date: Thu, 11 Jun 2026 14:22:54 -0700 From: Stanislav Fomichev To: Bobby Eshleman Cc: Donald Hunter , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Andrew Lunn , Gerd Hoffmann , Vivek Kasireddy , Sumit Semwal , Christian =?utf-8?B?S8O2bmln?= , Shuah Khan , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-kselftest@vger.kernel.org, sdf@fomichev.me, razor@blackwall.org, daniel@iogearbox.net, almasrymina@google.com, matttbe@kernel.org, skhawaja@google.com, dw@davidwei.uk, Bobby Eshleman Subject: Re: [PATCH net-next v2 3/4] selftests/net: ncdevmem: add -b option to set rx-buf-size on bind Message-ID: References: <20260611-tcpdm-large-niovs-v2-0-ee2bf15e7523@meta.com> <20260611-tcpdm-large-niovs-v2-3-ee2bf15e7523@meta.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20260611-tcpdm-large-niovs-v2-3-ee2bf15e7523@meta.com> On 06/11, Bobby Eshleman wrote: > From: Bobby Eshleman > > Add -b to request a non-default niov size via > NETDEV_A_DMABUF_RX_BUF_SIZE. When the value exceeds PAGE_SIZE, > udmabuf_alloc() switches to an MFD_HUGETLB-backed memfd so each 2 MB > hugepage produces one naturally-aligned sg entry. > > Reject values > 2 MB up front: MFD_HUGETLB + udmabuf can only guarantee > 2 MB per sg entry (one hugepage), so a larger rx_buf_size would fail the > per-sg length/alignment check. > > Add CONFIG_HUGETLBFS=y to drivers/net/hw/config so the new path is > reachable in the CI kernels built for these tests. > > Signed-off-by: Bobby Eshleman > --- > tools/testing/selftests/drivers/net/hw/config | 1 + > tools/testing/selftests/drivers/net/hw/ncdevmem.c | 49 +++++++++++++++++++++-- > 2 files changed, 47 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/drivers/net/hw/config b/tools/testing/selftests/drivers/net/hw/config > index cd20024218cd..ed8642b68094 100644 > --- a/tools/testing/selftests/drivers/net/hw/config > +++ b/tools/testing/selftests/drivers/net/hw/config > @@ -3,6 +3,7 @@ CONFIG_FAIL_FUNCTION=y > CONFIG_FAULT_INJECTION=y > CONFIG_FAULT_INJECTION_DEBUG_FS=y > CONFIG_FUNCTION_ERROR_INJECTION=y > +CONFIG_HUGETLBFS=y > CONFIG_INET6_ESP=y > CONFIG_INET6_ESP_OFFLOAD=y > CONFIG_INET_ESP=y > diff --git a/tools/testing/selftests/drivers/net/hw/ncdevmem.c b/tools/testing/selftests/drivers/net/hw/ncdevmem.c > index d96e8a3b5a65..325c128191e2 100644 > --- a/tools/testing/selftests/drivers/net/hw/ncdevmem.c > +++ b/tools/testing/selftests/drivers/net/hw/ncdevmem.c > @@ -61,6 +61,7 @@ > #include > > #include > +#include > #include > #include > #include > @@ -79,6 +80,7 @@ > #define PAGE_SHIFT 12 > #define TEST_PREFIX "ncdevmem" > #define NUM_PAGES 16000 > +#define MB(x) ((x) << 20) > > #ifndef MSG_SOCK_DEVMEM > #define MSG_SOCK_DEVMEM 0x2000000 > @@ -100,6 +102,7 @@ static unsigned int dmabuf_id; > static uint32_t tx_dmabuf_id; > static int waittime_ms = 500; > static bool fail_on_linear; > +static uint32_t rx_buf_size; > > /* System state loaded by current_config_load() */ > #define MAX_FLOWS 8 > @@ -142,6 +145,7 @@ static struct memory_buffer *udmabuf_alloc(size_t size) > { > struct udmabuf_create create; > struct memory_buffer *ctx; > + unsigned int memfd_flags; > int ret; > > ctx = malloc(sizeof(*ctx)); > @@ -156,9 +160,14 @@ static struct memory_buffer *udmabuf_alloc(size_t size) > goto err_free_ctx; > } > > - ctx->memfd = memfd_create("udmabuf-test", MFD_ALLOW_SEALING); > + memfd_flags = MFD_ALLOW_SEALING; [..] > + if (rx_buf_size > (uint32_t)getpagesize()) What's the logic behind explicit (uint32_t) cast? uint vs int comparisons should promote the int to uint automatically? > + memfd_flags |= MFD_HUGETLB | MFD_HUGE_2MB; > + > + ctx->memfd = memfd_create("udmabuf-test", memfd_flags); > if (ctx->memfd < 0) { > - pr_err("[skip,no-memfd]"); > + pr_err("[skip,no-memfd%s]", > + (memfd_flags & MFD_HUGETLB) ? " (need hugepages)" : ""); > goto err_close_dev; > } > > @@ -168,6 +177,11 @@ static struct memory_buffer *udmabuf_alloc(size_t size) > goto err_close_memfd; > } > > + if (memfd_flags & MFD_HUGETLB) { > + size = roundup(size, MB(2)); > + ctx->size = size; > + } > + > ret = ftruncate(ctx->memfd, size); > if (ret == -1) { > pr_err("[FAIL,memfd-truncate]"); > @@ -699,6 +713,8 @@ static int bind_rx_queue(unsigned int ifindex, unsigned int dmabuf_fd, > netdev_bind_rx_req_set_ifindex(req, ifindex); > netdev_bind_rx_req_set_fd(req, dmabuf_fd); > __netdev_bind_rx_req_set_queues(req, queues, n_queue_index); > + if (rx_buf_size) > + netdev_bind_rx_req_set_rx_buf_size(req, rx_buf_size); > > rsp = netdev_bind_rx(*ys, req); > if (!rsp) { > @@ -1411,7 +1427,7 @@ 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:n")) != -1) { > + while ((opt = getopt(argc, argv, "Lls:c:p:v:q:t:f:z:nb:")) != -1) { > switch (opt) { > case 'L': > fail_on_linear = true; > @@ -1446,6 +1462,33 @@ int main(int argc, char *argv[]) > case 'n': > skip_config = 1; > break; > + case 'b': { > + char *endp; > + unsigned long val; Christmas tree here as well? > + > + errno = 0; > + val = strtoul(optarg, &endp, 0); [..] > + if (errno || endp == optarg || *endp || val == 0 || > + val > UINT32_MAX) { > + pr_err("invalid rx_buf_size: %s", optarg); > + return 1; > + } This is too sophisticated :-/ Just (if val == UINT32_MAX && errno == ERANGE) ? (you're looking for an overflow here supposedly?) [..] > + if (val & (val - 1)) { > + pr_err("rx_buf_size must be a power of 2"); > + return 1; > + } > + if (val < (unsigned long)getpagesize()) { > + pr_err("rx_buf_size must be >= PAGE_SIZE (%d)", > + getpagesize()); > + return 1; > + } > + if (val > MB(2)) { > + pr_err("rx_buf_size > 2 MB not supported"); > + return 1; > + } We already check these on the kernel size, so should be ok to drop?