mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Maxime Chevallier <maxime.chevallier@bootlin.com>, davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	thomas.petazzoni@bootlin.com, "Andrew Lunn" <andrew@lunn.ch>,
	"Jakub Kicinski" <kuba@kernel.org>,
	"Eric Dumazet" <edumazet@google.com>,
	"Paolo Abeni" <pabeni@redhat.com>,
	"Russell King" <linux@armlinux.org.uk>,
	linux-arm-kernel@lists.infradead.org,
	"Herve Codina" <herve.codina@bootlin.com>,
	"Florian Fainelli" <f.fainelli@gmail.com>,
	"Heiner Kallweit" <hkallweit1@gmail.com>,
	"Vladimir Oltean" <vladimir.oltean@nxp.com>,
	"Köry Maincent" <kory.maincent@bootlin.com>,
	"Jesse Brandeburg" <jesse.brandeburg@intel.com>,
	"Marek Behún" <kabel@kernel.org>,
	"Piergiorgio Beruto" <piergiorgio.beruto@gmail.com>,
	"Oleksij Rempel" <o.rempel@pengutronix.de>,
	"Nicolò Veronese" <nicveronese@gmail.com>,
	"Simon Horman" <horms@kernel.org>,
	mwojtas@chromium.org, "Nathan Chancellor" <nathan@kernel.org>,
	"Antoine Tenart" <atenart@kernel.org>,
	"Marc Kleine-Budde" <mkl@pengutronix.de>,
	"Dan Carpenter" <dan.carpenter@linaro.org>,
	"Romain Gantois" <romain.gantois@bootlin.com>
Subject: Re: [PATCH net-next v17 13/14] net: ethtool: strset: Allow querying phy stats by index
Date: Wed, 14 Aug 2024 16:32:47 +0200	[thread overview]
Message-ID: <dc89e5ea-8495-4f1b-a86b-f49f7ac8bd22@csgroup.eu> (raw)
In-Reply-To: <20240709063039.2909536-14-maxime.chevallier@bootlin.com>



Le 09/07/2024 à 08:30, Maxime Chevallier a écrit :
> The ETH_SS_PHY_STATS command gets PHY statistics. Use the phydev pointer
> from the ethnl request to allow query phy stats from each PHY on the
> link.
> 
> Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>

Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Tested-by: Christophe Leroy <christophe.leroy@csgroup.eu>

