Skip to contentSkip to conversation

ice: Fix MAC address setting

PATCH In review Ivan Vecera 4 participants 6 messages Mar 23, 2022 – Mar 25, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ice: Fix MAC address setting

Commit 2ccc1c1ccc671b ("ice: Remove excess error variables") merged the usage of 'status' and 'err' variables into single one in function ice_set_mac_address(). Unfortunately this causes a regression when call of ice_fltr_add_mac() returns -EEXIST because this return value does not indicate an error in this case but value of 'err' value remains to be -EEXIST till the end of the function and is returned to caller.

Prior this commit this does not happen because return value of ice_fltr_add_mac() was stored to 'status' variable first and if it was -EEXIST then 'err' remains to be zero.

The patch fixes the problem by reset 'err' to zero when ice_fltr_add_mac() returns -EEXIST.

Fixes 2ccc1c1ccc671b ("ice: Remove excess error variables")
---
 drivers/net/ethernet/intel/ice/ice_main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +3 -2
index 168a41ea37b8..420558d1cd21 100644
@@ -5474,14 +5474,15 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)
 
 	/* Add filter for new MAC. If filter exists, return success */
 	err = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);
-	if (err == -EEXIST)
+	if (err == -EEXIST) {
 		/* Although this MAC filter is already present in hardware it's
 		 * possible in some cases (e.g. bonding) that dev_addr was
 		 * modified outside of the driver and needs to be restored back
 		 * to this value.
 		 */
 		netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);
-	else if (err)
+		err = 0;
+	} else if (err)
 		/* error if the new filter addition failed */
 		err = -EADDRNOTAVAIL;
 
Signature · 1 line
2.34.1
#1 lore raw
Quoted 49 lines

-----Original Message-----
From: Ivan Vecera <[email protected]>
Sent: Wednesday, March 23, 2022 6:58 AM
To: netdev at vger.kernel.org
Cc: poros at redhat.com; mschmidt at redhat.com; Brandeburg, Jesse <[email protected]>; Nguyen, Anthony L <[email protected]>; David S. Miller <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; moderated list:INTEL ETHERNET DRIVERS <[email protected]>; open list <linux- kernel at vger.kernel.org>
Subject: [PATCH net] ice: Fix MAC address setting

Commit 2ccc1c1ccc671b ("ice: Remove excess error variables") merged the usage of 'status' and 'err' variables into single one in function ice_set_mac_address(). Unfortunately this causes a regression when call of ice_fltr_add_mac() returns -EEXIST because this return value does not indicate an error in this case but value of 'err' value remains to be -EEXIST till the end of the function and is returned to caller.

Prior this commit this does not happen because return value of ice_fltr_add_mac() was stored to 'status' variable first and if it was -EEXIST then 'err' remains to be zero.

The patch fixes the problem by reset 'err' to zero when ice_fltr_add_mac() returns -EEXIST.

Fixes 2ccc1c1ccc671b ("ice: Remove excess error variables")
---
 drivers/net/ethernet/intel/ice/ice_main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
index 168a41ea37b8..420558d1cd21 100644
@@ -5474,14 +5474,15 @@ static int ice_set_mac_address(struct net_device
 *netdev, void *pi)
 
 	/* Add filter for new MAC. If filter exists, return success */
 	err = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);
-	if (err == -EEXIST)
+	if (err == -EEXIST) {
 		/* Although this MAC filter is already present in hardware it's

drivers/net/ethernet/intel/ice/ice_main.c static int ice_set_mac_address(struct net_device · line 5488

Quoted 10 lines
drivers/net/ethernet/intel/ice/ice_main.c +2 -1
 		 * possible in some cases (e.g. bonding) that dev_addr was
 		 * modified outside of the driver and needs to be restored back
 		 * to this value.
 		 */
 		netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);
-	else if (err)
+		err = 0;
+	} else if (err)
 		/* error if the new filter addition failed */
 		err = -EADDRNOTAVAIL;

Style wise, don't we typically use {} for all branches if its needed on one?

I'm ok takin this fix as-is now and doing the {} fix up afterwards if we want to avoid delay.

Thanks,
Jake

Quoted 2 lines

--
2.34.1

#2 lore raw
Quoted 14 lines · Jacob E
Quoted 14 lines

-----Original Message-----
From: Ivan Vecera <[email protected]>
Sent: Wednesday, March 23, 2022 6:58 AM
To: netdev at vger.kernel.org
Cc: poros at redhat.com; mschmidt at redhat.com; Brandeburg, Jesse <[email protected]>; Nguyen, Anthony L <[email protected]>; David S. Miller <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; moderated list:INTEL ETHERNET DRIVERS <[email protected]>; open list <linux- kernel at vger.kernel.org>
Subject: [PATCH net] ice: Fix MAC address setting

Quoted 6 lines
Quoted 6 lines

