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/raw.c | |
parent | 0526947f9dd019da8d550ed20177585a84b3460e (diff) | |
download | linux-stable-128aaa98ad1422eacc4c74879840cb3e579cd934.tar.gz linux-stable-128aaa98ad1422eacc4c74879840cb3e579cd934.tar.bz2 linux-stable-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 'net/ipv4/raw.c')
-rw-r--r-- | net/ipv4/raw.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 54648d20bf0f..720bef7da2f6 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -711,9 +711,7 @@ static void raw_close(struct sock *sk, long timeout) /* * Raw sockets may have direct kernel references. Kill them. */ - rtnl_lock(); ip_ra_control(sk, 0, NULL); - rtnl_unlock(); sk_common_release(sk); } |