diff options
| author | Francesco Ruggeri <fruggeri@arista.com> | 2017-11-08 11:23:46 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-13 10:13:04 +0900 |
| commit | 338d182fa542b3ca05456ad1ce9cebe6580083b1 (patch) | |
| tree | 597daa1cb98dba8fe8c2b679646ae7a9c8f0fa41 | |
| parent | 07842561a873e8f25272bcebe7f6c7f1af7c1a2d (diff) | |
| download | linux-338d182fa542b3ca05456ad1ce9cebe6580083b1.tar.gz linux-338d182fa542b3ca05456ad1ce9cebe6580083b1.tar.bz2 linux-338d182fa542b3ca05456ad1ce9cebe6580083b1.zip | |
ipv6: try not to take rtnl_lock in ip6mr_sk_done
Avoid traversing the list of mr6_tables (which requires the
rtnl_lock) in ip6mr_sk_done(), when we know in advance that
a match will not be found.
This can happen when rawv6_close()/ip6mr_sk_done() is invoked
on non-mroute6 sockets.
This patch helps reduce rtnl_lock contention when destroying
a large number of net namespaces, each having a non-mroute6
raw socket.
v2: same patch, only fixed subject line and expanded comment.
Signed-off-by: Francesco Ruggeri <fruggeri@arista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/ip6mr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 59fad81e5f7a..9c24b85949c1 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1617,6 +1617,10 @@ int ip6mr_sk_done(struct sock *sk) struct net *net = sock_net(sk); struct mr6_table *mrt; + if (sk->sk_type != SOCK_RAW || + inet_sk(sk)->inet_num != IPPROTO_ICMPV6) + return err; + rtnl_lock(); ip6mr_for_each_table(mrt, net) { if (sk == mrt->mroute6_sk) { |