From nobody Fri Sep 25 13:55:23 2026 Received: from mail-pj2-f10.google.com (mail-pj2-f10.google.com [74.125.227.138]) (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 893DA48EC7D for ; Fri, 11 Sep 2026 15:45:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789141560; cv=none; b=TW28YiDalv0v8Sv97RQlQxtSCtfEn4/WJDF5LZNXMh60CHz7NpQl8pS3YJRZ/nO7X1cDd3fb7e8b/MamG5WqPeCaAE4Oq09MHlD4K1z/BA+nCYI63NerJ/71FbPGaSBF8mkOQR5btHb41SGiiszMc/uswdJupF5eCTVwTisQFIQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789141560; c=relaxed/simple; bh=o/nuTlqRX+mJR2sIjhL71ai5NXB8U8gBYkqD7yDxOwQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n3kbtToV3GhXSsItrkeYXdeiGDckLiDM0yUaaSdGcuYgsMosTOVsP9ZDRwvW/sJ7pryQ6eXEJTlAnt+uy3NpRyOFkqjSsxXPpgJLvZucoNKZi+9M2LB2x96r8heFBRON5bXTY5oIvZIolI1NQc49skge+wogJEsFaEZ/IlQyPmE= 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=Nr4agfvQ; arc=none smtp.client-ip=74.125.227.138 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="Nr4agfvQ" Received: by mail-pj2-f10.google.com with SMTP id d9443c01a7336-2cf5e516e67so4909445ad.1 for ; Fri, 11 Sep 2026 08:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789141558; x=1789746358; 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=kUuqELK1QtIdlXzlFmG0wXr2/kyNd/dtDl+QfsbVkXg=; b=Nr4agfvQezyjY3hVktaQDptt7r4az/RX4iL/E70OOiN2SnDYGvQcWNZ4VgO3dGtYS6 cZWTBvCeZz+cNC5GlM5AWlBPXmKBN2B/GdXKvhCKn6S+Czt1dIVTVGGfRMg2ERSE9Zh0 u56P90bjDZDS7lsfByvMSNWRbg5+O6sgluKb42HEAQxOqu86gG78bKg6qwGnFg3sGgNq YEnCtCtzrax6eQuBaUlOKxiSGfhzB3cScx5I9KBTi1w0yRcSzIJKA+Bb9OHRSGG5ipfe jjtPjCUcnoMRzanyHEOsmYnmjJj1GjzwB1WFIA95bnXJIUJdpc/opK1EDnzV3Op/7hmY 5GMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789141558; x=1789746358; 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=kUuqELK1QtIdlXzlFmG0wXr2/kyNd/dtDl+QfsbVkXg=; b=c2bVBg3Z3r64X3frKWPQSTTlrqEBBeHWPmRGu4rno0cOlfRJcKMx2SGjXpeus73Xy0 rj1ShQZ/AhxbZYflmYYKBIioi1AjYX6OjlLuuH7zpkmkv0vJ2grBiHP+wYzvnma+JKcs nlSEaksAKPkHn+RJutgR+wOqy/Aek8dUauF02PUVkCQqoKOmK/9F3zMwYgsG1X/FK/xw 8Mvkpln6cuRs2nChgHf/wbsZC5lgulITKerglCpF0+6Yqrcbw6Zb2u232E0vf956vaxF 1jMjD3B0mfmDvzxDOhJX0eDjErbgOTDfXOy/ejX5DS3BQr+0V5T4C8mSPc+lCsJ1Y8D2 +Bvg== X-Forwarded-Encrypted: i=1; AKwUvBzNpdiO0m5JkxcXeE0S0GVJfscOA5AxkQJ+fCPeL7ZtRYA6HIX7UvSxIWNI9y+uclKQ0FJcKZSZpu1qZB0=@vger.kernel.org X-Gm-Message-State: AFuF++mEJVK7uZPOAjia+gH8tqYoSE9nvXY5bvXRPRitAhiF9Nm2701k CyCtL+y1ensxajnOKkp6+31OAUmjIJJaCSApR7bj1wwblLqC3Qk9I9Xq X-Gm-Gg: AYBFou3N0nUmFw0njK9TezCr7GVSIEIHrUNULFeDK6BoQSP5qwUHXreB++TgZpvIduN w+/lNgY3Ml4GKvH/4IyMZIWbAQ/JOYe1HMueBXumcej4hXrM/RtO70nsXRE9slbPvlHx0m3oC0a t6qqcPCMBoE2KXKkBs1Ga6TAdNC3lDaGzOi8nukGYQHX+q/UEHvcGXG4f8JTNe/r0rqXgc10WHS 4o1RfDElsKwT9Ni5UtGJ4cwz/8PsiRAcd7rVF9QSMHALy7o/OFoZBClYks+HfRtJHKbJCOfS5RO Z2VoiRqs6gLhUeZcTZ0F2GcGDqAvoErSzXPwWBPvDoVtzBJgv6ebFKcFt4CECQNFXlCBA2rs6Sl ZUYfPkwMs/m3w6k6nNN9sg15mr1PYXIlq6YPiZbUOCzsKHmWe5qK+GLpmapaQANsdoz6H7vR4zl TMtczJqL0y4pCCdP2DfvOvLAxTZCrLmeJrpBnMBbDviWKjMEIn66Vq/jIWkfsmvRgba2ruRj9UX F8= X-Received: by 2002:a17:903:19d0:b0:2db:20fa:9443 with SMTP id d9443c01a7336-2dd2a332f4fmr92415715ad.13.1789141557759; Fri, 11 Sep 2026 08:45:57 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:72::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2dd2c825ff5sm14200065ad.0.2026.09.11.08.45.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 08:45:57 -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, sdf@fomichev.me, bobbyeshleman@meta.com, almasrymina@google.com, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 1/3] net: devmem: replace gen_pool with freelist Date: Fri, 11 Sep 2026 08:45:53 -0700 Message-ID: <20260911154555.739041-2-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260911154555.739041-1-sdf@fomichev.me> References: <20260911154555.739041-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" devmem only needs fixed-size net_iov allocations for each dma-buf binding. The gen_pool tracks the same free set indirectly through DMA addresses, which makes devmem depend on the generic allocator even though the users are fixed-size net_iov chunks. Mirror the io_uring zcrx model more closely by keeping a binding-level freelist protected by spin_lock_bh(). Use a single net_iov_area owner for the binding, populate each net_iov's DMA address while walking the SG table, and check at teardown that all net_iovs have returned to the freelist. Drop the NET_DEVMEM select of GENERIC_ALLOCATOR now that devmem no longer calls gen_pool APIs. Signed-off-by: Stanislav Fomichev --- net/Kconfig | 1 - net/core/devmem.c | 172 +++++++++++++++++++++------------------------- net/core/devmem.h | 16 ++--- 3 files changed, 85 insertions(+), 104 deletions(-) diff --git a/net/Kconfig b/net/Kconfig index e38477393551..76ab44aa439a 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -68,7 +68,6 @@ config SKB_EXTENSIONS =20 config NET_DEVMEM def_bool y - select GENERIC_ALLOCATOR depends on DMA_SHARED_BUFFER depends on PAGE_POOL =20 diff --git a/net/core/devmem.c b/net/core/devmem.c index f4d60654ce7f..4883eb7f3a95 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -8,7 +8,6 @@ */ =20 #include -#include #include #include #include @@ -30,23 +29,13 @@ static DEFINE_XARRAY_FLAGS(net_devmem_dmabuf_bindings, = XA_FLAGS_ALLOC1); =20 static const struct memory_provider_ops dmabuf_devmem_ops; =20 -static void net_devmem_dmabuf_free_chunk_owner(struct gen_pool *genpool, - struct gen_pool_chunk *chunk, - void *not_used) +static void +net_devmem_dmabuf_free_chunk_owner(struct dmabuf_genpool_chunk_owner *owne= r) { - struct dmabuf_genpool_chunk_owner *owner =3D chunk->owner; - - kvfree(owner->area.niovs); - kfree(owner); -} - -static dma_addr_t net_devmem_get_dma_addr(const struct net_iov *niov) -{ - struct dmabuf_genpool_chunk_owner *owner; - - owner =3D net_devmem_iov_to_chunk_owner(niov); - return owner->base_dma_addr + - ((dma_addr_t)net_iov_idx(niov) << owner->binding->niov_shift); + if (owner) { + kvfree(owner->area.niovs); + kfree(owner); + } } =20 static void net_devmem_dmabuf_binding_release(struct percpu_ref *ref) @@ -62,24 +51,18 @@ void __net_devmem_dmabuf_binding_free(struct work_struc= t *wq) { struct net_devmem_dmabuf_binding *binding =3D container_of(wq, typeof(*bi= nding), unbind_w); =20 - size_t size, avail; - - gen_pool_for_each_chunk(binding->chunk_pool, - net_devmem_dmabuf_free_chunk_owner, NULL); - - size =3D gen_pool_size(binding->chunk_pool); - avail =3D gen_pool_avail(binding->chunk_pool); - - if (!WARN(size !=3D avail, "can't destroy genpool. size=3D%zu, avail=3D%z= u", - size, avail)) - gen_pool_destroy(binding->chunk_pool); + WARN(binding->free_count !=3D binding->total_niovs, + "can't destroy dmabuf binding. total=3D%zu, free=3D%zu", + binding->total_niovs, binding->free_count); =20 + net_devmem_dmabuf_free_chunk_owner(binding->chunk_owner); dma_buf_unmap_attachment_unlocked(binding->attachment, binding->sgt, binding->direction); dma_buf_detach(binding->dmabuf, binding->attachment); dma_buf_put(binding->dmabuf); xa_destroy(&binding->bound_rxqs); percpu_ref_exit(&binding->ref); + kvfree(binding->freelist); kvfree(binding->tx_vec); kfree(binding); } @@ -87,21 +70,16 @@ void __net_devmem_dmabuf_binding_free(struct work_struc= t *wq) struct net_iov * net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding) { - struct dmabuf_genpool_chunk_owner *owner; - unsigned long dma_addr; struct net_iov *niov; - ssize_t offset; - ssize_t index; - - dma_addr =3D gen_pool_alloc_owner(binding->chunk_pool, - 1UL << binding->niov_shift, - (void **)&owner); - if (!dma_addr) + spin_lock_bh(&binding->freelist_lock); + if (unlikely(!binding->free_count)) { + spin_unlock_bh(&binding->freelist_lock); return NULL; + } =20 - offset =3D dma_addr - owner->base_dma_addr; - index =3D offset >> binding->niov_shift; - niov =3D &owner->area.niovs[index]; + niov =3D binding->freelist[--binding->free_count]; + binding->freelist[binding->free_count] =3D NULL; + spin_unlock_bh(&binding->freelist_lock); =20 niov->desc.pp_magic =3D 0; niov->desc.pp =3D NULL; @@ -113,14 +91,15 @@ net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_bindi= ng *binding) void net_devmem_free_dmabuf(struct net_iov *niov) { struct net_devmem_dmabuf_binding *binding =3D net_devmem_iov_binding(niov= ); - unsigned long dma_addr =3D net_devmem_get_dma_addr(niov); - size_t niov_size =3D 1UL << binding->niov_shift; =20 - if (WARN_ON(!gen_pool_has_addr(binding->chunk_pool, dma_addr, - niov_size))) + spin_lock_bh(&binding->freelist_lock); + if (WARN_ON_ONCE(binding->free_count >=3D binding->total_niovs)) { + spin_unlock_bh(&binding->freelist_lock); return; + } =20 - gen_pool_free(binding->chunk_pool, dma_addr, niov_size); + binding->freelist[binding->free_count++] =3D niov; + spin_unlock_bh(&binding->freelist_lock); } =20 void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding) @@ -194,12 +173,15 @@ net_devmem_bind_dmabuf(struct net_device *dev, void *= vdev, struct netlink_ext_ack *extack) { struct net_devmem_dmabuf_binding *binding; + struct dmabuf_genpool_chunk_owner *owner; size_t niov_size =3D 1UL << niov_shift; static u32 id_alloc_next; struct scatterlist *sg; struct dma_buf *dmabuf; - unsigned int sg_idx, i; - unsigned long virtual; + unsigned int sg_idx; + size_t total_niovs; + size_t niov_idx; + size_t i; int err; =20 if (!dma_dev) { @@ -230,6 +212,7 @@ net_devmem_bind_dmabuf(struct net_device *dev, void *vd= ev, goto err_free_binding; =20 mutex_init(&binding->lock); + spin_lock_init(&binding->freelist_lock); =20 binding->dmabuf =3D dmabuf; binding->direction =3D direction; @@ -262,20 +245,10 @@ net_devmem_bind_dmabuf(struct net_device *dev, void *= vdev, goto err_unmap; } } - - binding->chunk_pool =3D gen_pool_create(niov_shift, - dev_to_node(&dev->dev)); - if (!binding->chunk_pool) { - err =3D -ENOMEM; - goto err_tx_vec; - } - - virtual =3D 0; + total_niovs =3D 0; for_each_sgtable_dma_sg(binding->sgt, sg, sg_idx) { dma_addr_t dma_addr =3D sg_dma_address(sg); - struct dmabuf_genpool_chunk_owner *owner; size_t len =3D sg_dma_len(sg); - struct net_iov *niov; =20 if (!IS_ALIGNED(dma_addr, niov_size) || !IS_ALIGNED(len, niov_size)) { @@ -283,63 +256,74 @@ net_devmem_bind_dmabuf(struct net_device *dev, void *= vdev, NL_SET_ERR_MSG_FMT(extack, "dmabuf sg entry (addr=3D%pad, len=3D%zu) not aligned to niov size= %zu", &dma_addr, len, niov_size); - goto err_free_chunks; + goto err_tx_vec; } =20 - owner =3D kzalloc_node(sizeof(*owner), GFP_KERNEL, - dev_to_node(&dev->dev)); - if (!owner) { - err =3D -ENOMEM; - goto err_free_chunks; - } + total_niovs +=3D len >> niov_shift; + } =20 - owner->area.base_virtual =3D virtual; - owner->base_dma_addr =3D dma_addr; - owner->area.num_niovs =3D len >> niov_shift; - owner->binding =3D binding; + binding->freelist =3D kvmalloc_array(total_niovs, + sizeof(binding->freelist[0]), + GFP_KERNEL); + if (!binding->freelist) { + err =3D -ENOMEM; + goto err_tx_vec; + } + binding->total_niovs =3D total_niovs; =20 - err =3D gen_pool_add_owner(binding->chunk_pool, dma_addr, - dma_addr, len, dev_to_node(&dev->dev), - owner); - if (err) { - kfree(owner); - err =3D -EINVAL; - goto err_free_chunks; - } + owner =3D kzalloc_node(sizeof(*owner), GFP_KERNEL, + dev_to_node(&dev->dev)); + if (!owner) { + err =3D -ENOMEM; + goto err_free_freelist; + } =20 - owner->area.niovs =3D kvmalloc_objs(*owner->area.niovs, - owner->area.num_niovs); - if (!owner->area.niovs) { - err =3D -ENOMEM; - goto err_free_chunks; - } + owner->area.num_niovs =3D total_niovs; + owner->binding =3D binding; + owner->area.niovs =3D kvmalloc_objs(*owner->area.niovs, + owner->area.num_niovs); + if (!owner->area.niovs) { + err =3D -ENOMEM; + goto err_free_owner; + } + binding->chunk_owner =3D owner; + + niov_idx =3D 0; + for_each_sgtable_dma_sg(binding->sgt, sg, sg_idx) { + dma_addr_t dma_addr =3D sg_dma_address(sg); + size_t len =3D sg_dma_len(sg); + struct net_iov *niov; + size_t nr_niovs =3D len >> niov_shift; =20 - for (i =3D 0; i < owner->area.num_niovs; i++) { - niov =3D &owner->area.niovs[i]; + for (i =3D 0; i < nr_niovs; i++, niov_idx++) { + niov =3D &owner->area.niovs[niov_idx]; net_iov_init(niov, &owner->area, NET_IOV_DMABUF); page_pool_set_dma_addr_netmem(net_iov_to_netmem(niov), - net_devmem_get_dma_addr(niov)); + dma_addr); if (direction =3D=3D DMA_TO_DEVICE) - binding->tx_vec[owner->area.base_virtual / PAGE_SIZE + i] =3D niov; + binding->tx_vec[niov_idx] =3D niov; + binding->freelist[binding->free_count++] =3D niov; + dma_addr +=3D niov_size; } - - virtual +=3D len; } =20 err =3D xa_alloc_cyclic(&net_devmem_dmabuf_bindings, &binding->id, binding, xa_limit_32b, &id_alloc_next, GFP_KERNEL); if (err < 0) - goto err_free_chunks; + goto err_free_chunk_owner; =20 list_add(&binding->list, &priv->bindings); =20 return binding; =20 -err_free_chunks: - gen_pool_for_each_chunk(binding->chunk_pool, - net_devmem_dmabuf_free_chunk_owner, NULL); - gen_pool_destroy(binding->chunk_pool); +err_free_chunk_owner: + net_devmem_dmabuf_free_chunk_owner(binding->chunk_owner); + goto err_free_freelist; +err_free_owner: + kfree(owner); +err_free_freelist: + kvfree(binding->freelist); err_tx_vec: kvfree(binding->tx_vec); err_unmap: diff --git a/net/core/devmem.h b/net/core/devmem.h index 4a293a7d1149..a5ee2d8d9169 100644 --- a/net/core/devmem.h +++ b/net/core/devmem.h @@ -14,6 +14,7 @@ #include =20 struct netlink_ext_ack; +struct dmabuf_genpool_chunk_owner; =20 struct net_devmem_dmabuf_binding { struct dma_buf *dmabuf; @@ -26,7 +27,7 @@ struct net_devmem_dmabuf_binding { * dereferenced. */ void *vdev; - struct gen_pool *chunk_pool; + struct dmabuf_genpool_chunk_owner *chunk_owner; /* Protect dev */ struct mutex lock; =20 @@ -57,6 +58,11 @@ struct net_devmem_dmabuf_binding { /* rxq's this binding is active on. */ struct xarray bound_rxqs; =20 + spinlock_t freelist_lock ____cacheline_aligned_in_smp; + size_t free_count; + size_t total_niovs; + struct net_iov **freelist; + /* ID of this binding. Globally unique to all bindings currently * active. */ @@ -77,17 +83,9 @@ struct net_devmem_dmabuf_binding { }; =20 #if defined(CONFIG_NET_DEVMEM) -/* Owner of the dma-buf chunks inserted into the gen pool. Each scatterlist - * entry from the dmabuf is inserted into the genpool as a chunk, and needs - * this owner struct to keep track of some metadata necessary to create - * allocations from this chunk. - */ struct dmabuf_genpool_chunk_owner { struct net_iov_area area; struct net_devmem_dmabuf_binding *binding; - - /* dma_addr of the start of the chunk. */ - dma_addr_t base_dma_addr; }; =20 void __net_devmem_dmabuf_binding_free(struct work_struct *wq); --=20 2.53.0-Meta From nobody Fri Sep 25 13:55:23 2026 Received: from mail-pz2-f11.google.com (mail-pz2-f11.google.com [74.125.228.11]) (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 76E3949DB98 for ; Fri, 11 Sep 2026 15:45:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789141561; cv=none; b=U83t2p2f0Cxr95mEbw51K9qoiUfDFJ+JWbxBytNZbJjK/CMNOj8BxgCrsWbtcnySw2dsD/1W+lf6rmwUWVljB3Xs61ZKO3VcNldAEYBHL2KoBNe26dT13qPUD8Ew1a9R0OWpBYqfWnuHMrDTMHU1xYxfpiuyDpqu4ms/+8Qe1Uw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789141561; c=relaxed/simple; bh=RudCEYnuc6J48k1REQnXqckswDqKj6d2EnaaGRHKhIc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GCePcM7ixEMSNDv/lDHtwFnR1Av/N+OWvyImzQJdGu5z/KwmoD77So42Q9x/mOpAbqTijCmua5IwO4Nv3Euys+vL01NaJ50lfNkp/z2ATH1OD0ClvQh6C6fhhaqUrCEEF5poPOMmqfpWnt9ssQ9FPDU2L6QelNaQZu+8EcQSeu8= 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=Ykz9tFdJ; arc=none smtp.client-ip=74.125.228.11 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="Ykz9tFdJ" Received: by mail-pz2-f11.google.com with SMTP id 41be03b00d2f7-cc1c2963c92so270904a12.0 for ; Fri, 11 Sep 2026 08:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789141559; x=1789746359; 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=EqLWvLZmzqdbYQJ9xM7Lpiu5RpgWcEW8R8Rm+W/rL7Y=; b=Ykz9tFdJhl7XkYKZDQ4r0qhM0eA+lNFYy8dWHhkfZ66wM8wfXhjgC36WAHDIQYpNIc mHVXQdb5DX6MLguSp325xlwjFBAqceVKS9YpBaqlM8JIfB2LbKOPBWltP7Jfh6DmwHhP XMFBQW+mGXpNxuP17bnrC6Y/qdKz8QAR6b8Je7g6VPT7XRUPzUtHMxFhIoREGn5+RzNL civZlxou4hWzcQypz4+oI2rQwWKzN+OSmAQJzXbpi/3jxZTRGp8nxnD9/Rggwx6uQLBT kK/qnabjYJN9K9SRn3lv/IEeP+n8hUvnIDfwo2zPqe5gq0yitQqatQpHPaG65980fScb +meA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789141559; x=1789746359; 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=EqLWvLZmzqdbYQJ9xM7Lpiu5RpgWcEW8R8Rm+W/rL7Y=; b=LLUUA98DdaII6byKfotUcZFms8vGy3aYu7ps4p7c9ldCsEGBc7I4w0rKWo7/vmmBtD ZbAFmP7ZDmSdElQ/YdJq60t2DrbxC7dpEBfAIEXCd3x+CtFj+yvJ0VDjG6jXT7kCHbeq OEiK/oC7SB6Zp25b5FzsAVz6TlQpPkNjZzX+exgJsuUpwNcDEJ0ehq/TCFjyZoZ5Mfup Cfm5qzbjX7xhdY3IKn1lqloaAQANTmrLiAp5ZPP9MDs0hlWAje+T3QaLoMAQ2LRpiwqq OLFCvCxhlQe9zNDvnAmBgM44vyaAItcoVkn6NE433ISS5awbhlYfs79vaIZ7T7eJphzU xHZw== X-Forwarded-Encrypted: i=1; AKwUvBwaGsRUaIWWzM9CZK0CbDFJbjQjfGSXPc+1sh8U9mzCnoHC+no4TdXPYvVDBJlysHZ1r4E4xk2TcGFgJXg=@vger.kernel.org X-Gm-Message-State: AFuF++njXZV3oZdnUzewT5jGAippvOWziafsHf9KXELFQ8LsKXG452Y/ n28ZJwV9PRG2YYZOMFw3L70pva/0JJJetiFcjXWBMFa8dg5AHywJzzzs X-Gm-Gg: AYBFou1vKNxKGBuJpYAybC4Uj6K41/wQuD9OQ57C98csvPuyJA4xyy8Xbrjs+tydX1p synbAq9ElONfonV5zAQM1HYPQiDBQm6Qs0HpySI2n4+Q1Rq1v0wAFnRQ4qSxS/H/TnWiymuZmj0 fDkMNIGYIAphPpyshV9BkwDYJBhRuLXKJR238PvZM/BRnFLk1vPGscR0i+WFZl3e7wAxwV607Ut xlD0EMGHlZNt0bGBmP0nAdEgvV0v5QTwN7lMvng5KG70qfKrypAdYScTMEjaQ21gtsF+9+FsZPg /m33s530DKboisDf2/GuE1L8Cngxwl45FU3b8Wjg6yR264j5sw1yRqqiYuweazb6luX2PHSUvme AZvF2PkgYIoFmpIcv1bIsDYZAxaAzKAmRtXV9yvihqIPhIsLlMvr1IaVOGrSYhFzz7C0vKd3Hpi Fjb7AMu9AfoLkQOnsLO41sgf0A64r7ESdFoX5KZWSMtmzRWKcl4OaFfX0izL0/U7CwOA== X-Received: by 2002:a05:6a00:22d4:b0:857:73e2:9103 with SMTP id d2e1a72fcca58-86b336d6a0bmr7215011b3a.19.1789141558662; Fri, 11 Sep 2026 08:45:58 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:48::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-86b2a1b827esm1318332b3a.51.2026.09.11.08.45.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 08:45:58 -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, sdf@fomichev.me, bobbyeshleman@meta.com, almasrymina@google.com, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 2/3] net: devmem: embed net_iov_area in binding Date: Fri, 11 Sep 2026 08:45:54 -0700 Message-ID: <20260911154555.739041-3-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260911154555.739041-1-sdf@fomichev.me> References: <20260911154555.739041-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" After replacing the gen_pool with a binding-level freelist, devmem no longer needs a separate chunk owner object. There is only one net_iov_area for the binding, so store it directly in struct net_devmem_dmabuf_binding. Derive the binding from net_iov_owner() with container_of(), matching the pattern used by io_uring zcrx. This removes the leftover dmabuf_genpool_chunk_owner wrapper and its allocation/free path. Signed-off-by: Stanislav Fomichev Reviewed-by: Mina Almasry --- net/core/devmem.c | 41 ++++++++++------------------------------- net/core/devmem.h | 26 +++++++------------------- 2 files changed, 17 insertions(+), 50 deletions(-) diff --git a/net/core/devmem.c b/net/core/devmem.c index 4883eb7f3a95..7949f8425bcd 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -29,15 +29,6 @@ static DEFINE_XARRAY_FLAGS(net_devmem_dmabuf_bindings, X= A_FLAGS_ALLOC1); =20 static const struct memory_provider_ops dmabuf_devmem_ops; =20 -static void -net_devmem_dmabuf_free_chunk_owner(struct dmabuf_genpool_chunk_owner *owne= r) -{ - if (owner) { - kvfree(owner->area.niovs); - kfree(owner); - } -} - static void net_devmem_dmabuf_binding_release(struct percpu_ref *ref) { struct net_devmem_dmabuf_binding *binding =3D @@ -55,7 +46,7 @@ void __net_devmem_dmabuf_binding_free(struct work_struct = *wq) "can't destroy dmabuf binding. total=3D%zu, free=3D%zu", binding->total_niovs, binding->free_count); =20 - net_devmem_dmabuf_free_chunk_owner(binding->chunk_owner); + kvfree(binding->area.niovs); dma_buf_unmap_attachment_unlocked(binding->attachment, binding->sgt, binding->direction); dma_buf_detach(binding->dmabuf, binding->attachment); @@ -271,23 +262,14 @@ net_devmem_bind_dmabuf(struct net_device *dev, void *= vdev, } binding->total_niovs =3D total_niovs; =20 - owner =3D kzalloc_node(sizeof(*owner), GFP_KERNEL, - dev_to_node(&dev->dev)); - if (!owner) { + binding->area.num_niovs =3D total_niovs; + binding->area.niovs =3D kvmalloc_objs(*binding->area.niovs, + binding->area.num_niovs); + if (!binding->area.niovs) { err =3D -ENOMEM; goto err_free_freelist; } =20 - owner->area.num_niovs =3D total_niovs; - owner->binding =3D binding; - owner->area.niovs =3D kvmalloc_objs(*owner->area.niovs, - owner->area.num_niovs); - if (!owner->area.niovs) { - err =3D -ENOMEM; - goto err_free_owner; - } - binding->chunk_owner =3D owner; - niov_idx =3D 0; for_each_sgtable_dma_sg(binding->sgt, sg, sg_idx) { dma_addr_t dma_addr =3D sg_dma_address(sg); @@ -296,8 +278,8 @@ net_devmem_bind_dmabuf(struct net_device *dev, void *vd= ev, size_t nr_niovs =3D len >> niov_shift; =20 for (i =3D 0; i < nr_niovs; i++, niov_idx++) { - niov =3D &owner->area.niovs[niov_idx]; - net_iov_init(niov, &owner->area, NET_IOV_DMABUF); + niov =3D &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 (direction =3D=3D DMA_TO_DEVICE) @@ -311,17 +293,14 @@ net_devmem_bind_dmabuf(struct net_device *dev, void *= vdev, binding, xa_limit_32b, &id_alloc_next, GFP_KERNEL); if (err < 0) - goto err_free_chunk_owner; + goto err_free_niovs; =20 list_add(&binding->list, &priv->bindings); =20 return binding; =20 -err_free_chunk_owner: - net_devmem_dmabuf_free_chunk_owner(binding->chunk_owner); - goto err_free_freelist; -err_free_owner: - kfree(owner); +err_free_niovs: + kvfree(binding->area.niovs); err_free_freelist: kvfree(binding->freelist); err_tx_vec: diff --git a/net/core/devmem.h b/net/core/devmem.h index a5ee2d8d9169..20a3eb90ea7f 100644 --- a/net/core/devmem.h +++ b/net/core/devmem.h @@ -14,9 +14,9 @@ #include =20 struct netlink_ext_ack; -struct dmabuf_genpool_chunk_owner; =20 struct net_devmem_dmabuf_binding { + struct net_iov_area area; struct dma_buf *dmabuf; struct dma_buf_attachment *attachment; struct sg_table *sgt; @@ -27,7 +27,6 @@ struct net_devmem_dmabuf_binding { * dereferenced. */ void *vdev; - struct dmabuf_genpool_chunk_owner *chunk_owner; /* Protect dev */ struct mutex lock; =20 @@ -83,11 +82,6 @@ struct net_devmem_dmabuf_binding { }; =20 #if defined(CONFIG_NET_DEVMEM) -struct dmabuf_genpool_chunk_owner { - struct net_iov_area area; - struct net_devmem_dmabuf_binding *binding; -}; - void __net_devmem_dmabuf_binding_free(struct work_struct *wq); struct net_devmem_dmabuf_binding * net_devmem_bind_dmabuf(struct net_device *dev, void *vdev, @@ -102,18 +96,12 @@ int net_devmem_bind_dmabuf_to_queue(struct net_device = *dev, u32 rxq_idx, struct net_devmem_dmabuf_binding *binding, struct netlink_ext_ack *extack); =20 -static inline struct dmabuf_genpool_chunk_owner * -net_devmem_iov_to_chunk_owner(const struct net_iov *niov) -{ - struct net_iov_area *owner =3D net_iov_owner(niov); - - return container_of(owner, struct dmabuf_genpool_chunk_owner, area); -} - static inline struct net_devmem_dmabuf_binding * net_devmem_iov_binding(const struct net_iov *niov) { - return net_devmem_iov_to_chunk_owner(niov)->binding; + struct net_iov_area *owner =3D net_iov_owner(niov); + + return container_of(owner, struct net_devmem_dmabuf_binding, area); } =20 static inline u32 net_devmem_iov_binding_id(const struct net_iov *niov) @@ -123,11 +111,11 @@ static inline u32 net_devmem_iov_binding_id(const str= uct net_iov *niov) =20 static inline unsigned long net_iov_virtual_addr(const struct net_iov *nio= v) { - struct dmabuf_genpool_chunk_owner *co =3D - net_devmem_iov_to_chunk_owner(niov); + struct net_devmem_dmabuf_binding *binding =3D + net_devmem_iov_binding(niov); =20 return net_iov_owner(niov)->base_virtual + - ((unsigned long)net_iov_idx(niov) << co->binding->niov_shift); + ((unsigned long)net_iov_idx(niov) << binding->niov_shift); } =20 static inline bool --=20 2.53.0-Meta From nobody Fri Sep 25 13:55:23 2026 Received: from mail-pz2-f7.google.com (mail-pz2-f7.google.com [74.125.228.7]) (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 44E0C49CF2B for ; Fri, 11 Sep 2026 15:46:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789141562; cv=none; b=gvfgL8Z7s3kP3PKCcPryc11Jg43i1rwv7/5FZNKiuUoY0W7Gdn+xHa/KGzMFQ/ykoN4Wq7OtsgO0pKMVDOCC/TlZmGgUiYhWBwqNXQFDmg5Og3gEs4WdCYwJo2jp2//LdWAnUpEXmYRMl0sXmvAEsEiwCPquKvIrzjOhiZKWulI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789141562; c=relaxed/simple; bh=dwidtErhUY0SPgza+QmVGqpbGK/gB5oWWj/NKusH69E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gcCscxTrwSXZ2ps07llmRdv2m843gazVNBR4Y0Y4pEq4njcKNNnHeO2rWAvv0SS5aQob4gewQGu7OVaNR/hepVYc+Gv/+oyll6DAlebyFxGeOh4rxtK92s7+5rfhjE40qdMtt1+98y7++0qBiKja0XkCOiv2mW0TKPvCU0wWXw8= 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=jSAvZuPj; arc=none smtp.client-ip=74.125.228.7 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="jSAvZuPj" Received: by mail-pz2-f7.google.com with SMTP id 41be03b00d2f7-cc1ddb3ba3eso470356a12.1 for ; Fri, 11 Sep 2026 08:46:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789141559; x=1789746359; 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=TjLjJHsnoGr4hoUce+r9jZNs+03YVIaRC1YD0zIjtuk=; b=jSAvZuPjOIcf520SmN2LHt/v8fV2WlFFhEpvExors8CvLVAqNs8brpLv3+XcDWB8fE 3qoWJ8e3lJbEopaJuzAkqc46XtnuBclSEot7/RIT8l6R2ksd+UihdYQB/LhIX7tiKYEC IRFlU+kK5D+BRfYO3HeDYaKWEz9KbA9PyU+Zud+Qxyje+lSoF6Pinn/VZ17t1jStZK9v ynAgnJT8qYfzxNTpDjC/iyKVlFJUeS644tzE98oEt+ijIeWEvkolWGdmNmqgM0A2fg2f syvJz3g2NDnzI4e7vryRlsO5aaqiqIt0OYxWoOcWM/6038g24UFGQ+q5IDpo8/SXqD/Z QPhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789141559; x=1789746359; 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=TjLjJHsnoGr4hoUce+r9jZNs+03YVIaRC1YD0zIjtuk=; b=fEbpeyo1QVcpPalG9VnLayZsMOf+H0uuZoSd++TkZlbFBu/+oQM6upAG9axBuxq6jW O6JAASaxTkiufL4XS4L+hZQioZgRVSpDKLQ18KFbjGgiF1+QS03fs6Q6LbWbIND4l2NP Qec+p/VfcAcdgsI57MeS9O9t3Hiv8ByE/+cFs4M4pmyg+fy76DVCqbctLj34nFrl9ZtG ejwvO5olHsYuGJdoIDPLEbfF1o1aLLZLCEwuk/gsTM+/56HioJNDi+N8qR0UoCj6Lzd5 tiaLldGp6BwSwAHQc1xU7rcvd3UIU+qwbV8DBSzuE649IKM8uqLGJ4gla3AjhPa2eqQi XsKg== X-Forwarded-Encrypted: i=1; AKwUvBzuhioLI6UE8NXENrjUIdtkiD6sl4z9USvlnZ6MtTad5TCvkD2zs8Sq0fr+hc5cIlB8wtMA5FbmnndLbOQ=@vger.kernel.org X-Gm-Message-State: AFuF++lxgb1JsOf9Ed128EJep3gpAcdfI9Hio3cfvXuN9pEmaoAhcMaK iKOf3fdi5nJ2UF6Yt0nhVLjBEkfEipvUD6wl1k49VNGcbNFYZfMTKnQH X-Gm-Gg: AYBFou3b/ydk1m927sfbdqyLCpNX3+Pl5Z4axxO1/RlgzyK2ODzmFeiGBCRXP+ZuHCf UTTvkUEBjnOHLOS77p8/n/nOofRPeogdf0BljOCvlb0YuiBMExmBFCKkTyWD88g4yP5ghf+y766 fcs4cdHKBqkvjnv1KOtVlhKztF71OnL0coE6FehHVwCiiz6PraTB/5WDiba5g/MRqAlZZrbCHD7 tYCT3v76jwLsuQrvsmmQFcCcbXs3DF66TOlxJN4U8jIkRSxbGbGhgySpGezgS++cXN8a4SNtoOW q9ikXRywtqTE2F7lUafOg9cujQ9hMph/v8Y/1nrqqItGIYlskZQYE+x6mHZQGGpheD9LAECkxoh FpMYXczTfiOJ0stDxEDSDdK8C7vtR83qXN6z8knGivSOtuzcc+x4MSRyx2pvOeNIFhPQSNMcLHo XKuIXwm+T0ZMwCwdqruu1lKcAU7S8Uqadp06iuZKbGmarRa1F/OsZaioUREu0a6NYx X-Received: by 2002:a05:6a00:4106:b0:857:72f8:dc98 with SMTP id d2e1a72fcca58-86b325e5d14mr8976131b3a.25.1789141559536; Fri, 11 Sep 2026 08:45:59 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:72::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-86b2a3bc011sm1325837b3a.57.2026.09.11.08.45.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 08:45:59 -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, sdf@fomichev.me, bobbyeshleman@meta.com, almasrymina@google.com, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 3/3] net: devmem: batch net_iov allocations into the page_pool cache Date: Fri, 11 Sep 2026 08:45:55 -0700 Message-ID: <20260911154555.739041-4-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260911154555.739041-1-sdf@fomichev.me> References: <20260911154555.739041-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename net_devmem_alloc_dmabuf() into net_devmem_alloc_dmabuf_bulk() and make it refill page pool with up to PP_ALLOC_CACHE_REFILL NIOVs, similar to io_pp_zc_alloc_netmems(). That should amortize recently introduced freelist_lock. Signed-off-by: Stanislav Fomichev Reviewed-by: Mina Almasry --- net/core/devmem.c | 59 +++++++++++++++++++++++++++++------------------ net/core/devmem.h | 8 ------- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/net/core/devmem.c b/net/core/devmem.c index 7949f8425bcd..a0dcc896dd12 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -58,25 +58,25 @@ void __net_devmem_dmabuf_binding_free(struct work_struc= t *wq) kfree(binding); } =20 -struct net_iov * -net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding) +static unsigned int +net_devmem_alloc_dmabuf_bulk(struct net_devmem_dmabuf_binding *binding, + netmem_ref *netmems, unsigned int count) { - struct net_iov *niov; + unsigned int i; + spin_lock_bh(&binding->freelist_lock); - if (unlikely(!binding->free_count)) { - spin_unlock_bh(&binding->freelist_lock); - return NULL; + + count =3D min_t(size_t, count, binding->free_count); + for (i =3D 0; i < count; i++) { + struct net_iov *niov =3D binding->freelist[--binding->free_count]; + + binding->freelist[binding->free_count] =3D NULL; + netmems[i] =3D net_iov_to_netmem(niov); } =20 - niov =3D binding->freelist[--binding->free_count]; - binding->freelist[binding->free_count] =3D NULL; spin_unlock_bh(&binding->freelist_lock); =20 - niov->desc.pp_magic =3D 0; - niov->desc.pp =3D NULL; - atomic_long_set(&niov->desc.pp_ref_count, 0); - - return niov; + return count; } =20 void net_devmem_free_dmabuf(struct net_iov *niov) @@ -434,20 +434,35 @@ int mp_dmabuf_devmem_init(struct page_pool *pool) netmem_ref mp_dmabuf_devmem_alloc_netmems(struct page_pool *pool, gfp_t gf= p) { struct net_devmem_dmabuf_binding *binding =3D pool->mp_priv; - struct net_iov *niov; - netmem_ref netmem; + netmem_ref *netmems =3D pool->alloc.cache; + unsigned int allocated, i; + + if (WARN_ON_ONCE(pool->alloc.count)) + return 0; =20 - niov =3D net_devmem_alloc_dmabuf(binding); - if (!niov) + allocated =3D net_devmem_alloc_dmabuf_bulk(binding, netmems, + PP_ALLOC_CACHE_REFILL); + if (unlikely(!allocated)) return 0; =20 - netmem =3D net_iov_to_netmem(niov); + for (i =3D 0; i < allocated; i++) { + struct net_iov *niov =3D netmem_to_net_iov(netmems[i]); =20 - page_pool_set_pp_info(pool, netmem); + niov->desc.pp_magic =3D 0; + niov->desc.pp =3D 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); + } =20 - pool->pages_state_hold_cnt++; - trace_page_pool_state_hold(pool, netmem, pool->pages_state_hold_cnt); - return netmem; + /* Return the last one, the rest stay in the page_pool cache. */ + allocated--; + pool->alloc.count =3D allocated; + return netmems[allocated]; } =20 void mp_dmabuf_devmem_destroy(struct page_pool *pool) diff --git a/net/core/devmem.h b/net/core/devmem.h index 20a3eb90ea7f..7195769b8bd1 100644 --- a/net/core/devmem.h +++ b/net/core/devmem.h @@ -133,8 +133,6 @@ net_devmem_dmabuf_binding_put(struct net_devmem_dmabuf_= binding *binding) void net_devmem_get_net_iov(struct net_iov *niov); void net_devmem_put_net_iov(struct net_iov *niov); =20 -struct net_iov * -net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding); void net_devmem_free_dmabuf(struct net_iov *ppiov); =20 =20 @@ -191,12 +189,6 @@ net_devmem_bind_dmabuf_to_queue(struct net_device *dev= , u32 rxq_idx, return -EOPNOTSUPP; } =20 -static inline struct net_iov * -net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding) -{ - return NULL; -} - static inline void net_devmem_free_dmabuf(struct net_iov *ppiov) { } --=20 2.53.0-Meta