| 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: <fee52e22-f0d3-432d-8672-b4e244f79268@csgroup.eu>
Date: Wed, 14 Aug 2024 16:32:04 +0200
From: Christophe Leroy <christophe.leroy@...roup.eu>
To: Maxime Chevallier <maxime.chevallier@...tlin.com>, davem@...emloft.net
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
thomas.petazzoni@...tlin.com, Andrew Lunn <andrew@...n.ch>,
Jakub Kicinski <kuba@...nel.org>, Eric Dumazet <edumazet@...gle.com>,
Paolo Abeni <pabeni@...hat.com>, Russell King <linux@...linux.org.uk>,
linux-arm-kernel@...ts.infradead.org, Herve Codina
<herve.codina@...tlin.com>, Florian Fainelli <f.fainelli@...il.com>,
Heiner Kallweit <hkallweit1@...il.com>,
Vladimir Oltean <vladimir.oltean@....com>,
Köry Maincent <kory.maincent@...tlin.com>,
Jesse Brandeburg <jesse.brandeburg@...el.com>, Marek Behún
<kabel@...nel.org>, Piergiorgio Beruto <piergiorgio.beruto@...il.com>,
Oleksij Rempel <o.rempel@...gutronix.de>,
Nicolò Veronese <nicveronese@...il.com>,
Simon Horman <horms@...nel.org>, mwojtas@...omium.org,
Nathan Chancellor <nathan@...nel.org>, Antoine Tenart <atenart@...nel.org>,
Marc Kleine-Budde <mkl@...gutronix.de>,
Dan Carpenter <dan.carpenter@...aro.org>,
Romain Gantois <romain.gantois@...tlin.com>
Subject: Re: [PATCH net-next v17 11/14] net: ethtool: cable-test: Target the
command to the requested PHY
Le 09/07/2024 à 08:30, Maxime Chevallier a écrit :
> Cable testing is a PHY-specific command. Instead of targeting the command
> towards dev->phydev, use the request to pick the targeted PHY.
>
> Signed-off-by: Maxime Chevallier <maxime.chevallier@...tlin.com>
Reviewed-by: Christophe Leroy <christophe.leroy@...roup.eu>
Tested-by: Christophe Leroy <christophe.leroy@...roup.eu>
> ---
> net/ethtool/cabletest.c | 35 ++++++++++++++++++++++-------------
> 1 file changed, 22 insertions(+), 13 deletions(-)
>
> diff --git a/net/ethtool/cabletest.c b/net/ethtool/cabletest.c
> index f6f136ec7ddf..01db8f394869 100644
> --- a/net/ethtool/cabletest.c
> +++ b/net/ethtool/cabletest.c
> @@ -13,7 +13,7 @@
>
> const struct nla_policy ethnl_cable_test_act_policy[] = {
> [ETHTOOL_A_CABLE_TEST_HEADER] =
> - NLA_POLICY_NESTED(ethnl_header_policy),
> + NLA_POLICY_NESTED(ethnl_header_policy_phy),
> };
>
> static int ethnl_cable_test_started(struct phy_device *phydev, u8 cmd)
> @@ -58,6 +58,7 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
> struct ethnl_req_info req_info = {};
> const struct ethtool_phy_ops *ops;
> struct nlattr **tb = info->attrs;
> + struct phy_device *phydev;
> struct net_device *dev;
> int ret;
>
> @@ -69,12 +70,16 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
> return ret;
>
> dev = req_info.dev;
> - if (!dev->phydev) {
> +
> + rtnl_lock();
> + phydev = ethnl_req_get_phydev(&req_info,
> + tb[ETHTOOL_A_CABLE_TEST_HEADER],
> + info->extack);
> + if (IS_ERR_OR_NULL(phydev)) {
> ret = -EOPNOTSUPP;
> goto out_dev_put;
> }
>
> - rtnl_lock();
> ops = ethtool_phy_ops;
> if (!ops || !ops->start_cable_test) {
> ret = -EOPNOTSUPP;
> @@ -85,13 +90,12 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
> if (ret < 0)
> goto out_rtnl;
>
> - ret = ops->start_cable_test(dev->phydev, info->extack);
> + ret = ops->start_cable_test(phydev, info->extack);
>
> ethnl_ops_complete(dev);
>
> if (!ret)
> - ethnl_cable_test_started(dev->phydev,
> - ETHTOOL_MSG_CABLE_TEST_NTF);
> + ethnl_cable_test_started(phydev, ETHTOOL_MSG_CABLE_TEST_NTF);
>
> out_rtnl:
> rtnl_unlock();
> @@ -216,7 +220,7 @@ static const struct nla_policy cable_test_tdr_act_cfg_policy[] = {
>
> const struct nla_policy ethnl_cable_test_tdr_act_policy[] = {
> [ETHTOOL_A_CABLE_TEST_TDR_HEADER] =
> - NLA_POLICY_NESTED(ethnl_header_policy),
> + NLA_POLICY_NESTED(ethnl_header_policy_phy),
> [ETHTOOL_A_CABLE_TEST_TDR_CFG] = { .type = NLA_NESTED },
> };
>
> @@ -305,6 +309,7 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
> struct ethnl_req_info req_info = {};
> const struct ethtool_phy_ops *ops;
> struct nlattr **tb = info->attrs;
> + struct phy_device *phydev;
> struct phy_tdr_config cfg;
> struct net_device *dev;
> int ret;
> @@ -317,10 +322,6 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
> return ret;
>
> dev = req_info.dev;
> - if (!dev->phydev) {
> - ret = -EOPNOTSUPP;
> - goto out_dev_put;
> - }
>
> ret = ethnl_act_cable_test_tdr_cfg(tb[ETHTOOL_A_CABLE_TEST_TDR_CFG],
> info, &cfg);
> @@ -328,6 +329,14 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
> goto out_dev_put;
>
> rtnl_lock();
> + phydev = ethnl_req_get_phydev(&req_info,
> + tb[ETHTOOL_A_CABLE_TEST_TDR_HEADER],
> + info->extack);
> + if (!IS_ERR_OR_NULL(phydev)) {
> + ret = -EOPNOTSUPP;
> + goto out_dev_put;
> + }
> +
> ops = ethtool_phy_ops;
> if (!ops || !ops->start_cable_test_tdr) {
> ret = -EOPNOTSUPP;
> @@ -338,12 +347,12 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
> if (ret < 0)
> goto out_rtnl;
>
> - ret = ops->start_cable_test_tdr(dev->phydev, info->extack, &cfg);
> + ret = ops->start_cable_test_tdr(phydev, info->extack, &cfg);
>
> ethnl_ops_complete(dev);
>
> if (!ret)
> - ethnl_cable_test_started(dev->phydev,
> + ethnl_cable_test_started(phydev,
> ETHTOOL_MSG_CABLE_TEST_TDR_NTF);
>
> out_rtnl:
Powered by blists - more mailing lists