Skip to content

Commit c7ee6ce

Browse files
Haiyue Wanganguy11
authored andcommitted
ice: handle the VF VSI rebuild failure
VSI rebuild can be failed for LAN queue config, then the VF's VSI will be NULL, the VF reset should be stopped with the VF entering into the disable state. Fixes: 12bb018 ("ice: Refactor VF reset") Signed-off-by: Haiyue Wang <[email protected]> Tested-by: Konrad Jankowski <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent 8679f07 commit c7ee6ce

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1700,7 +1700,12 @@ bool ice_reset_vf(struct ice_vf *vf, bool is_vflr)
17001700
ice_vf_ctrl_vsi_release(vf);
17011701

17021702
ice_vf_pre_vsi_rebuild(vf);
1703-
ice_vf_rebuild_vsi_with_release(vf);
1703+
1704+
if (ice_vf_rebuild_vsi_with_release(vf)) {
1705+
dev_err(dev, "Failed to release and setup the VF%u's VSI\n", vf->vf_id);
1706+
return false;
1707+
}
1708+
17041709
ice_vf_post_vsi_rebuild(vf);
17051710

17061711
/* if the VF has been reset allow it to come up again */

0 commit comments

Comments
 (0)