[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20190918130620.8556-1-zhangsha.zhang@huawei.com>
Date: Wed, 18 Sep 2019 21:06:20 +0800
From: <zhangsha.zhang@...wei.com>
To: <jay.vosburgh@...onical.com>, <vfalico@...il.com>,
<andy@...yhouse.net>, <davem@...emloft.net>,
<netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<yuehaibing@...wei.com>, <hunongda@...wei.com>,
<alex.chen@...wei.com>, <zhangsha.zhang@...wei.com>
Subject: [PATCH v3] bonding: force enable lacp port after link state recovery for 802.3ad
From: Sha Zhang <zhangsha.zhang@...wei.com>
After the commit 334031219a84 ("bonding/802.3ad: fix slave link
initialization transition states") merged,
the slave's link status will be changed to BOND_LINK_FAIL
from BOND_LINK_DOWN in the following scenario:
- Driver reports loss of carrier and
bonding driver receives NETDEV_DOWN notifier
- slave's duplex and speed is zerod and
its port->is_enabled is cleard to 'false';
- Driver reports link recovery and
bonding driver receives NETDEV_UP notifier;
- If speed/duplex getting failed here, the link status
will be changed to BOND_LINK_FAIL;
- The MII monotor later recover the slave's speed/duplex
and set link status to BOND_LINK_UP, but remains
the 'port->is_enabled' to 'false'.
In this scenario, the lacp port will not be enabled even its speed
and duplex are valid. The bond will not send LACPDU's, and its
state is 'AD_STATE_DEFAULTED' forever. The simplest fix I think
is to call bond_3ad_handle_link_change() in bond_miimon_commit,
this function can enable lacp after port slave speed check.
As enabled, the lacp port can run its state machine normally
after link recovery.
Signed-off-by: Sha Zhang <zhangsha.zhang@...wei.com>
---
drivers/net/bonding/bond_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 931d9d9..76324a5 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2206,7 +2206,8 @@ static void bond_miimon_commit(struct bonding *bond)
*/
if (BOND_MODE(bond) == BOND_MODE_8023AD &&
slave->link == BOND_LINK_UP)
- bond_3ad_adapter_speed_duplex_changed(slave);
+ bond_3ad_handle_link_change(slave,
+ BOND_LINK_UP);
continue;
case BOND_LINK_UP:
--
1.8.3.1
Powered by blists - more mailing lists