ice: Fix and refactor Rx queue disable for VFs

Currently when a VF driver sends the PF a request to disable Rx queues
we will disable them one at a time, even if the VF driver sent us a
batch of queues to disable. This is causing issues where the Rx queue
disable times out with LFC enabled. This can be improved by detecting
when the VF is trying to disable all of its queues.

Also remove the variable num_qs_ena from the ice_vf structure as it was
only used to see if there were no Rx and no Tx queues active. Instead
add a function that checks if both the vf->rxq_ena and vf->txq_ena
bitmaps are empty.

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
index 53a9e09..7c8ec4f 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -91,6 +91,19 @@ ice_set_pfe_link(struct ice_vf *vf, struct virtchnl_pf_event *pfe,
 }
 
 /**
+ * ice_vf_has_no_qs_ena - check if the VF has any Rx or Tx queues enabled
+ * @vf: the VF to check
+ *
+ * Returns true if the VF has no Rx and no Tx queues enabled and returns false
+ * otherwise
+ */
+static bool ice_vf_has_no_qs_ena(struct ice_vf *vf)
+{
+       return (!bitmap_weight(vf->rxq_ena, ICE_MAX_BASE_QS_PER_VF) &&
+               !bitmap_weight(vf->txq_ena, ICE_MAX_BASE_QS_PER_VF));
+}
+
+/**
  * ice_is_vf_link_up - check if the VF's link is up
  * @vf: VF to check if link is up
  */
@@ -101,7 +114,7 @@ static bool ice_is_vf_link_up(struct ice_vf *vf)
        if (ice_check_vf_init(pf, vf))
                return false;
 
-       if (!vf->num_qs_ena)
+       if (ice_vf_has_no_qs_ena(vf))
                return false;
        else if (vf->link_forced)
                return vf->link_up;
@@ -255,7 +268,6 @@ void ice_set_vf_state_qs_dis(struct ice_vf *vf)
        /* Clear Rx/Tx enabled queues flag */
        bitmap_zero(vf->txq_ena, ICE_MAX_BASE_QS_PER_VF);
        bitmap_zero(vf->rxq_ena, ICE_MAX_BASE_QS_PER_VF);
-       vf->num_qs_ena = 0;
        clear_bit(ICE_VF_STATE_QS_ENA, vf->vf_states);
 }
 
@@ -2125,7 +2137,6 @@ static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)
                }
 
                set_bit(vf_q_id, vf->rxq_ena);
-               vf->num_qs_ena++;
        }
 
        vsi = pf->vsi[vf->lan_vsi_idx];
@@ -2141,7 +2152,6 @@ static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)
                        continue;
 
                set_bit(vf_q_id, vf->txq_ena);
-               vf->num_qs_ena++;
        }
 
        /* Set flag to indicate that queues are enabled */
@@ -2228,13 +2238,22 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)
 
                        /* Clear enabled queues flag */
                        clear_bit(vf_q_id, vf->txq_ena);
-                       vf->num_qs_ena--;
                }
        }
 
-       if (vqs->rx_queues) {
-               q_map = vqs->rx_queues;
+       q_map = vqs->rx_queues;
+       /* speed up Rx queue disable by batching them if possible */
+       if (q_map &&
+           bitmap_equal(&q_map, vf->rxq_ena, ICE_MAX_BASE_QS_PER_VF)) {
+               if (ice_vsi_stop_all_rx_rings(vsi)) {
+                       dev_err(ice_pf_to_dev(vsi->back), "Failed to stop all Rx rings on VSI %d\n",
+                               vsi->vsi_num);
+                       v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+                       goto error_param;
+               }
 
+               bitmap_zero(vf->rxq_ena, ICE_MAX_BASE_QS_PER_VF);
+       } else if (q_map) {
                for_each_set_bit(vf_q_id, &q_map, ICE_MAX_BASE_QS_PER_VF) {
                        if (!ice_vc_isvalid_q_id(vf, vqs->vsi_id, vf_q_id)) {
                                v_ret = VIRTCHNL_STATUS_ERR_PARAM;
@@ -2255,12 +2274,11 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)
 
                        /* Clear enabled queues flag */
                        clear_bit(vf_q_id, vf->rxq_ena);
-                       vf->num_qs_ena--;
                }
        }
 
        /* Clear enabled queues flag */
-       if (v_ret == VIRTCHNL_STATUS_SUCCESS && !vf->num_qs_ena)
+       if (v_ret == VIRTCHNL_STATUS_SUCCESS && ice_vf_has_no_qs_ena(vf))
                clear_bit(ICE_VF_STATE_QS_ENA, vf->vf_states);
 
 error_param:

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
index c65269c..474b261 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
@@ -90,7 +90,6 @@ struct ice_vf {
        u8 num_req_qs;                  /* num of queue pairs requested by VF */
        u16 num_mac;
        u16 num_vf_qs;                  /* num of queue configured per VF */
-       u16 num_qs_ena;                 /* total num of Tx/Rx queue enabled */
 };
 
 #ifdef CONFIG_PCI_IOV