From patchwork Thu Dec 21 18:00:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 182382 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp591631dyi; Thu, 21 Dec 2023 10:08:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IEvwtS8zsk9CRBgWK1y04AJPfQq60inrGW8fY86LBBkqEyqVyAYBfnyJoMZOcLtVy75y1qc X-Received: by 2002:a05:6a20:748e:b0:194:d71b:813c with SMTP id p14-20020a056a20748e00b00194d71b813cmr65033pzd.82.1703182083225; Thu, 21 Dec 2023 10:08:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703182083; cv=none; d=google.com; s=arc-20160816; b=WUzkGNkiHnNDoT+Yx55t4qo4KP8sD+hhVWqu5z4Bedo8yLRyl4S7kGGIWn81gsY5lc 4w9RLzX3zAwETAIgriTh+HyBbPOzfWKE3tmvGO9tF2qerLUFMOVjp5775xSVWMZKrRQq ygeaCFP8erEZb9IXRQbvoys8fZAAfQePfPubiiE4lzo0Wpakuna6o3I3e00oq2V7nK2m wN28c92eFaKxpr9nnD2TwRoIYMMflfk+K/ylAN2fPI7Vs6uFADsOHnzdZ8g9qFe9dseb 4uyfiNpYcC2bJGZaXgHTMvUDCoxy0hNIjHq88yswfXyVi975dG2lzqkReCIB+OPOlz5v 8I0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=/L19pZWpSlfJz7sFcUtDttLXAqUoAX7c8SoAYBK8OTY=; fh=d3Krop4IPE3x6nBOvh3GY5QHg6bS91zVnQiH59I3hyM=; b=BU50ZGsRFvlwQ2i/hewEI6lP4LaLnAgtQQ7YsP+exJ6fdT6ALfonk4leMCDkE6UJMg dbS8YPWXaNuSa58SayCWvWc+O9bgOrjmG35gNAtfee3j9ZNDwG5EWF5RXA8CVuB2xnNp GIb1uBCV6yYJmF33klrgy7wd3XTSyrkMHlLyzm7ngzbyzj5OowIqqFlDns2Clv8jVPQ9 iD583of1gdhtt6zEIZL9yTwaoS4rU1aT3/jy/vyGfKlk4pffxMwY1t9YKKVmFqtJE4p3 WEoTxvY8nwE0vKbAJa22YQxKG3yvBdYrWWYV2JwDcRmp5TswpZCGJtzJ59yIMKAtpxRV Mf1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=P6xGgCOK; spf=pass (google.com: domain of linux-kernel+bounces-8897-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8897-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id l64-20020a638843000000b005c663eae38dsi1873563pgd.370.2023.12.21.10.08.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 10:08:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8897-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=P6xGgCOK; spf=pass (google.com: domain of linux-kernel+bounces-8897-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8897-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id E9DD3B25783 for ; Thu, 21 Dec 2023 18:05:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6A6AB7994A; Thu, 21 Dec 2023 18:01:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="P6xGgCOK" X-Original-To: linux-kernel@vger.kernel.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D213577F15; Thu, 21 Dec 2023 18:01:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id 3E95E1C0016; Thu, 21 Dec 2023 18:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1703181667; 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=/L19pZWpSlfJz7sFcUtDttLXAqUoAX7c8SoAYBK8OTY=; b=P6xGgCOKorZryCpY6TqXW4ee+fpKUS3ufxMako30VtrgsBSpMao5GVTiipfMuAqcrLOpOp cGnbWs+8Cmv6ED6C+T3amboYSJm+SFOmildQqMEAsEAIeZJB+E8wxKpYDXZCQ8CW4L62dx 03+SDYBURFfmjf3FjQRp0BU8r1/0jD/q6KvcSD+lfFYXEITbMG/6WLQIvtE9EbfzElpohv YHg546L8k9t3ug/sCwP6E743YHUz9DLqag//ifXK8l+bbg0RTpXXLqGoVh11bEL3HK1iY9 DWNlBwZEROul3C7X5IlvPzaTMaGZnvzYgdNh3Mw78Wc00SYBBj/uWSSoS7z5tQ== 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 , Jonathan Corbet , =?utf-8?q?Marek_Beh=C3=BAn?= , Piergiorgio Beruto , Oleksij Rempel , =?utf-8?q?Nicol=C3=B2_Veronese?= , Simon Horman Subject: [PATCH net-next v5 12/13] net: ethtool: strset: Allow querying phy stats by index Date: Thu, 21 Dec 2023 19:00:45 +0100 Message-ID: <20231221180047.1924733-13-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221180047.1924733-1-maxime.chevallier@bootlin.com> References: <20231221180047.1924733-1-maxime.chevallier@bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-GND-Sasl: maxime.chevallier@bootlin.com X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785915856302093258 X-GMAIL-MSGID: 1785915856302093258 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 Reviewed-by: Andrew Lunn --- V5: Added Andrew's R-b V4: No changes V3: No changes V2: New patch net/ethtool/strset.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c index c678b484a079..70c00631c51f 100644 --- a/net/ethtool/strset.c +++ b/net/ethtool/strset.c @@ -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; @@ -305,8 +306,8 @@ 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, - req_info->counts_only); + ret = strset_prepare_set(&data->sets[i], dev, req_base->phydev, + i, req_info->counts_only); if (ret < 0) goto err_ops; }