nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: prefix devmem specific helpers

Browse source 
Add prefixes to all helpers that are specific to devmem TCP, i.e.
net_iov_binding[_id].

Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Mina Almasry <almasrymina@google.com>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: David Wei <dw@davidwei.uk>
Link: https://patch.msgid.link/20250204215622.695511-3-dw@davidwei.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Pavel Begunkov 2025-02-04 13:56:13 -08:00 committed by Jakub Kicinski
parent 8d522566ae
commit 297d389e9e
3 changed files with 9 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
net/core/devmem.c
View file

@ -94,7 +94,7 @@ net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding)
void net_devmem_free_dmabuf(struct net_iov *niov) void net_devmem_free_dmabuf(struct net_iov *niov)
{ {
struct net_devmem_dmabuf_binding *binding = net_iov_binding(niov); struct net_devmem_dmabuf_binding *binding = net_devmem_iov_binding(niov);
unsigned long dma_addr = net_devmem_get_dma_addr(niov); unsigned long dma_addr = net_devmem_get_dma_addr(niov);
if (WARN_ON(!gen_pool_has_addr(binding->chunk_pool, dma_addr, if (WARN_ON(!gen_pool_has_addr(binding->chunk_pool, dma_addr,

14
net/core/devmem.h
View file

@ -86,11 +86,16 @@ static inline unsigned int net_iov_idx(const struct net_iov *niov)
} }
static inline struct net_devmem_dmabuf_binding * static inline struct net_devmem_dmabuf_binding *
net_iov_binding(const struct net_iov *niov) net_devmem_iov_binding(const struct net_iov *niov)
{ {
return net_iov_owner(niov)->binding; return net_iov_owner(niov)->binding;
} }
static inline u32 net_devmem_iov_binding_id(const struct net_iov *niov)
{
return net_devmem_iov_binding(niov)->id;
}
static inline unsigned long net_iov_virtual_addr(const struct net_iov *niov) static inline unsigned long net_iov_virtual_addr(const struct net_iov *niov)
{ {
struct dmabuf_genpool_chunk_owner *owner = net_iov_owner(niov); struct dmabuf_genpool_chunk_owner *owner = net_iov_owner(niov);
@ -99,11 +104,6 @@ static inline unsigned long net_iov_virtual_addr(const struct net_iov *niov)
((unsigned long)net_iov_idx(niov) << PAGE_SHIFT); ((unsigned long)net_iov_idx(niov) << PAGE_SHIFT);
} }
static inline u32 net_iov_binding_id(const struct net_iov *niov)
{
return net_iov_owner(niov)->binding->id;
}
static inline void static inline void
net_devmem_dmabuf_binding_get(struct net_devmem_dmabuf_binding *binding) net_devmem_dmabuf_binding_get(struct net_devmem_dmabuf_binding *binding)
{ {
@ -171,7 +171,7 @@ static inline unsigned long net_iov_virtual_addr(const struct net_iov *niov)
return 0; return 0;
} }
static inline u32 net_iov_binding_id(const struct net_iov *niov) static inline u32 net_devmem_iov_binding_id(const struct net_iov *niov)
{ {
return 0; return 0;
} }

2
net/ipv4/tcp.c
View file

@ -2494,7 +2494,7 @@ static int tcp_recvmsg_dmabuf(struct sock *sk, const struct sk_buff *skb,
/* Will perform the exchange later */ /* Will perform the exchange later */
dmabuf_cmsg.frag_token = tcp_xa_pool.tokens[tcp_xa_pool.idx]; dmabuf_cmsg.frag_token = tcp_xa_pool.tokens[tcp_xa_pool.idx];
dmabuf_cmsg.dmabuf_id = net_iov_binding_id(niov); dmabuf_cmsg.dmabuf_id = net_devmem_iov_binding_id(niov);
offset += copy; offset += copy;
remaining_len -= copy; remaining_len -= copy;