提交 9fcb0714 编写于 作者: I Ido Schimmel 提交者: David S. Miller

ipv6: Remove redundant route flushing during namespace dismantle

By the time fib6_net_exit() is executed all the netdevs in the namespace
have been either unregistered or pushed back to the default namespace.
That is because pernet subsys operations are always ordered before
pernet device operations and therefore invoked after them during
namespace dismantle.

Thus, all the routing tables in the namespace are empty by the time
fib6_net_exit() is invoked and the call to rt6_ifdown() can be removed.

This allows us to simplify the condition in fib6_ifdown() as it's only
ever called with an actual netdev.
Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
Acked-by: NDavid Ahern <dsahern@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 7f0b8000
...@@ -2103,7 +2103,6 @@ static void fib6_net_exit(struct net *net) ...@@ -2103,7 +2103,6 @@ static void fib6_net_exit(struct net *net)
{ {
unsigned int i; unsigned int i;
rt6_ifdown(net, NULL);
del_timer_sync(&net->ipv6.ip6_fib_timer); del_timer_sync(&net->ipv6.ip6_fib_timer);
for (i = 0; i < FIB6_TABLE_HASHSZ; i++) { for (i = 0; i < FIB6_TABLE_HASHSZ; i++) {
......
...@@ -3470,10 +3470,9 @@ static int fib6_ifdown(struct rt6_info *rt, void *arg) ...@@ -3470,10 +3470,9 @@ static int fib6_ifdown(struct rt6_info *rt, void *arg)
const struct arg_dev_net *adn = arg; const struct arg_dev_net *adn = arg;
const struct net_device *dev = adn->dev; const struct net_device *dev = adn->dev;
if ((rt->dst.dev == dev || !dev) && if (rt->dst.dev == dev &&
rt != adn->net->ipv6.ip6_null_entry && rt != adn->net->ipv6.ip6_null_entry &&
(rt->rt6i_nsiblings == 0 || (rt->rt6i_nsiblings == 0 || netdev_unregistering(dev) ||
(dev && netdev_unregistering(dev)) ||
!rt->rt6i_idev->cnf.ignore_routes_with_linkdown)) !rt->rt6i_idev->cnf.ignore_routes_with_linkdown))
return -1; return -1;
...@@ -3488,8 +3487,7 @@ void rt6_ifdown(struct net *net, struct net_device *dev) ...@@ -3488,8 +3487,7 @@ void rt6_ifdown(struct net *net, struct net_device *dev)
}; };
fib6_clean_all(net, fib6_ifdown, &adn); fib6_clean_all(net, fib6_ifdown, &adn);
if (dev) rt6_uncached_list_flush_dev(net, dev);
rt6_uncached_list_flush_dev(net, dev);
} }
struct rt6_mtu_change_arg { struct rt6_mtu_change_arg {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册