Commit fc2a263b authored by David S. Miller's avatar David S. Miller

Merge branch 'ipv4_link_down'

Julian Anastasov says:

====================
ipv4: fix problems from the RTNH_F_LINKDOWN introduction

Fix two problems from the change that introduced RTNH_F_LINKDOWN
flag. The first patch deals with the removal of local route on
DOWN event. The second patch makes sure the RTNH_F_LINKDOWN
flag is properly updated on UP event because the DOWN event
sets it in all cases.

v2->v3:
- use bool for force var

v1->v2:
- forgot to add ifconfig dummy0 down in the test case
- split to 2 patches
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5dbebbb4 c9b3292e
...@@ -317,7 +317,7 @@ void fib_flush_external(struct net *net); ...@@ -317,7 +317,7 @@ void fib_flush_external(struct net *net);
/* Exported by fib_semantics.c */ /* Exported by fib_semantics.c */
int ip_fib_check_default(__be32 gw, struct net_device *dev); int ip_fib_check_default(__be32 gw, struct net_device *dev);
int fib_sync_down_dev(struct net_device *dev, unsigned long event); int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force);
int fib_sync_down_addr(struct net *net, __be32 local); int fib_sync_down_addr(struct net *net, __be32 local);
int fib_sync_up(struct net_device *dev, unsigned int nh_flags); int fib_sync_up(struct net_device *dev, unsigned int nh_flags);
void fib_select_multipath(struct fib_result *res); void fib_select_multipath(struct fib_result *res);
......
...@@ -1110,9 +1110,10 @@ static void nl_fib_lookup_exit(struct net *net) ...@@ -1110,9 +1110,10 @@ static void nl_fib_lookup_exit(struct net *net)
net->ipv4.fibnl = NULL; net->ipv4.fibnl = NULL;
} }
static void fib_disable_ip(struct net_device *dev, unsigned long event) static void fib_disable_ip(struct net_device *dev, unsigned long event,
bool force)
{ {
if (fib_sync_down_dev(dev, event)) if (fib_sync_down_dev(dev, event, force))
fib_flush(dev_net(dev)); fib_flush(dev_net(dev));
rt_cache_flush(dev_net(dev)); rt_cache_flush(dev_net(dev));
arp_ifdown(dev); arp_ifdown(dev);
...@@ -1140,7 +1141,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event, ...@@ -1140,7 +1141,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
/* Last address was deleted from this interface. /* Last address was deleted from this interface.
* Disable IP. * Disable IP.
*/ */
fib_disable_ip(dev, event); fib_disable_ip(dev, event, true);
} else { } else {
rt_cache_flush(dev_net(dev)); rt_cache_flush(dev_net(dev));
} }
...@@ -1157,7 +1158,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo ...@@ -1157,7 +1158,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
unsigned int flags; unsigned int flags;
if (event == NETDEV_UNREGISTER) { if (event == NETDEV_UNREGISTER) {
fib_disable_ip(dev, event); fib_disable_ip(dev, event, true);
rt_flush_dev(dev); rt_flush_dev(dev);
return NOTIFY_DONE; return NOTIFY_DONE;
} }
...@@ -1178,14 +1179,14 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo ...@@ -1178,14 +1179,14 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
rt_cache_flush(net); rt_cache_flush(net);
break; break;
case NETDEV_DOWN: case NETDEV_DOWN:
fib_disable_ip(dev, event); fib_disable_ip(dev, event, false);
break; break;
case NETDEV_CHANGE: case NETDEV_CHANGE:
flags = dev_get_flags(dev); flags = dev_get_flags(dev);
if (flags & (IFF_RUNNING | IFF_LOWER_UP)) if (flags & (IFF_RUNNING | IFF_LOWER_UP))
fib_sync_up(dev, RTNH_F_LINKDOWN); fib_sync_up(dev, RTNH_F_LINKDOWN);
else else
fib_sync_down_dev(dev, event); fib_sync_down_dev(dev, event, false);
/* fall through */ /* fall through */
case NETDEV_CHANGEMTU: case NETDEV_CHANGEMTU:
rt_cache_flush(net); rt_cache_flush(net);
......
...@@ -1281,7 +1281,13 @@ int fib_sync_down_addr(struct net *net, __be32 local) ...@@ -1281,7 +1281,13 @@ int fib_sync_down_addr(struct net *net, __be32 local)
return ret; return ret;
} }
int fib_sync_down_dev(struct net_device *dev, unsigned long event) /* Event force Flags Description
* NETDEV_CHANGE 0 LINKDOWN Carrier OFF, not for scope host
* NETDEV_DOWN 0 LINKDOWN|DEAD Link down, not for scope host
* NETDEV_DOWN 1 LINKDOWN|DEAD Last address removed
* NETDEV_UNREGISTER 1 LINKDOWN|DEAD Device removed
*/
int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force)
{ {
int ret = 0; int ret = 0;
int scope = RT_SCOPE_NOWHERE; int scope = RT_SCOPE_NOWHERE;
...@@ -1290,8 +1296,7 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event) ...@@ -1290,8 +1296,7 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event)
struct hlist_head *head = &fib_info_devhash[hash]; struct hlist_head *head = &fib_info_devhash[hash];
struct fib_nh *nh; struct fib_nh *nh;
if (event == NETDEV_UNREGISTER || if (force)
event == NETDEV_DOWN)
scope = -1; scope = -1;
hlist_for_each_entry(nh, head, nh_hash) { hlist_for_each_entry(nh, head, nh_hash) {
...@@ -1440,6 +1445,13 @@ int fib_sync_up(struct net_device *dev, unsigned int nh_flags) ...@@ -1440,6 +1445,13 @@ int fib_sync_up(struct net_device *dev, unsigned int nh_flags)
if (!(dev->flags & IFF_UP)) if (!(dev->flags & IFF_UP))
return 0; return 0;
if (nh_flags & RTNH_F_DEAD) {
unsigned int flags = dev_get_flags(dev);
if (flags & (IFF_RUNNING | IFF_LOWER_UP))
nh_flags |= RTNH_F_LINKDOWN;
}
prev_fi = NULL; prev_fi = NULL;
hash = fib_devindex_hashfn(dev->ifindex); hash = fib_devindex_hashfn(dev->ifindex);
head = &fib_info_devhash[hash]; head = &fib_info_devhash[hash];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment