From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f8.google.com (mail-pz2-f8.google.com [74.125.228.8]) (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 8A10541168B for ; Tue, 22 Sep 2026 20:43:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.8 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790109853; cv=none; b=THPJnD/KMAmmjOSfZmWCHghP8YMOnQWU0bPbILNw+NF8Np8sExPkHj5PKpPpmFHK0ChLLA4ST9rW+jiEhLvv5R1MHQViTt18HPaEpvoadJfPqaagXTenElpK7NTW2wOnxyUl0GZENmzaBohcArfCV+bc6R2h0VgPgWieDJceKpU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790109853; c=relaxed/simple; bh=skCoc+C0hEQPVu18sCy3a39JKiwa3vnAiGPPaMNlYOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fWcLypLBgr7HSEDowBXaGsm/cAb4T2qwZk/qzcBTXp4XqVwieN911Rn3dExlFT6Z2yfp+51/us4eUO2z8ATX2MQmU1G/g3o9HAJVdcby4RDRdzsL+z2m/59BGFEQ6HfioKhjVQA4WJDORG+CZo7UwMk2KT54VCLZf3LFgy+FHrs= 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=XlfHmxgS; arc=none smtp.client-ip=74.125.228.8 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="XlfHmxgS" Received: by mail-pz2-f8.google.com with SMTP id 41be03b00d2f7-cc1ccc32960so18232a12.0 for ; Tue, 22 Sep 2026 13:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790109832; x=1790714632; 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=Q2XSgCg/L+gcV4fc8+Srep5u/tQwTGnGLQScsN2YpZw=; b=XlfHmxgSl9Gx8kKDvp+jLClKQMTvp2SYLnbKzqwZ31Kb4Ja/CLHhgiqwBl+N0/0qMY Kqi0KRaktuTsVx+4Nj5+hv3XbUobKMoAdU3IL/ZTBakEsu3M+gRG5k8lYMt5f3GX2Cs7 dOqrTrTjAQDj1+WdKUC+oWp/xkigxsO+gWSj2cB3gEy/pH7KSReqVYK2Bfa5mElhKgho aXtOE8tl0onrPyj3ktK9suPZlnSkdkhJHf55WRWVk7EIyrvRg6zegZUaAPIjDDTxyAFh 7AwFZQXQdtP2FW5ZiqePHpyFRgZ3rL4jr9Zhi4RUwuy1YyNjsVj96b6XeYIDCjU8aBx1 Z4tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790109832; x=1790714632; 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=Q2XSgCg/L+gcV4fc8+Srep5u/tQwTGnGLQScsN2YpZw=; b=s1NPh+c8p6uy1f1qHW8QbOCSV2aPd/DAw8AcomKtQ4je46JD6I0iRPrHGpxl1NcpYU lOGFfKxe/jo+lP9x+cWPyvBoFsWNULDGlxvUAC1U3WXdpvuoQbplEQJa/6Tu1UanO3Rh A1G50pWw3umGZJruqmvGC0Sc9EJ7k90ARzzSB3fCCvl9fVOmLtwhRxN9vSY5AdBQYGYu ntHQ8WjPouM20IGR6M0DHIgmWqLj6AL5cLOqEvOnzggGP3M1sr2FQyOamG4IgF+DEEfQ Lu91ccESxmkvpuGCkr07XIVcZLWUwl+6mXn7Jjhml6uKbAFpLtBLmndEf/PJTw1bsu5H Xi3A== X-Forwarded-Encrypted: i=1; AKwUvBwpRBA22lBEvjd27GpQkq2h/WzPXOOP/BDOkzRwQV9416W919MJHzdc8d77AxfDHaRPhHUjMsF0+g==@vger.kernel.org X-Gm-Message-State: AFuF++kLu1audGbKbgM411jjMhdW4+UaAZh5KK0D2fE3rj1DYBYmDJxY YKcZuVs/Xvpq07nmnoX/kRxA0h6NNlMI6O+X/Y6NmZ8+gjKbq2bmF0Wd X-Gm-Gg: AYBFou0jFfDmJATJVypuL2hTIeNICHwqGqyClErOdQ4Duw7XLtjQZplQmN6M/SnSL1O +LMRTlabV3hYSp/24YQcHyhFMhDPwHjUErCIlszEO2zudogOI/R3+b8EmBnoijZSpEPxtPVygkg KSVHnSfsbix32kXOkm7tTMT5WKa1qRMFbYnvl8HHFdrP3IKYQGf/7edvmSDpYMbG8VYGLwWNB/b L0VwkBWkQVoEBumlZCiWFS2G/kgh74y6+o5CIrGiBYf/kPb7KAO7JZaNwZwZxEPzAIuzKglTgkb 4YtQTUoy2dOvN+Jcm2Fylqe5SY04EYfq+JgcihImhH/BD5L0ppYxmeZECExvQpR0Sfy36z+HHjG E1KiypnP7jNdt+wtN78hH2cgW9gqYrMkm31BdobdAvBf6JeHBYFttdAdloOe6Uv6omavxRP/S5x wFMJ5Nvx/hfKh4zvUzVXxNitgkeTP8MJiIvZgeabahCRj8VevXmc07kG9pUIQDDYEj X-Received: by 2002:a05:6a00:b807:b0:857:72f8:dca6 with SMTP id d2e1a72fcca58-87d2374c350mr495409b3a.12.1790109831832; Tue, 22 Sep 2026 13:43:51 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:47::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87d1dff9769sm280202b3a.46.2026.09.22.13.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 13:43:51 -0700 (PDT) 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, horms@kernel.org, hawk@kernel.org, ilias.apalodimas@linaro.org, asml.silence@gmail.com, axboe@kernel.dk, sdf@fomichev.me, bobbyeshleman@meta.com, almasrymina@google.com, kaiyuanz@google.com, linux-kernel@vger.kernel.org, io-uring@vger.kernel.org Subject: [PATCH net-next 2/3] net: devmem: use memory provider helpers for net_iovs Date: Tue, 22 Sep 2026 13:43:47 -0700 Message-ID: <20260922204348.717198-3-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260922204348.717198-1-sdf@fomichev.me> References: <20260922204348.717198-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use public memory-provider helpers for DMA address storage and page-pool association instead of open-coding page_pool state and accounting. Zero the net_iov array because net_mp_niov_set_page_pool() ORs PP_SIGNATURE into pp_magic. Reject DMA addresses that cannot be represented in net_iov metadata. Signed-off-by: Stanislav Fomichev --- net/core/devmem.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/net/core/devmem.c b/net/core/devmem.c index c1c1872b88de..0fc77c1a2956 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -17,11 +17,9 @@ #include #include #include -#include #include "devmem.h" #include "mp_dmabuf_devmem.h" -#include "page_pool_priv.h" /* Device memory support */ @@ -247,7 +245,7 @@ net_devmem_bind_dmabuf(struct net_device *dev, void *vdev, goto err_unmap; } } - binding->area.niovs = kvmalloc_objs(*binding->area.niovs, + binding->area.niovs = kvzalloc_objs(*binding->area.niovs, binding->area.num_niovs); if (!binding->area.niovs) { err = -ENOMEM; @@ -274,8 +272,12 @@ net_devmem_bind_dmabuf(struct net_device *dev, void *vdev, for (i = 0; i < nr_niovs; i++, niov_idx++) { niov = &binding->area.niovs[niov_idx]; net_iov_init(niov, &binding->area, NET_IOV_DMABUF); - page_pool_set_dma_addr_netmem(net_iov_to_netmem(niov), - dma_addr); + if (net_mp_niov_set_dma_addr(niov, dma_addr)) { + err = -EFAULT; + NL_SET_ERR_MSG(extack, + "dmabuf DMA address cannot be represented"); + goto err_free_niovs; + } if (direction == DMA_TO_DEVICE) binding->tx_vec[niov_idx] = niov; else @@ -439,19 +441,9 @@ netmem_ref mp_dmabuf_devmem_alloc_netmems(struct page_pool *pool, gfp_t gfp) if (unlikely(!allocated)) return 0; - for (i = 0; i < allocated; i++) { - struct net_iov *niov = netmem_to_net_iov(netmems[i]); - - niov->desc.pp_magic = 0; - niov->desc.pp = NULL; - atomic_long_set(&niov->desc.pp_ref_count, 0); - - page_pool_set_pp_info(pool, netmems[i]); - - pool->pages_state_hold_cnt++; - trace_page_pool_state_hold(pool, netmems[i], - pool->pages_state_hold_cnt); - } + for (i = 0; i < allocated; i++) + net_mp_niov_set_page_pool(pool, + netmem_to_net_iov(netmems[i])); /* Return the last one, the rest stay in the page_pool cache. */ allocated--; @@ -476,8 +468,7 @@ bool mp_dmabuf_devmem_release_page(struct page_pool *pool, netmem_ref netmem) if (WARN_ON_ONCE(refcount != 1)) return false; - page_pool_clear_pp_info(netmem); - + net_mp_niov_clear_page_pool(netmem_to_net_iov(netmem)); net_devmem_free_dmabuf(netmem_to_net_iov(netmem)); /* We don't want the page pool put_page()ing our net_iovs. */ -- 2.53.0-Meta