[Intel-wired-lan] [PATCH AUTOSEL 6.1 194/212] ice: count combined queues using Rx/Tx count

[Loktionov, Aleksandr]

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces at osuosl.org> On Behalf Of
> Sasha Levin
> Sent: Tuesday, May 6, 2025 1:06 AM
> To: linux-kernel at vger.kernel.org; stable at vger.kernel.org
> Cc: Michal Swiatkowski <michal.swiatkowski at linux.intel.com>; Keller, Jacob E
> <jacob.e.keller at intel.com>; Pucha Himasekhar Reddy
> <himasekharx.reddy.pucha at intel.com>; Nguyen, Anthony L
> <anthony.l.nguyen at intel.com>; Sasha Levin <sashal at kernel.org>; Kitszel,
> Przemyslaw <przemyslaw.kitszel at intel.com>; andrew+netdev at lunn.ch;
> davem at davemloft.net; edumazet at google.com; kuba at kernel.org;
> pabeni at redhat.com; intel-wired-lan at lists.osuosl.org;
> netdev at vger.kernel.org
> Subject: [Intel-wired-lan] [PATCH AUTOSEL 6.1 194/212] ice: count combined
> queues using Rx/Tx count
> 
> From: Michal Swiatkowski <michal.swiatkowski at linux.intel.com>
> 
> [ Upstream commit c3a392bdd31adc474f1009ee85c13fdd01fe800d ]
> 
> Previous implementation assumes that there is 1:1 matching between vectors
> and queues. It isn't always true.
> 
> Get minimum value from Rx/Tx queues to determine combined queues
> number.
> 
> Reviewed-by: Jacob Keller <jacob.e.keller at intel.com>
> Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha at intel.com>
> Signed-off-by: Michal Swiatkowski <michal.swiatkowski at linux.intel.com>
> Signed-off-by: Tony Nguyen <anthony.l.nguyen at intel.com>
> Signed-off-by: Sasha Levin <sashal at kernel.org>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov at intel.com>

> ---
>  drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> index a163e7717a534..1f62d11831567 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> @@ -3373,8 +3373,7 @@ static u32 ice_get_combined_cnt(struct ice_vsi
> *vsi)
>  	ice_for_each_q_vector(vsi, q_idx) {
>  		struct ice_q_vector *q_vector = vsi->q_vectors[q_idx];
> 
> -		if (q_vector->rx.rx_ring && q_vector->tx.tx_ring)
> -			combined++;
> +		combined += min(q_vector->num_ring_tx, q_vector-
> >num_ring_rx);
>  	}
> 
>  	return combined;
> --
> 2.39.5