Skip to content

Commit

Permalink
ipv6: avoid taking locks at socket dismantle
Browse files Browse the repository at this point in the history
ipv6_sock_mc_close() is called for ipv6 sockets at close time, and most
of them don't use multicast.

Add a test to avoid contention on a shared spinlock.

Same heuristic applies for ipv6_sock_ac_close(), to avoid contention
on a shared rwlock.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Dec 5, 2012
1 parent cc86802 commit 0e1efe9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions net/ipv6/anycast.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ void ipv6_sock_ac_close(struct sock *sk)
struct net *net = sock_net(sk);
int prev_index;

if (!np->ipv6_ac_list)
return;

write_lock_bh(&ipv6_sk_ac_lock);
pac = np->ipv6_ac_list;
np->ipv6_ac_list = NULL;
Expand Down
3 changes: 3 additions & 0 deletions net/ipv6/mcast.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,9 @@ void ipv6_sock_mc_close(struct sock *sk)
struct ipv6_mc_socklist *mc_lst;
struct net *net = sock_net(sk);

if (!rcu_access_pointer(np->ipv6_mc_list))
return;

spin_lock(&ipv6_sk_mc_lock);
while ((mc_lst = rcu_dereference_protected(np->ipv6_mc_list,
lockdep_is_held(&ipv6_sk_mc_lock))) != NULL) {
Expand Down

0 comments on commit 0e1efe9

Please sign in to comment.