diff options
| author |   Kirill Tkhai <ktkhai@virtuozzo.com> | 2018-03-22 12:45:22 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-22 15:12:56 -0400 |
| commit | 128aaa98ad1422eacc4c74879840cb3e579cd934 (patch) | |
| tree | f4e4bbd368062c32567a24e857a27fc3ab0ecd02 /net/ipv4/ip_sockglue.c | |
| parent | net: Move IP_ROUTER_ALERT out of lock_sock(sk) (diff) | |
| download | linux-dev-128aaa98ad1422eacc4c74879840cb3e579cd934.tar.xz linux-dev-128aaa98ad1422eacc4c74879840cb3e579cd934.zip | |
net: Revert "ipv4: fix a deadlock in ip_ra_control"
This reverts commit 1215e51edad1.
Since raw_close() is used on every RAW socket destruction,
the changes made by 1215e51edad1 scale sadly. This clearly
seen on endless unshare(CLONE_NEWNET) test, and cleanup_net()
kwork spends a lot of time waiting for rtnl_lock() introduced
by this commit.
Previous patch moved IP_ROUTER_ALERT out of rtnl_lock(),
so we revert this patch.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/ip_sockglue.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index dcbf6afe27e7..bf5f44b27b7e 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -594,7 +594,6 @@ static bool setsockopt_needs_rtnl(int optname) case MCAST_LEAVE_GROUP: case MCAST_LEAVE_SOURCE_GROUP: case MCAST_UNBLOCK_SOURCE: - case IP_ROUTER_ALERT: return true; } return false; |