From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90F5C3CB57D for ; Tue, 4 Aug 2026 22:22:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785882145; cv=none; b=tLRP1AC+cUUbGGZHHpTUaNZIW1AMU8LUoRnhaje+8jrgpFU8KPNwGav0VbsONkwku9gqtNfAo/pgghlbEYbSHOBUHrgpA/dhu0ZMucqTqy+HnVw8x3J0br9LiU39u9FnG2PokGnBCGgvk2EcvoTHp5Uo0o8aEHHFkX9PP9uJYb4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785882145; c=relaxed/simple; bh=eVZTCbigDZuKaUiYWXxaL7HOBa7MnP+6I/X1G4e3sSo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L3Od+3NuOENDIBjtCTsSUqQL0R17S4xDfFvtzBKEh4QxalePm/ym7/KVH8PiZujBiNdP7mmf4UNfRBKrlQGOXSZfT67ot26HudojMpuJ2ubv7QwpVvn2QpUQyNcqLLdBzAGz6TS6I2ECNKhPTa6db4ZotmzRcbOL7KIYOej1j/E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=L6vVvSpM; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="L6vVvSpM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1785882141; x=1817418141; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eVZTCbigDZuKaUiYWXxaL7HOBa7MnP+6I/X1G4e3sSo=; b=L6vVvSpMNH95FYYLqeWiP6kXt8meU1BlOsmnYXolPtEZmNGJQ4E7bmv2 6PaAWSIuOCdPLnJfBm1G5ugHxHa8H1791rcJPRf8AL+ahyBZYaZDVYI0v fdIeRpw3xWHaG5FYtz/QrSxcfg6kIrUYSLcx0ZEUHqnYqo7oW9f6se7cz IU58JeY6hWjIkiaKJ8mdHzw8NiJX67GLeyfRepPHr1vGHtjsYT43VAG4F Oibjx9LCx5Hy3K1c//vRg0OmrVKy6lEl7c2Rr/GPRprEulf0oXadjrmtg nOO0lAJro/YWCjrhMh+uQZ41Re3d1xX5hMOVLDaeY4xkAOT8wDaimNXoi A==; X-CSE-ConnectionGUID: bu+76W+ERqa29qTrnYB30g== X-CSE-MsgGUID: Qx8KMOBTTtOf2lswl21hgw== X-IronPort-AV: E=McAfee;i="6800,10657,11865"; a="96803432" X-IronPort-AV: E=Sophos;i="6.25,205,1779174000"; d="scan'208";a="96803432" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2026 15:22:19 -0700 X-CSE-ConnectionGUID: wJDKqEr5RHetZR8qCpDOqg== X-CSE-MsgGUID: vMvCCZLKTS+e1a3MMVQspg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,205,1779174000"; d="scan'208";a="257307981" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by fmviesa006.fm.intel.com with ESMTP; 04 Aug 2026 15:22:19 -0700 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Przemek Kitszel , anthony.l.nguyen@intel.com, piotr.kwapulinski@intel.com, aleksandr.loktionov@intel.com, marcin.szycik@linux.intel.com, jedrzej.jagielski@intel.com, mschmidt@redhat.com, Simon Horman , Rafal Romanowski Subject: [PATCH net 05/10] ice: move ice_vsi_realloc_stat_arrays() up Date: Tue, 4 Aug 2026 15:21:58 -0700 Message-ID: <20260804222205.1580328-6-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260804222205.1580328-1-anthony.l.nguyen@intel.com> References: <20260804222205.1580328-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Przemek Kitszel Move ice_vsi_realloc_stat_arrays() up, to allow calling it from ice_vsi_cfg_def() by the next commit. Fix kdoc for touched code. One line break removed, "int i" scope minimized to the loop, no changes otherwise. Reviewed-by: Marcin Szycik Signed-off-by: Przemek Kitszel Reviewed-by: Aleksandr Loktionov Reviewed-by: Simon Horman Tested-by: Rafal Romanowski Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/ice/ice_lib.c | 119 +++++++++++------------ 1 file changed, 59 insertions(+), 60 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index 8cdc4fda89e9..e48ee5940f17 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -2303,6 +2303,65 @@ static int ice_vsi_cfg_tc_lan(struct ice_pf *pf, struct ice_vsi *vsi) return 0; } +/** + * ice_vsi_realloc_stat_arrays - Frees unused stat structures or alloc new ones + * @vsi: VSI pointer + * Return: 0 on success or -ENOMEM on allocation failure. + */ +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; + + vsi_stat = pf->vsi_stats[vsi->idx]; + + if (req_txq < prev_txq) { + for (int 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); + } + } + } + + tx_ring_stats = vsi_stat->tx_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 (int 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; +} + /** * ice_vsi_cfg_def - configure default VSI based on the type * @vsi: pointer to VSI @@ -3011,66 +3070,6 @@ ice_vsi_rebuild_set_coalesce(struct ice_vsi *vsi, } } -/** - * ice_vsi_realloc_stat_arrays - Frees unused stat structures or alloc new ones - * @vsi: VSI pointer - */ -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; - - vsi_stat = pf->vsi_stats[vsi->idx]; - - 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); - } - } - } - - tx_ring_stats = vsi_stat->tx_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; -} - /** * ice_vsi_rebuild - Rebuild VSI after reset * @vsi: VSI to be rebuild -- 2.47.1