ice: realloc VSI stats arrays

[ Upstream commit 5995ef88e3a8c2b014f51256a88be8e336532ce7 ]

Previously only case when queues amount is lower was covered. Implement
realloc for case when queues amount is higher than previous one. Use
krealloc() function and zero new allocated elements.

It has to be done before ice_vsi_def_cfg(), because stats element for
ring is set there.

Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Stable-dep-of: 1cb7fdb1dfde ("ice: fix memory corruption bug with suspend and rebuild")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 7f4bc110ead44f4be2d63c845ca4b232f39b5ef2..47298ab675a558fb6120e20b926801d5723a2979 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -3084,27 +3084,26 @@ ice_vsi_rebuild_set_coalesce(struct ice_vsi *vsi,
 }
 
 /**
- * ice_vsi_realloc_stat_arrays - Frees unused stat structures
+ * ice_vsi_realloc_stat_arrays - Frees unused stat structures or alloc new ones
  * @vsi: VSI pointer
- * @prev_txq: Number of Tx rings before ring reallocation
- * @prev_rxq: Number of Rx rings before ring reallocation
  */
-static void
-ice_vsi_realloc_stat_arrays(struct ice_vsi *vsi, int prev_txq, int prev_rxq)
+static int
+ice_vsi_realloc_stat_arrays(struct ice_vsi *vsi)
 {
+       u16 req_txq = vsi->req_txq ? vsi->req_txq : vsi->alloc_txq;
+       u16 req_rxq = vsi->req_rxq ? vsi->req_rxq : vsi->alloc_rxq;
+       struct ice_ring_stats **tx_ring_stats;
+       struct ice_ring_stats **rx_ring_stats;
        struct ice_vsi_stats *vsi_stat;
        struct ice_pf *pf = vsi->back;
+       u16 prev_txq = vsi->alloc_txq;
+       u16 prev_rxq = vsi->alloc_rxq;
        int i;
 
-       if (!prev_txq || !prev_rxq)
-               return;
-       if (vsi->type == ICE_VSI_CHNL)
-               return;
-
        vsi_stat = pf->vsi_stats[vsi->idx];
 
-       if (vsi->num_txq < prev_txq) {
-               for (i = vsi->num_txq; i < prev_txq; i++) {
+       if (req_txq < prev_txq) {
+               for (i = req_txq; i < prev_txq; i++) {
                        if (vsi_stat->tx_ring_stats[i]) {
                                kfree_rcu(vsi_stat->tx_ring_stats[i], rcu);
                                WRITE_ONCE(vsi_stat->tx_ring_stats[i], NULL);
@@ -3112,14 +3111,36 @@ ice_vsi_realloc_stat_arrays(struct ice_vsi *vsi, int prev_txq, int prev_rxq)
                }
        }
 
-       if (vsi->num_rxq < prev_rxq) {
-               for (i = vsi->num_rxq; i < prev_rxq; i++) {
+       tx_ring_stats = vsi_stat->rx_ring_stats;
+       vsi_stat->tx_ring_stats =
+               krealloc_array(vsi_stat->tx_ring_stats, req_txq,
+                              sizeof(*vsi_stat->tx_ring_stats),
+                              GFP_KERNEL | __GFP_ZERO);
+       if (!vsi_stat->tx_ring_stats) {
+               vsi_stat->tx_ring_stats = tx_ring_stats;
+               return -ENOMEM;
+       }
+
+       if (req_rxq < prev_rxq) {
+               for (i = req_rxq; i < prev_rxq; i++) {
                        if (vsi_stat->rx_ring_stats[i]) {
                                kfree_rcu(vsi_stat->rx_ring_stats[i], rcu);
                                WRITE_ONCE(vsi_stat->rx_ring_stats[i], NULL);
                        }
                }
        }
+
+       rx_ring_stats = vsi_stat->rx_ring_stats;
+       vsi_stat->rx_ring_stats =
+               krealloc_array(vsi_stat->rx_ring_stats, req_rxq,
+                              sizeof(*vsi_stat->rx_ring_stats),
+                              GFP_KERNEL | __GFP_ZERO);
+       if (!vsi_stat->rx_ring_stats) {
+               vsi_stat->rx_ring_stats = rx_ring_stats;
+               return -ENOMEM;
+       }
+
+       return 0;
 }
 
 /**
@@ -3136,9 +3157,9 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, u32 vsi_flags)
 {
        struct ice_vsi_cfg_params params = {};
        struct ice_coalesce_stored *coalesce;
-       int ret, prev_txq, prev_rxq;
        int prev_num_q_vectors = 0;
        struct ice_pf *pf;
+       int ret;
 
        if (!vsi)
                return -EINVAL;
@@ -3157,8 +3178,9 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, u32 vsi_flags)
 
        prev_num_q_vectors = ice_vsi_rebuild_get_coalesce(vsi, coalesce);
 
-       prev_txq = vsi->num_txq;
-       prev_rxq = vsi->num_rxq;
+       ret = ice_vsi_realloc_stat_arrays(vsi);
+       if (ret)
+               goto err_vsi_cfg;
 
        ice_vsi_decfg(vsi);
        ret = ice_vsi_cfg_def(vsi, &params);
@@ -3176,8 +3198,6 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, u32 vsi_flags)
                return ice_schedule_reset(pf, ICE_RESET_PFR);
        }
 
-       ice_vsi_realloc_stat_arrays(vsi, prev_txq, prev_rxq);
-
        ice_vsi_rebuild_set_coalesce(vsi, coalesce, prev_num_q_vectors);
        kfree(coalesce);