linux-kernel - RE: [Intel-wired-lan] [PATCH net-next 8/8] fm10k: extract GRXRINGS from .get

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <IA3PR11MB89869BA2186EBF7726E6DC14E5D1A@IA3PR11MB8986.namprd11.prod.outlook.com>
Date: Tue, 25 Nov 2025 06:49:07 +0000
From: "Loktionov, Aleksandr" <aleksandr.loktionov@...el.com>
To: Breno Leitao <leitao@...ian.org>, "Lobakin, Aleksander"
	<aleksander.lobakin@...el.com>, "Nguyen, Anthony L"
	<anthony.l.nguyen@...el.com>, "Kitszel, Przemyslaw"
	<przemyslaw.kitszel@...el.com>, Andrew Lunn <andrew+netdev@...n.ch>, "David
 S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, "Jakub
 Kicinski" <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>
CC: "michal.swiatkowski@...ux.intel.com" <michal.swiatkowski@...ux.intel.com>,
	"michal.kubiak@...el.com" <michal.kubiak@...el.com>, "Fijalkowski, Maciej"
	<maciej.fijalkowski@...el.com>, "intel-wired-lan@...ts.osuosl.org"
	<intel-wired-lan@...ts.osuosl.org>, "netdev@...r.kernel.org"
	<netdev@...r.kernel.org>, "linux-kernel@...r.kernel.org"
	<linux-kernel@...r.kernel.org>, "kernel-team@...a.com" <kernel-team@...a.com>
Subject: RE: [Intel-wired-lan] [PATCH net-next 8/8] fm10k: extract GRXRINGS
 from .get_rxnfc



> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@...osl.org> On Behalf
> Of Breno Leitao
> Sent: Monday, November 24, 2025 7:19 PM
> To: Lobakin, Aleksander <aleksander.lobakin@...el.com>; Nguyen,
> Anthony L <anthony.l.nguyen@...el.com>; Kitszel, Przemyslaw
> <przemyslaw.kitszel@...el.com>; Andrew Lunn <andrew+netdev@...n.ch>;
> David S. Miller <davem@...emloft.net>; Eric Dumazet
> <edumazet@...gle.com>; Jakub Kicinski <kuba@...nel.org>; Paolo Abeni
> <pabeni@...hat.com>
> Cc: michal.swiatkowski@...ux.intel.com; michal.kubiak@...el.com;
> Fijalkowski, Maciej <maciej.fijalkowski@...el.com>; intel-wired-
> lan@...ts.osuosl.org; netdev@...r.kernel.org; linux-
> kernel@...r.kernel.org; kernel-team@...a.com; Breno Leitao
> <leitao@...ian.org>
> Subject: [Intel-wired-lan] [PATCH net-next 8/8] fm10k: extract
> GRXRINGS from .get_rxnfc
> 
> Commit 84eaf4359c36 ("net: ethtool: add get_rx_ring_count callback to
> optimize RX ring queries") added specific support for GRXRINGS
> callback, simplifying .get_rxnfc.
> 
> Remove the handling of GRXRINGS in .get_rxnfc() by moving it to the
> new .get_rx_ring_count().
> 
> This simplifies the RX ring count retrieval and aligns fm10k with the
> new ethtool API for querying RX ring parameters.
> 
> Signed-off-by: Breno Leitao <leitao@...ian.org>
> ---
>  drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 17 +++------------
> --
>  1 file changed, 3 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
> b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
> index bf2029144c1d..76e42abca965 100644
> --- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
> +++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
> @@ -734,22 +734,11 @@ static int fm10k_get_rssh_fields(struct
> net_device *dev,
>  	return 0;
>  }
> 
> -static int fm10k_get_rxnfc(struct net_device *dev, struct
> ethtool_rxnfc *cmd,
> -			   u32 __always_unused *rule_locs)
> +static u32 fm10k_get_rx_ring_count(struct net_device *dev)
>  {
>  	struct fm10k_intfc *interface = netdev_priv(dev);
> -	int ret = -EOPNOTSUPP;
> 
> -	switch (cmd->cmd) {
> -	case ETHTOOL_GRXRINGS:
> -		cmd->data = interface->num_rx_queues;
> -		ret = 0;
> -		break;
> -	default:
> -		break;
> -	}
> -
> -	return ret;
> +	return interface->num_rx_queues;
>  }
> 
>  static int fm10k_set_rssh_fields(struct net_device *dev, @@ -1160,7
> +1149,7 @@ static const struct ethtool_ops fm10k_ethtool_ops = {
>  	.set_ringparam		= fm10k_set_ringparam,
>  	.get_coalesce		= fm10k_get_coalesce,
>  	.set_coalesce		= fm10k_set_coalesce,
> -	.get_rxnfc		= fm10k_get_rxnfc,
> +	.get_rx_ring_count	= fm10k_get_rx_ring_count,
>  	.get_regs               = fm10k_get_regs,
>  	.get_regs_len           = fm10k_get_regs_len,
>  	.self_test		= fm10k_self_test,
> 
> --
> 2.47.3

Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@...el.com>