mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
net: linkwatch: only report IF_OPER_LOWERLAYERDOWN if iflink is actually down
RFC 2863 says: The lowerLayerDown state is also a refinement on the down state. This new state indicates that this interface runs "on top of" one or more other interfaces (see ifStackTable) and that this interface is down specifically because one or more of these lower-layer interfaces are down. DSA interfaces are virtual network devices, stacked on top of the DSA master, but they have a physical MAC, with a PHY that reports a real link status. But since DSA (perhaps improperly) uses an iflink to describe the relationship to its master since commitc084080151
("dsa: set ->iflink on slave interfaces to the ifindex of the parent"), default_operstate() will misinterpret this to mean that every time the carrier of a DSA interface is not ok, it is because of the master being not ok. In fact, since commitc0a8a9c274
("net: dsa: automatically bring user ports down when master goes down"), DSA cannot even in theory be in the lowerLayerDown state, because it just calls dev_close_many(), thereby going down, when the master goes down. We could revert the commit that creates an iflink between a DSA user port and its master, especially since now we have an alternative IFLA_DSA_MASTER which has less side effects. But there may be tooling in use which relies on the iflink, which has existed since 2009. We could also probably do something local within DSA to overwrite what rfc2863_policy() did, in a way similar to hsr_set_operstate(), but this seems like a hack. What seems appropriate is to follow the iflink, and check the carrier status of that interface as well. If that's down too, yes, keep reporting lowerLayerDown, otherwise just down. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
fd258f2aba
commit
8c55facecd
@ -38,9 +38,23 @@ static unsigned char default_operstate(const struct net_device *dev)
|
||||
if (netif_testing(dev))
|
||||
return IF_OPER_TESTING;
|
||||
|
||||
if (!netif_carrier_ok(dev))
|
||||
return (dev->ifindex != dev_get_iflink(dev) ?
|
||||
IF_OPER_LOWERLAYERDOWN : IF_OPER_DOWN);
|
||||
/* Some uppers (DSA) have additional sources for being down, so
|
||||
* first check whether lower is indeed the source of its down state.
|
||||
*/
|
||||
if (!netif_carrier_ok(dev)) {
|
||||
int iflink = dev_get_iflink(dev);
|
||||
struct net_device *peer;
|
||||
|
||||
if (iflink == dev->ifindex)
|
||||
return IF_OPER_DOWN;
|
||||
|
||||
peer = __dev_get_by_index(dev_net(dev), iflink);
|
||||
if (!peer)
|
||||
return IF_OPER_DOWN;
|
||||
|
||||
return netif_carrier_ok(peer) ? IF_OPER_DOWN :
|
||||
IF_OPER_LOWERLAYERDOWN;
|
||||
}
|
||||
|
||||
if (netif_dormant(dev))
|
||||
return IF_OPER_DORMANT;
|
||||
|
Loading…
Reference in New Issue
Block a user