> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On Behalf
> Of Jakub Kicinski
> Sent: Friday, June 13, 2025 3:01 AM
> To: [email protected]
> Cc: [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]; intel-wired-
> [email protected]; Nguyen, Anthony L <[email protected]>;
> Kitszel, Przemyslaw <[email protected]>; Keller, Jacob E
> <[email protected]>; [email protected]; Jakub
> Kicinski <[email protected]>
> Subject: [Intel-wired-lan] [PATCH net-next 5/7] eth: i40e: migrate to
> new RXFH callbacks
>
> Migrate to new callbacks added by commit 9bb00786fc61 ("net: ethtool:
> add dedicated callbacks for getting and setting rxfh fields").
>
> I'm deleting all the boilerplate kdoc from the affected functions.
> It is somewhere between pointless and incorrect, just a burden for
> people refactoring the code.
>
> Signed-off-by: Jakub Kicinski <[email protected]>
Reviewed-by: Aleksandr Loktionov <[email protected]>
> ---
> .../net/ethernet/intel/i40e/i40e_ethtool.c | 38 +++++++-----------
> -
> 1 file changed, 14 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> index c7f2d85eafcd..2ff17d50135c 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> @@ -3139,15 +3139,12 @@ static int i40e_set_per_queue_coalesce(struct
> net_device *netdev, u32 queue,
> return __i40e_set_coalesce(netdev, ec, queue); }
>
> -/**
> - * i40e_get_rss_hash_opts - Get RSS hash Input Set for each flow type
> - * @pf: pointer to the physical function struct
> - * @cmd: ethtool rxnfc command
> - *
> - * Returns Success if the flow is supported, else Invalid Input.
> - **/
> -static int i40e_get_rss_hash_opts(struct i40e_pf *pf, struct
> ethtool_rxnfc *cmd)
> +static int i40e_get_rxfh_fields(struct net_device *netdev,
> + struct ethtool_rxfh_fields *cmd)
> {
> + struct i40e_netdev_priv *np = netdev_priv(netdev);
> + struct i40e_vsi *vsi = np->vsi;
> + struct i40e_pf *pf = vsi->back;
> struct i40e_hw *hw = &pf->hw;
> u8 flow_pctype = 0;
> u64 i_set = 0;
> @@ -3545,9 +3542,6 @@ static int i40e_get_rxnfc(struct net_device
> *netdev, struct ethtool_rxnfc *cmd,
> cmd->data = vsi->rss_size;
> ret = 0;
> break;
> - case ETHTOOL_GRXFH:
> - ret = i40e_get_rss_hash_opts(pf, cmd);
> - break;
> case ETHTOOL_GRXCLSRLCNT:
> cmd->rule_cnt = pf->fdir_pf_active_filters;
> /* report total rule count */
> @@ -3576,7 +3570,7 @@ static int i40e_get_rxnfc(struct net_device
> *netdev, struct ethtool_rxnfc *cmd,
> * Returns value of bits to be set per user request
> **/
> static u64 i40e_get_rss_hash_bits(struct i40e_hw *hw,
> - struct ethtool_rxnfc *nfc,
> + const struct ethtool_rxfh_fields *nfc,
> u64 i_setc)
> {
> u64 i_set = i_setc;
> @@ -3621,15 +3615,13 @@ static u64 i40e_get_rss_hash_bits(struct
> i40e_hw *hw, }
>
> #define FLOW_PCTYPES_SIZE 64
> -/**
> - * i40e_set_rss_hash_opt - Enable/Disable flow types for RSS hash
> - * @pf: pointer to the physical function struct
> - * @nfc: ethtool rxnfc command
> - *
> - * Returns Success if the flow input set is supported.
> - **/
> -static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct
> ethtool_rxnfc *nfc)
> +static int i40e_set_rxfh_fields(struct net_device *netdev,
> + const struct ethtool_rxfh_fields *nfc,
> + struct netlink_ext_ack *extack)
> {
> + struct i40e_netdev_priv *np = netdev_priv(netdev);
> + struct i40e_vsi *vsi = np->vsi;
> + struct i40e_pf *pf = vsi->back;
> struct i40e_hw *hw = &pf->hw;
> u64 hena = (u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(0)) |
> ((u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(1)) << 32);
> @@ -4964,13 +4956,9 @@ static int i40e_set_rxnfc(struct net_device
> *netdev, struct ethtool_rxnfc *cmd) {
> struct i40e_netdev_priv *np = netdev_priv(netdev);
> struct i40e_vsi *vsi = np->vsi;
> - struct i40e_pf *pf = vsi->back;
> int ret = -EOPNOTSUPP;
>
> switch (cmd->cmd) {
> - case ETHTOOL_SRXFH:
> - ret = i40e_set_rss_hash_opt(pf, cmd);
> - break;
> case ETHTOOL_SRXCLSRLINS:
> ret = i40e_add_fdir_ethtool(vsi, cmd);
> break;
> @@ -5846,6 +5834,8 @@ static const struct ethtool_ops i40e_ethtool_ops
> = {
> .get_rxfh_indir_size = i40e_get_rxfh_indir_size,
> .get_rxfh = i40e_get_rxfh,
> .set_rxfh = i40e_set_rxfh,
> + .get_rxfh_fields = i40e_get_rxfh_fields,
> + .set_rxfh_fields = i40e_set_rxfh_fields,
> .get_channels = i40e_get_channels,
> .set_channels = i40e_set_channels,
> .get_module_info = i40e_get_module_info,
> --
> 2.49.0
