From patchwork Mon Mar 4 15:10:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 209580 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1486500dyc; Mon, 4 Mar 2024 07:16:10 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWiO0O+jCNzkONCLRizWXueG8DahJ6QUA6e6iwtfksFLc5WzR1idrSPDXuUhhlqlpaK3oOwOwVxOmAK7/2mCwjE7DUWHQ== X-Google-Smtp-Source: AGHT+IEfVw3/nZ5RrRX4m/btGNsZuWWnz6t8JdEF7FI2wGm1hzlkfsynOSijj+bCwJGIDcgf9gvK X-Received: by 2002:a05:622a:11d5:b0:42e:d66b:d57a with SMTP id n21-20020a05622a11d500b0042ed66bd57amr11876070qtk.4.1709565370254; Mon, 04 Mar 2024 07:16:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709565370; cv=pass; d=google.com; s=arc-20160816; b=kKXwjZSAAAQKIikpNYMbT17zfVAIgkG36k3P+suvE+QtTqmxbX/ZAq6JEsgHYyo5uq 7aV0StZy/0/j8rZXwfeK3ib6OcWcKgclVpXIXUlxLnS4/Kb9mEkuNqmVQl6NNzjdqtZP rSA0w/NCr6aiXNg6dD3gviHxX8uMO5rAFDKnYGbM06J6XJTs5rsM1Y6zxkw1K1tM8kgI 0B/nWzUHGQrFh5gXCAd+DUzrUxBwJnDW6G4IRpMOZ+aNxmWpsuWbo2xWxf8DTP/PmCXD YLuspm3HiEw18m69ENGj23PEfb8vTExGtPgMaqO9AK21AWkup7Z1IPWsCPC3GnfmvGeL /hGw== 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=39f7IwNhw2jCdJtHS1cJz/zVjPZ7MqFQUxRY0gaMRO4=; fh=1vUu/d1GTjraph6G+ET+Z0z13QVrf6oL/IrrK9zaTF8=; b=pHfUdWKmrGyPzdWdkDY4eFfiVFjmT4tGP0nxLuyFFkLUsH9TH5pItWow+Y5eP8d515 wuy7l2BWcdwtC6dCZfPaUfNeCrMwFRp0snxgGvc2RZ5f6330Jy6EUpessovysXrnhCsE KewZnnecQEKiX7FRbm90rXKg+QH3DNANqSsT90dXOEentNW/OKOUrWi/ehs9DWRt7fza pHEqeT88s12POwG3Z5bSJCyIROyovRAZ0c/Um8SPMn+T+N78lx3mSpbBZTAF94F2arkI OwtPdJ99cv3PG5RkJD7h2pbJy5I/0FFnAPaBAvEmpOMBjRUWPYqmv/KD0MugucLT4VUp hNHw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b="Gj4M/Dkv"; 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-90791-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90791-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id b5-20020ac85bc5000000b0042dcbe3ee25si10164245qtb.785.2024.03.04.07.16.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:16:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-90791-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b="Gj4M/Dkv"; 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-90791-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90791-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id AC7921C21436 for ; Mon, 4 Mar 2024 15:15:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F2AE259B4F; Mon, 4 Mar 2024 15:10:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="Gj4M/Dkv" 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 F22175674B; Mon, 4 Mar 2024 15:10:31 +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=1709565034; cv=none; b=q6b86K2xW7GFdi0uZWBrHLbUwEU79F6fPOaQVqcgORKDMOJ12oBqU7Lg7EnfLU6JocJGEyrt/iSPOMFXlzb9Ff9BKIl1tZG0xPtVF+4t/dBlluTl/CkZJIW/FJHjpHOC5UB+DK2sYNkOlaV/7xpJl87dC90/8e62GtnMU6/U5Ww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709565034; c=relaxed/simple; bh=pW/q/tI8Ukj2QjsYts45yiVyqopiGdHr0p3RANBiRf0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pdr9KFlvbEMPXnv5veF8QqU7/WKjgqlt+nyaBE51UIndbQu69bErVZnybhxF2904EJwVyy+EENMMBicGoV1AqGqj0wshVXF7tb5rxcNqR8/CSZAvqMJViYUCun5rmYJ4AHBoojn0376RotdWGjuZA/1qo1Ixe/cNQfN24Z2EFLo= 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=Gj4M/Dkv; 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 638151BF212; Mon, 4 Mar 2024 15:10:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1709565030; 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=39f7IwNhw2jCdJtHS1cJz/zVjPZ7MqFQUxRY0gaMRO4=; b=Gj4M/DkvX82z7vNFsJ+4ypdEd0ZX8w969Rk1QRrDz6fu5dabW3auC5c5N0TGX83poXhXoc IxH1C0bErHdK6PuDXiMS7IEEkEZ2ox8BW6+g2Xhx/ifKF7zgxe0WJrzQ+h9uVFcGRjkoC4 re/Bjoulg8oaHfjR6/GUy9gJP+NyPVp8HG2yvaRGs0NStCc4YlzmuAiouhr6j4Tj1a1qus LsshcAyxrszTCOgjko6BtAymzHQnKeGaE66GHu9OBfX7/ihDTeLZRQHMk5FI+LiauekWc7 ElifHPICYshZUAKZQlmEtQSZln9lza6VZWXgWbgRP8PQ9MpP6w80WSdSpSuaLw== 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 v10 12/13] net: ethtool: strset: Allow querying phy stats by index Date: Mon, 4 Mar 2024 16:10:08 +0100 Message-ID: <20240304151011.1610175-13-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240304151011.1610175-1-maxime.chevallier@bootlin.com> References: <20240304151011.1610175-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: 1792609217419158852 X-GMAIL-MSGID: 1792609217419158852 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 --- V10: No changes V9: No changes 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; }