torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: add granular lock for the netdev netlink socket

Browse Source 
As we move away from rtnl_lock for queue ops, introduce
per-netdev_nl_sock lock.

Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Reviewed-by: Mina Almasry <almasrymina@google.com>
Link: https://patch.msgid.link/20250311144026.4154277-3-sdf@fomichev.me
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Stanislav Fomichev
2025-03-11 07:40:25 -07:00
committed by Jakub Kicinski
parent b6b67141d6
commit 10eef096be
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/netdev_netlink.h
View File

@@ -5,6 +5,7 @@
#include <linux/list.h> #include <linux/list.h>
struct netdev_nl_sock { struct netdev_nl_sock {
struct mutex lock;
struct list_head bindings; struct list_head bindings;
}; };

6
net/core/netdev-genl.c
View File

@@ -859,6 +859,7 @@ int netdev_nl_bind_rx_doit(struct sk_buff *skb, struct genl_info *info)
goto err_genlmsg_free; goto err_genlmsg_free;
} }
mutex_lock(&priv->lock);
rtnl_lock(); rtnl_lock();
netdev = __dev_get_by_index(genl_info_net(info), ifindex); netdev = __dev_get_by_index(genl_info_net(info), ifindex);
@@ -918,6 +919,7 @@ int netdev_nl_bind_rx_doit(struct sk_buff *skb, struct genl_info *info)
goto err_unbind; goto err_unbind;
rtnl_unlock(); rtnl_unlock();
mutex_unlock(&priv->lock);
return 0; return 0;
@@ -925,6 +927,7 @@ err_unbind:
net_devmem_unbind_dmabuf(binding); net_devmem_unbind_dmabuf(binding);
err_unlock: err_unlock:
rtnl_unlock(); rtnl_unlock();
mutex_unlock(&priv->lock);
err_genlmsg_free: err_genlmsg_free:
nlmsg_free(rsp); nlmsg_free(rsp);
return err; return err;
@@ -933,6 +936,7 @@ err_genlmsg_free:
void netdev_nl_sock_priv_init(struct netdev_nl_sock *priv) void netdev_nl_sock_priv_init(struct netdev_nl_sock *priv)
{ {
INIT_LIST_HEAD(&priv->bindings); INIT_LIST_HEAD(&priv->bindings);
mutex_init(&priv->lock);
} }
void netdev_nl_sock_priv_destroy(struct netdev_nl_sock *priv) void netdev_nl_sock_priv_destroy(struct netdev_nl_sock *priv)
@@ -940,11 +944,13 @@ void netdev_nl_sock_priv_destroy(struct netdev_nl_sock *priv)
struct net_devmem_dmabuf_binding *binding; struct net_devmem_dmabuf_binding *binding;
struct net_devmem_dmabuf_binding *temp; struct net_devmem_dmabuf_binding *temp;
mutex_lock(&priv->lock);
list_for_each_entry_safe(binding, temp, &priv->bindings, list) { list_for_each_entry_safe(binding, temp, &priv->bindings, list) {
rtnl_lock(); rtnl_lock();
net_devmem_unbind_dmabuf(binding); net_devmem_unbind_dmabuf(binding);
rtnl_unlock(); rtnl_unlock();
} }
mutex_unlock(&priv->lock);
} }
static int netdev_genl_netdevice_event(struct notifier_block *nb, static int netdev_genl_netdevice_event(struct notifier_block *nb,