| 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
| ||
|
Message-ID: <IA3PR11MB8986F23095383D5802A34A88E577A@IA3PR11MB8986.namprd11.prod.outlook.com>
Date: Fri, 13 Jun 2025 07:50:09 +0000
From: "Loktionov, Aleksandr" <aleksandr.loktionov@...el.com>
To: Jakub Kicinski <kuba@...nel.org>, "davem@...emloft.net"
<davem@...emloft.net>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>, "edumazet@...gle.com"
<edumazet@...gle.com>, "pabeni@...hat.com" <pabeni@...hat.com>,
"andrew+netdev@...n.ch" <andrew+netdev@...n.ch>, "horms@...nel.org"
<horms@...nel.org>, "intel-wired-lan@...ts.osuosl.org"
<intel-wired-lan@...ts.osuosl.org>, "Nguyen, Anthony L"
<anthony.l.nguyen@...el.com>, "Kitszel, Przemyslaw"
<przemyslaw.kitszel@...el.com>, "Keller, Jacob E" <jacob.e.keller@...el.com>,
"michal.swiatkowski@...ux.intel.com" <michal.swiatkowski@...ux.intel.com>
Subject: RE: [Intel-wired-lan] [PATCH net-next 6/7] eth: ice: migrate to new
RXFH callbacks
> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@...osl.org> On Behalf
> Of Jakub Kicinski
> Sent: Friday, June 13, 2025 3:01 AM
> To: davem@...emloft.net
> Cc: netdev@...r.kernel.org; edumazet@...gle.com; pabeni@...hat.com;
> andrew+netdev@...n.ch; horms@...nel.org; intel-wired-
> lan@...ts.osuosl.org; Nguyen, Anthony L <anthony.l.nguyen@...el.com>;
> Kitszel, Przemyslaw <przemyslaw.kitszel@...el.com>; Keller, Jacob E
> <jacob.e.keller@...el.com>; michal.swiatkowski@...ux.intel.com; Jakub
> Kicinski <kuba@...nel.org>
> Subject: [Intel-wired-lan] [PATCH net-next 6/7] eth: ice: 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 <kuba@...nel.org>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@...el.com>
> ---
> drivers/net/ethernet/intel/ice/ice_ethtool.c | 59 ++++++-------------
> -
> 1 file changed, 18 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> index 5863a86482f5..ea7e8b879b48 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> @@ -2797,14 +2797,7 @@ ice_set_link_ksettings(struct net_device
> *netdev,
> return err;
> }
>
> -/**
> - * ice_parse_hdrs - parses headers from RSS hash input
> - * @nfc: ethtool rxnfc command
> - *
> - * This function parses the rxnfc command and returns intended
> - * header types for RSS configuration
> - */
> -static u32 ice_parse_hdrs(struct ethtool_rxnfc *nfc)
> +static u32 ice_parse_hdrs(const struct ethtool_rxfh_fields *nfc)
> {
> u32 hdrs = ICE_FLOW_SEG_HDR_NONE;
>
> @@ -2869,15 +2862,7 @@ static u32 ice_parse_hdrs(struct ethtool_rxnfc
> *nfc)
> return hdrs;
> }
>
> -/**
> - * ice_parse_hash_flds - parses hash fields from RSS hash input
> - * @nfc: ethtool rxnfc command
> - * @symm: true if Symmetric Topelitz is set
> - *
> - * This function parses the rxnfc command and returns intended
> - * hash fields for RSS configuration
> - */
> -static u64 ice_parse_hash_flds(struct ethtool_rxnfc *nfc, bool symm)
> +static u64 ice_parse_hash_flds(const struct ethtool_rxfh_fields *nfc,
> +bool symm)
> {
> u64 hfld = ICE_HASH_INVALID;
>
> @@ -2974,16 +2959,13 @@ static u64 ice_parse_hash_flds(struct
> ethtool_rxnfc *nfc, bool symm)
> return hfld;
> }
>
> -/**
> - * ice_set_rss_hash_opt - Enable/Disable flow types for RSS hash
> - * @vsi: the VSI being configured
> - * @nfc: ethtool rxnfc command
> - *
> - * Returns Success if the flow input set is supported.
> - */
> static int
> -ice_set_rss_hash_opt(struct ice_vsi *vsi, struct ethtool_rxnfc *nfc)
> +ice_set_rxfh_fields(struct net_device *netdev,
> + const struct ethtool_rxfh_fields *nfc,
> + struct netlink_ext_ack *extack)
> {
> + struct ice_netdev_priv *np = netdev_priv(netdev);
> + struct ice_vsi *vsi = np->vsi;
> struct ice_pf *pf = vsi->back;
> struct ice_rss_hash_cfg cfg;
> struct device *dev;
> @@ -3029,14 +3011,11 @@ ice_set_rss_hash_opt(struct ice_vsi *vsi,
> struct ethtool_rxnfc *nfc)
> return 0;
> }
>
> -/**
> - * ice_get_rss_hash_opt - Retrieve hash fields for a given flow-type
> - * @vsi: the VSI being configured
> - * @nfc: ethtool rxnfc command
> - */
> -static void
> -ice_get_rss_hash_opt(struct ice_vsi *vsi, struct ethtool_rxnfc *nfc)
> +static int
> +ice_get_rxfh_fields(struct net_device *netdev, struct
> +ethtool_rxfh_fields *nfc)
> {
> + struct ice_netdev_priv *np = netdev_priv(netdev);
> + struct ice_vsi *vsi = np->vsi;
> struct ice_pf *pf = vsi->back;
> struct device *dev;
> u64 hash_flds;
> @@ -3049,21 +3028,21 @@ ice_get_rss_hash_opt(struct ice_vsi *vsi,
> struct ethtool_rxnfc *nfc)
> if (ice_is_safe_mode(pf)) {
> dev_dbg(dev, "Advanced RSS disabled. Package download
> failed, vsi num = %d\n",
> vsi->vsi_num);
> - return;
> + return 0;
> }
>
> hdrs = ice_parse_hdrs(nfc);
> if (hdrs == ICE_FLOW_SEG_HDR_NONE) {
> dev_dbg(dev, "Header type is not valid, vsi num = %d\n",
> vsi->vsi_num);
> - return;
> + return 0;
> }
>
> hash_flds = ice_get_rss_cfg(&pf->hw, vsi->idx, hdrs, &symm);
> if (hash_flds == ICE_HASH_INVALID) {
> dev_dbg(dev, "No hash fields found for the given header
> type, vsi num = %d\n",
> vsi->vsi_num);
> - return;
> + return 0;
> }
>
> if (hash_flds & ICE_FLOW_HASH_FLD_IPV4_SA || @@ -3090,6 +3069,8
> @@ ice_get_rss_hash_opt(struct ice_vsi *vsi, struct ethtool_rxnfc
> *nfc)
> hash_flds & ICE_FLOW_HASH_FLD_GTPU_UP_TEID ||
> hash_flds & ICE_FLOW_HASH_FLD_GTPU_DWN_TEID)
> nfc->data |= (u64)RXH_GTP_TEID;
> +
> + return 0;
> }
>
> /**
> @@ -3109,8 +3090,6 @@ static int ice_set_rxnfc(struct net_device
> *netdev, struct ethtool_rxnfc *cmd)
> return ice_add_fdir_ethtool(vsi, cmd);
> case ETHTOOL_SRXCLSRLDEL:
> return ice_del_fdir_ethtool(vsi, cmd);
> - case ETHTOOL_SRXFH:
> - return ice_set_rss_hash_opt(vsi, cmd);
> default:
> break;
> }
> @@ -3153,10 +3132,6 @@ ice_get_rxnfc(struct net_device *netdev, struct
> ethtool_rxnfc *cmd,
> case ETHTOOL_GRXCLSRLALL:
> ret = ice_get_fdir_fltr_ids(hw, cmd, (u32 *)rule_locs);
> break;
> - case ETHTOOL_GRXFH:
> - ice_get_rss_hash_opt(vsi, cmd);
> - ret = 0;
> - break;
> default:
> break;
> }
> @@ -4816,6 +4791,8 @@ static const struct ethtool_ops ice_ethtool_ops
> = {
> .get_rxfh_indir_size = ice_get_rxfh_indir_size,
> .get_rxfh = ice_get_rxfh,
> .set_rxfh = ice_set_rxfh,
> + .get_rxfh_fields = ice_get_rxfh_fields,
> + .set_rxfh_fields = ice_set_rxfh_fields,
> .get_channels = ice_get_channels,
> .set_channels = ice_set_channels,
> .get_ts_info = ice_get_ts_info,
> --
> 2.49.0
Powered by blists - more mailing lists