From: Mina Almasry <almasrymina@google.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Mina Almasry <almasrymina@google.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Sabrina Dubroca <sd@queasysnail.net>,
Ralf Lici <ralf@mandelbit.com>,
Stanislav Fomichev <sdf@fomichev.me>,
Pavel Begunkov <asml.silence@gmail.com>,
Bobby Eshleman <bobbyeshleman@meta.com>,
Willem de Bruijn <willemb@google.com>,
Daniel Borkmann <daniel@iogearbox.net>
Subject: [PATCH net-next v1 2/2] netmem: rename get/put_netmem() to netmem_inc/dec_ref()
Date: Wed, 21 Oct 2026 01:55:58 +0000 [thread overview]
Message-ID: <20261021015558.4124825-3-almasrymina@google.com> (raw)
In-Reply-To: <20261021015558.4124825-1-almasrymina@google.com>
Follow the object_action() naming convention for netmem non-page_pool
reference helpers by renaming get_netmem() and put_netmem() to
netmem_inc_ref() and netmem_dec_ref().
Use netmem_inc_ref() and netmem_dec_ref() rather than netmem_ref() and
netmem_unref() because netmem_ref is already a typedef (typedef unsigned
long __bitwise netmem_ref).
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Mina Almasry <almasrymina@google.com>
---
drivers/net/veth.c | 2 +-
include/linux/skbuff_ref.h | 8 ++++----
include/net/netmem.h | 12 ++++++------
net/core/datagram.c | 2 +-
net/core/net_test.c | 16 ++++++++--------
net/tls/tls_device.c | 2 +-
net/tls/tls_device_fallback.c | 2 +-
7 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 8746d0d1f5911..54fceb64f4268 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -751,7 +751,7 @@ static void veth_xdp_get(struct xdp_buff *xdp)
return;
for (i = 0; i < sinfo->nr_frags; i++)
- get_netmem(skb_frag_netmem(&sinfo->frags[i]));
+ netmem_inc_ref(skb_frag_netmem(&sinfo->frags[i]));
}
static int veth_convert_skb_to_xdp_buff(struct veth_rq *rq,
diff --git a/include/linux/skbuff_ref.h b/include/linux/skbuff_ref.h
index f768a3fa1d606..b6f6da556ee90 100644
--- a/include/linux/skbuff_ref.h
+++ b/include/linux/skbuff_ref.h
@@ -18,7 +18,7 @@ bool napi_pp_get_page(netmem_ref netmem);
*
* Acquires pp_ref_count via napi_pp_get_page() if @recycle is true and
* @netmem belongs to a page_pool; otherwise acquires a non-pp backing
- * reference via get_netmem(). Counterpart to skb_netmem_unref().
+ * reference via netmem_inc_ref(). Counterpart to skb_netmem_unref().
*/
static __always_inline void skb_netmem_ref(netmem_ref netmem, bool recycle)
{
@@ -26,7 +26,7 @@ static __always_inline void skb_netmem_ref(netmem_ref netmem, bool recycle)
if (recycle && napi_pp_get_page(netmem))
return;
#endif
- get_netmem(netmem);
+ netmem_inc_ref(netmem);
}
/**
@@ -53,7 +53,7 @@ bool napi_pp_put_page(netmem_ref netmem);
*
* Drops pp_ref_count via napi_pp_put_page() if @recycle is true and @netmem
* belongs to a page_pool; otherwise drops a non-pp backing reference via
- * put_netmem(). Counterpart to skb_netmem_ref().
+ * netmem_dec_ref(). Counterpart to skb_netmem_ref().
*/
static __always_inline void skb_netmem_unref(netmem_ref netmem, bool recycle)
{
@@ -61,7 +61,7 @@ static __always_inline void skb_netmem_unref(netmem_ref netmem, bool recycle)
if (recycle && napi_pp_put_page(netmem))
return;
#endif
- put_netmem(netmem);
+ netmem_dec_ref(netmem);
}
/**
diff --git a/include/net/netmem.h b/include/net/netmem.h
index 7f36c734edcd9..fb693bc1702a4 100644
--- a/include/net/netmem.h
+++ b/include/net/netmem.h
@@ -413,14 +413,14 @@ void net_iov_inc_ref(struct net_iov *niov);
void net_iov_dec_ref(struct net_iov *niov);
/**
- * get_netmem - acquire a non-page_pool reference on a netmem
+ * netmem_inc_ref - acquire a non-page_pool reference on a netmem
* @netmem: netmem to reference
*
* Acquires a non-pp backing reference (page._refcount via get_page() or
* binding->ref via net_iov_inc_ref()) regardless of page_pool membership.
- * Counterpart to put_netmem().
+ * Counterpart to netmem_dec_ref().
*/
-static __always_inline void get_netmem(netmem_ref netmem)
+static __always_inline void netmem_inc_ref(netmem_ref netmem)
{
if (netmem_is_net_iov(netmem))
net_iov_inc_ref(netmem_to_net_iov(netmem));
@@ -429,14 +429,14 @@ static __always_inline void get_netmem(netmem_ref netmem)
}
/**
- * put_netmem - release a non-page_pool reference on a netmem
+ * netmem_dec_ref - release a non-page_pool reference on a netmem
* @netmem: netmem to unreference
*
* Drops a non-pp backing reference (page._refcount via put_page() or
* binding->ref via net_iov_dec_ref()) regardless of page_pool membership.
- * Counterpart to get_netmem().
+ * Counterpart to netmem_inc_ref().
*/
-static __always_inline void put_netmem(netmem_ref netmem)
+static __always_inline void netmem_dec_ref(netmem_ref netmem)
{
if (netmem_is_net_iov(netmem))
net_iov_dec_ref(netmem_to_net_iov(netmem));
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 173b5d97bd409..ecc30a6f83023 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -735,7 +735,7 @@ zerocopy_fill_skb_from_devmem(struct sk_buff *skb, struct iov_iter *from,
size = min_t(size_t, size, length);
size = min_t(size_t, size, iter_iov_len(from));
- get_netmem(net_iov_to_netmem(niov));
+ netmem_inc_ref(net_iov_to_netmem(niov));
skb_add_rx_frag_netmem(skb, i, net_iov_to_netmem(niov), off,
size, PAGE_SIZE);
iov_iter_advance(from, size);
diff --git a/net/core/net_test.c b/net/core/net_test.c
index 6fdab6a55b4d5..2b5080c226636 100644
--- a/net/core/net_test.c
+++ b/net/core/net_test.c
@@ -536,10 +536,10 @@ static void netmem_ref_test_page(struct kunit *test)
netmem = page_to_netmem(page);
base_ref = page_ref_count(page);
- /* Layer 1: get_netmem / put_netmem use page non-pp refcount */
- get_netmem(netmem);
+ /* Layer 1: netmem_inc_ref / netmem_dec_ref use page non-pp refcount */
+ netmem_inc_ref(netmem);
KUNIT_EXPECT_EQ(test, page_ref_count(page), base_ref + 1);
- put_netmem(netmem);
+ netmem_dec_ref(netmem);
KUNIT_EXPECT_EQ(test, page_ref_count(page), base_ref);
#ifdef CONFIG_PAGE_POOL
@@ -600,12 +600,12 @@ static void netmem_ref_test_pp_page(struct kunit *test)
base_ref = page_ref_count(page);
base_pp_ref = atomic_long_read(&page->pp_ref_count);
- /* Layer 1: get_netmem / put_netmem always use non-pp refcount */
- get_netmem(netmem);
+ /* Layer 1: netmem_inc/dec_ref always use non-pp refcount */
+ netmem_inc_ref(netmem);
KUNIT_EXPECT_EQ(test, page_ref_count(page), base_ref + 1);
KUNIT_EXPECT_EQ(test, atomic_long_read(&page->pp_ref_count),
base_pp_ref);
- put_netmem(netmem);
+ netmem_dec_ref(netmem);
KUNIT_EXPECT_EQ(test, page_ref_count(page), base_ref);
/* Layer 2: napi_pp_get/put_page use pp_ref_count */
@@ -861,7 +861,7 @@ static void netmem_ref_test_net_iov(struct kunit *test)
netmem = net_iov_to_netmem(&niov);
base_ref = atomic_long_read(&binding.ref.data->count);
- /* Non-PP net_iov: net_iov_inc/dec_ref & get/put_netmem */
+ /* Non-PP net_iov: net_iov_inc/dec_ref & netmem_inc/dec_ref */
net_iov_inc_ref(&niov);
KUNIT_EXPECT_EQ(test, atomic_long_read(&binding.ref.data->count),
base_ref + 1);
@@ -886,7 +886,7 @@ static void netmem_ref_test_net_iov(struct kunit *test)
netmem_or_pp_magic(netmem, PP_SIGNATURE);
atomic_long_set(&niov.desc.pp_ref_count, 2);
- /* Layer 0 & 1: net_iov_inc_ref / get_netmem grab non-pp ref on PP */
+ /* Layer 0 & 1: net_iov/netmem_inc_ref grab non-pp ref on PP */
net_iov_inc_ref(&niov);
KUNIT_EXPECT_EQ(test, atomic_long_read(&binding.ref.data->count),
base_ref + 1);
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index 2382d00aef8fc..1a5f328d80a50 100644
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -143,7 +143,7 @@ static void destroy_record(struct tls_record_info *record)
int i;
for (i = 0; i < record->num_frags; i++)
- put_netmem(skb_frag_netmem(&record->frags[i]));
+ netmem_dec_ref(skb_frag_netmem(&record->frags[i]));
kfree(record);
}
diff --git a/net/tls/tls_device_fallback.c b/net/tls/tls_device_fallback.c
index 35cc510db4321..b547027cc879f 100644
--- a/net/tls/tls_device_fallback.c
+++ b/net/tls/tls_device_fallback.c
@@ -256,7 +256,7 @@ static int fill_sg_in(struct scatterlist *sg_in,
for (i = 0; remaining > 0; i++) {
skb_frag_t *frag = &record->frags[i];
- get_netmem(skb_frag_netmem(frag));
+ netmem_inc_ref(skb_frag_netmem(frag));
sg_set_page(sg_in + i, skb_frag_page(frag),
skb_frag_size(frag), skb_frag_off(frag));
--
2.56.0.212.g129ede20d9-goog
prev parent reply other threads:[~2026-10-21 1:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-21 1:55 [PATCH net-next v1 0/2] netmem: rename non-pp ref helpers to *_inc/dec_ref() Mina Almasry
2026-10-21 1:55 ` [PATCH net-next v1 1/2] netmem: rename get/put_net_iov() to net_iov_inc/dec_ref() Mina Almasry
2026-10-21 1:55 ` Mina Almasry [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261021015558.4124825-3-almasrymina@google.com \
--to=almasrymina@google.com \
--cc=andrew+netdev@lunn.ch \
--cc=asml.silence@gmail.com \
--cc=bobbyeshleman@meta.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=horms@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=ralf@mandelbit.com \
--cc=sd@queasysnail.net \
--cc=sdf@fomichev.me \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox