OSDN Git Service

net: Revert "ipv4: fix a deadlock in ip_ra_control"
authorKirill Tkhai <ktkhai@virtuozzo.com>
Thu, 22 Mar 2018 09:45:22 +0000 (12:45 +0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Mar 2018 19:12:56 +0000 (15:12 -0400)
commit128aaa98ad1422eacc4c74879840cb3e579cd934
treef4e4bbd368062c32567a24e857a27fc3ab0ecd02
parent0526947f9dd019da8d550ed20177585a84b3460e
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>
net/ipv4/ip_sockglue.c
net/ipv4/ipmr.c
net/ipv4/raw.c