> ---
>   net/ethtool/strset.c | 24 +++++++++++++++++-------
>   1 file changed, 17 insertions(+), 7 deletions(-)
> 
> diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c
> index 56b99606f00b..b3382b3cf325 100644
> --- a/net/ethtool/strset.c
> +++ b/net/ethtool/strset.c
> @@ -126,7 +126,7 @@ struct strset_reply_data {
>   
>   const struct nla_policy ethnl_strset_get_policy[] = {
>   	[ETHTOOL_A_STRSET_HEADER]	=
> -		NLA_POLICY_NESTED(ethnl_header_policy),
> +		NLA_POLICY_NESTED(ethnl_header_policy_phy),
>   	[ETHTOOL_A_STRSET_STRINGSETS]	= { .type = NLA_NESTED },
>   	[ETHTOOL_A_STRSET_COUNTS_ONLY]	= { .type = NLA_FLAG },
>   };
> @@ -233,17 +233,18 @@ static void strset_cleanup_data(struct ethnl_reply_data *reply_base)
>   }
>   
>   static int strset_prepare_set(struct strset_info *info, struct net_device *dev,
> -			      unsigned int id, bool counts_only)
> +			      struct phy_device *phydev, unsigned int id,
> +			      bool counts_only)
>   {
>   	const struct ethtool_phy_ops *phy_ops = ethtool_phy_ops;
>   	const struct ethtool_ops *ops = dev->ethtool_ops;
>   	void *strings;
>   	int count, ret;
>   
> -	if (id == ETH_SS_PHY_STATS && dev->phydev &&
> +	if (id == ETH_SS_PHY_STATS && phydev &&
>   	    !ops->get_ethtool_phy_stats && phy_ops &&
>   	    phy_ops->get_sset_count)
> -		ret = phy_ops->get_sset_count(dev->phydev);
> +		ret = phy_ops->get_sset_count(phydev);
>   	else if (ops->get_sset_count && ops->get_strings)
>   		ret = ops->get_sset_count(dev, id);
>   	else
> @@ -258,10 +259,10 @@ static int strset_prepare_set(struct strset_info *info, struct net_device *dev,
>   		strings = kcalloc(count, ETH_GSTRING_LEN, GFP_KERNEL);
>   		if (!strings)
>   			return -ENOMEM;
> -		if (id == ETH_SS_PHY_STATS && dev->phydev &&
> +		if (id == ETH_SS_PHY_STATS && phydev &&
>   		    !ops->get_ethtool_phy_stats && phy_ops &&
>   		    phy_ops->get_strings)
> -			phy_ops->get_strings(dev->phydev, strings);
> +			phy_ops->get_strings(phydev, strings);
>   		else
>   			ops->get_strings(dev, id, strings);
>   		info->strings = strings;
> @@ -279,6 +280,8 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,
>   	const struct strset_req_info *req_info = STRSET_REQINFO(req_base);
>   	struct strset_reply_data *data = STRSET_REPDATA(reply_base);
>   	struct net_device *dev = reply_base->dev;
> +	struct nlattr **tb = info->attrs;
> +	struct phy_device *phydev;
>   	unsigned int i;
>   	int ret;
>   
> @@ -296,6 +299,13 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,
>   		return 0;
>   	}
>   
> +	phydev = ethnl_req_get_phydev(req_base, tb[ETHTOOL_A_HEADER_FLAGS],
> +				      info->extack);
> +
> +	/* phydev can be NULL, check for errors only */
> +	if (IS_ERR(phydev))
> +		return PTR_ERR(phydev);
> +
>   	ret = ethnl_ops_begin(dev);
>   	if (ret < 0)
>   		goto err_strset;
> @@ -304,7 +314,7 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,
>   		    !data->sets[i].per_dev)
>   			continue;
>   
> -		ret = strset_prepare_set(&data->sets[i], dev, i,
> +		ret = strset_prepare_set(&data->sets[i], dev, phydev, i,
>   					 req_info->counts_only);
>   		if (ret < 0)
>   			goto err_ops;

  reply	other threads:[~2024-08-14 14:32 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-09  6:30 [PATCH net-next v17 00/14] Introduce PHY listing and link_topology tracking Maxime Chevallier
2024-07-09  6:30 ` [PATCH net-next v17 01/14] net: phy: Introduce ethernet link topology representation Maxime Chevallier
2024-08-14 14:28   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 02/14] net: sfp: pass the phy_device when disconnecting an sfp module's PHY Maxime Chevallier
2024-08-14 14:29   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 03/14] net: phy: add helpers to handle sfp phy connect/disconnect Maxime Chevallier
2024-08-14 14:29   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 04/14] net: sfp: Add helper to return the SFP bus name Maxime Chevallier
2024-08-14 14:29   ` LEROY Christophe
2024-08-14 14:33   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 05/14] net: ethtool: Allow passing a phy index for some commands Maxime Chevallier
2024-08-14 14:30   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 06/14] netlink: specs: add phy-index as a header parameter Maxime Chevallier
2024-08-14 14:30   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 07/14] net: ethtool: Introduce a command to list PHYs on an interface Maxime Chevallier
2024-08-14 14:30   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 08/14] netlink: specs: add ethnl PHY_GET command set Maxime Chevallier
2024-08-14 14:31   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 09/14] net: ethtool: plca: Target the command to the requested PHY Maxime Chevallier
2024-08-14 14:31   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 10/14] net: ethtool: pse-pd: " Maxime Chevallier
2024-08-14 14:31   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 11/14] net: ethtool: cable-test: " Maxime Chevallier
2024-08-14 14:32   ` Christophe Leroy
2024-08-27  5:25   ` Pengfei Xu
2024-08-27  5:33     ` Maxime Chevallier
2024-08-27  6:19       ` Pengfei Xu
2024-08-27  8:27       ` Dan Carpenter
2024-08-27  8:37         ` Maxime Chevallier
2024-08-27  8:48         ` Maxime Chevallier
2024-08-27  9:17           ` Dan Carpenter
2024-07-09  6:30 ` [PATCH net-next v17 12/14] net: ethtool: strset: Remove unnecessary check on genl_info Maxime Chevallier
2024-08-14 14:32   ` Christophe Leroy
2024-07-09  6:30 ` [PATCH net-next v17 13/14] net: ethtool: strset: Allow querying phy stats by index Maxime Chevallier
2024-08-14 14:32   ` Christophe Leroy [this message]
2024-07-09  6:30 ` [PATCH net-next v17 14/14] Documentation: networking: document phy_link_topology Maxime Chevallier
2024-08-14 14:33   ` Christophe Leroy
2024-07-15 15:31 ` [PATCH net-next v17 00/14] Introduce PHY listing and link_topology tracking Jakub Kicinski
2024-07-16  8:16   ` Maxime Chevallier
2024-07-17 15:26     ` Jakub Kicinski
2024-08-16 17:02       ` Christophe Leroy
2024-08-16 17:11         ` Jakub Kicinski
2024-08-17 15:43         ` Andrew Lunn
2024-08-17 15:47           ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=dc89e5ea-8495-4f1b-a86b-f49f7ac8bd22@csgroup.eu \
    --to=christophe.leroy@csgroup.eu \
    --cc=andrew@lunn.ch \
    --cc=atenart@kernel.org \
    --cc=dan.carpenter@linaro.org \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=f.fainelli@gmail.com \
    --cc=herve.codina@bootlin.com \
    --cc=hkallweit1@gmail.com \
    --cc=horms@kernel.org \
    --cc=jesse.brandeburg@intel.com \
    --cc=kabel@kernel.org \
    --cc=kory.maincent@bootlin.com \
    --cc=kuba@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=maxime.chevallier@bootlin.com \
    --cc=mkl@pengutronix.de \
    --cc=mwojtas@chromium.org \
    --cc=nathan@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nicveronese@gmail.com \
    --cc=o.rempel@pengutronix.de \
    --cc=pabeni@redhat.com \
    --cc=piergiorgio.beruto@gmail.com \
    --cc=romain.gantois@bootlin.com \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=vladimir.oltean@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®