net/qlcnic: fix mac address restore in bond mode 5/6
Subsystems (3)
PATCH 1/1 net/qlcnic: fix mac address restore in bond mode 5/6
The bonding driver saves a copy of slaves' original mac address and then assigns whatever mac as needed to the slave, depending on mode. In at least modes 5 and 6 (balance-tlb, balance-alb), it often ends up being the mac address of another slave. On release from the bond, the original mac address is supposed to get restored via a dev_set_mac_address() call in the bonding driver's __bond_release_one() function, which calls the slave's ndo_set_mac_address function, which for qlcnic, is qlcnic_set_mac().
Now, this function tries to be somewhat intelligent and exit early if you're trying to set the mac address to the same thing that is already set. The problem here is that adapter->mac_addr isn't in sync with netdev->dev_addr. The qlcnic driver still has the original mac stored in adapter->mac_addr, while the bonding driver has updated netdev->dev_addr, so qlcnic thinks we're trying to set the same address it already has.
I think the way to go here, since the function updates both netdev and adapter's stored mac addresses, is to check if either of them doesn't match the newly requested mac. Simply checking netdev's value only could result in a similar mismatch and non-update, so look at both.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +2 -1
@@ -353,7 +353,8 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p)if (!is_valid_ether_addr (addr->sa_data))return -EINVAL ; -if (ether_addr_equal_unaligned (adapter->mac_addr, addr->sa_data)) +if (ether_addr_equal_unaligned (adapter->mac_addr, addr->sa_data) && +ether_addr_equal_unaligned (netdev->dev_addr, addr->sa_data))return 0 ;if (test_bit (__QLCNIC_DEV_UP, &adapter->state)) {
Signature · 1 line
1.8.3.1
Quoted 8 lines · Jarod Wilson
The bonding driver saves a copy of slaves' original mac address and then assigns whatever mac as needed to the slave, depending on mode. In at least modes 5 and 6 (balance-tlb, balance-alb), it often ends up being the mac address of another slave. On release from the bond, the original mac address is supposed to get restored via a
dev_set_mac_address()call in the bonding driver's__bond_release_one()function, which calls the slave'sndo_set_mac_addressfunction, which for qlcnic, isqlcnic_set_mac().
I didn't entirely flesh out this comment with some other relevant thoughts. The qlcnic interface getting assigned another interface's mac while in the bond is even more of a problem when you release the qlcnic interface and the interface that it was borrowing an address from, because now you have two interfaces in the system claiming to have the same mac address, which by itself can be problematic, and also causes problems if/when you try to add them back into a bond.
Quoted 11 lines
Now, this function tries to be somewhat intelligent and exit early if you're trying to set the mac address to the same thing that is already set. The problem here is that
adapter->mac_addrisn't in sync withnetdev->dev_addr. The qlcnic driver still has the original mac stored inadapter->mac_addr, while the bonding driver has updatednetdev->dev_addr, so qlcnic thinks we're trying to set the same address it already has.I think the way to go here, since the function updates both netdev and adapter's stored mac addresses, is to check if either of them doesn't match the newly requested mac. Simply checking netdev's value only could result in a similar mismatch and non-update, so look at both.
Signature · 2 lines
Jarod Wilson [email protected]
From: Jarod Wilson <[email protected]>
Date: Fri, 6 Nov 2015 09:25:31 -0500
Quoted 21 lines
The bonding driver saves a copy of slaves' original mac address and then assigns whatever mac as needed to the slave, depending on mode. In at least modes 5 and 6 (balance-tlb, balance-alb), it often ends up being the mac address of another slave. On release from the bond, the original mac address is supposed to get restored via a
dev_set_mac_address()call in the bonding driver's__bond_release_one()function, which calls the slave'sndo_set_mac_addressfunction, which for qlcnic, isqlcnic_set_mac().Now, this function tries to be somewhat intelligent and exit early if you're trying to set the mac address to the same thing that is already set. The problem here is that
adapter->mac_addrisn't in sync withnetdev->dev_addr. The qlcnic driver still has the original mac stored inadapter->mac_addr, while the bonding driver has updatednetdev->dev_addr, so qlcnic thinks we're trying to set the same address it already has.I think the way to go here, since the function updates both netdev and adapter's stored mac addresses, is to check if either of them doesn't match the newly requested mac. Simply checking netdev's value only could result in a similar mismatch and non-update, so look at both.
Quoted 4 lines
CC Manish Chopra <[email protected]>Signed-off-by Jarod Wilson <[email protected]>
Applied.