Skip to content

Commit

Permalink
ice: handle the VF VSI rebuild failure
Browse files Browse the repository at this point in the history
[ Upstream commit c7ee6ce ]

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 <haiyue.wang@intel.com>
Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
haiyuewa authored and gregkh committed Jun 10, 2021
1 parent a79883c commit 8726b9e
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
Expand Up @@ -1341,7 +1341,12 @@ bool ice_reset_vf(struct ice_vf *vf, bool is_vflr)
}

ice_vf_pre_vsi_rebuild(vf);
ice_vf_rebuild_vsi_with_release(vf);

if (ice_vf_rebuild_vsi_with_release(vf)) {
dev_err(dev, "Failed to release and setup the VF%u's VSI\n", vf->vf_id);
return false;
}

ice_vf_post_vsi_rebuild(vf);

return true;
Expand Down

0 comments on commit 8726b9e

Please sign in to comment.