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_net_iov() to net_iov_inc/dec_ref()

Browse Source 
Follow the object_action() naming convention for net_iov non-page_pool
reference helpers by renaming get_net_iov() and put_net_iov() to
net_iov_inc_ref() and net_iov_dec_ref(), and renaming
net_devmem_get_net_iov() and net_devmem_put_net_iov() to
net_devmem_net_iov_inc_ref() and net_devmem_net_iov_dec_ref().

Use *_inc_ref() and *_dec_ref() rather than *_ref() and *_unref() to
pair symmetrically with netmem_inc_ref() and netmem_dec_ref() (since
netmem_ref is already the typedef for the generic network memory
handle).

Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Mina Almasry <almasrymina@google.com>
Link: https://patch.msgid.link/20261021015558.4124825-2-almasrymina@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Mina Almasry 2026-10-21 01:55:57 +00:00 committed by Jakub Kicinski
parent 68bc53d9bd
commit bbee999025
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/net/netmem.h
View File

@ -409,21 +409,21 @@ static inline bool net_is_devmem_iov(const struct net_iov *niov)
}
#endif
void get_net_iov(struct net_iov *niov);
void put_net_iov(struct net_iov *niov);
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: netmem to reference
*
* Acquires a non-pp backing reference (page._refcount via get_page() or
* binding->ref via get_net_iov()) regardless of page_pool membership.
* binding->ref via net_iov_inc_ref()) regardless of page_pool membership.
* Counterpart to put_netmem().
*/
static __always_inline void get_netmem(netmem_ref netmem)
{
if (netmem_is_net_iov(netmem))
get_net_iov(netmem_to_net_iov(netmem));
net_iov_inc_ref(netmem_to_net_iov(netmem));
else
get_page(netmem_to_page(netmem));
}
@ -433,13 +433,13 @@ static __always_inline void get_netmem(netmem_ref netmem)
* @netmem: netmem to unreference
*
* Drops a non-pp backing reference (page._refcount via put_page() or
* binding->ref via put_net_iov()) regardless of page_pool membership.
* binding->ref via net_iov_dec_ref()) regardless of page_pool membership.
* Counterpart to get_netmem().
*/
static __always_inline void put_netmem(netmem_ref netmem)
{
if (netmem_is_net_iov(netmem))
put_net_iov(netmem_to_net_iov(netmem));
net_iov_dec_ref(netmem_to_net_iov(netmem));
else
put_page(netmem_to_page(netmem));
}

4
net/core/devmem.c
View File

@ -387,12 +387,12 @@ struct net_devmem_dmabuf_binding *net_devmem_lookup_dmabuf(u32 id)
return binding;
}
void net_devmem_get_net_iov(struct net_iov *niov)
void net_devmem_net_iov_inc_ref(struct net_iov *niov)
{
net_devmem_dmabuf_binding_get(net_devmem_iov_binding(niov));
}
void net_devmem_put_net_iov(struct net_iov *niov)
void net_devmem_net_iov_dec_ref(struct net_iov *niov)
{
net_devmem_dmabuf_binding_put(net_devmem_iov_binding(niov));
}

10
net/core/devmem.h
View File

