| 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: <bbb40362-4552-44d2-aaae-b8b1729efc26@csgroup.eu>
Date: Wed, 14 Aug 2024 16:31:32 +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 09/14] net: ethtool: plca: Target the command
to the requested PHY
Le 09/07/2024 à 08:30, Maxime Chevallier a écrit :
> PLCA 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/plca.c | 30 ++++++++++++++++++++----------
> 1 file changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/net/ethtool/plca.c b/net/ethtool/plca.c
> index b1e2e3b5027f..d95d92f173a6 100644
> --- a/net/ethtool/plca.c
> +++ b/net/ethtool/plca.c
> @@ -25,7 +25,7 @@ struct plca_reply_data {
>
> const struct nla_policy ethnl_plca_get_cfg_policy[] = {
> [ETHTOOL_A_PLCA_HEADER] =
> - NLA_POLICY_NESTED(ethnl_header_policy),
> + NLA_POLICY_NESTED(ethnl_header_policy_phy),
> };
>
> static void plca_update_sint(int *dst, struct nlattr **tb, u32 attrid,
> @@ -58,10 +58,14 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base,
> struct plca_reply_data *data = PLCA_REPDATA(reply_base);
> struct net_device *dev = reply_base->dev;
> const struct ethtool_phy_ops *ops;
> + struct nlattr **tb = info->attrs;
> + struct phy_device *phydev;
> int ret;
>
> + phydev = ethnl_req_get_phydev(req_base, tb[ETHTOOL_A_PLCA_HEADER],
> + info->extack);
> // check that the PHY device is available and connected
> - if (!dev->phydev) {
> + if (IS_ERR_OR_NULL(phydev)) {
> ret = -EOPNOTSUPP;
> goto out;
> }
> @@ -80,7 +84,7 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base,
> memset(&data->plca_cfg, 0xff,
> sizeof_field(struct plca_reply_data, plca_cfg));
>
> - ret = ops->get_plca_cfg(dev->phydev, &data->plca_cfg);
> + ret = ops->get_plca_cfg(phydev, &data->plca_cfg);
> ethnl_ops_complete(dev);
>
> out:
> @@ -129,7 +133,7 @@ static int plca_get_cfg_fill_reply(struct sk_buff *skb,
>
> const struct nla_policy ethnl_plca_set_cfg_policy[] = {
> [ETHTOOL_A_PLCA_HEADER] =
> - NLA_POLICY_NESTED(ethnl_header_policy),
> + NLA_POLICY_NESTED(ethnl_header_policy_phy),
> [ETHTOOL_A_PLCA_ENABLED] = NLA_POLICY_MAX(NLA_U8, 1),
> [ETHTOOL_A_PLCA_NODE_ID] = NLA_POLICY_MAX(NLA_U32, 255),
> [ETHTOOL_A_PLCA_NODE_CNT] = NLA_POLICY_RANGE(NLA_U32, 1, 255),
> @@ -141,15 +145,17 @@ const struct nla_policy ethnl_plca_set_cfg_policy[] = {
> static int
> ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info)
> {
> - struct net_device *dev = req_info->dev;
> const struct ethtool_phy_ops *ops;
> struct nlattr **tb = info->attrs;
> struct phy_plca_cfg plca_cfg;
> + struct phy_device *phydev;
> bool mod = false;
> int ret;
>
> + phydev = ethnl_req_get_phydev(req_info, tb[ETHTOOL_A_PLCA_HEADER],
> + info->extack);
> // check that the PHY device is available and connected
> - if (!dev->phydev)
> + if (IS_ERR_OR_NULL(phydev))
> return -EOPNOTSUPP;
>
> ops = ethtool_phy_ops;
> @@ -168,7 +174,7 @@ ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info)
> if (!mod)
> return 0;
>
> - ret = ops->set_plca_cfg(dev->phydev, &plca_cfg, info->extack);
> + ret = ops->set_plca_cfg(phydev, &plca_cfg, info->extack);
> return ret < 0 ? ret : 1;
> }
>
> @@ -191,7 +197,7 @@ const struct ethnl_request_ops ethnl_plca_cfg_request_ops = {
>
> const struct nla_policy ethnl_plca_get_status_policy[] = {
> [ETHTOOL_A_PLCA_HEADER] =
> - NLA_POLICY_NESTED(ethnl_header_policy),
> + NLA_POLICY_NESTED(ethnl_header_policy_phy),
> };
>
> static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base,
> @@ -201,10 +207,14 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base,
> struct plca_reply_data *data = PLCA_REPDATA(reply_base);
> struct net_device *dev = reply_base->dev;
> const struct ethtool_phy_ops *ops;
> + struct nlattr **tb = info->attrs;
> + struct phy_device *phydev;
> int ret;
>
> + phydev = ethnl_req_get_phydev(req_base, tb[ETHTOOL_A_PLCA_HEADER],
> + info->extack);
> // check that the PHY device is available and connected
> - if (!dev->phydev) {
> + if (IS_ERR_OR_NULL(phydev)) {
> ret = -EOPNOTSUPP;
> goto out;
> }
> @@ -223,7 +233,7 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base,
> memset(&data->plca_st, 0xff,
> sizeof_field(struct plca_reply_data, plca_st));
>
> - ret = ops->get_plca_status(dev->phydev, &data->plca_st);
> + ret = ops->get_plca_status(phydev, &data->plca_st);
> ethnl_ops_complete(dev);
> out:
> return ret;
Powered by blists - more mailing lists