github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-24 06:24:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

geneve: Unlink geneve->sock[46].hlist[46].hlist in __geneve_sock_release().

Browse Source 
Currently, geneve->sock[46].hlist[46] is unliked from
geneve_sock.vni_list in geneve_stop() and geneve_sock.refcnt is
decremented for each socket later in __geneve_sock_release().

The following patch will introduce a mutex in geneve_net to
protect geneve_sock.{refcnt,vni_list}.

However, udp_tunnel_notify_del_rx_port() must be outside of the
lock to avoid AB-BA deadlock.

To make the change cleaner, let's move hlist_del_init_rcu()
from geneve_stop() to __geneve_sock_release().

Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20260731164612.2148830-2-kuniyu@google.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Kuniyuki Iwashima 2026-07-31 16:45:53 +00:00 committed by Paolo Abeni
parent 5b4f243f78
commit cf31c7f186
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/net/geneve.c
View File

@ -1052,9 +1052,30 @@ static struct geneve_sock *geneve_socket_create(struct net *net,
return gs;
}
static void __geneve_sock_release(struct geneve_sock *gs)
static void __geneve_sock_release(struct geneve_dev *geneve, bool ipv6)
{
if (!gs || --gs->refcnt)
struct geneve_dev_node *node;
struct geneve_sock *gs;
#if IS_ENABLED(CONFIG_IPV6)
if (ipv6) {
gs = rtnl_dereference(geneve->sock6);
rcu_assign_pointer(geneve->sock6, NULL);
node = &geneve->hlist6;
} else
#endif
{
gs = rtnl_dereference(geneve->sock4);
rcu_assign_pointer(geneve->sock4, NULL);
node = &geneve->hlist4;
}
if (!gs)
return;
hlist_del_init_rcu(&node->hlist);
if (--gs->refcnt)
return;
list_del(&gs->list);
@ -1065,19 +1086,10 @@ static void __geneve_sock_release(struct geneve_sock *gs)
static void geneve_sock_release(struct geneve_dev *geneve)
{
struct geneve_sock *gs4 = rtnl_dereference(geneve->sock4);
#if IS_ENABLED(CONFIG_IPV6)
struct geneve_sock *gs6 = rtnl_dereference(geneve->sock6);
rcu_assign_pointer(geneve->sock6, NULL);
#endif
rcu_assign_pointer(geneve->sock4, NULL);
__geneve_sock_release(gs4);
#if IS_ENABLED(CONFIG_IPV6)
__geneve_sock_release(gs6);
__geneve_sock_release(geneve, true);
#endif
__geneve_sock_release(geneve, false);
}
static struct geneve_sock *geneve_find_sock(struct net *net,
@ -1187,10 +1199,6 @@ static int geneve_stop(struct net_device *dev)
{
struct geneve_dev *geneve = netdev_priv(dev);
hlist_del_init_rcu(&geneve->hlist4.hlist);
#if IS_ENABLED(CONFIG_IPV6)
hlist_del_init_rcu(&geneve->hlist6.hlist);
#endif
geneve_sock_release(geneve);
return 0;
}