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 F1BF542669A for ; Wed, 1 Jul 2026 11:00:39 +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=1782903641; cv=none; b=JIwMqRs0j9ibXz2u1D0Hxkz5sjbxc1vUl9np9xgvGA3Bl9Kn1Iy4qvKcsTRSXzDXmGvy6zNr59Ugxo4JgTCpLlVlzUBX4pHr/ub57hw3ROZ8vGxRAjmpff0mh1UuvNogRqN5DNqs/xkS2oadxUdahH8U+P7JRftHkV5bAj5qdpI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782903641; c=relaxed/simple; bh=3pmEw2qPxSXg5uI9h9+5OcFv71SOdAdkty++WGYoVTM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=QxQPxrMYj6XIrm2z714vRScRY/pwAHgsj4jw5sBLY3Pv+ZcCiMZgasRlZZMJsvchL+0eGWuiaNrfN4Y8+IRiebsvCkqgO1DNrn+43Ik13Lkb4/GRGf0d0amumzWfiXUghHZEntJ89XvPcYQEDc0LMaJLatkDBk2wo5nutsXrLHk= 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=m600cZT7; 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="m600cZT7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1782903640; x=1814439640; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3pmEw2qPxSXg5uI9h9+5OcFv71SOdAdkty++WGYoVTM=; b=m600cZT72uqmhf+PkbLKaClPzCOqLGmn8wvMORC7Y007MQM0kIVkrTRN 6atsmAVF9BgAGPk3HAFLGL3Duj89F4GOdUZ1kcFTZMi9VuEiX3ILZklRP OQlnImUZuuqbApw9ejZSqk9ZZP9SVJuZHMVSPCaynhGlzirW+q7HoEuBw Z8ouDAai6nF89KMcqbCQxb/VV6q0wKT2NY36+19IaE8BeUd+y69BzkPYn +kmO0dvqVEYBTfcv87Y+JLQZiYqs73zADkJuqOWVwaq8a9X598rj6zGmE s2EORJGA8I+2iDlmbdYeLRXHThUMBvRZhYX+GT3CqJWJ+BchejZEvbB/k Q==; X-CSE-ConnectionGUID: kIEUQwD9TrWdPJqti+sQ7g== X-CSE-MsgGUID: 9thpOb1fRUKwUoodzy0esg== X-IronPort-AV: E=McAfee;i="6800,10657,11833"; a="93989144" X-IronPort-AV: E=Sophos;i="6.25,141,1779174000"; d="scan'208";a="93989144" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jul 2026 04:00:40 -0700 X-CSE-ConnectionGUID: zxnrgDauS7mrroVTFwgtIw== X-CSE-MsgGUID: 6k0WgOeET1asd0smPv5VwQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,141,1779174000"; d="scan'208";a="249887288" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by fmviesa008.fm.intel.com with ESMTP; 01 Jul 2026 04:00:36 -0700 Received: from vecna.igk.intel.com (vecna.igk.intel.com [10.123.220.17]) by irvmail002.ir.intel.com (Postfix) with ESMTP id DFB5828762; Wed, 1 Jul 2026 12:00:34 +0100 (IST) From: Przemek Kitszel To: intel-wired-lan@lists.osuosl.org, Michal Schmidt , Jakub Kicinski Cc: netdev@vger.kernel.org, Tony Nguyen , Aleksandr Loktionov , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Jedrzej Jagielski , Piotr Kwapulinski , Przemek Kitszel Subject: [PATCH iwl-net 1/2] ice: move ice_vsi_realloc_stat_arrays() up Date: Wed, 1 Jul 2026 12:41:02 +0200 Message-ID: <20260701104141.9740-1-przemyslaw.kitszel@intel.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Przemek Kitszel --- 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.54.0