admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

idpf: extract GRXRINGS from .get_rxnfc

Browse Source 
Commit 84eaf4359c ("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: Breno Leitao <leitao@debian.org>
Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Link: https://patch.msgid.link/20251125-gxring_intel-v2-4-f55cd022d28b@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Breno Leitao
2025-11-25 02:19:47 -08:00
committed by Jakub Kicinski
parent 8e8c00e1d2
commit 873a1942fb
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/ethernet/intel/idpf/idpf_ethtool.c
View File

@@ -5,6 +5,25 @@
#include "idpf_ptp.h" #include "idpf_ptp.h"
#include "idpf_virtchnl.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 * idpf_get_rxnfc - command to get RX flow classification rules
* @netdev: network interface device structure * @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; user_config = &np->adapter->vport_config[np->vport_idx]->user_config;
switch (cmd->cmd) { switch (cmd->cmd) {
case ETHTOOL_GRXRINGS:
cmd->data = vport->num_rxq;
break;
case ETHTOOL_GRXCLSRLCNT: case ETHTOOL_GRXCLSRLCNT:
cmd->rule_cnt = user_config->num_fsteer_fltrs; cmd->rule_cnt = user_config->num_fsteer_fltrs;
cmd->data = idpf_fsteer_max_rules(vport); 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_channels = idpf_get_channels,
.get_rxnfc = idpf_get_rxnfc, .get_rxnfc = idpf_get_rxnfc,
.set_rxnfc = idpf_set_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_key_size = idpf_get_rxfh_key_size,
.get_rxfh_indir_size = idpf_get_rxfh_indir_size, .get_rxfh_indir_size = idpf_get_rxfh_indir_size,
.get_rxfh = idpf_get_rxfh, .get_rxfh = idpf_get_rxfh,