| 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: <a4204cc7-cb40-dc17-610e-73ca12d8d6f7@intel.com>
Date: Fri, 22 Sep 2023 13:04:14 +0200
From: Przemek Kitszel <przemyslaw.kitszel@...el.com>
To: Pawel Chmielewski <pawel.chmielewski@...el.com>, <netdev@...r.kernel.org>
CC: <andrew@...n.ch>, <aelior@...vell.com>, <manishc@...vell.com>,
<intel-wired-lan@...ts.osuosl.org>, <horms@...nel.org>, Paul Greenwalt
<paul.greenwalt@...el.com>
Subject: Re: [Intel-wired-lan] [PATCH net-next v2 2/2] ice: Refactor finding
advertised link speed
On 9/21/23 15:51, Pawel Chmielewski wrote:
> Refactor ice_get_link_ksettings to using forced speed to link modes mapping.
>
> Suggested-by : Alexander Lobakin <aleksander.lobakin@...el.com>
> Signed-off-by: Pawel Chmielewski <pawel.chmielewski@...el.com>
> Signed-off-by: Paul Greenwalt <paul.greenwalt@...el.com>
minor: your SB should be last
> ---
> drivers/net/ethernet/intel/ice/ice.h | 1 +
> drivers/net/ethernet/intel/ice/ice_ethtool.c | 200 +++++++++++++------
> drivers/net/ethernet/intel/ice/ice_main.c | 2 +
> 3 files changed, 138 insertions(+), 65 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
> index 5022b036ca4f..5eda0fa39d81 100644
> --- a/drivers/net/ethernet/intel/ice/ice.h
> +++ b/drivers/net/ethernet/intel/ice/ice.h
> @@ -942,6 +942,7 @@ int ice_stop(struct net_device *netdev);
> void ice_service_task_schedule(struct ice_pf *pf);
> int ice_load(struct ice_pf *pf);
> void ice_unload(struct ice_pf *pf);
> +void ice_adv_lnk_speed_maps_init(void);
>
> /**
> * ice_set_rdma_cap - enable RDMA support
> diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> index ad4d4702129f..8b84bb539e1a 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> @@ -345,6 +345,86 @@ static const struct ice_priv_flag ice_gstrings_priv_flags[] = {
>
> #define ICE_PRIV_FLAG_ARRAY_SIZE ARRAY_SIZE(ice_gstrings_priv_flags)
>
> +static const u32 ice_adv_lnk_speed_100[] __initconst = {
> + ETHTOOL_LINK_MODE_100baseT_Full_BIT,
> +};
> +
> +static const u32 ice_adv_lnk_speed_1000[] __initconst = {
> + ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
> + ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
> + ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,
> +};
> +
> +static const u32 ice_adv_lnk_speed_2500[] __initconst = {
> + ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
> + ETHTOOL_LINK_MODE_2500baseX_Full_BIT,
> +};
> +
> +static const u32 ice_adv_lnk_speed_5000[] __initconst = {
> + ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
> +};
> +
> +static const u32 ice_adv_lnk_speed_10000[] __initconst = {
> + ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
> + ETHTOOL_LINK_MODE_10000baseKR_Full_BIT,
> + ETHTOOL_LINK_MODE_10000baseSR_Full_BIT,
> + ETHTOOL_LINK_MODE_10000baseLR_Full_BIT,
> +};
> +
> +static const u32 ice_adv_lnk_speed_25000[] __initconst = {
> + ETHTOOL_LINK_MODE_25000baseCR_Full_BIT,
> + ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,
> + ETHTOOL_LINK_MODE_25000baseKR_Full_BIT,
> +};
> +
> +static const u32 ice_adv_lnk_speed_40000[] __initconst = {
> + ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT,
> + ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT,
> + ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT,
> + ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT,
> +};
> +
> +static const u32 ice_adv_lnk_speed_50000[] __initconst = {
> + ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT,
> + ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT,
> + ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,
> +};
> +
> +static const u32 ice_adv_lnk_speed_100000[] __initconst = {
> + ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT,
> + ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT,
> + ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,
> + ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT,
> + ETHTOOL_LINK_MODE_100000baseCR2_Full_BIT,
> + ETHTOOL_LINK_MODE_100000baseSR2_Full_BIT,
> + ETHTOOL_LINK_MODE_100000baseKR2_Full_BIT,
> +};
> +
> +#define ICE_ADV_LNK_SPEED_MAP(value) \
> +{ \
> + .speed = SPEED_##value, \
> + .cap_arr = ice_adv_lnk_speed_##value, \
> + .arr_size = ARRAY_SIZE(ice_adv_lnk_speed_##value), \
> +}
> +
> +static struct ethtool_forced_speed_map ice_adv_lnk_speed_maps[] __ro_after_init = {
> + ICE_ADV_LNK_SPEED_MAP(100),
> + ICE_ADV_LNK_SPEED_MAP(1000),
> + ICE_ADV_LNK_SPEED_MAP(2500),
> + ICE_ADV_LNK_SPEED_MAP(5000),
> + ICE_ADV_LNK_SPEED_MAP(10000),
> + ICE_ADV_LNK_SPEED_MAP(25000),
> + ICE_ADV_LNK_SPEED_MAP(40000),
> + ICE_ADV_LNK_SPEED_MAP(50000),
> + ICE_ADV_LNK_SPEED_MAP(100000),
> +};
> +
> +void __init ice_adv_lnk_speed_maps_init(void)
> +{
> + ethtool_forced_speed_maps_init(ice_adv_lnk_speed_maps,
> + ARRAY_SIZE(ice_adv_lnk_speed_maps));
> +}
> +
> static void
> __ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo,
> struct ice_vsi *vsi)
> @@ -2007,6 +2087,55 @@ ice_get_link_ksettings(struct net_device *netdev,
> return err;
> }
>
> +/**
> + * ice_speed_to_aq_link - Get AQ link speed by Ethtool forced speed
> + * @speed: ethtool forced speed
> + */
> +static u16 ice_speed_to_aq_link(int speed)
> +{
> + int aq_speed;
> +
> + switch (speed) {
> + case SPEED_10:
> + aq_speed = ICE_AQ_LINK_SPEED_10MB;
> + break;
> + case SPEED_100:
> + aq_speed = ICE_AQ_LINK_SPEED_100MB;
> + break;
> + case SPEED_1000:
> + aq_speed = ICE_AQ_LINK_SPEED_1000MB;
> + break;
> + case SPEED_2500:
> + aq_speed = ICE_AQ_LINK_SPEED_2500MB;
> + break;
> + case SPEED_5000:
> + aq_speed = ICE_AQ_LINK_SPEED_5GB;
> + break;
> + case SPEED_10000:
> + aq_speed = ICE_AQ_LINK_SPEED_10GB;
> + break;
> + case SPEED_20000:
> + aq_speed = ICE_AQ_LINK_SPEED_20GB;
> + break;
> + case SPEED_25000:
> + aq_speed = ICE_AQ_LINK_SPEED_25GB;
> + break;
> + case SPEED_40000:
> + aq_speed = ICE_AQ_LINK_SPEED_40GB;
> + break;
> + case SPEED_50000:
> + aq_speed = ICE_AQ_LINK_SPEED_50GB;
> + break;
> + case SPEED_100000:
> + aq_speed = ICE_AQ_LINK_SPEED_100GB;
> + break;
> + default:
> + aq_speed = ICE_AQ_LINK_SPEED_UNKNOWN;
minor: wrong whitespaces
> + break;
> + }
> + return aq_speed;
> +}
> +
> /**
> * ice_ksettings_find_adv_link_speed - Find advertising link speed
> * @ks: ethtool ksettings
> @@ -2014,73 +2143,14 @@ ice_get_link_ksettings(struct net_device *netdev,
> static u16
> ice_ksettings_find_adv_link_speed(const struct ethtool_link_ksettings *ks)
> {
> + const struct ethtool_forced_speed_map *map;
> u16 adv_link_speed = 0;
>
> - if (ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 100baseT_Full))
> - adv_link_speed |= ICE_AQ_LINK_SPEED_100MB;
> - if (ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 1000baseX_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 1000baseT_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 1000baseKX_Full))
> - adv_link_speed |= ICE_AQ_LINK_SPEED_1000MB;
> - if (ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 2500baseT_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 2500baseX_Full))
> - adv_link_speed |= ICE_AQ_LINK_SPEED_2500MB;
> - if (ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 5000baseT_Full))
> - adv_link_speed |= ICE_AQ_LINK_SPEED_5GB;
> - if (ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 10000baseT_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 10000baseKR_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 10000baseSR_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 10000baseLR_Full))
> - adv_link_speed |= ICE_AQ_LINK_SPEED_10GB;
> - if (ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 25000baseCR_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 25000baseSR_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 25000baseKR_Full))
> - adv_link_speed |= ICE_AQ_LINK_SPEED_25GB;
> - if (ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 40000baseCR4_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 40000baseSR4_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 40000baseLR4_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 40000baseKR4_Full))
> - adv_link_speed |= ICE_AQ_LINK_SPEED_40GB;
> - if (ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 50000baseCR2_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 50000baseKR2_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 50000baseSR2_Full))
> - adv_link_speed |= ICE_AQ_LINK_SPEED_50GB;
> - if (ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 100000baseCR4_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 100000baseSR4_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 100000baseLR4_ER4_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 100000baseKR4_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 100000baseCR2_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 100000baseSR2_Full) ||
> - ethtool_link_ksettings_test_link_mode(ks, advertising,
> - 100000baseKR2_Full))
> - adv_link_speed |= ICE_AQ_LINK_SPEED_100GB;
> + for (u32 i = 0; i < ARRAY_SIZE(ice_adv_lnk_speed_maps); i++) {
> + map = ice_adv_lnk_speed_maps + i;
> + if (linkmode_intersects(ks->link_modes.advertising, map->caps))
> + adv_link_speed |= ice_speed_to_aq_link(map->speed);
> + }
>
> return adv_link_speed;
> }
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
> index c8286adae946..04047f869a99 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -5627,6 +5627,8 @@ static int __init ice_module_init(void)
> pr_info("%s\n", ice_driver_string);
> pr_info("%s\n", ice_copyright);
>
> + ice_adv_lnk_speed_maps_init();
> +
> ice_wq = alloc_workqueue("%s", 0, 0, KBUILD_MODNAME);
> if (!ice_wq) {
> pr_err("Failed to create workqueue\n");
Powered by blists - more mailing lists