Commit f44e6499 authored by Eric Dumazet's avatar Eric Dumazet Committed by Paolo Abeni
Browse files

sock_diag: remove sock_diag_mutex 



sock_diag_rcv() is still serializing its operations using
a mutex, for no good reason.

This came with commit 0a9c7301 ("[INET_DIAG]: Fix oops
in netlink_rcv_skb"), but the root cause has been fixed
with commit cd40b7d3 ("[NET]: make netlink user -> kernel
interface synchronious")

Remove this mutex to let multiple threads run concurrently.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarGuillaume Nault <gnault@redhat.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 86e8921d

net/core/sock_diag.c

+0 −4
Original line number Diff line number Diff line
@@ -292,13 +292,9 @@ static int sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, 
	}

}



static DEFINE_MUTEX(sock_diag_mutex);



static void sock_diag_rcv(struct sk_buff *skb)

{

	mutex_lock(&sock_diag_mutex);

	netlink_rcv_skb(skb, &sock_diag_rcv_msg);

	mutex_unlock(&sock_diag_mutex);

}



static int sock_diag_bind(struct net *net, int group)