From patchwork Tue Feb 13 15:04:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200483 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp603596dyb; Tue, 13 Feb 2024 07:14:19 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWBogoBtNwbVuO8cy8+HaEVeFwOphfOJ3YOwNBhHA/ekG5llWc6gt6CD8X5YpS7o3zxPd3o2ckGFYcehsOtkSDHwNFIWQ== X-Google-Smtp-Source: AGHT+IG6ik8sGkF/Qox1HEJTcbJMfHZW0KP2KoTSUcS4Kmd/qRpY3SZKruD7eF4MYmE2Au1qa3Td X-Received: by 2002:a17:903:40d0:b0:1d9:e182:2bf8 with SMTP id t16-20020a17090340d000b001d9e1822bf8mr13620843pld.6.1707837259272; Tue, 13 Feb 2024 07:14:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707837259; cv=pass; d=google.com; s=arc-20160816; b=fdktxSR/rwuSMHKbQbiO1x3RI8pwzFBRwhO7u3voDwZ/HAybLsWR2apr9asIQKgsMa Xq2oFKSRhvCrbwsravlGBM+cHGlKzg4xX5j673FiSL6vn0HUmVM+q9xYv6ofYJSvlZMX Uyq52GCRdQFkdD0TCO2lgn62wrvL4LcJkFkekgESy19nIQDjKs5C0zbqpe5xcemda5jV UNZGTqadopj0hlOK/gzIsF36IsMr+eF9qSOlZVQyFK0gR6ZQ+0/asKgLFgV7zJwN5btl sQbIKxsdyJhbM5d+/hpMS86/zviBLFyrBpWS8MoMipBPf5MwnatEDz9+oz+0RX9NzTmM NXCA== 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=VpcLvlmRCP8z4hAlqgEJxn9ClN29g/4O7Rm+VP+Hs9w=; fh=Cb2bn6LCtk8pv9NdsT1FTXssbyxwPFTmrlkCOxP5UZE=; b=NRVhvBulfCzeyWELo5w2u2khdhgA86oG/8bqhwiSadIUU0v9s5stXRByZh8mMEyRK9 UZuBU5uh6NJu+v2TmaozIb0AU1J3GZ0q22Hf2802/pGfvQkJAKrOJJaZFaWDWBO/yOyy 9MyF6sExfW0e+JRrv1ef4kTUzoYbmdmDQONnp4irz0kLqfD+V6U/+359rNx4YA9H3/UI vBNyfOGoLwQRRX4jM70GPeBRID/ez9JOct543Mb0aHF7wleK6duv9kmzbomOziIYi0yk vhaK1jodl9ry80NE7wQG6pVSa1Wvw6N30gEP8894esFueQ0TjGMhVelnE0u1wD71xO8x owhA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=X9imBKQN; 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-63777-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63777-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCXb8rt8tkwUJOSqd2ZKf1P6pdXotK35rTSbjHRGPdDl7hFWluTUjUrPYU5+8kBezCY6vgjyuEoWhlZEZiMeak4oWmwbhg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id e7-20020a170902784700b001db35c3088bsi1228282pln.105.2024.02.13.07.14.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:14:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63777-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=X9imBKQN; 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-63777-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63777-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 759C12851DD for ; Tue, 13 Feb 2024 15:11:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C1162612E1; Tue, 13 Feb 2024 15:04:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="X9imBKQN" Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) (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 D18FD60BB7; Tue, 13 Feb 2024 15:04:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836695; cv=none; b=DzGF+GfFNr2Y+oGTEglXxwpVN+plWwXI0zzlIBlsXgIQO5+S9cuPYjVJHTupGzbGitqW7NnZerYuiND4y4EyFM4ZUwC4Jr5ypiqurfGyzbAweXh+aJlfS6SVO70CQoFp3lrQlMTCiNtKNjqjihIlN48WQ2ZdIGAcUvesYn1V9VI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836695; c=relaxed/simple; bh=rn6DALXlDmbDVCt5dynIqvf6ymqJW0h7IDOc9cDX4Ss=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hazxa0DKep2+f/5hwMtE7IGOre4Xi5my/HmaqtiwfYDHpC1AZFDYuT6W3RJ3APBQMvHHwDeBxDCLBmWNbx5C8EqgfsUP6yEBY9nJ7mDSAhKLsPqlI5BC6YFrz3sUIbBhI4HmMbPZZFF4Pc8dS8fZPIL6/fETdoG0vqTU1ceVjWk= 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=X9imBKQN; arc=none smtp.client-ip=217.70.183.201 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 218191BF20E; Tue, 13 Feb 2024 15:04:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836692; 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=VpcLvlmRCP8z4hAlqgEJxn9ClN29g/4O7Rm+VP+Hs9w=; b=X9imBKQNLAigr714rynkVDtm/WslD/djWOsUskD+lRqtUxrzGZKe9p9/mNeeBLTi8rpD0X E0jAYdmlU7BeEjcuD97j8QXxd3KXmr6LlTAlyqjci28mF2E3QGok6W/F9APvzD1J/iJB27 sjQozGbaEr5blLZr5gW1hqUAL/vQKJhAt1xHC9ujmcuEaavpZtJm18oPwUloYaSVzWQ7ty WwPuD8h4b1xjQD2f3UazA2Z2Q4yrxO91UBKcFcY6hslFS0OCkLQ6wZNA2WpT/1AzSsddpV llHEmy/oDRBTUKWyDxwqfqo7EQPucvYwWVZEbBZ0T1fSg76gjRLUPXcI6vDFlQ== 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 v7 12/13] net: ethtool: strset: Allow querying phy stats by index Date: Tue, 13 Feb 2024 16:04:29 +0100 Message-ID: <20240213150431.1796171-13-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213150431.1796171-1-maxime.chevallier@bootlin.com> References: <20240213150431.1796171-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: 1790797161874658226 X-GMAIL-MSGID: 1790797161874658226 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 --- 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; }