Skip to contentSkip to conversation

i40e: always propagate error value in i40e_set_vsi_promisc()

PATCH In review Stefan Assmann 2 participants 2 messages Aug 20, 2020 – Sep 4, 2020

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

PATCH 1/1 i40e: always propagate error value in i40e_set_vsi_promisc()

The for loop in i40e_set_vsi_promisc() reports errors via dev_err() but does not propage the error up the call chain. Instead it continues the loop and potentially overwrites the reported error value. This results in the error being recorded in the log buffer, but the caller might never know anything went the wrong way.

To avoid this situation i40e_set_vsi_promisc() needs to temporary store the error after reporting it. This is still not optimal as multiple different errors may occur, so store the first error and hope that's the main issue.

Fixes 37d318d7805f (i40e: Remove scheduling while atomic possibility)
---
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +11 -1
index 8e133d6545bd..526ce89b0ba5 100644
@@ -1173,7 +1173,7 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
 {
 	struct i40e_pf *pf = vf->pf;
 	struct i40e_hw *hw = &pf->hw;
-	i40e_status aq_ret;
+	i40e_status aq_ret, aq_tmp = 0;
 	int i;
 
 	/* No VLAN to set promisc on, set on VSI */
@@ -1222,6 +1222,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
 				vf->vf_id,
 				i40e_stat_str(&pf->hw, aq_ret),
 				i40e_aq_str(&pf->hw, aq_err));
+
+			if (!aq_tmp)
+				aq_tmp = aq_ret;
 		}
 
 		aq_ret = i40e_aq_set_vsi_uc_promisc_on_vlan(hw, seid,
@@ -1235,8 +1238,15 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
 				vf->vf_id,
 				i40e_stat_str(&pf->hw, aq_ret),
 				i40e_aq_str(&pf->hw, aq_err));
+
+			if (!aq_tmp)
+				aq_tmp = aq_ret;
 		}
 	}
+
+	if (aq_tmp)
+		aq_ret = aq_tmp;
+
 	return aq_ret;
 }
 
Signature · 1 line
2.26.2
Tested-by on v1 1/1
#1 lore raw
Quoted 21 lines

From: Intel-wired-lan <[email protected]> On Behalf Of Stefan Assmann
Sent: Thursday, August 20, 2020 4:53 AM
To: intel-wired-lan at lists.osuosl.org
Cc: netdev at vger.kernel.org; Loktionov, Aleksandr <[email protected]>; sassmann at kpanic.de; davem at davemloft.net
Subject: [Intel-wired-lan] [PATCH] i40e: always propagate error value in i40e_set_vsi_promisc()

The for loop in i40e_set_vsi_promisc() reports errors via dev_err() but does not propage the error up the call chain. Instead it continues the loop and potentially overwrites the reported error value. This results in the error being recorded in the log buffer, but the caller might never know anything went the wrong way.

To avoid this situation i40e_set_vsi_promisc() needs to temporary store the error after reporting it. This is still not optimal as multiple different errors may occur, so store the first error and hope that's the main issue.

Quoted 6 lines
Fixes 37d318d7805f (i40e: Remove scheduling while atomic possibility)
---
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

In the summary text:
%s/ propage/propagate/
%s/ temporary/temporarily/

I suspect Tony can fix that up before pushing. Aside from that,