From patchwork Wed Jul 3 14:08:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 13722448 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0115AC30653 for ; Wed, 3 Jul 2024 15:16:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=thN6IdfOGL5JBJUVblIwdG2InFbFxvoTmh4Xec8y75w=; b=YWTUlCSuNuG+DoBw5pdw0UcjUE 3hgzzMWMSV/dIVxvH15oI2/BJ0DsGH83274JjVmq5Ow6hinHdUjCShX4WM6t+I8ltv0nyyrxUhf9+ bB2pPYYpn8tE3oIKQ9+k98FOPce3gD6tZwNplirY7uX5a6PkKgEJv4dA7fhdGbGA69FG0wSurMoh7 WOXrQ2zkF9ZiTqAjNQ9HRme3GN2CLsOFJjBjx9UAiLvXLUO18NiMKesHyhgJCEUWb94aCEQZ8gUhZ wb4MhzTgXvUB+wa3MMFQdXAHQ+HTIRT3SyrJgZkjA37Qc6PahpgZgWmdWx+aBaFNyUUeoWRqV+yEf yzQW7i5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sP1i7-0000000AeAx-34Qy; Wed, 03 Jul 2024 15:15:55 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sP0ev-0000000APZ3-1aKm for linux-arm-kernel@bombadil.infradead.org; Wed, 03 Jul 2024 14:08:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=thN6IdfOGL5JBJUVblIwdG2InFbFxvoTmh4Xec8y75w=; b=CvD4/6mW766ZNBEtrYF4hObk3D SpOG0xVceIbb3NZu2C3tvMK25dGcSZ58QC6cs2BfKxVkwYG2ynWjbrUVUi0sXm0lI1LQQzbuQ968i V56GZKgbuCBmoF+NOlFszBLgnKF55eUeC1IJXLwmfq416qvgXLkcBBSj3j+qp7xYGGi0uwDzXZN2V W2mxs/IiCTiOnbpkTHTGtCnNKKKn6akZZtAxq3tsm/Xg4gUOdw+BZCG73g3udTmszedGdRrKHOitN FcJB078qQZZY0cfzp87ugjoxli7i415tZ2H942iYHH6Dkg08/BUWNeJ5x26tpvfoTx6hnCx69Op3c yCdyK06g==; Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sP0er-0000000A34S-3teE for linux-arm-kernel@lists.infradead.org; Wed, 03 Jul 2024 14:08:32 +0000 Received: by mail.gandi.net (Postfix) with ESMTPSA id 8F4C9E000B; Wed, 3 Jul 2024 14:08:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1720015709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=thN6IdfOGL5JBJUVblIwdG2InFbFxvoTmh4Xec8y75w=; b=BcRpomyCaPHa/ZKBP2+XgHl/qppoEy3v0Tbpu0e5EYyivWStgDmrTlZud1kAoum7wfaseS K1eJZndApFG8E6+9ZW4AnP5MqUexcGQ1HdV7OqGJrvKZCH19zEKrxWH3V6mKzRWK5WK+5n GM4J5V+JVck+AJccJ/Zw1SOWS9Do9bhTxL2eZ5OKwNNdBKF46vhQtxHyK2la/rVwVmYfI3 8QiXAsf226b7OUgspF/r6WmYlaaFvDBRiN3D2eM2Z+ujBYdHRCd9rtPXSOWxK9mrRgJaUx cvffNobb9JxtKZWnENHSH+L3sOm3fniQqOaEHnozIpjIZWPoXsoJdvcglIYuqQ== From: Maxime Chevallier To: davem@davemloft.net Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Russell King , linux-arm-kernel@lists.infradead.org, Christophe Leroy , Herve Codina , Florian Fainelli , Heiner Kallweit , Vladimir Oltean , =?utf-8?q?K=C3=B6ry_Maincent?= , Jesse Brandeburg , =?utf-8?q?Marek_Beh=C3=BAn?= , Piergiorgio Beruto , Oleksij Rempel , =?utf-8?q?Nicol=C3=B2_Veronese?= , Simon Horman , mwojtas@chromium.org, Nathan Chancellor , Antoine Tenart , Marc Kleine-Budde , Dan Carpenter Subject: [PATCH net-next v15 13/14] net: ethtool: strset: Allow querying phy stats by index Date: Wed, 3 Jul 2024 16:08:03 +0200 Message-ID: <20240703140806.271938-14-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240703140806.271938-1-maxime.chevallier@bootlin.com> References: <20240703140806.271938-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: maxime.chevallier@bootlin.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240703_150830_439761_E1C1C9F9 X-CRM114-Status: GOOD ( 14.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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;