From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f199.google.com (mail-dy1-f199.google.com [74.125.82.199]) (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 618573F23DB for ; Wed, 14 Oct 2026 16:18:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791994685; cv=none; b=GJlEzwzaZiRKyLT/eIHC4wlCHCgYezGjhqCLmqEHHl1zABp4FNA4W3g1+vApv1mxTPuHSj2uhrDqeDmG404p4NiIREPKS50NcpAhtNZMYbeprPtY6HDw/9MxRshjjrVEO2AH04/MzjbMbHE5bXK5mlqKBUjx0Iai+8Z8A265lF8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791994685; c=relaxed/simple; bh=vO6YEQIMsSYDbMWgTeXfd0RkPWpXF5baIQZyZXdCBFU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tAqMRz9wb3Xmzb62fJYSjoG19U2D2LxKk9CY2Ge4f1jTM9fcB/+LSc/bpv29oX2JkN5KyMYRynzdOMXhKMoeuunMOYaG9Yik0fAby6sTCDPQk0UDVINzw0woWUK5N36bFvfnLSnYPLf5f13rNsKRYt1XVuVuerGyfRuLRjnHsEI= 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=u60jC2Lr; arc=none smtp.client-ip=74.125.82.199 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="u60jC2Lr" Received: by mail-dy1-f199.google.com with SMTP id 5a478bee46e88-35c5aef2a74so4874365eec.0 for ; Wed, 14 Oct 2026 09:18:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1791994679; x=1792599479; 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=01xy5PseRVpPPje1JnCly3s3YIplU78ERdCkYH+3Kds=; b=u60jC2LrZnLVjsNpgSBwNsGCb+pDuHCqnJDjsjOmuV6t/YK8fv4GRcfPXvFkyAzhod V3JXDO6sbpVcuGGjU6YwQfyaF7f0Fy4Hh2+eEIwIWfJ/Fd9DeNAQxDAcPBiCY/EhlaYd 7GAZjDcGGLEHBaP4l6ImBpMM6Px8QQq3VyDbD3MPylumTIl+XCB9rlaluSZx3q30MEeG Mro5dR0F4B/KMJQhshU5IovZIyV39RHAt8imGJFa6B/o+MQe+8mWwiwFym5yyIZoEULo DDxqtb5ra3CM+qfk3wcgsZ5CQ8+QVOUhYeKzJmUDMlKhYOo76ua8Tb04oHA10K8151vx nxDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791994679; x=1792599479; 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=01xy5PseRVpPPje1JnCly3s3YIplU78ERdCkYH+3Kds=; b=JEYHc6zLkj2ZQy+UK5n1AykojhujKwFLKy6IP4M76fx9UUJVdj6a0v3fv0NxGEg0cA nL72JbQCkLZB7C+Q5bfg/PsUU+d3uNjtmqeRIwJvtBaWZ4/U2B283vHXN/0putfAYMLm DQXNLum3/fEOxYT2GJBNABx+Dhy5V6qfmP5dBk+DWkVI/JjiagvK0Y9Uv9xIEGGmiTkS h1qzaQ+6C9IxLOQY17PFVvUIcev6PCJV5Zg5fw6qMhdhZHreM11jRkoETnE8kRIfJ+WB XW2E6ruMPYyk3HLp3tqlEowCDFKxxnpkOI+uVCZYROnG/Wfo6/Vomy5KSCnZ7cFQgo1L r3NA== X-Forwarded-Encrypted: i=1; AKwUvBzLZ/ivIHytgB0jDcpxzg+GeRAR+A4ibn/gkOyE6rHXhnl42GfoaYn/ZezZH3+xnmdeh/jK9j68ITXiX2A=@vger.kernel.org X-Gm-Message-State: AFq9FYI4hjBbxr/Z/Xh+8aNfQsp8DnxxtLjI6p73pK7hlH9ObTW+xgxo VvieaKQJbX8PLhSRljN4tXXJYfPBj/3doYXY3RtS9sLq0hsX1/HbpV8xu6GVP/yD6uOtlNEJwdc Epb+HXFKHZe+s97sXO0+SqDWn7A== X-Received: from dlcip5.prod.google.com ([2002:a05:7023:c085:b0:16b:e65c:ee1b]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:4541:10b0:144:ed03:8972 with SMTP id a92af1059eb24-16a5dee12c8mr21630544c88.16.1791994679033; Wed, 14 Oct 2026 09:17:59 -0700 (PDT) Date: Wed, 14 Oct 2026 16:17:53 +0000 In-Reply-To: <20261014161754.3782346-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@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-4-almasrymina@google.com> Subject: [PATCH net v3 3/4] netdevsim: support devmem RX and TX bindings 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" Set a 64-bit DMA mask on nsim_bus_dev, enable NETMEM_TX_DMA on the netdevsim net_device, and configure page_pool instances with PP_FLAG_ALLOW_UNREADABLE_NETMEM and queue_idx, plus PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV when CONFIG_HAS_DMA is set, so devmem bind-rx and bind-tx netlink operations can be tested against netdevsim in software selftests. The pp_hold debugfs file allocates pages from the queue 0 page pool, so refuse it when that pool is backed by a memory provider, and take the netdev instance lock there so a concurrent bind-rx cannot swap the pool in between. The software PSP path checksums the payload when the peer does not decapsulate, so drop unreadable skbs there. Cc: Tariq Toukan Cc: Kaifeng Wang Assisted-by: LLM Signed-off-by: Mina Almasry Reviewed-by: Dragos Tatulea --- v3: - Only request page pool DMA mapping when CONFIG_HAS_DMA is set (Sashiko). - Refuse pp_hold on a page pool backed by a memory provider, under the netdev instance lock (Sashiko). - Drop unreadable skbs in the software PSP path when it would have to checksum the payload (Sashiko). --- drivers/net/netdevsim/bus.c | 1 + drivers/net/netdevsim/netdev.c | 27 +++++++++++++++++++++------ drivers/net/netdevsim/psp.c | 5 +++++ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c index 5c55c308487b4..f87f5e037b6fb 100644 --- a/drivers/net/netdevsim/bus.c +++ b/drivers/net/netdevsim/bus.c @@ -462,6 +462,7 @@ nsim_bus_dev_new(unsigned int id, unsigned int port_count, unsigned int num_queu nsim_bus_dev->port_count = port_count; nsim_bus_dev->num_queues = num_queues; nsim_bus_dev->initial_net = current->nsproxy->net_ns; + dma_coerce_mask_and_coherent(&nsim_bus_dev->dev, DMA_BIT_MASK(64)); /* Disallow using nsim_bus_dev */ smp_store_release(&nsim_bus_dev->init, false); diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index b4a99f3ceac60..357ea9e5623b3 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -414,19 +414,27 @@ static int nsim_poll(struct napi_struct *napi, int budget) return done; } -static int nsim_create_page_pool(struct page_pool **p, struct napi_struct *napi) +static int nsim_create_page_pool(struct net_device *dev, struct page_pool **p, + struct napi_struct *napi, int idx) { + struct netdevsim *ns = netdev_priv(dev); struct page_pool_params params = { .order = 0, .pool_size = NSIM_RING_SIZE, + .flags = PP_FLAG_ALLOW_UNREADABLE_NETMEM, + .max_len = PAGE_SIZE, .nid = NUMA_NO_NODE, - .dev = &napi->dev->dev, + .dev = &ns->nsim_bus_dev->dev, .napi = napi, .dma_dir = DMA_BIDIRECTIONAL, - .netdev = napi->dev, + .netdev = dev, + .queue_idx = idx, }; struct page_pool *pool; + if (IS_ENABLED(CONFIG_HAS_DMA)) + params.flags |= PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV; + pool = page_pool_create(¶ms); if (IS_ERR(pool)) return PTR_ERR(pool); @@ -450,7 +458,7 @@ static int nsim_init_napi(struct netdevsim *ns) for (i = 0; i < dev->num_rx_queues; i++) { rq = ns->rq[i]; - err = nsim_create_page_pool(&rq->page_pool, &rq->napi); + err = nsim_create_page_pool(dev, &rq->page_pool, &rq->napi, i); if (err) goto err_pp_destroy; } @@ -762,14 +770,16 @@ nsim_queue_mem_alloc(struct net_device *dev, if (ns->rq_reset_mode == 1) { if (!netif_running(ns->netdev)) return -ENETDOWN; - return nsim_create_page_pool(&qmem->pp, &ns->rq[idx]->napi); + return nsim_create_page_pool(dev, &qmem->pp, + &ns->rq[idx]->napi, idx); } qmem->rq = nsim_queue_alloc(); if (!qmem->rq) return -ENOMEM; - err = nsim_create_page_pool(&qmem->rq->page_pool, &qmem->rq->napi); + err = nsim_create_page_pool(dev, &qmem->rq->page_pool, &qmem->rq->napi, + idx); if (err) goto err_free; @@ -929,12 +939,15 @@ nsim_pp_hold_write(struct file *file, const char __user *data, return ret; rtnl_lock(); + netdev_lock(ns->netdev); ret = count; if (val == !!ns->page) goto exit; if (!netif_running(ns->netdev) && val) { ret = -ENETDOWN; + } else if (val && page_pool_is_unreadable(ns->rq[0]->page_pool)) { + ret = -EOPNOTSUPP; } else if (val) { ns->page = page_pool_dev_alloc_pages(ns->rq[0]->page_pool); if (!ns->page) @@ -946,6 +959,7 @@ nsim_pp_hold_write(struct file *file, const char __user *data, } exit: + netdev_unlock(ns->netdev); rtnl_unlock(); return ret; } @@ -1051,6 +1065,7 @@ static int nsim_init_netdevsim(struct netdevsim *ns) ns->netdev->netdev_ops = &nsim_netdev_ops; ns->netdev->stat_ops = &nsim_stat_ops; ns->netdev->queue_mgmt_ops = &nsim_queue_mgmt_ops; + ns->netdev->netmem_tx = NETMEM_TX_DMA; netdev_lockdep_set_classes(ns->netdev); err = nsim_udp_tunnels_info_create(ns->nsim_dev, ns->netdev); diff --git a/drivers/net/netdevsim/psp.c b/drivers/net/netdevsim/psp.c index 6b3532b5e360d..908cc0d391dc6 100644 --- a/drivers/net/netdevsim/psp.c +++ b/drivers/net/netdevsim/psp.c @@ -86,6 +86,11 @@ nsim_do_psp(struct sk_buff *skb, struct netdevsim *ns, __wsum csum; int udplen; + if (!skb_frags_readable(skb)) { + rc = SKB_DROP_REASON_PSP_OUTPUT; + goto out_unlock; + } + /* Do not decapsulate. Receive the skb with the udp and psp * headers still there as if this is a normal udp packet. * psp_dev_encapsulate() sets udp checksum to 0, so we need to -- 2.56.0.176.g3575e65682-goog