Commit 297d389e authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jakub Kicinski
Browse files

net: prefix devmem specific helpers 



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

Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarMina Almasry <almasrymina@google.com>
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarDavid Wei <dw@davidwei.uk>
Link: https://patch.msgid.link/20250204215622.695511-3-dw@davidwei.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8d522566

net/core/devmem.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding) 


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



	if (WARN_ON(!gen_pool_has_addr(binding->chunk_pool, dma_addr,

net/core/devmem.h

+7 −7
Original line number Diff line number Diff line
@@ -86,11 +86,16 @@ static inline unsigned int net_iov_idx(const struct net_iov *niov) 
}



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;

}



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)

{

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

}



static inline u32 net_iov_binding_id(const struct net_iov *niov)

{

	return net_iov_owner(niov)->binding->id;

}



static inline void

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;

}



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;

}

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -2494,7 +2494,7 @@ static int tcp_recvmsg_dmabuf(struct sock *sk, const struct sk_buff *skb, 


				/* Will perform the exchange later */

				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;

				remaining_len -= copy;