| Message ID | 20171231161513.25785-5-idosch@mellanox.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [RFC,net-next,01/19] ipv6: Remove redundant route flushing during namespace dismantle | expand |
On 12/31/17 9:14 AM, Ido Schimmel wrote: > To make IPv6 more in line with IPv4 we need to be able to respond > differently to different netdev events. For example, when a netdev is > unregistered all the routes using it as their nexthop device should be > flushed, whereas when the netdev's carrier changes only the 'linkdown' > flag should be toggled. > > Currently, this is not possible, as the function that traverses the > routing tables is not aware of the triggering event. > > Propagate the triggering event down, so that it could be used in later > patches. > > Signed-off-by: Ido Schimmel <idosch@mellanox.com> > --- > include/net/ip6_route.h | 1 + > net/ipv6/addrconf.c | 4 ++-- > net/ipv6/route.c | 35 ++++++++++++++++++++--------------- > 3 files changed, 23 insertions(+), 17 deletions(-) > > diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h > index caad39198c2a..8205402ff3dc 100644 > --- a/include/net/ip6_route.h > +++ b/include/net/ip6_route.h rt6_ifdown is done with this change, so the declaration of rt6_ifdown can be removed from this file as well. > @@ -170,6 +170,7 @@ void rt6_mtu_change(struct net_device *dev, unsigned int mtu); > void rt6_remove_prefsrc(struct inet6_ifaddr *ifp); > void rt6_clean_tohost(struct net *net, struct in6_addr *gateway); > void rt6_sync_up(struct net_device *dev, unsigned int nh_flags); > +void rt6_disable_ip(struct net_device *dev, unsigned long event); > > static inline const struct rt6_info *skb_rt6_info(const struct sk_buff *skb) > {
On Tue, Jan 02, 2018 at 09:29:42AM -0700, David Ahern wrote: > On 12/31/17 9:14 AM, Ido Schimmel wrote: > > To make IPv6 more in line with IPv4 we need to be able to respond > > differently to different netdev events. For example, when a netdev is > > unregistered all the routes using it as their nexthop device should be > > flushed, whereas when the netdev's carrier changes only the 'linkdown' > > flag should be toggled. > > > > Currently, this is not possible, as the function that traverses the > > routing tables is not aware of the triggering event. > > > > Propagate the triggering event down, so that it could be used in later > > patches. > > > > Signed-off-by: Ido Schimmel <idosch@mellanox.com> > > --- > > include/net/ip6_route.h | 1 + > > net/ipv6/addrconf.c | 4 ++-- > > net/ipv6/route.c | 35 ++++++++++++++++++++--------------- > > 3 files changed, 23 insertions(+), 17 deletions(-) > > > > diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h > > index caad39198c2a..8205402ff3dc 100644 > > --- a/include/net/ip6_route.h > > +++ b/include/net/ip6_route.h > > rt6_ifdown is done with this change, so the declaration of rt6_ifdown > can be removed from this file as well. Yes, I missed that. grepping for `rt6_ifdown` I now see that I need to reword a comment referencing it in icmp6_dst_alloc(). Thanks
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index caad39198c2a..8205402ff3dc 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -170,6 +170,7 @@ void rt6_mtu_change(struct net_device *dev, unsigned int mtu); void rt6_remove_prefsrc(struct inet6_ifaddr *ifp); void rt6_clean_tohost(struct net *net, struct in6_addr *gateway); void rt6_sync_up(struct net_device *dev, unsigned int nh_flags); +void rt6_disable_ip(struct net_device *dev, unsigned long event); static inline const struct rt6_info *skb_rt6_info(const struct sk_buff *skb) { diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index b6405568ed7b..a13e1ffe87ec 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3580,6 +3580,7 @@ static bool addr_is_local(const struct in6_addr *addr) static int addrconf_ifdown(struct net_device *dev, int how) { + unsigned long event = how ? NETDEV_UNREGISTER : NETDEV_DOWN; struct net *net = dev_net(dev); struct inet6_dev *idev; struct inet6_ifaddr *ifa, *tmp; @@ -3589,8 +3590,7 @@ static int addrconf_ifdown(struct net_device *dev, int how) ASSERT_RTNL(); - rt6_ifdown(net, dev); - neigh_ifdown(&nd_tbl, dev); + rt6_disable_ip(dev, event); idev = __in6_dev_get(dev); if (!idev) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 4796d87e0b93..9d1c34f2c7ed 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -3461,7 +3461,10 @@ void rt6_clean_tohost(struct net *net, struct in6_addr *gateway) struct arg_netdev_event { const struct net_device *dev; - unsigned int nh_flags; + union { + unsigned int nh_flags; + unsigned long event; + }; }; static int fib6_ifup(struct rt6_info *rt, void *p_arg) @@ -3488,19 +3491,15 @@ void rt6_sync_up(struct net_device *dev, unsigned int nh_flags) fib6_clean_all(dev_net(dev), fib6_ifup, &arg); } -struct arg_dev_net { - struct net_device *dev; - struct net *net; -}; - /* called with write lock held for table with rt */ -static int fib6_ifdown(struct rt6_info *rt, void *arg) +static int fib6_ifdown(struct rt6_info *rt, void *p_arg) { - const struct arg_dev_net *adn = arg; - const struct net_device *dev = adn->dev; + const struct arg_netdev_event *arg = p_arg; + const struct net_device *dev = arg->dev; + const struct net *net = dev_net(dev); if (rt->dst.dev == dev && - rt != adn->net->ipv6.ip6_null_entry && + rt != net->ipv6.ip6_null_entry && (rt->rt6i_nsiblings == 0 || netdev_unregistering(dev) || !rt->rt6i_idev->cnf.ignore_routes_with_linkdown)) { rt->rt6i_nh_flags |= (RTNH_F_DEAD | RTNH_F_LINKDOWN); @@ -3510,15 +3509,21 @@ static int fib6_ifdown(struct rt6_info *rt, void *arg) return 0; } -void rt6_ifdown(struct net *net, struct net_device *dev) +static void rt6_sync_down_dev(struct net_device *dev, unsigned long event) { - struct arg_dev_net adn = { + struct arg_netdev_event arg = { .dev = dev, - .net = net, + .event = event, }; - fib6_clean_all(net, fib6_ifdown, &adn); - rt6_uncached_list_flush_dev(net, dev); + fib6_clean_all(dev_net(dev), fib6_ifdown, &arg); +} + +void rt6_disable_ip(struct net_device *dev, unsigned long event) +{ + rt6_sync_down_dev(dev, event); + rt6_uncached_list_flush_dev(dev_net(dev), dev); + neigh_ifdown(&nd_tbl, dev); } struct rt6_mtu_change_arg {
To make IPv6 more in line with IPv4 we need to be able to respond differently to different netdev events. For example, when a netdev is unregistered all the routes using it as their nexthop device should be flushed, whereas when the netdev's carrier changes only the 'linkdown' flag should be toggled. Currently, this is not possible, as the function that traverses the routing tables is not aware of the triggering event. Propagate the triggering event down, so that it could be used in later patches. Signed-off-by: Ido Schimmel <idosch@mellanox.com> --- include/net/ip6_route.h | 1 + net/ipv6/addrconf.c | 4 ++-- net/ipv6/route.c | 35 ++++++++++++++++++++--------------- 3 files changed, 23 insertions(+), 17 deletions(-)