i40e: retry VFLR handling if there is ongoing VF reset

[ Upstream commit fb4e9239e029954a37a00818b21e837cebf2aa10 ]

When a VFLR interrupt is received during a VF reset initiated from a
different source, the VFLR may be not fully handled. This can
leave the VF in an undefined state.
To address this, set the I40E_VFLR_EVENT_PENDING bit again during VFLR
handling if the reset is not yet complete. This ensures the driver
will properly complete the VF reset in such scenarios.

Fixes: 52424f974bc5 ("i40e: Fix VF hang when reset is triggered on another VF")
Signed-off-by: Robert Malz <robert.malz@canonical.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 68e39a38e7588447e146363371dd16b50fc0c9c0..852ece241a2780ff05eac82e250f0d8fc4f93467 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -4170,7 +4170,10 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf)
                reg = rd32(hw, I40E_GLGEN_VFLRSTAT(reg_idx));
                if (reg & BIT(bit_idx))
                        /* i40e_reset_vf will clear the bit in GLGEN_VFLRSTAT */
-                       i40e_reset_vf(vf, true);
+                       if (!i40e_reset_vf(vf, true)) {
+                               /* At least one VF did not finish resetting, retry next time */
+                               set_bit(__I40E_VFLR_EVENT_PENDING, pf->state);
+                       }
        }
 
        return 0;