ice: Rebuild TC queues on VSI queue reconfiguration

TC queues needs to be correctly updated when the number of queues on
a VSI is reconfigured, so netdev's queue and TC settings will be
dynamically adjusted and could accurately represent the underlying
hardware state after changes to the VSI queue counts.

Fixes: 0754d65bd4be ("ice: Add infrastructure for mqprio support via ndo_setup_tc")
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Jan Sokolowski <jan.sokolowski@intel.com>
Signed-off-by: Karen Ostrowska <karen.ostrowska@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 1766230abfff6503717584aee65e0f3d80510986..55a42aad92a51ad21cce6ecaa5a3177c76777136 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -4139,7 +4139,7 @@ bool ice_is_wol_supported(struct ice_hw *hw)
 int ice_vsi_recfg_qs(struct ice_vsi *vsi, int new_rx, int new_tx, bool locked)
 {
        struct ice_pf *pf = vsi->back;
-       int err = 0, timeout = 50;
+       int i, err = 0, timeout = 50;
 
        if (!new_rx && !new_tx)
                return -EINVAL;
@@ -4165,6 +4165,14 @@ int ice_vsi_recfg_qs(struct ice_vsi *vsi, int new_rx, int new_tx, bool locked)
 
        ice_vsi_close(vsi);
        ice_vsi_rebuild(vsi, ICE_VSI_FLAG_NO_INIT);
+
+       ice_for_each_traffic_class(i) {
+               if (vsi->tc_cfg.ena_tc & BIT(i))
+                       netdev_set_tc_queue(vsi->netdev,
+                                           vsi->tc_cfg.tc_info[i].netdev_tc,
+                                           vsi->tc_cfg.tc_info[i].qcount_tx,
+                                           vsi->tc_cfg.tc_info[i].qoffset);
+       }
        ice_pf_dcb_recfg(pf, locked);
        ice_vsi_open(vsi);
 done: