Commit 873a1942 authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

idpf: extract GRXRINGS from .get_rxnfc 



Commit 84eaf435 ("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 idpf with the new
ethtool API for querying RX ring parameters.

I was not totally convinced I needed to have the lock, but, I decided to
be on the safe side and get the exact same behaviour it was before.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Signed-off-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Link: https://patch.msgid.link/20251125-gxring_intel-v2-4-f55cd022d28b@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8e8c00e1

drivers/net/ethernet/intel/idpf/idpf_ethtool.c

+20 −3
Original line number Diff line number Diff line
@@ -5,6 +5,25 @@ 
#include "idpf_ptp.h"

#include "idpf_virtchnl.h"



/**

 * idpf_get_rx_ring_count - get RX ring count

 * @netdev: network interface device structure

 *

 * Return: number of RX rings.

 */

static u32 idpf_get_rx_ring_count(struct net_device *netdev)

{

	struct idpf_vport *vport;

	u32 num_rxq;



	idpf_vport_ctrl_lock(netdev);

	vport = idpf_netdev_to_vport(netdev);

	num_rxq = vport->num_rxq;

	idpf_vport_ctrl_unlock(netdev);



	return num_rxq;

}



/**

 * idpf_get_rxnfc - command to get RX flow classification rules

 * @netdev: network interface device structure
@@ -28,9 +47,6 @@ static int idpf_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, 
	user_config = &np->adapter->vport_config[np->vport_idx]->user_config;



	switch (cmd->cmd) {

	case ETHTOOL_GRXRINGS:

		cmd->data = vport->num_rxq;

		break;

	case ETHTOOL_GRXCLSRLCNT:

		cmd->rule_cnt = user_config->num_fsteer_fltrs;

		cmd->data = idpf_fsteer_max_rules(vport);
@@ -1757,6 +1773,7 @@ static const struct ethtool_ops idpf_ethtool_ops = { 
	.get_channels		= idpf_get_channels,

	.get_rxnfc		= idpf_get_rxnfc,

	.set_rxnfc		= idpf_set_rxnfc,

	.get_rx_ring_count	= idpf_get_rx_ring_count,

	.get_rxfh_key_size	= idpf_get_rxfh_key_size,

	.get_rxfh_indir_size	= idpf_get_rxfh_indir_size,

	.get_rxfh		= idpf_get_rxfh,