github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

netmem: rename get/put_netmem() to netmem_inc/dec_ref()

Browse Source 
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>
Link: https://patch.msgid.link/20261021015558.4124825-3-almasrymina@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Mina Almasry 2026-10-21 01:55:58 +00:00 committed by Jakub Kicinski
parent bbee999025
commit 2620efb2ce
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/veth.c
View File

@ -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,

8
include/linux/skbuff_ref.h
View File

@ -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);
}
/**

12
include/net/netmem.h
View File

@ -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));

2
net/core/datagram.c
View File

@ -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);

16
net/core/net_test.c
View File

@ -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);

2
net/tls/tls_device.c
View File

@ -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);
}

2
net/tls/tls_device_fallback.c
View File

@ -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));