From patchwork Wed Feb 28 11:47:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 207819 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3302478dyb; Wed, 28 Feb 2024 04:11:48 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXc4FbsiQXOeZFJDThKB33azOCdnCRQNbK1KggZV+zovO/toLDAS9193sv4Gen7g+bQtyz4Bitg9/KJzP4B+XX9d33tUQ== X-Google-Smtp-Source: AGHT+IFP/FENlwlDOO1OnuLq2uO/Y5sYJhsu3RjTGwszQxhxjYoakr1IR5Tx8IahvRDwxRuLjf+t X-Received: by 2002:a05:6808:1288:b0:3c0:33b5:d1b0 with SMTP id a8-20020a056808128800b003c033b5d1b0mr5415008oiw.10.1709122308489; Wed, 28 Feb 2024 04:11:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709122308; cv=pass; d=google.com; s=arc-20160816; b=GWU0sRLWZQiJ9gp6NYbuaIId7A5BYx0VSsjAHWPUKkzXvQt2rWdQjNRhqd5cx9V30X eXnpwa0QBbrJODzgHvVJ3jGvgzRl1AC+sbjo6ptJiY61/UevT5i9PbgA1jU40SHoQPvr 2UVIEA+0a6g5djXvk/nWjGuUzBnBZ1rcMmMQjANPmNhJAFW533xsrsdYwkNPmGB0Fdda LEHgC2+hd3nX93mJR7EgFX5WCQRKU+pZSxbebJ1/E6g1p2SrhZCTfoKp4278iVK5T5V8 hrI+CX0oT+f42Ou2AUksz+v3pAXTiMdmcRN4UcBga6JNRk6Slvpsnddbo0SrZ4fS+hc2 CIUQ== 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=fWgGWj5P8Yr52HQ5xyDbwBoI/GhoQmy2xfbLru+Vbow=; fh=1vUu/d1GTjraph6G+ET+Z0z13QVrf6oL/IrrK9zaTF8=; b=sImrwZ7J8UmKfOSl41LQxa61UwS8K435r52KE7TICVwEkbjvFHqFiOo0LV9C3vwN0A G1xDs7e9RHVEI+5dCDNqG87k5nkVQz/a5gSV1rvrhY0a7w0Y33A/SsVvb9K7B3vwPdxr wzdi/LlErS+rUHlTh2wzFsszCaPjvtlpI0njZd9YnlGenPJEgFzVqMUR0jql7NbzsYlv 0XWJk0f4JRXIbXMbMavMtQQkryj+yPEYqym+KGI1nGbYOCq6LJETed6ksYfh31LRApQE kmGzYj9WFSH6lDSdX+1H/8uew9nIV0CGL6uqnVJ5jFCbQ59grOR67NwpRziQOZECCZNW ufIQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=aPxOXQVb; 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-84954-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84954-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id s11-20020a056a0008cb00b006e55362471esi2249939pfu.92.2024.02.28.04.11.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 04:11:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-84954-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=aPxOXQVb; 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-84954-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84954-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 BD62C2966FE for ; Wed, 28 Feb 2024 11:52:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 20998150999; Wed, 28 Feb 2024 11:47:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="aPxOXQVb" 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 29E64146908; Wed, 28 Feb 2024 11:47:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709120874; cv=none; b=Y0SRDjS0SeokwXFtB+Cj+kCWgdnr0DAKemmdk15j8eI97gBKMlm/IPbLLgG69XiwTBpHJM5net2ZwJX9TSLzLBQNhnYpncyG8nVrYduVS+Y4zg7iaaK0uVj9GwbSyuzigGdRqw3ibHzulNtfv1UrJtDwV/37Bd3mr9C7ybr0750= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709120874; c=relaxed/simple; bh=GsRtod+a/eUYG602CpiQTS9TwQCsbZFyfSHZ9K5H6FU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G9Pg8QUZfUkMs5iRaYP2EYBaYsabmATXSpWyWlJdsw5obU4xuyG23I/unF1ydJz0mnZ7gcg4hdPk21t9Bt6VNVrGTetzCNT7W7efi94ahCZV2MJdRjxnydOzTq0+sqzkqZdVt1cu1mwmFgpEt/UdtYQ0RhC7v53MtQqDANwktpQ= 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=aPxOXQVb; arc=none smtp.client-ip=217.70.183.197 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 597891C000F; Wed, 28 Feb 2024 11:47:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1709120870; 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=fWgGWj5P8Yr52HQ5xyDbwBoI/GhoQmy2xfbLru+Vbow=; b=aPxOXQVbZhw5JCxyeWqa6afq6Moe9B1EYbXI/2rXoA3qR3d4bxP0GBjxHs0SgMiq9Ead3m OLOeSb6hr8ny625zlNgQvDKadIswVqivv2Qity1vH01ngh2evZH/VjWfFPDtjkyWjKuxci HF4amS5FphYOWwfFLRrc8E4JIA3gDhassMZyxWtQAbJi+3O/DhPIekO6ZTUPT6D3gPDFf3 HnjPY3Xnr1QzXy3YQLIfoZlkJRxFdsOngKcaVhdcXS07exo0uUzn+cyWdp7YWHG6Ybe3la m82FhzYTff0vRNT6ij11DOgWxEUV3a5nlK3VSQ9DOGSXh2/kjGjZiBmI+aLM1g== 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 v9 12/13] net: ethtool: strset: Allow querying phy stats by index Date: Wed, 28 Feb 2024 12:47:26 +0100 Message-ID: <20240228114728.51861-13-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240228114728.51861-1-maxime.chevallier@bootlin.com> References: <20240228114728.51861-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: 1792144633714339958 X-GMAIL-MSGID: 1792144633714339958 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 --- 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; }