Commit 88e47c93 authored by Mina Almasry's avatar Mina Almasry Committed by Jakub Kicinski
Browse files

net: devmem: move list_add to net_devmem_bind_dmabuf. 



It's annoying for the list_add to be outside net_devmem_bind_dmabuf, but
the list_del is in net_devmem_unbind_dmabuf. Make it consistent by
having both the list_add/del be inside the net_devmem_[un]bind_dmabuf.

Cc: ap420073@gmail.com
Signed-off-by: default avatarMina Almasry <almasrymina@google.com>
Tested-by: default avatarTaehee Yoo <ap420073@gmail.com>
Acked-by: default avatarStanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250523230524.1107879-2-almasrymina@google.com


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

net/core/devmem.c

+4 −1
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ int net_devmem_bind_dmabuf_to_queue(struct net_device *dev, u32 rxq_idx, 
struct net_devmem_dmabuf_binding *

net_devmem_bind_dmabuf(struct net_device *dev,

		       enum dma_data_direction direction,

		       unsigned int dmabuf_fd, struct netlink_ext_ack *extack)

		       unsigned int dmabuf_fd, struct netdev_nl_sock *priv,

		       struct netlink_ext_ack *extack)

{

	struct net_devmem_dmabuf_binding *binding;

	static u32 id_alloc_next;
@@ -299,6 +300,8 @@ net_devmem_bind_dmabuf(struct net_device *dev, 
	if (err < 0)

		goto err_free_chunks;



	list_add(&binding->list, &priv->bindings);



	return binding;



err_free_chunks:

net/core/devmem.h

+4 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define _NET_DEVMEM_H



#include <net/netmem.h>

#include <net/netdev_netlink.h>



struct netlink_ext_ack;
@@ -82,7 +83,8 @@ void __net_devmem_dmabuf_binding_free(struct work_struct *wq); 
struct net_devmem_dmabuf_binding *

net_devmem_bind_dmabuf(struct net_device *dev,

		       enum dma_data_direction direction,

		       unsigned int dmabuf_fd, struct netlink_ext_ack *extack);

		       unsigned int dmabuf_fd, struct netdev_nl_sock *priv,

		       struct netlink_ext_ack *extack);

struct net_devmem_dmabuf_binding *net_devmem_lookup_dmabuf(u32 id);

void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding);

int net_devmem_bind_dmabuf_to_queue(struct net_device *dev, u32 rxq_idx,
@@ -170,6 +172,7 @@ static inline void __net_devmem_dmabuf_binding_free(struct work_struct *wq) 
static inline struct net_devmem_dmabuf_binding *

net_devmem_bind_dmabuf(struct net_device *dev, unsigned int dmabuf_fd,

		       enum dma_data_direction direction,

		       struct netdev_nl_sock *priv,

		       struct netlink_ext_ack *extack)

{

	return ERR_PTR(-EOPNOTSUPP);

net/core/netdev-genl.c

+2 −6
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ int netdev_nl_bind_rx_doit(struct sk_buff *skb, struct genl_info *info) 
	}



	binding = net_devmem_bind_dmabuf(netdev, DMA_FROM_DEVICE, dmabuf_fd,

					 info->extack);

					 priv, info->extack);

	if (IS_ERR(binding)) {

		err = PTR_ERR(binding);

		goto err_unlock;
@@ -943,8 +943,6 @@ int netdev_nl_bind_rx_doit(struct sk_buff *skb, struct genl_info *info) 
			goto err_unbind;

	}



	list_add(&binding->list, &priv->bindings);



	nla_put_u32(rsp, NETDEV_A_DMABUF_ID, binding->id);

	genlmsg_end(rsp, hdr);
@@ -1020,15 +1018,13 @@ int netdev_nl_bind_tx_doit(struct sk_buff *skb, struct genl_info *info) 
		goto err_unlock_netdev;

	}



	binding = net_devmem_bind_dmabuf(netdev, DMA_TO_DEVICE, dmabuf_fd,

	binding = net_devmem_bind_dmabuf(netdev, DMA_TO_DEVICE, dmabuf_fd, priv,

					 info->extack);

	if (IS_ERR(binding)) {

		err = PTR_ERR(binding);

		goto err_unlock_netdev;

	}



	list_add(&binding->list, &priv->bindings);



	nla_put_u32(rsp, NETDEV_A_DMABUF_ID, binding->id);

	genlmsg_end(rsp, hdr);