From patchwork Tue Feb 20 18:42:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 203760 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp597280dyc; Tue, 20 Feb 2024 10:46:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW6+T2I9qxqgush4bV7l03BWHR/F0SfV8Tm55hfx7sWsD2jXyJJd9G07p+HUa49b4ztXRVnht1cO2NBHovo2yYUSUuDVQ== X-Google-Smtp-Source: AGHT+IG9VhrR6u9nRwjiavdReBDXNle11Gevbh8QgMVLcKfR2diNa+SatfaejcKaZW/7gKC4nXYj X-Received: by 2002:a05:6402:3d9:b0:564:6bf1:e804 with SMTP id t25-20020a05640203d900b005646bf1e804mr4466012edw.42.1708454784266; Tue, 20 Feb 2024 10:46:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708454784; cv=pass; d=google.com; s=arc-20160816; b=zGbVVpBe+WV9Cq1816gXwKi8vVj32V4oFkmybKnI5F+HOro69vBgCGNWdunMIZ6a8+ gGLhaxkiBG4u4U8fYE8+y0alDh1BMfqaJLqgUb+gan5sG6Q+I6/oZM7hKd17P9HfGnp6 nUgFaafT5AviAHg1Qum6BRj6pJzsnTq3l2V042xQ979m3u+k/Qpr5xIl019JU/v5+gTy 9C5xmA84BqcXgnzKjenOWbQxRoXvuOhePIGgiPEhLkgmfS9oK9saYT6S3YczNFZ8bTbV D5Ezjm/4qNMezyhvexsBCA6ElgDuSVzHHOIJJykG4owEfdC6bIliONQoIWkyn/o6lpgs q4CA== ARC-Message-Signature: i=2; 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=dmNu9x1vvx+A32IO3C4lfv40eh0Ar3kAHClkXW8GGrs=; fh=1vUu/d1GTjraph6G+ET+Z0z13QVrf6oL/IrrK9zaTF8=; b=Xw3mJKZfuYSTPjqUa08F3LQ97xD2hSMWXqFBOCYldnH3i9d1cNk1VrpuHMOlw6Z210 D8gbOJvnVcVybbXtmGVAyA0vY9lMCZNCFk6sla1/mU7e/1rliPjnPDp4o+eLjZPC8NPr 0kPa6fTKjpePzQQqF00qmMZsdMxcRshrWLLHJQSSt5VCQ1hOqv+0JkVuCUmKxQHIKNii E65fnm8RduMXML0UKkYMWPcESyc7pN1nYNaRl3BCVle7wJl1qxqyenYfakk2xiA0Gdly F37prKAHwP/bcQreV9kGsocgCthY4CcwYTPEDaGrC8n1oo8O87NbiTMeb39GPDxPZcH8 tB3Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=nLpEv+IG; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-73537-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73537-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id f1-20020a50ee81000000b005619df31a97si3647426edr.446.2024.02.20.10.46.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 10:46:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73537-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=nLpEv+IG; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-73537-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73537-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 am.mirrors.kernel.org (Postfix) with ESMTPS id DE0AC1F2354A for ; Tue, 20 Feb 2024 18:46:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 08F9F132C1C; Tue, 20 Feb 2024 18:42:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="nLpEv+IG" Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) (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 F162A15098A; Tue, 20 Feb 2024 18:42:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708454562; cv=none; b=N0DhPzAWfFEwyy/wVGwzU3bSx0G5JumqgNZLoZV5TLM80xqzlfxqzMdncRTSvXlMDuyobBgLxJbw8aEBwNgNrwWMXo/HgKS8pnlRvNGZDNfDNS++hccRc8dWTWGLDQK72pGO1KAEAs/hfy/SczmAJ8E1ZSRWc4Nd5i/L0uaMSPA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708454562; c=relaxed/simple; bh=flMKJT3xUr4xlJipxUFnihBmLRYLLl3NwOH9Bydg9tU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dquv2aoh6EbeR3gIEcwLVU8vZUm6w2wWCB6ftZ5T66ZM8tUWdyrP53RUj3fYk0iRhE54jJwRNMXr/TiO/fEKF11roVC77uh0Vp5/887kqIqRHiTe6vs3dYfeLg125wtVPP5bBbHaF4dYVR1Ivf5xzAS7QsHpENQ9hlUrqJqeFlY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=nLpEv+IG; arc=none smtp.client-ip=217.70.183.195 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 5FC416000B; Tue, 20 Feb 2024 18:42:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1708454558; 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=dmNu9x1vvx+A32IO3C4lfv40eh0Ar3kAHClkXW8GGrs=; b=nLpEv+IGo5YJ8NrYV6FzKTWByR7rUTKrrFQrDbD0xiF8YXIPu5u7oBIdgAOUBmzDMAcXk3 9ssgLhfYSoguWcjxTqCJTi8cEfzpM8QSdFpcqNuJFBkxeHkxiCWoJ665Ic8/4Qvvo28Suw wCWf7IxsyIu42+GF4NjjKEif4cYfIGGcGNm2epehZn2aQua/wCcGn/a7jwNPSpuTM7vlEH h8e8A5S+ohzzlGVRPiDnBB5Lss5BIwVDOUebAnZYTassKvZKE0ZPc3OW/NrvNqoq9v/FwY JHygOSFto3I3wRTeUeLgG8aT18jM4T5TEGhzeV5AOlYJgTD9XQevnAPrMzIjSg== 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 , mwojtas@chromium.org Subject: [PATCH net-next v8 12/13] net: ethtool: strset: Allow querying phy stats by index Date: Tue, 20 Feb 2024 19:42:15 +0100 Message-ID: <20240220184217.3689988-13-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220184217.3689988-1-maxime.chevallier@bootlin.com> References: <20240220184217.3689988-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: 1791444683898342420 X-GMAIL-MSGID: 1791444683898342420 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 --- V8: No changes V7: No changes V6: Use dedicated policy V5: Added Andrew's R-b V4: No changes V3: No changes V2: New patch net/ethtool/strset.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c index c678b484a079..edc826407564 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; @@ -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; }