Commit 2ccc1c1ccc671b ("ice: Remove excess error variables") merged the usage of 'status' and 'err' variables into single one in function ice_set_mac_address(). Unfortunately this causes a regression when call of ice_fltr_add_mac() returns -EEXIST because this return value does not indicate an error in this case but value of 'err' value remains to be -EEXIST till the end of

s/'err' value/'err'

Quoted 3 lines
Quoted 3 lines

the function and is returned to caller.

Prior this commit this does not happen because return value of

s/this/mentioned ?

Quoted 5 lines
Quoted 5 lines

ice_fltr_add_mac() was stored to 'status' variable first and if it was -EEXIST then 'err' remains to be zero.

The patch fixes the problem by reset 'err' to zero when ice_fltr_add_mac() returns -EEXIST.

Again, i'd recommend imperative mood. Besides, good catch!

Quoted 25 lines
Quoted 25 lines
Fixes 2ccc1c1ccc671b ("ice: Remove excess error variables")
---
 drivers/net/ethernet/intel/ice/ice_main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
index 168a41ea37b8..420558d1cd21 100644
@@ -5474,14 +5474,15 @@ static int ice_set_mac_address(struct net_device
 *netdev, void *pi)
 
 	/* Add filter for new MAC. If filter exists, return success */
 	err = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);
-	if (err == -EEXIST)
+	if (err == -EEXIST) {
 		/* Although this MAC filter is already present in hardware it's
 		 * possible in some cases (e.g. bonding) that dev_addr was
 		 * modified outside of the driver and needs to be restored back
 		 * to this value.
 		 */
 		netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);
Quoted 8 lines

drivers/net/ethernet/intel/ice/ice_main.c static int ice_set_mac_address(struct net_device *netdev, void *pi) · line 5487

Quoted 6 lines
drivers/net/ethernet/intel/ice/ice_main.c +2 -1
-	else if (err)
+		err = 0;
+	} else if (err)
 		/* error if the new filter addition failed */
 		err = -EADDRNOTAVAIL;

Style wise, don't we typically use {} for all branches if its needed on one?

+1, please add braces around second branch as well.

Quoted 9 lines

I'm ok takin this fix as-is now and doing the {} fix up afterwards if we want to avoid delay.

Thanks,
Jake

Quoted 2 lines

--
2.34.1

#3 lore raw

PATCH 1/1 ice: Fix MAC address setting

Quoted 72 lines · On Thu, 24 Mar 2022 12:25:58 +0100 Maciej Fijalkowski…
Quoted 14 lines · Jacob E
Quoted 14 lines

-----Original Message-----
From: Ivan Vecera <[email protected]>
Sent: Wednesday, March 23, 2022 6:58 AM
To: netdev at vger.kernel.org
Cc: poros at redhat.com; mschmidt at redhat.com; Brandeburg, Jesse <[email protected]>; Nguyen, Anthony L <[email protected]>; David S. Miller <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; moderated list:INTEL ETHERNET DRIVERS <[email protected]>; open list <linux- kernel at vger.kernel.org>
Subject: [PATCH net] ice: Fix MAC address setting

Quoted 6 lines
Quoted 6 lines

Commit 2ccc1c1ccc671b ("ice: Remove excess error variables") merged the usage of 'status' and 'err' variables into single one in function ice_set_mac_address(). Unfortunately this causes a regression when call of ice_fltr_add_mac() returns -EEXIST because this return value does not indicate an error in this case but value of 'err' value remains to be -EEXIST till the end of

s/'err' value/'err'

Quoted 3 lines
Quoted 3 lines

the function and is returned to caller.

Prior this commit this does not happen because return value of

s/this/mentioned ?

Quoted 5 lines
Quoted 5 lines

ice_fltr_add_mac() was stored to 'status' variable first and if it was -EEXIST then 'err' remains to be zero.

The patch fixes the problem by reset 'err' to zero when ice_fltr_add_mac() returns -EEXIST.

Again, i'd recommend imperative mood. Besides, good catch!

Quoted 25 lines
Quoted 25 lines
Fixes 2ccc1c1ccc671b ("ice: Remove excess error variables")
---
 drivers/net/ethernet/intel/ice/ice_main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
index 168a41ea37b8..420558d1cd21 100644
@@ -5474,14 +5474,15 @@ static int ice_set_mac_address(struct net_device
 *netdev, void *pi)
 
 	/* Add filter for new MAC. If filter exists, return success */
 	err = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);
-	if (err == -EEXIST)
+	if (err == -EEXIST) {
 		/* Although this MAC filter is already present in hardware it's
 		 * possible in some cases (e.g. bonding) that dev_addr was
 		 * modified outside of the driver and needs to be restored back
 		 * to this value.
 		 */
 		netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);
Quoted 8 lines

drivers/net/ethernet/intel/ice/ice_main.c static int ice_set_mac_address(struct net_device *netdev, void *pi) · line 5487