@ -43,7 +43,7 @@ struct net_devmem_dmabuf_binding {
* those refs are dropped and the binding is no longer desired or in
* use.
*
* net_devmem_get_net_iov() on dmabuf net_iovs will increment this
* net_devmem_net_iov_inc_ref() on dmabuf net_iovs will increment this
* reference, making sure that the binding remains alive until all the
* net_iovs are no longer used. net_iovs allocated from this binding
* that are stuck in the TX path for any reason (such as awaiting
@ -131,8 +131,8 @@ net_devmem_dmabuf_binding_put(struct net_devmem_dmabuf_binding *binding)
percpu_ref_put(&binding->ref);
}
void net_devmem_get_net_iov(struct net_iov *niov);
void net_devmem_put_net_iov(struct net_iov *niov);
void net_devmem_net_iov_inc_ref(struct net_iov *niov);
void net_devmem_net_iov_dec_ref(struct net_iov *niov);
void net_devmem_free_dmabuf(struct net_iov *ppiov);
@ -151,11 +151,11 @@ net_devmem_dmabuf_binding_put(struct net_devmem_dmabuf_binding *binding)
{
}
static inline void net_devmem_get_net_iov(struct net_iov *niov)
static inline void net_devmem_net_iov_inc_ref(struct net_iov *niov)
{
}
static inline void net_devmem_put_net_iov(struct net_iov *niov)
static inline void net_devmem_net_iov_dec_ref(struct net_iov *niov)
{
}

12
net/core/net_test.c
View File

@ -861,11 +861,11 @@ 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: get/put_net_iov & get/put_netmem */
get_net_iov(&niov);
/* Non-PP net_iov: net_iov_inc/dec_ref & get/put_netmem */
net_iov_inc_ref(&niov);
KUNIT_EXPECT_EQ(test, atomic_long_read(&binding.ref.data->count),
base_ref + 1);
put_net_iov(&niov);
net_iov_dec_ref(&niov);
KUNIT_EXPECT_EQ(test, atomic_long_read(&binding.ref.data->count),
base_ref);
@ -886,12 +886,12 @@ 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: get_net_iov / get_netmem grab non-pp ref even on PP */
get_net_iov(&niov);
/* Layer 0 & 1: net_iov_inc_ref / get_netmem 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);
KUNIT_EXPECT_EQ(test, atomic_long_read(&niov.desc.pp_ref_count), 2L);
put_net_iov(&niov);
net_iov_dec_ref(&niov);
KUNIT_EXPECT_EQ(test, atomic_long_read(&binding.ref.data->count),
base_ref);

20
net/core/skbuff.c
View File

@ -7643,38 +7643,38 @@ bool csum_and_copy_from_iter_full(void *addr, size_t bytes,
EXPORT_SYMBOL(csum_and_copy_from_iter_full);
/**
* get_net_iov - acquire a non-page_pool reference on a net_iov
* net_iov_inc_ref - acquire a non-page_pool reference on a net_iov
* @niov: net_iov to reference
*
* Acquires a non-pp backing reference (binding->ref) on @niov regardless of
* page_pool membership, warning if @niov does not support non-pp references.
* Counterpart to put_net_iov().
* Counterpart to net_iov_dec_ref().
*/
void get_net_iov(struct net_iov *niov)
void net_iov_inc_ref(struct net_iov *niov)
{
if (net_is_devmem_iov(niov))
net_devmem_get_net_iov(niov);
net_devmem_net_iov_inc_ref(niov);
else
DEBUG_NET_WARN_ON_ONCE(true);
}
EXPORT_SYMBOL(get_net_iov);
EXPORT_SYMBOL(net_iov_inc_ref);
/**
* put_net_iov - release a non-page_pool reference on a net_iov
* net_iov_dec_ref - release a non-page_pool reference on a net_iov
* @niov: net_iov to unreference
*
* Drops a non-pp backing reference (binding->ref) on @niov regardless of
* page_pool membership, warning if @niov does not support non-pp references.
* Counterpart to get_net_iov().
* Counterpart to net_iov_inc_ref().
*/
void put_net_iov(struct net_iov *niov)
void net_iov_dec_ref(struct net_iov *niov)
{
if (net_is_devmem_iov(niov))
net_devmem_put_net_iov(niov);
net_devmem_net_iov_dec_ref(niov);
else
DEBUG_NET_WARN_ON_ONCE(true);
}
EXPORT_SYMBOL(put_net_iov);
EXPORT_SYMBOL(net_iov_dec_ref);
struct vlan_type_depth __vlan_get_protocol_offset(const struct sk_buff *skb,
__be16 type,