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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <SJ0PR11MB586611FAF885ED575D41A90FE5892@SJ0PR11MB5866.namprd11.prod.outlook.com>
Date: Tue, 6 May 2025 09:26:39 +0000
From: "Loktionov, Aleksandr" <aleksandr.loktionov@...el.com>
To: Sasha Levin <sashal@...nel.org>, "linux-kernel@...r.kernel.org"
	<linux-kernel@...r.kernel.org>, "stable@...r.kernel.org"
	<stable@...r.kernel.org>
CC: Michal Swiatkowski <michal.swiatkowski@...ux.intel.com>, "Keller, Jacob E"
	<jacob.e.keller@...el.com>, Pucha Himasekhar Reddy
	<himasekharx.reddy.pucha@...el.com>, "Nguyen, Anthony L"
	<anthony.l.nguyen@...el.com>, "Kitszel, Przemyslaw"
	<przemyslaw.kitszel@...el.com>, "andrew+netdev@...n.ch"
	<andrew+netdev@...n.ch>, "davem@...emloft.net" <davem@...emloft.net>,
	"edumazet@...gle.com" <edumazet@...gle.com>, "kuba@...nel.org"
	<kuba@...nel.org>, "pabeni@...hat.com" <pabeni@...hat.com>,
	"intel-wired-lan@...ts.osuosl.org" <intel-wired-lan@...ts.osuosl.org>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: RE: [Intel-wired-lan] [PATCH AUTOSEL 6.1 194/212] ice: count combined
 queues using Rx/Tx count



> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@...osl.org> On Behalf Of
> Sasha Levin
> Sent: Tuesday, May 6, 2025 1:06 AM
> To: linux-kernel@...r.kernel.org; stable@...r.kernel.org
> Cc: Michal Swiatkowski <michal.swiatkowski@...ux.intel.com>; Keller, Jacob E
> <jacob.e.keller@...el.com>; Pucha Himasekhar Reddy
> <himasekharx.reddy.pucha@...el.com>; Nguyen, Anthony L
> <anthony.l.nguyen@...el.com>; Sasha Levin <sashal@...nel.org>; Kitszel,
> Przemyslaw <przemyslaw.kitszel@...el.com>; andrew+netdev@...n.ch;
> davem@...emloft.net; edumazet@...gle.com; kuba@...nel.org;
> pabeni@...hat.com; intel-wired-lan@...ts.osuosl.org;
> netdev@...r.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@...ux.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@...el.com>
> Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@...el.com>
> Signed-off-by: Michal Swiatkowski <michal.swiatkowski@...ux.intel.com>
> Signed-off-by: Tony Nguyen <anthony.l.nguyen@...el.com>
> Signed-off-by: Sasha Levin <sashal@...nel.org>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@...el.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