Quoted 6 lines
drivers/net/ethernet/intel/ice/ice_main.c +2 -1
-	else if (err)
+		err = 0;
+	} else if (err)
 		/* error if the new filter addition failed */
 		err = -EADDRNOTAVAIL;

Style wise, don't we typically use {} for all branches if its needed on one?

Quoted 12 lines

+1, please add braces around second branch as well.

Quoted 9 lines

I'm ok takin this fix as-is now and doing the {} fix up afterwards if we want to avoid delay.

Thanks,
Jake

Quoted 2 lines

--
2.34.1

Will fix by v2

Ivan

#4 lore raw
In reply to Ivan Vecera
Quoted 29 lines · Ivan Vecera

Commit 2ccc1c1ccc671b ("ice: Remove excess error variables") merged the usage of 'status' and 'err' variables into single one in function ice_set_mac_address(). Unfortunately this causes a regression when call of ice_fltr_add_mac() returns -EEXIST because this return value does not indicate an error in this case but value of 'err' value remains to be -EEXIST till the end of the function and is returned to caller.

Prior this commit this does not happen because return value of ice_fltr_add_mac() was stored to 'status' variable first and if it was -EEXIST then 'err' remains to be zero.

The patch fixes the problem by reset 'err' to zero when ice_fltr_add_mac() returns -EEXIST.

Fixes 2ccc1c1ccc671b ("ice: Remove excess error variables")
---
 drivers/net/ethernet/intel/ice/ice_main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
index 168a41ea37b8..420558d1cd21 100644
@@ -5474,14 +5474,15 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)
 
 	/* Add filter for new MAC. If filter exists, return success */
 	err = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);

drivers/net/ethernet/intel/ice/ice_main.c static int ice_set_mac_address(struct net_device *netdev, void *pi) · line 5484

Quoted 10 lines
drivers/net/ethernet/intel/ice/ice_main.c +2 -2
-	if (err == -EEXIST)
+	if (err == -EEXIST) {
 		/* Although this MAC filter is already present in hardware it's
 		 * possible in some cases (e.g. bonding) that dev_addr was
 		 * modified outside of the driver and needs to be restored back
 		 * to this value.
 		 */
 		netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);
-	else if (err)
+		err = 0;

Thanks Ivan, This looks fine. It is a regression as I checked since driver used to return success in such case. It seems that the only way to have EEXIST here is when the same MAC is requested, I'd also consider just return 0 here to skip later firwmare write which seems redundant here.

Piotr

Quoted 7 lines
drivers/net/ethernet/intel/ice/ice_main.c +1 -0
+	} else if (err)
 		/* error if the new filter addition failed */
 		err = -EADDRNOTAVAIL;
 
Signature · 1 line
2.34.1
#5 lore raw

PATCH 1/1 ice: Fix MAC address setting

Quoted 38 lines · On Wed, 23 Mar 2022 20:10:10 +0100 Piotr Raczynski <[email protected]>…
Quoted 37 lines · Ivan Vecera

Commit 2ccc1c1ccc671b ("ice: Remove excess error variables") merged the usage of 'status' and 'err' variables into single one in function ice_set_mac_address(). Unfortunately this causes a regression when call of ice_fltr_add_mac() returns -EEXIST because this return value does not indicate an error in this case but value of 'err' value remains to be -EEXIST till the end of the function and is returned to caller.

Prior this commit this does not happen because return value of ice_fltr_add_mac() was stored to 'status' variable first and if it was -EEXIST then 'err' remains to be zero.

The patch fixes the problem by reset 'err' to zero when ice_fltr_add_mac() returns -EEXIST.

Fixes 2ccc1c1ccc671b ("ice: Remove excess error variables")
---
 drivers/net/ethernet/intel/ice/ice_main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
index 168a41ea37b8..420558d1cd21 100644
@@ -5474,14 +5474,15 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)
 
 	/* Add filter for new MAC. If filter exists, return success */
 	err = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);
-	if (err == -EEXIST)
+	if (err == -EEXIST) {
 		/* Although this MAC filter is already present in hardware it's
 		 * possible in some cases (e.g. bonding) that dev_addr was
 		 * modified outside of the driver and needs to be restored back
 		 * to this value.
 		 */
 		netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);
Quoted 8 lines

drivers/net/ethernet/intel/ice/ice_main.c static int ice_set_mac_address(struct net_device *netdev, void *pi) · line 5484

Quoted 2 lines
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
-	else if (err)
+		err = 0;  

Thanks Ivan, This looks fine. It is a regression as I checked since driver used to return success in such case. It seems that the only way to have EEXIST here is when the same MAC is requested, I'd also consider just return 0 here to skip later firwmare write which seems redundant here.

Yes, firmware write looks for me also redundant but to be I wanted to restore only the previous behavior broken by mentioned commit.

Thanks,
Ivan