From patchwork Tue Feb 13 15:04:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200492 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp617279dyb; Tue, 13 Feb 2024 07:35:20 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUNZRRbBRklwDqKCuJcE/fen5/UI3krmaGhULP90lxxtUWGDi0lwwCVz+f/AW/e8ZD8iLf/KU7Sl9mXmzAEyFUdkdE+uA== X-Google-Smtp-Source: AGHT+IHa/C09tFbSYJ41QYwjequofUpx0Rq/0WyoyMHNJPT9N/0uCO8oJNW2/2FCxH/bwV4mCCs8 X-Received: by 2002:a17:903:2288:b0:1d9:5038:f115 with SMTP id b8-20020a170903228800b001d95038f115mr10877046plh.4.1707838520495; Tue, 13 Feb 2024 07:35:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707838520; cv=pass; d=google.com; s=arc-20160816; b=nFCteTEnZKaEDdzML8u++IKWpv41EdN5BH77SIrxAiy3qt1dWvDvKHzEUBI4JH1A3Q 9dnvE+nghqKdqCYwwVDvgvNq/eyHLQZwgj6uaf13GbEJNwgDC/zYKO6VDUzB3UUO76H1 RHNzeWq0leOBjPlJEC5x3+QzFW3UVshqc4iUrvt2l6tUId5JiLBmOoux+Cj9cEYor5J9 FGiHlGlpLjufxO+GCyFsOK0fW66m/MH/huOksqwNZDS0EQT9/8vsG2KbP+Pq0aSJVYZO xsA2w0l4Ii/TUHDkglgTLY3SmjvrGa0xrEwRB3MUOtDpzE20Cnl294nfozq7UR0nTYHP IYzQ== 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=eoBmwAByCPECYMqx4mhnkkfTJ9Zb0fG7mFlRU+qot5k=; fh=iLpn1zoOjl7PJJc3xC8yCWFNeyK8lXe3SdjpbIAx8nw=; b=BUOl7JXDhzsQbxTNliYBJyF4oWSPG1x2Td/tmO90lqRY/PA67xBJcutPVRtDVIyw2R gtALA1TXHIOy4xEYqqVDbkETz1+32kvhOVOzhUVNPQfKzsFTXOqg4x2KIMcpjgos8H3G RvUTBdamVX/tYGoCUjHwBmM774hb8nvQq/kXNrExApEY+533eRP8ZNNDFuI0zsFcokVt cuyHlXvQ2xPHiAuaLOO1/S+ME3qzd8vluz0jenVQ0Gn7iWoAl5jlz3MD0O/NuF6ohYxS e9qneMEL8sdkkCq6cVlAGbeOFPVfA9TmHYbmj9O2+cqw2RTPg1/IhmchEC6vIQKUetzf 4/Xw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=kB+7zGfl; 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-63766-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63766-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCWjIiYknsXC8zpfv4ndDGAcvKtl0bLXmgMUy9GkauDs787DJJl12FWCKPXm5dOrcztIzitoYi/tYT2TUN48uGPoHU7+jQ== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id x15-20020a170902a38f00b001db3b8d4823si1005748pla.648.2024.02.13.07.35.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:35:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63766-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=kB+7zGfl; 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-63766-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63766-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 4BC8CB2A2C5 for ; Tue, 13 Feb 2024 15:08:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BE34B604D4; Tue, 13 Feb 2024 15:04:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="kB+7zGfl" 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 03CD85DF19; Tue, 13 Feb 2024 15:04:39 +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=1707836682; cv=none; b=A8NJwWxTbAcwqpIIX1gwnvPajUjq7St6ms3/nam9rqE1I2fCxzrJyQycI20PR7tAdS2g5dsukQ27smGLhKIh3VVZx26/jf35Vlc6Y2b75aEsHbB8n2/a/ggKtc3vMns9XAqa6ydZZaOlLP5wFI8pK6XI3cf2fUNEZGSlx9hLOjM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836682; c=relaxed/simple; bh=rEzklPL7XO/QeM3IB+DwasxJic974YGvekFUCpVFMb8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g6pw/p6HAY0X0QnALbQhi4eKd8jUUCuTGGhUz42/MfEKgPDG3P4LzQv6AnWiCZPrYXX9IIX84CaNVw2jifd75uUn3wuRK41GN2vqo8r3ahA7ToxbYXn1RcerDpCRd3hPVhq6YLEoRy1+w7IqqKxPMBw/0qYv3IaHHIp0vIuB7uE= 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=kB+7zGfl; 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 3D63A1BF20E; Tue, 13 Feb 2024 15:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836678; 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=eoBmwAByCPECYMqx4mhnkkfTJ9Zb0fG7mFlRU+qot5k=; b=kB+7zGfl0YBMWcWKUVn3BfSkNUvnXDw/AVO+Vg0haXBescwKzKsrrhflT2WZZN3Id+aym3 BCP4heLIa+PIQEGYdpzKtuBZjgUNUkIa0szjrY3soFyYMEE4igrAYtchG0HkOXiNavS2EE Oo2VqkVqhg8w6DZbUmZoB9UTagd8r46wznEWfcf9CRWLt3IdL2rwZOzFTxD2QPAOZQ2cWT +pUXqhNJko/UNnNFC5S+YqMYukOUWbOZJUCrSHA5EHLDds8gUC2PQOeFsPHrn/EvohhX9y aH6utjOAGvCZNPFZjEqudcOxA8aiDWr0xL8qEfhobEnv6x2WxfHI2svQ16m0RQ== 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 01/13] net: phy: Introduce ethernet link topology representation Date: Tue, 13 Feb 2024 16:04:18 +0100 Message-ID: <20240213150431.1796171-2-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: 1790798484690231926 X-GMAIL-MSGID: 1790798484690231926 Link topologies containing multiple network PHYs attached to the same net_device can be found when using a PHY as a media converter for use with an SFP connector, on which an SFP transceiver containing a PHY can be used. With the current model, the transceiver's PHY can't be used for operations such as cable testing, timestamping, macsec offload, etc. The reason being that most of the logic for these configuration, coming from either ethtool netlink or ioctls tend to use netdev->phydev, which in multi-phy systems will reference the PHY closest to the MAC. Introduce a numbering scheme allowing to enumerate PHY devices that belong to any netdev, which can in turn allow userspace to take more precise decisions with regard to each PHY's configuration. The numbering is maintained per-netdev, in a phy_device_list. The numbering works similarly to a netdevice's ifindex, with identifiers that are only recycled once INT_MAX has been reached. This prevents races that could occur between PHY listing and SFP transceiver removal/insertion. The identifiers are assigned at phy_attach time, as the numbering depends on the netdevice the phy is attached to. The PHY index can be re-used for PHYs that are persistent. Signed-off-by: Maxime Chevallier --- V7: - Protected the phy_link_topo helpers/stubs with IS_REACHABLE V6: - Made link_topo a pointer - Reworked the init/cleanup sequence - Added phy_index recycling if possible V5: - Dropped the ASSERT_RTNL() - Made the phy_link_topo_get_phy inline V4: - Moved the phy_link_topo_init() code to an inline header function - Made the code build without phylib V3: - Renamed to phy_link_topology - Added assertions for RTNL - Various cleanups of leftover, unused test code - Made the PHY index u32 MAINTAINERS | 2 + drivers/net/phy/Makefile | 2 +- drivers/net/phy/phy_device.c | 7 ++ drivers/net/phy/phy_link_topology.c | 105 +++++++++++++++++++++++++ include/linux/netdevice.h | 4 +- include/linux/phy.h | 4 + include/linux/phy_link_topology.h | 72 +++++++++++++++++ include/linux/phy_link_topology_core.h | 25 ++++++ include/uapi/linux/ethtool.h | 16 ++++ net/core/dev.c | 9 +++ 10 files changed, 244 insertions(+), 2 deletions(-) create mode 100644 drivers/net/phy/phy_link_topology.c create mode 100644 include/linux/phy_link_topology.h create mode 100644 include/linux/phy_link_topology_core.h diff --git a/MAINTAINERS b/MAINTAINERS index 960512bec428..03403f38aaf9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7938,6 +7938,8 @@ F: include/linux/mii.h F: include/linux/of_net.h F: include/linux/phy.h F: include/linux/phy_fixed.h +F: include/linux/phy_link_topology.h +F: include/linux/phy_link_topology_core.h F: include/linux/phylib_stubs.h F: include/linux/platform_data/mdio-bcm-unimac.h F: include/linux/platform_data/mdio-gpio.h diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 6097afd44392..f218954fd7a8 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -2,7 +2,7 @@ # Makefile for Linux PHY drivers libphy-y := phy.o phy-c45.o phy-core.o phy_device.o \ - linkmode.o + linkmode.o phy_link_topology.o mdio-bus-y += mdio_bus.o mdio_device.o ifdef CONFIG_MDIO_DEVICE diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 3611ea64875e..9385a4ee9380 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -1491,6 +1492,11 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, if (phydev->sfp_bus_attached) dev->sfp_bus = phydev->sfp_bus; + + err = phy_link_topo_add_phy(dev->link_topo, phydev, + PHY_UPSTREAM_MAC, dev); + if (err) + goto error; } /* Some Ethernet drivers try to connect to a PHY device before @@ -1820,6 +1826,7 @@ void phy_detach(struct phy_device *phydev) if (dev) { phydev->attached_dev->phydev = NULL; phydev->attached_dev = NULL; + phy_link_topo_del_phy(dev->link_topo, phydev); } phydev->phylink = NULL; diff --git a/drivers/net/phy/phy_link_topology.c b/drivers/net/phy/phy_link_topology.c new file mode 100644 index 000000000000..985941c5c558 --- /dev/null +++ b/drivers/net/phy/phy_link_topology.c @@ -0,0 +1,105 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Infrastructure to handle all PHY devices connected to a given netdev, + * either directly or indirectly attached. + * + * Copyright (c) 2023 Maxime Chevallier + */ + +#include +#include +#include +#include +#include + +struct phy_link_topology *phy_link_topo_create(struct net_device *dev) +{ + struct phy_link_topology *topo; + + topo = kzalloc(sizeof(*topo), GFP_KERNEL); + if (!topo) + return ERR_PTR(-ENOMEM); + + xa_init_flags(&topo->phys, XA_FLAGS_ALLOC1); + topo->next_phy_index = 1; + + return topo; +} + +void phy_link_topo_destroy(struct phy_link_topology *topo) +{ + if (!topo) + return; + + xa_destroy(&topo->phys); + kfree(topo); +} + +int phy_link_topo_add_phy(struct phy_link_topology *topo, + struct phy_device *phy, + enum phy_upstream upt, void *upstream) +{ + struct phy_device_node *pdn; + int ret; + + pdn = kzalloc(sizeof(*pdn), GFP_KERNEL); + if (!pdn) + return -ENOMEM; + + pdn->phy = phy; + switch (upt) { + case PHY_UPSTREAM_MAC: + pdn->upstream.netdev = (struct net_device *)upstream; + if (phy_on_sfp(phy)) + pdn->parent_sfp_bus = pdn->upstream.netdev->sfp_bus; + break; + case PHY_UPSTREAM_PHY: + pdn->upstream.phydev = (struct phy_device *)upstream; + if (phy_on_sfp(phy)) + pdn->parent_sfp_bus = pdn->upstream.phydev->sfp_bus; + break; + default: + ret = -EINVAL; + goto err; + } + pdn->upstream_type = upt; + + /* Attempt to re-use a previously allocated phy_index */ + if (phy->phyindex) { + ret = xa_insert(&topo->phys, phy->phyindex, pdn, GFP_KERNEL); + + /* Errors could be either -ENOMEM or -EBUSY. If the phy has an + * index, and there's another entry at the same index, this is + * unexpected and we still error-out + */ + if (ret) + goto err; + return 0; + } + + ret = xa_alloc_cyclic(&topo->phys, &phy->phyindex, pdn, xa_limit_32b, + &topo->next_phy_index, GFP_KERNEL); + if (ret) + goto err; + + return 0; + +err: + kfree(pdn); + return ret; +} +EXPORT_SYMBOL_GPL(phy_link_topo_add_phy); + +void phy_link_topo_del_phy(struct phy_link_topology *topo, + struct phy_device *phy) +{ + struct phy_device_node *pdn = xa_erase(&topo->phys, phy->phyindex); + + /* We delete the PHY from the topology, however we don't re-set the + * phy->phyindex field. If the PHY isn't gone, we can re-assign it the + * same index next time it's added back to the topology + */ + + kfree(pdn); +} +EXPORT_SYMBOL_GPL(phy_link_topo_del_phy); diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 118c40258d07..eef604c4df81 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -40,7 +40,6 @@ #include #endif #include - #include #include #include @@ -52,6 +51,7 @@ #include #include #include +#include struct netpoll_info; struct device; @@ -2047,6 +2047,7 @@ enum netdev_stat_type { * @fcoe_ddp_xid: Max exchange id for FCoE LRO by ddp * * @priomap: XXX: need comments on this one + * @link_topo: Physical link topology tracking attached PHYs * @phydev: Physical device may attach itself * for hardware timestamping * @sfp_bus: attached &struct sfp_bus structure. @@ -2441,6 +2442,7 @@ struct net_device { #if IS_ENABLED(CONFIG_CGROUP_NET_PRIO) struct netprio_map __rcu *priomap; #endif + struct phy_link_topology *link_topo; struct phy_device *phydev; struct sfp_bus *sfp_bus; struct lock_class_key *qdisc_tx_busylock; diff --git a/include/linux/phy.h b/include/linux/phy.h index 684efaeca07c..78647b5e0c13 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -544,6 +544,9 @@ struct macsec_ops; * @drv: Pointer to the driver for this PHY instance * @devlink: Create a link between phy dev and mac dev, if the external phy * used by current mac interface is managed by another mac interface. + * @phyindex: Unique id across the phy's parent tree of phys to address the PHY + * from userspace, similar to ifindex. A zero index means the PHY + * wasn't assigned an id yet. * @phy_id: UID for this device found during discovery * @c45_ids: 802.3-c45 Device Identifiers if is_c45. * @is_c45: Set to true if this PHY uses clause 45 addressing. @@ -642,6 +645,7 @@ struct phy_device { struct device_link *devlink; + u32 phyindex; u32 phy_id; struct phy_c45_device_ids c45_ids; diff --git a/include/linux/phy_link_topology.h b/include/linux/phy_link_topology.h new file mode 100644 index 000000000000..6b79feb607e7 --- /dev/null +++ b/include/linux/phy_link_topology.h @@ -0,0 +1,72 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * PHY device list allow maintaining a list of PHY devices that are + * part of a netdevice's link topology. PHYs can for example be chained, + * as is the case when using a PHY that exposes an SFP module, on which an + * SFP transceiver that embeds a PHY is connected. + * + * This list can then be used by userspace to leverage individual PHY + * capabilities. + */ +#ifndef __PHY_LINK_TOPOLOGY_H +#define __PHY_LINK_TOPOLOGY_H + +#include +#include + +struct xarray; +struct phy_device; +struct net_device; +struct sfp_bus; + +struct phy_device_node { + enum phy_upstream upstream_type; + + union { + struct net_device *netdev; + struct phy_device *phydev; + } upstream; + + struct sfp_bus *parent_sfp_bus; + + struct phy_device *phy; +}; + +struct phy_link_topology { + struct xarray phys; + u32 next_phy_index; +}; + +static inline struct phy_device * +phy_link_topo_get_phy(struct phy_link_topology *topo, u32 phyindex) +{ + struct phy_device_node *pdn = xa_load(&topo->phys, phyindex); + + if (pdn) + return pdn->phy; + + return NULL; +} + +#if IS_REACHABLE(CONFIG_PHYLIB) +int phy_link_topo_add_phy(struct phy_link_topology *topo, + struct phy_device *phy, + enum phy_upstream upt, void *upstream); + +void phy_link_topo_del_phy(struct phy_link_topology *lt, struct phy_device *phy); + +#else +static inline int phy_link_topo_add_phy(struct phy_link_topology *topo, + struct phy_device *phy, + enum phy_upstream upt, void *upstream) +{ + return 0; +} + +static inline void phy_link_topo_del_phy(struct phy_link_topology *topo, + struct phy_device *phy) +{ +} +#endif + +#endif /* __PHY_LINK_TOPOLOGY_H */ diff --git a/include/linux/phy_link_topology_core.h b/include/linux/phy_link_topology_core.h new file mode 100644 index 000000000000..0a6479055745 --- /dev/null +++ b/include/linux/phy_link_topology_core.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __PHY_LINK_TOPOLOGY_CORE_H +#define __PHY_LINK_TOPOLOGY_CORE_H + +struct phy_link_topology; + +#if IS_REACHABLE(CONFIG_PHYLIB) + +struct phy_link_topology *phy_link_topo_create(struct net_device *dev); +void phy_link_topo_destroy(struct phy_link_topology *topo); + +#else + +static inline struct phy_link_topology *phy_link_topo_create(struct net_device *dev) +{ + return NULL; +} + +static inline void phy_link_topo_destroy(struct phy_link_topology *topo) +{ +} + +#endif + +#endif /* __PHY_LINK_TOPOLOGY_CORE_H */ diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 06ef6b78b7de..01ba529dbb6d 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -2220,4 +2220,20 @@ struct ethtool_link_settings { * __u32 map_lp_advertising[link_mode_masks_nwords]; */ }; + +/** + * enum phy_upstream - Represents the upstream component a given PHY device + * is connected to, as in what is on the other end of the MII bus. Most PHYs + * will be attached to an Ethernet MAC controller, but in some cases, there's + * an intermediate PHY used as a media-converter, which will driver another + * MII interface as its output. + * @PHY_UPSTREAM_MAC: Upstream component is a MAC (a switch port, + * or ethernet controller) + * @PHY_UPSTREAM_PHY: Upstream component is a PHY (likely a media converter) + */ +enum phy_upstream { + PHY_UPSTREAM_MAC, + PHY_UPSTREAM_PHY, +}; + #endif /* _UAPI_LINUX_ETHTOOL_H */ diff --git a/net/core/dev.c b/net/core/dev.c index cb2dab0feee0..0fed31da523a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -153,6 +153,7 @@ #include #include #include +#include #include "dev.h" #include "net-sysfs.h" @@ -10875,6 +10876,12 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, #ifdef CONFIG_NET_SCHED hash_init(dev->qdisc_hash); #endif + dev->link_topo = phy_link_topo_create(dev); + if (IS_ERR(dev->link_topo)) { + dev->link_topo = NULL; + goto free_all; + } + dev->priv_flags = IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM; setup(dev); @@ -10963,6 +10970,8 @@ void free_netdev(struct net_device *dev) free_percpu(dev->xdp_bulkq); dev->xdp_bulkq = NULL; + phy_link_topo_destroy(dev->link_topo); + /* Compatibility with error handling in drivers */ if (dev->reg_state == NETREG_UNINITIALIZED) { netdev_freemem(dev); From patchwork Tue Feb 13 15:04:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp600498dyb; Tue, 13 Feb 2024 07:10:13 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUc6gEhLRoZzjNCoEqc/66QryA5L0omd1b4VR51E3BXsQ5ETVYPt0DfAZxpAR6jVnQpUkOmHSpciuhahmYBZvOe1dBClw== X-Google-Smtp-Source: AGHT+IFE4XHrxJlv+wbFstXwJKyopv8Uw/7fAuA6YxoI9ku6zrnhnYP0S8LWJV1AMytDMa6y2g8Z X-Received: by 2002:a05:6214:21a9:b0:68c:c602:d3f9 with SMTP id t9-20020a05621421a900b0068cc602d3f9mr10462268qvc.10.1707837012832; Tue, 13 Feb 2024 07:10:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707837012; cv=pass; d=google.com; s=arc-20160816; b=RQrMj5S/gmfm64qTixiarXAf8s9r30dJnDp/fVzs0rbVdnrpAa4VnqF36xDbYNlg+C j0wNOdxAn3pfZxFu8bptGMpKVredp8sW8/WpNSqRt0mUC7DYmE5k7anglmbRo+RWGUDs 7wT3p2RVjcX+3B8/rATnrK4hexXeN2XE1KP1kpI87LTMM8lymIgxJPTT5oBMnA+g7BI1 3oD065X9/oNdYG3pnZXuFsgfaOCOsk0PKjUBqtotWl/WfgLkJ+LRWQbMNDeQNsCqkxqT ZVdD0zn9zyVowW7NZr3HWJVvwUCiAlRovvCrrXtWofFUZiO7m9Au2hsTl3k8ox+n8Xf0 iAbg== 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=t/k2LZOtRfWqQWug6J8q2rLd/U7FeEJo/09riTvV4sw=; fh=5hkJJrsXqa4yzg+fEMBSMx2lgljg9w8T5GXgVq5wUlM=; b=Z+J8VU5sYbLg0c9kD3+fi97i4AS6d+CpHDdoFS2ySU+Am9vAqYKU/MyDYpuxQParYv HSNZODaezyOXhqeR0O86CB191mUnKV6P9J/ESaI++WEMO/fUOwjTlaBwV6bm1ecb1dmO kN+srg5P2EKVVIfKgkf5nnzAXoddpYUZ2PvBnbFZb/TE/bYAf6JmHehoAORmZWmd6AwU f8GGVAI8sWoMH5FdJkrKAzym0RWZaOwezdrWOZRWR4He9VzJ0LnwFhiy9ey6VIOF6ZaQ Bj7f7tudXBgUDnrok6njeYVnmOco6jaAYpj0+D/cTxJ88kQo53H4cpgSVe0XAV4dJWjH e7pw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Gufq9RHd; 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-63767-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63767-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCUGilKooHPYJGn3KEa7TEiUmkcIhtcJ5ArTIDxej83Y1Z/jUR89m02GUcyHEumfm6cNMP73TE1kfcjf0fxxJwOXwVf5iQ== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id gy13-20020a056214242d00b0068d14cbf19csi3137985qvb.345.2024.02.13.07.10.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:10:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63767-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=Gufq9RHd; 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-63767-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63767-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 E7F751C2858C for ; Tue, 13 Feb 2024 15:07:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ED3DC604BA; Tue, 13 Feb 2024 15:04:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="Gufq9RHd" 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 8765E5DF2D; Tue, 13 Feb 2024 15:04:41 +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=1707836684; cv=none; b=jtbzBvnGboN6Xw7rrQUOP1llmfElzAz+9oZzbG9Io3MoUA17roZagp9sp30nfDBLq+lA27+aw4vs4bTRUrvXx+7Vlow1gIoFB+6tav41xRptjt56FpPr1oOd/RSAiOrLomGyfT9cViyHkuRPqqQsZ3l/+VxBNttkBF89rybQtdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836684; c=relaxed/simple; bh=sUJvzUCKeAXw0uB2jlHSYFSabUelDp7xZNuGeGI5Q74=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q0EqRg+YGX338RflB6kDgIfXSSUmxe0HTCh+AwZy/yL34Z+/lptVT//h2/nv7oPpKhAIC+XUPrejc+R6b2y4XIU3imWqqIwpysFoj4HxOIfl2ywV1z75q9zBh2kM9SXXtlndWRPO38I55hmGf2nW/wNO6xJFlvJjiao2D+Ccnbo= 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=Gufq9RHd; 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 831761BF20A; Tue, 13 Feb 2024 15:04:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836679; 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=t/k2LZOtRfWqQWug6J8q2rLd/U7FeEJo/09riTvV4sw=; b=Gufq9RHdflf2LWNQBe7Q/X7K+jAZgsXq9rlWvcBD9vKynIblwXLluOurXs/PBDwbQvw5sa cdCz83WRcTQNipvTa68TxzN84kvUi3T00UmEY8OxzT7K8RNptUcts88EP3Ylj8378GOHOx QWmHxOcHHBk33LUgaN5w61S7CXfayOzEbJNKHCeyY7x1yGJbI8MlhX4sUgceDjsL1GTCMw X0nqsy1PVFMfo3YeWY4RmD+JbG5kBNIR1/6CRZAsz9Bg85d8ZlR2Q642gfodHLQ8KoYegv KTfGNAyWc3wiazN317M81avlW9dxyMBT7UGifFDCXCQ8ddGa73Qj4PFnyUZX+g== 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 02/13] net: sfp: pass the phy_device when disconnecting an sfp module's PHY Date: Tue, 13 Feb 2024 16:04:19 +0100 Message-ID: <20240213150431.1796171-3-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: 1790796903663448320 X-GMAIL-MSGID: 1790796903663448320 Pass the phy_device as a parameter to the sfp upstream .disconnect_phy operation. This is preparatory work to help track phy devices across a net_device's link. Signed-off-by: Maxime Chevallier --- V7: No changes V6: Moved an incorrectly added hunk from the previous series to patch 0003 V5: No changes V4: No changes V3: No changes drivers/net/phy/phylink.c | 3 ++- drivers/net/phy/sfp-bus.c | 4 ++-- include/linux/sfp.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index ed0b4ccaa6a6..a816391add12 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -3385,7 +3385,8 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) return ret; } -static void phylink_sfp_disconnect_phy(void *upstream) +static void phylink_sfp_disconnect_phy(void *upstream, + struct phy_device *phydev) { phylink_disconnect_phy(upstream); } diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c index db39dec7f247..e05013aeecc3 100644 --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c @@ -486,7 +486,7 @@ static void sfp_unregister_bus(struct sfp_bus *bus) bus->socket_ops->stop(bus->sfp); bus->socket_ops->detach(bus->sfp); if (bus->phydev && ops && ops->disconnect_phy) - ops->disconnect_phy(bus->upstream); + ops->disconnect_phy(bus->upstream, bus->phydev); } bus->registered = false; } @@ -742,7 +742,7 @@ void sfp_remove_phy(struct sfp_bus *bus) const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus); if (ops && ops->disconnect_phy) - ops->disconnect_phy(bus->upstream); + ops->disconnect_phy(bus->upstream, bus->phydev); bus->phydev = NULL; } EXPORT_SYMBOL_GPL(sfp_remove_phy); diff --git a/include/linux/sfp.h b/include/linux/sfp.h index 9346cd44814d..0573e53b0c11 100644 --- a/include/linux/sfp.h +++ b/include/linux/sfp.h @@ -544,7 +544,7 @@ struct sfp_upstream_ops { void (*link_down)(void *priv); void (*link_up)(void *priv); int (*connect_phy)(void *priv, struct phy_device *); - void (*disconnect_phy)(void *priv); + void (*disconnect_phy)(void *priv, struct phy_device *); }; #if IS_ENABLED(CONFIG_SFP) From patchwork Tue Feb 13 15:04:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200493 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp617323dyb; Tue, 13 Feb 2024 07:35:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IEy47D0fSjN81ZF5xYzEexpxuh8lM2JtG9K2xdPoc2UQr8FnwR9IEcc+3fG/Kx/y2g63M7f X-Received: by 2002:a17:903:40ca:b0:1d9:63a3:e962 with SMTP id t10-20020a17090340ca00b001d963a3e962mr11990594pld.6.1707838524093; Tue, 13 Feb 2024 07:35:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707838524; cv=pass; d=google.com; s=arc-20160816; b=I47h2ZyX6SOAfDBEgzCk06OKE84pSVJaJ2IDjV0g4smYXXh9SgdpKOhJDiHwba+Qxh fD2k2VeCinEfGjGUD4KN6sd+SOTlzvHFXN67IJCYpWFJFV4RebgrdYBWLrE8D81d0EJR 2hKq/DvblpCRLcN1zBY89idpaIBugTRgQKjuFOJt5zgEH0FBVztHWSQsaXM++4L8HoWb PnCWTTisQtdy2pRUFHFzk1QvDEZlwbwj+NhGhx/Tla4YQpY7LdOssKtPCyuvilUv+hgN NS65vPUm8NLnfNmrH4G/Tm6QDZNpZj6mLLx3qPXUYWJ1fT3NbBtxKqwKDj/3Gf6Z8zSj dvTw== 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=aUTAV3vM7bzG90dPzPRUHCaDTqnzb40CTDmAFG07evI=; fh=jJUqzBFYOcb5VJOOSLx4lea6hDOYgYziCv394K3i5V8=; b=pfxm+Qgk2dWorbQ6Z9h2u16IP6esrNMCnPrpi+qlEm3wi+2/jcnXcI1T+pctPnau5u nszeVKRVwpYkrGstnjOrxbVgjSi849Mbv4xX5mVp+i2/AOQHfBbIgdFyohTLMoqqIDto bdV64sm2JM4LVrhXvetum9l4Lz1l7jvXTl8pIajUfB1Mp6Mmogz6RzhxIHDSOYAA6hds WYrLih/5JAmjYNFVZk4FqIM1GsTA0JyUsdI+K51iDKGe1FytYshZCCrkBg1sSrIi5+fJ PcctD4uc29Hn3tMtKf75DjREnhqBfvRt6wK7QDOJY0EkOnkQY4TVeToY9tgtuvPhjo5M +QcQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=SywZ0okb; 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-63768-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63768-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCX3gulZB39uZln3qdxWI2+ib9z9rxt9SjD76f3YWuBWpv9/FbvxXFdXt2xzbjWJoupUvM8F3D2ODToxvrsw7o9Gf3mUcQ== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id a13-20020a170902b58d00b001d95b785884si2098834pls.639.2024.02.13.07.35.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:35:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63768-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=SywZ0okb; 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-63768-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63768-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 EA2E8B2A38D for ; Tue, 13 Feb 2024 15:08:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 508B5605A7; Tue, 13 Feb 2024 15:04:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="SywZ0okb" 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 984DD5EE71; Tue, 13 Feb 2024 15:04:42 +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=1707836684; cv=none; b=e9Al9gw4S5ifFaXvH80GSh4zQkUxFtLG2q+MCXzUc8m3LIckiv8EONLtFeKMNWBWALfcPBx2ulS9Km8STBEEMjldU49PtRc6sZv3kRgYunZrRr23iakHjmD6+5wdP8PVlElGQzseBsQsVwZIGguD11Z9YK6LBTbqedfvFbz67Og= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836684; c=relaxed/simple; bh=c3cTFpPnPvkpO7kctK+igbMko6WftdTV9+9Z4Z6y404=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T9l3YigC4YJb0+PFkNYjAcU0qUy/anveZPFr7gNpmY2XtV+MjAw5VoPVi+g48GeIuoQ+eZM0a03JAPAOF0edHzKdcUMsLxLg2VXPsziVfo+CI2V7FWvn6hB1OJzDyVrjPsHs29/He0NSPyHfTScFMtZ4PZ6Zm81k+tcXY9RaDWU= 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=SywZ0okb; 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 C27221BF205; Tue, 13 Feb 2024 15:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836680; 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=aUTAV3vM7bzG90dPzPRUHCaDTqnzb40CTDmAFG07evI=; b=SywZ0okbgt9wcM9g+2+z3pT9O+z64d6iViGWQe+kQWVVMQbWWBjQsHL5NAFB2TCcvXxDvk meChK+MfISEnGn5V3DW4G/VMzwgeWIyUi6srYYDONdIeGa3BXHQAq9zilvqnWAbtiDn9Il lzs82CQhmyjargWeagZM5D0f+ciqv2d2c/hrsa+Yk+9gblylRofcbVQbSV3WRB9pLRV8Eh D0uD+TrfmN2/TDwMJgDIyYMQOEYaDfDDed4xZwZK7EReIdyYVqFqeDyZIq3iXvE0FIJL54 7AcZjkyfiSufk9zoRWpc71mvZi7/BpN5m4LdXXgOp26YvTq+zpryonub6nkwXA== 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 03/13] net: phy: add helpers to handle sfp phy connect/disconnect Date: Tue, 13 Feb 2024 16:04:20 +0100 Message-ID: <20240213150431.1796171-4-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: 1790798488207870896 X-GMAIL-MSGID: 1790798488207870896 There are a few PHY drivers that can handle SFP modules through their sfp_upstream_ops. Introduce Phylib helpers to keep track of connected SFP PHYs in a netdevice's namespace, by adding the SFP PHY to the upstream PHY's netdev's namespace. By doing so, these SFP PHYs can be enumerated and exposed to users, which will be able to use their capabilities. Signed-off-by: Maxime Chevallier --- V7: No changes V6: Moved phy_get_link_topology() definition to this patch V5: No Changes V4: Rebased the at803x part with the newer version on net-next V3: Renaming V2: Renaming drivers/net/phy/at803x.c | 2 ++ drivers/net/phy/marvell-88x2222.c | 2 ++ drivers/net/phy/marvell.c | 2 ++ drivers/net/phy/marvell10g.c | 2 ++ drivers/net/phy/phy_device.c | 48 +++++++++++++++++++++++++++++++ include/linux/phy.h | 2 ++ 6 files changed, 58 insertions(+) diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index a62442a55774..2f50170738f3 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -1475,6 +1475,8 @@ static const struct sfp_upstream_ops at8031_sfp_ops = { .attach = phy_sfp_attach, .detach = phy_sfp_detach, .module_insert = at8031_sfp_insert, + .connect_phy = phy_sfp_connect_phy, + .disconnect_phy = phy_sfp_disconnect_phy, }; static int at8031_parse_dt(struct phy_device *phydev) diff --git a/drivers/net/phy/marvell-88x2222.c b/drivers/net/phy/marvell-88x2222.c index e3aa30dad2e6..3f77bbc7e04f 100644 --- a/drivers/net/phy/marvell-88x2222.c +++ b/drivers/net/phy/marvell-88x2222.c @@ -555,6 +555,8 @@ static const struct sfp_upstream_ops sfp_phy_ops = { .link_down = mv2222_sfp_link_down, .attach = phy_sfp_attach, .detach = phy_sfp_detach, + .connect_phy = phy_sfp_connect_phy, + .disconnect_phy = phy_sfp_disconnect_phy, }; static int mv2222_probe(struct phy_device *phydev) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index eba652a4c1d8..674e29bce2cc 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -3254,6 +3254,8 @@ static const struct sfp_upstream_ops m88e1510_sfp_ops = { .module_remove = m88e1510_sfp_remove, .attach = phy_sfp_attach, .detach = phy_sfp_detach, + .connect_phy = phy_sfp_connect_phy, + .disconnect_phy = phy_sfp_disconnect_phy, }; static int m88e1510_probe(struct phy_device *phydev) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index ad43e280930c..6642eb642d4b 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -503,6 +503,8 @@ static int mv3310_sfp_insert(void *upstream, const struct sfp_eeprom_id *id) static const struct sfp_upstream_ops mv3310_sfp_ops = { .attach = phy_sfp_attach, .detach = phy_sfp_detach, + .connect_phy = phy_sfp_connect_phy, + .disconnect_phy = phy_sfp_disconnect_phy, .module_insert = mv3310_sfp_insert, }; diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 9385a4ee9380..436c7b62d5be 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -266,6 +266,14 @@ static void phy_mdio_device_remove(struct mdio_device *mdiodev) static struct phy_driver genphy_driver; +static struct phy_link_topology *phy_get_link_topology(struct phy_device *phydev) +{ + if (phydev->attached_dev) + return phydev->attached_dev->link_topo; + + return NULL; +} + static LIST_HEAD(phy_fixup_list); static DEFINE_MUTEX(phy_fixup_lock); @@ -1355,6 +1363,46 @@ phy_standalone_show(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_RO(phy_standalone); +/** + * phy_sfp_connect_phy - Connect the SFP module's PHY to the upstream PHY + * @upstream: pointer to the upstream phy device + * @phy: pointer to the SFP module's phy device + * + * This helper allows keeping track of PHY devices on the link. It adds the + * SFP module's phy to the phy namespace of the upstream phy + */ +int phy_sfp_connect_phy(void *upstream, struct phy_device *phy) +{ + struct phy_device *phydev = upstream; + struct phy_link_topology *topo = phy_get_link_topology(phydev); + + if (topo) + return phy_link_topo_add_phy(topo, phy, PHY_UPSTREAM_PHY, phydev); + + return 0; +} +EXPORT_SYMBOL(phy_sfp_connect_phy); + +/** + * phy_sfp_disconnect_phy - Disconnect the SFP module's PHY from the upstream PHY + * @upstream: pointer to the upstream phy device + * @phy: pointer to the SFP module's phy device + * + * This helper allows keeping track of PHY devices on the link. It removes the + * SFP module's phy to the phy namespace of the upstream phy. As the module phy + * will be destroyed, re-inserting the same module will add a new phy with a + * new index. + */ +void phy_sfp_disconnect_phy(void *upstream, struct phy_device *phy) +{ + struct phy_device *phydev = upstream; + struct phy_link_topology *topo = phy_get_link_topology(phydev); + + if (topo) + phy_link_topo_del_phy(topo, phy); +} +EXPORT_SYMBOL(phy_sfp_disconnect_phy); + /** * phy_sfp_attach - attach the SFP bus to the PHY upstream network device * @upstream: pointer to the phy device diff --git a/include/linux/phy.h b/include/linux/phy.h index 78647b5e0c13..3637bdfc1166 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1725,6 +1725,8 @@ int phy_suspend(struct phy_device *phydev); int phy_resume(struct phy_device *phydev); int __phy_resume(struct phy_device *phydev); int phy_loopback(struct phy_device *phydev, bool enable); +int phy_sfp_connect_phy(void *upstream, struct phy_device *phy); +void phy_sfp_disconnect_phy(void *upstream, struct phy_device *phy); void phy_sfp_attach(void *upstream, struct sfp_bus *bus); void phy_sfp_detach(void *upstream, struct sfp_bus *bus); int phy_sfp_probe(struct phy_device *phydev, From patchwork Tue Feb 13 15:04:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200494 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp617455dyb; Tue, 13 Feb 2024 07:35:35 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU3O6D3hbwYdJyMd6166yyBPtbUCTyx3hPNaBLFABMv4ML7EV5jlvbCuq56lnMB04eexH6vwTpZyjkxidyjglDiNa9cig== X-Google-Smtp-Source: AGHT+IG5tZJ5kA3k1ijdKH4NXwr3COEWwWwPjqtd78/DJOEbhpHianufwDhTYNk4cp5JKgn+yZew X-Received: by 2002:a05:6a00:986:b0:6e0:6140:5e1 with SMTP id u6-20020a056a00098600b006e0614005e1mr10669254pfg.25.1707838535786; Tue, 13 Feb 2024 07:35:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707838535; cv=pass; d=google.com; s=arc-20160816; b=X4qQnp0Cg/fzzwzi7obvFsMgFqToOSyNaHM4N7F7sP8bwmnWdvtNGkTQpaoTxhmURF 115poCXfoYK3ignymQ1hFAG++1l4JJjmUu4dhGb2cF4TnxmbktDbsjzjU6KsssBQ1Z7U uBMa5Eb0XNxwA1GiRQmd5aX6XOw7ElUALvMjkyV5guEZuB5wvkIwd/VjqLRS4qRwI5b9 0d2i83gfXMsWc4pZPdCvpqzKF0oSxHA5V0dWdNYgcwxwWbsRaUZmwe2J7uX5l4q82oNl xvQKbV77yAuQyMu/PHNQ5d9se11+MRwByCrtP/moPbXGOqBZ2cpXvTBFxXa9xHSViq/+ LR+Q== 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=KTmhC9GjYAsePibiU7IujsC7f4CZ9RTCQLK3qNI1ORI=; fh=4CXgGbPLkb72ArW8ym7kutBoFEtqI3Z9fqDobT1/6AQ=; b=Nfbk2fYwJuGIowCpZgmXi/ru34svLJktq2S5Ah3M9jezqRmlas23XjCC6qWXjaMdnK /nqSzDDzTnnwwJPOeayH4TO853+z7tfR/EvX02xZAwJkor3IL9WaQDcYuLugHONNjRP1 Xs3oXU8Hbq6leHNoQ4sRxlQpcoNDn9zjUNtHvHpUNehhi1K4Jb2OhjmCPU1I6pBH6tiV 27nngk6kEHr60R0L+R1/HGJKu+CDxBCnJJoHn94B5rNbzmGahEH6qq92KW1AGfoUURHZ 3/MirtXIlHLGcp7CzFScQEMrbHv5lpKsWL890ZLj59FCuuFjtrKYTEi6V0BTpPUYwLbZ JOZA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=emmeAh0K; 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-63769-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63769-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCUwDrTJlsLXmTYnXbCSMD1VXJEye6VWi9Yj3kBY7v5WqRbgW3lKHPMDJuYUb2aRqcz8+FSSsKtZV3aO6ArjayD5Y9HpcQ== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id q22-20020a656a96000000b005dc375e5da4si2115464pgu.486.2024.02.13.07.35.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:35:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63769-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=emmeAh0K; 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-63769-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63769-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 22B3CB2A335 for ; Tue, 13 Feb 2024 15:08:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DB0B2605C3; Tue, 13 Feb 2024 15:04:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="emmeAh0K" 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 05C385EE9B; Tue, 13 Feb 2024 15:04:43 +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=1707836686; cv=none; b=mfXqMqy9cPeUzgU4qjAc4OClR5HKuTA6t40TFnPKu4G0jPe+Wg76vJ8uU0oAiv3/uLGHZgcDuAERnpEk5rlkaYb8q7gA0bLHH4D4PiHEkRNWycCSFBkfHGM/8OHhaJkodtyJJHTSH9JD6lKVMBAKjW8K5GHcDmPx6hTFOKLlgAs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836686; c=relaxed/simple; bh=tyo+KC7pg/1rkjnwq9wNNL45hWJwDIjFK1Gq4wwdE0k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fiJjj0bMrSKlAVg/tsHqBp+h12LzFq4XlG3hoFSqo1n8Lc9QxQTyPAnJAlBEV1AA3SiiV3MjfnB+eCrtAZZCxSVgtMT/sCb0DyIwhCVN6mgO3cS957+sDOOLw+uriLKeJR0A3SMnDnMWOvam0sMFFfjGoQjYAyVmpXME+0nV/0s= 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=emmeAh0K; 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 1763E1BF208; Tue, 13 Feb 2024 15:04:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836682; 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=KTmhC9GjYAsePibiU7IujsC7f4CZ9RTCQLK3qNI1ORI=; b=emmeAh0KnbtvoWUOHUpDn4bsEHHOTy1L69fszsWqCBAjwx6IaxAeVvY2uFVcTikrZGiZiw b6sN6Il3Nfa9tYHQdJD+To12xliNdlgCcgaCyIauoCpCKG0V079fLtAi3eAC37yf+a+ATB lmuWtVP7RoevX8WNl1W7VBHODztLWHCnXAXimx2r9r28lIocrn8Ruxrgl5ngzc54BgQu1Q RiM90Qci4kFS1DjkybbEy0Y2LGldnis9sedvClZoY+CBOiSSqSJJ40XNlwI+9uH/TjnJN2 MhJxb5o6DqZMp9EaGvMxKbWX//9u82ewmMFoowbDnOBFZGiuQf1Hom2OC/y80Q== 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 04/13] net: sfp: Add helper to return the SFP bus name Date: Tue, 13 Feb 2024 16:04:21 +0100 Message-ID: <20240213150431.1796171-5-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: 1790798500455715226 X-GMAIL-MSGID: 1790798500455715226 Knowing the bus name is helpful when we want to expose the link topology to userspace, add a helper to return the SFP bus name. Signed-off-by: Maxime Chevallier Reviewed-by: Andrew Lunn --- V7: - No changes V6: - No changes V5: - Added Andrew's R-b V4: - No changes V3: - Added RTNL assert - Made the stub inline V2: New patch drivers/net/phy/sfp-bus.c | 11 +++++++++++ include/linux/sfp.h | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c index e05013aeecc3..413021619afe 100644 --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c @@ -859,3 +859,14 @@ void sfp_unregister_socket(struct sfp_bus *bus) sfp_bus_put(bus); } EXPORT_SYMBOL_GPL(sfp_unregister_socket); + +const char *sfp_get_name(struct sfp_bus *bus) +{ + ASSERT_RTNL(); + + if (bus->sfp_dev) + return dev_name(bus->sfp_dev); + + return NULL; +} +EXPORT_SYMBOL_GPL(sfp_get_name); diff --git a/include/linux/sfp.h b/include/linux/sfp.h index 0573e53b0c11..55c0ab17c9e2 100644 --- a/include/linux/sfp.h +++ b/include/linux/sfp.h @@ -570,6 +570,7 @@ struct sfp_bus *sfp_bus_find_fwnode(const struct fwnode_handle *fwnode); int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream, const struct sfp_upstream_ops *ops); void sfp_bus_del_upstream(struct sfp_bus *bus); +const char *sfp_get_name(struct sfp_bus *bus); #else static inline int sfp_parse_port(struct sfp_bus *bus, const struct sfp_eeprom_id *id, @@ -648,6 +649,11 @@ static inline int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream, static inline void sfp_bus_del_upstream(struct sfp_bus *bus) { } + +static inline const char *sfp_get_name(struct sfp_bus *bus) +{ + return NULL; +} #endif #endif From patchwork Tue Feb 13 15:04:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200478 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp600959dyb; Tue, 13 Feb 2024 07:10:47 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW3n/8jEoCGyMQ3E0JMThaj3Ho5+7KP6A/hIcV0sakk25ASAdeEji9aCA/7Bec5yycBxa4N2m4oIJPgvsDKip1CA/Wpuw== X-Google-Smtp-Source: AGHT+IFgc7Odbm+WUBZheRATZ9216BDOsBrTu2gZeHs7k2PBSpDrbnNXE7xwLXrkbcV/S3BVk9mZ X-Received: by 2002:a0d:d146:0:b0:5ff:77b4:60b7 with SMTP id t67-20020a0dd146000000b005ff77b460b7mr9591827ywd.25.1707837046766; Tue, 13 Feb 2024 07:10:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707837046; cv=pass; d=google.com; s=arc-20160816; b=m/clrHNopMVABU4nVwCW66X66QLxe27rRHX7gqfD/hy0d0qLfENQfZc97KjY3Eas+a xARU+8Al2YmKZJQRWkzp5Pt87qO9yCQWXKszwCovm2MxTdz308IzpVxOLl/z70+uw0p4 Dt97Pu5ghloaIi4RRgixzDOeVtlJaqQa3n/aabkSeslFnCrJLKPIFBm8188yqYD956dP wtSW/9vzEQ9hMlxkCzkjo566csbeG7E//ZLCf/58VBITPir7ElZjJUk24GnTsvOPSz0K txNLkPFzSTcU0VMiJLYXBplF/552BrYFtQogp7Rqv9xxt+S6U5icvNVByYB6iItV/W3u vyIw== 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=kjzRMUYA1Ihq0ViRO0FWv0r3GqKWWBhvBioG7PKKyO0=; fh=fCAABMRgDn8n9Wy9XlRAeviMAWMKh9OGOHrZ46AEtOI=; b=0NNtaXaTi5P8CIzbLh2G5Ot9rXhBq+B8Tgs2mJpo6uz6cQnPlN/tm18b2SA1Ko8Hdg S2q3R8WZQe6wAyRZMOfA55WRSgR6rdJa35PIo+gbIXiqvoDwAnes8O3nsdW6f6VRVjxO ulKEaRmvkA74YEX22SBWoDaADgWrTk/4Tw89nMconmOsrwTkUPD72U/IR7tztjXDs97o jdJl/pQB3jTu+nw7oh5ZUHAutLuCNwYsEMK0g/g4xh8kuHhOg1Es1OyK53WUNrA4jLth 27emaIIEqKVjjAXOkj9PKsiZHcnXaf5w6gkUwS0wNdi/6IU+5wJhiAHJSoHGXspNmhtK GmyA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b="RRSO6k1/"; 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-63770-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63770-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCXdsbaf82LsVEKvpotOb5nv0HuZ0r5av4RszTLOuHC0QpMHTJpv9HjSaPkt3mudq0MY44R1XNvbXFyctBgdQcMc0V/ZVA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id v20-20020a05622a145400b0042c5c0d5f73si3070802qtx.33.2024.02.13.07.10.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:10:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63770-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="RRSO6k1/"; 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-63770-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63770-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 A3F701C21244 for ; Tue, 13 Feb 2024 15:09:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6DEA060890; Tue, 13 Feb 2024 15:04:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="RRSO6k1/" 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 268795F551; Tue, 13 Feb 2024 15:04:44 +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=1707836687; cv=none; b=T3dd85zljQhoXglyRacxTPfvU/N8Zsd8/zLixTuLzFjTHeiI5oYYka6Fzo8Gg6BcOKQE9MpnnSNEZoiZcbzBqxirqN2Z6Xq6ifOoynLhbFfjq4mnoEegPpSe5K/xMp5EWUQR5wQ2ggm0XmuiLafPDFoLctmLUu3WthOwCeI8NBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836687; c=relaxed/simple; bh=bvkXCHeX9a57rRVfkZ3QauvkQ8COJckzXRf+bpZlSPM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E5ThZXGnyF7joBwHCIL92f1S3ATWayRex9a+Z8lKPVB1K1QmOR/+hP/KzoU92ImrOIzAUGl2x2zAkF8j3PdEk3HICoRPLoRSYHdJvwIIPpnT9OrO30sqSthS35rkrLNxH/vNKKdZFGCnyFS3rXB5QHU8cDyP3r0tlpnXrDbUGU8= 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=RRSO6k1/; 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 582F81BF211; Tue, 13 Feb 2024 15:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836683; 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=kjzRMUYA1Ihq0ViRO0FWv0r3GqKWWBhvBioG7PKKyO0=; b=RRSO6k1/HD/qIiXTnJ9CgOP4ZXyVaBmCkhutz5xjXCE3Da1cuEqM4GfERWLntD6ev7GVS7 37CmrSCrH0+av7VrRVXOWIaEDbQMSqtIWpGxMaMqfC7qBuCCLsYvTF1j8Mt9ZLcGS47Bhq t6SOJhMsMOANuT++O5vLGwZYZ0+6oozk3W84PeaUvMxZx7d4Xy0nGWanF1HYSO09f6MOdq xejkgHlTcFBjLnhb0CKr6qrxLJntKdLlyhtw9sA5w/OEkgyzbkyPUbGTToBNT/YZrViSY2 x/ikyuzAv9I3NheQmVogs5m5oHvcVtwkVxBSL92jyKYeeW/RRWLYhB4FxSqxBQ== 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 05/13] net: ethtool: Allow passing a phy index for some commands Date: Tue, 13 Feb 2024 16:04:22 +0100 Message-ID: <20240213150431.1796171-6-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: 1790796938931093589 X-GMAIL-MSGID: 1790796938931093589 Some netlink commands are target towards ethernet PHYs, to control some of their features. As there's several such commands, add the ability to pass a PHY index in the ethnl request, which will populate the generic ethnl_req_info with the relevant phydev when the command targets a PHY. Signed-off-by: Maxime Chevallier Reviewed-by: Andrew Lunn --- V7: - No changes V6: - Added dedicated policies when passing a PHY index - Dropped Andrew's R-b as there were changes V5: - Added Andrew's R-b - Fix a typo reported by Simon V4: - No Changes V3: - Fixed the documentation V2: - New patch Documentation/networking/ethtool-netlink.rst | 7 ++++ include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/netlink.c | 44 +++++++++++++++++++- net/ethtool/netlink.h | 5 +++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst index d583d9abf2f8..3ca6c21e74af 100644 --- a/Documentation/networking/ethtool-netlink.rst +++ b/Documentation/networking/ethtool-netlink.rst @@ -57,6 +57,7 @@ Structure of this header is ``ETHTOOL_A_HEADER_DEV_INDEX`` u32 device ifindex ``ETHTOOL_A_HEADER_DEV_NAME`` string device name ``ETHTOOL_A_HEADER_FLAGS`` u32 flags common for all requests + ``ETHTOOL_A_HEADER_PHY_INDEX`` u32 phy device index ============================== ====== ============================= ``ETHTOOL_A_HEADER_DEV_INDEX`` and ``ETHTOOL_A_HEADER_DEV_NAME`` identify the @@ -81,6 +82,12 @@ the behaviour is backward compatible, i.e. requests from old clients not aware of the flag should be interpreted the way the client expects. A client must not set flags it does not understand. +``ETHTOOL_A_HEADER_PHY_INDEX`` identify the ethernet PHY the message relates to. +As there are numerous commands that are related to PHY configuration, and because +we can have more than one PHY on the link, the PHY index can be passed in the +request for the commands that needs it. It is however not mandatory, and if it +is not passed for commands that target a PHY, the net_device.phydev pointer +is used, as a fallback that keeps the legacy behaviour. Bit sets ======== diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h index 3f89074aa06c..422e8cfdd98c 100644 --- a/include/uapi/linux/ethtool_netlink.h +++ b/include/uapi/linux/ethtool_netlink.h @@ -133,6 +133,7 @@ enum { ETHTOOL_A_HEADER_DEV_INDEX, /* u32 */ ETHTOOL_A_HEADER_DEV_NAME, /* string */ ETHTOOL_A_HEADER_FLAGS, /* u32 - ETHTOOL_FLAG_* */ + ETHTOOL_A_HEADER_PHY_INDEX, /* u32 */ /* add new constants above here */ __ETHTOOL_A_HEADER_CNT, diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c index fe3553f60bf3..5a9beb09e5d4 100644 --- a/net/ethtool/netlink.c +++ b/net/ethtool/netlink.c @@ -4,6 +4,7 @@ #include #include #include "netlink.h" +#include static struct genl_family ethtool_genl_family; @@ -30,6 +31,24 @@ const struct nla_policy ethnl_header_policy_stats[] = { ETHTOOL_FLAGS_STATS), }; +const struct nla_policy ethnl_header_policy_phy[] = { + [ETHTOOL_A_HEADER_DEV_INDEX] = { .type = NLA_U32 }, + [ETHTOOL_A_HEADER_DEV_NAME] = { .type = NLA_NUL_STRING, + .len = ALTIFNAMSIZ - 1 }, + [ETHTOOL_A_HEADER_FLAGS] = NLA_POLICY_MASK(NLA_U32, + ETHTOOL_FLAGS_BASIC), + [ETHTOOL_A_HEADER_PHY_INDEX] = NLA_POLICY_MIN(NLA_U32, 1), +}; + +const struct nla_policy ethnl_header_policy_phy_stats[] = { + [ETHTOOL_A_HEADER_DEV_INDEX] = { .type = NLA_U32 }, + [ETHTOOL_A_HEADER_DEV_NAME] = { .type = NLA_NUL_STRING, + .len = ALTIFNAMSIZ - 1 }, + [ETHTOOL_A_HEADER_FLAGS] = NLA_POLICY_MASK(NLA_U32, + ETHTOOL_FLAGS_STATS), + [ETHTOOL_A_HEADER_PHY_INDEX] = NLA_POLICY_MIN(NLA_U32, 1), +}; + int ethnl_ops_begin(struct net_device *dev) { int ret; @@ -89,8 +108,9 @@ int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info, const struct nlattr *header, struct net *net, struct netlink_ext_ack *extack, bool require_dev) { - struct nlattr *tb[ARRAY_SIZE(ethnl_header_policy)]; + struct nlattr *tb[ARRAY_SIZE(ethnl_header_policy_phy)]; const struct nlattr *devname_attr; + struct phy_device *phydev = NULL; struct net_device *dev = NULL; u32 flags = 0; int ret; @@ -104,7 +124,7 @@ int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info, /* No validation here, command policy should have a nested policy set * for the header, therefore validation should have already been done. */ - ret = nla_parse_nested(tb, ARRAY_SIZE(ethnl_header_policy) - 1, header, + ret = nla_parse_nested(tb, ARRAY_SIZE(ethnl_header_policy_phy) - 1, header, NULL, extack); if (ret < 0) return ret; @@ -145,6 +165,26 @@ int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info, return -EINVAL; } + if (dev) { + if (tb[ETHTOOL_A_HEADER_PHY_INDEX]) { + u32 phy_index = nla_get_u32(tb[ETHTOOL_A_HEADER_PHY_INDEX]); + + phydev = phy_link_topo_get_phy(dev->link_topo, + phy_index); + if (!phydev) { + NL_SET_ERR_MSG_ATTR(extack, header, + "no phy matches phy index"); + return -EINVAL; + } + } else { + /* If we need a PHY but no phy index is specified, fallback + * to dev->phydev + */ + phydev = dev->phydev; + } + } + + req_info->phydev = phydev; req_info->dev = dev; req_info->flags = flags; return 0; diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h index 9a333a8d04c1..d57a890b5d9e 100644 --- a/net/ethtool/netlink.h +++ b/net/ethtool/netlink.h @@ -250,6 +250,7 @@ static inline unsigned int ethnl_reply_header_size(void) * @dev: network device the request is for (may be null) * @dev_tracker: refcount tracker for @dev reference * @flags: request flags common for all request types + * @phydev: phy_device connected to @dev this request is for (may be null) * * This is a common base for request specific structures holding data from * parsed userspace request. These always embed struct ethnl_req_info at @@ -259,6 +260,7 @@ struct ethnl_req_info { struct net_device *dev; netdevice_tracker dev_tracker; u32 flags; + struct phy_device *phydev; }; static inline void ethnl_parse_header_dev_put(struct ethnl_req_info *req_info) @@ -395,9 +397,12 @@ extern const struct ethnl_request_ops ethnl_rss_request_ops; extern const struct ethnl_request_ops ethnl_plca_cfg_request_ops; extern const struct ethnl_request_ops ethnl_plca_status_request_ops; extern const struct ethnl_request_ops ethnl_mm_request_ops; +extern const struct ethnl_request_ops ethnl_phy_request_ops; extern const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_FLAGS + 1]; extern const struct nla_policy ethnl_header_policy_stats[ETHTOOL_A_HEADER_FLAGS + 1]; +extern const struct nla_policy ethnl_header_policy_phy[ETHTOOL_A_HEADER_PHY_INDEX + 1]; +extern const struct nla_policy ethnl_header_policy_phy_stats[ETHTOOL_A_HEADER_PHY_INDEX + 1]; extern const struct nla_policy ethnl_strset_get_policy[ETHTOOL_A_STRSET_COUNTS_ONLY + 1]; extern const struct nla_policy ethnl_linkinfo_get_policy[ETHTOOL_A_LINKINFO_HEADER + 1]; extern const struct nla_policy ethnl_linkinfo_set_policy[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL + 1]; From patchwork Tue Feb 13 15:04:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200476 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp600513dyb; Tue, 13 Feb 2024 07:10:13 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWWpinLuMfbLawE9SHcc3dlG7r69h3W8G9E9QaG/f1mqYlmSSK7LfmRgyF+TN7qvUYgzvt/sgLEU9Gh+o8DzjBhemXy6g== X-Google-Smtp-Source: AGHT+IG68CGuLHtc0ieKglwwZtXaGbWvlUwhsjA86gRgDvfJo+vy43oq2ZPMMDUqzcoTil+Jhcr1 X-Received: by 2002:aa7:cb47:0:b0:55f:d95c:923 with SMTP id w7-20020aa7cb47000000b0055fd95c0923mr6691266edt.25.1707837013545; Tue, 13 Feb 2024 07:10:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707837013; cv=pass; d=google.com; s=arc-20160816; b=UQmuCtRF1+1QEqA838BGz+GIgtsmgw3qDzg/DVfvLBe91yRYYRunCdAddsqF5e+b9l Mf5vagKoiz27GH1N0/ONOdF6ZUrSI+JJsoDoD59xkZ8QWy/EU86mK5m13ne8H8PNifKX rqSjrCVnBk6bkqiz8kip4+aT4cpmTSPd9w4o/JgU4tXyVPXIHYkGpzJ6wcuJJ8QnaY3I t2iKFhNzti8qhIrCGEemP6lxCPhPJ7QG1ZifBCfTl8s+0nvp64wnoQHNbadJFXHtxZ35 AJUfTOTZTL2G3liILl+5SyiCxnObah2x3/a3/g50nAdOxsUlngaew816D+7GBpWPHEkF AV7g== 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=VwIX7+El5QmnjROakdN4myLsb1ax3viGLX6LhH3RGqg=; fh=aL61WfFzcAtLU/cqbAnLoQNaklO1jJhSRN92OCM2+Kc=; b=xhivvFz3hLAdzrgGvZHUoyig1W94fBc/RivUpC6dh8rirqAzUj64IJvKu9Hn4m/yXs TSQUf3sUrYqg3GuXruFJ8OGh35pd9hPE6rXJxFCUQZIuU6sJ8RiPjuaEd6ONP8u/6OoR 3vTImRWNPMam29fJhwPdFo/wRpPYO97xlOCsuMb+R5NRpPHlf5kR+G/SPIhIvhvtPyJN 4nWhSESqrtXGVCtRVQ9LQwMyw6ss5NCzLVk7V5Mz9mJNcVxiP7CR9GCWE9nBfR7G7CeK Fz1/ILMQtb8TvajINceZLFC3mY7BJFsoaUR2Ynq9WnAikcOOP+uJ4Y+5Vq3tw0RghQsp HsXw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=PytGMhye; 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-63771-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63771-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCWzMKxzvqxIjAeS7deNTombk+/srK0DjK5RXss26lrywzEm4aMR+gEY5dea3ZTNZvysAFDYQJorUICdu8hTqTKKLY9ZnA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id dy22-20020a05640231f600b0056110e68e82si3849950edb.137.2024.02.13.07.10.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:10:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63771-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=PytGMhye; 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-63771-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63771-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 0204B1F29E6A for ; Tue, 13 Feb 2024 15:08:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3690560885; Tue, 13 Feb 2024 15:04:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="PytGMhye" 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 82F535F87A; Tue, 13 Feb 2024 15:04:46 +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=1707836688; cv=none; b=SymAh0aH9qPRN3hD6Yyq4c0HoIKECiLs34A8hGDeinHsBOjBF9Owqq1EOtvYD0Z85Ts6yFIiITS2E9eD7FX9LNDNRbpBMGHunlxarG8OL29V6bHKZbrKVNTLfXhG9aaH7sozqjCjKDuNa8CRfqN8+WFPI97F1DK8A9z+dlFscoI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836688; c=relaxed/simple; bh=57X+EBrpaLE/1lkDUXRPxy6Yx07hO3FWy/vn76Y07Mc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eBpy/++YD34xLYh+ZLmgkxeyfYbQWY4xT2b/ql/15o/xdVaehEYNcg/v1klC4Z06oweS4OMx69pq1BIk15TeG1P5BGetusTPGF64ObZMXiQzxWjHkhMxRM4Z7EW9LKTxdpduC7/xF7Qy7jnuJZLAQSAbBD96pwiWY9c6ipTiGYg= 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=PytGMhye; 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 9E56C1BF213; Tue, 13 Feb 2024 15:04:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836684; 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=VwIX7+El5QmnjROakdN4myLsb1ax3viGLX6LhH3RGqg=; b=PytGMhyeOYM5jYUaEKRjAOI2GSDCVx7LRSQT5UzLNj3dTIysGD8dOOKCCRRdZ/YR9a8hLu JNCEPcEhYlYIhc2xtZVXuA5tlCsQ6nZEF9CowAush5Zb1AyscTgYUAwyLt5O9hWvSWW5pi FO6U+VVobe5VnwlEj5ag02QxY9oqAdIG9TWAljjHcERdIxvII1VEWCA+fTjlq8wJ9CfqV7 cKAC3siHAnVOKj7n5ApO8V2qLOyrpaCE8nNMXJdCBIu+1RMNjVl4yqOFQOWPvc/fbZT6up u6EV0oq68SBcB/v8Oy0QaVzcWsAg6/SUuA2PaP47ZihNTb1gXQsIyZ/mZwwVjA== 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 06/13] netlink: specs: add phy-index as a header parameter Date: Tue, 13 Feb 2024 16:04:23 +0100 Message-ID: <20240213150431.1796171-7-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: 1790796904781663046 X-GMAIL-MSGID: 1790796904781663046 Update the spec to take the newly introduced phy-index as a generic request parameter. Signed-off-by: Maxime Chevallier Reviewed-by: Andrew Lunn --- V7: No changes V6: No changes V5: Added Andrew's R-b V4: Ditch the ethtool-user generated code V3: New patch Documentation/netlink/specs/ethtool.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml index 197208f419dc..bb6e1dc6d1c5 100644 --- a/Documentation/netlink/specs/ethtool.yaml +++ b/Documentation/netlink/specs/ethtool.yaml @@ -30,6 +30,9 @@ attribute-sets: - name: flags type: u32 + - + name: phy-index + type: u32 - name: bitset-bit From patchwork Tue Feb 13 15:04:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200479 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp602918dyb; Tue, 13 Feb 2024 07:13:20 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUjUhC1DSsaf1vk84+zDf+R4wKfy068BmyY6Hyc66Icz0ie5DCwuZuUJrtLBuYYncLxCXjFj52NAyCF6xP/eesMf6axTQ== X-Google-Smtp-Source: AGHT+IHNIiD8hFIe58zxhm5xX9ISO2ZwGT5MQMgFlLZl0ugPoN5Jdm+NZ575fNQmCVw5QWFOQZJN X-Received: by 2002:a05:620a:22a5:b0:787:2045:f065 with SMTP id p5-20020a05620a22a500b007872045f065mr1231801qkh.76.1707837200740; Tue, 13 Feb 2024 07:13:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707837200; cv=pass; d=google.com; s=arc-20160816; b=0RXkWN5tadahpp5Vn1FVCAAFbhVfqGysIpih7g6X8OqZEPlTJES652WzTUE7KkVgSK Sp7FowaHim9IZWlOeERyXPGMf4gOFM6mrTqHRc4aVGqM6SFYhK3Ro0vyIAOnDXNkFwYk 7Z5Qcp6Jzpe+GZfIZWEIO2d7PUyGJ1sS/xml5rDk1vKMSe+EPsyTRFr6ckNepsJinZNr 6J7Jp1lvsOsQLEX50MsGb3Ij7WiCSGkHPp7GDPmYGKztSC/DAd8S/7qrkJeNYu1CfbW/ 2vbHltcszr/W/VIZRA7HtPYF9BZ3X1RvKQIdbPdK/GoQqK821EFJHHVwhFvVvjXiDgVR FERg== 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=SnfTkZefh7YI0ay4PeIeNci6oOxWWcBCcJ0nUOiOhVc=; fh=JP6YLoEB5ekVBxMz3gFI1Sl3IMk4Az2nE46hkF4vYQg=; b=tMVDh90QxHP8IxcfeT1YdF5SVw48C+ehHW8rx7unUHHISqq55funi8YEiGbjrcNhLH lfKvfCFsEsZ1oa40CWKn9R23piOLYxOJfxuu5bycHNENwLba5LAjOVVhsCEZbD7vqSPn qvUvkasoPZM69PzUhUu4TgWlM8XjFLqxZDCWXgKCLGDloN6z+9E+s0QB4lab0/HugUhr RRDTJzR56+8jzPY8UtoCOFZlc83ywO1KYGBaO6qHqexhspwnFVjPtacC7DDMkEhNFt6F 137KEChNznbYjJ9HZ/MYX3eLGAV1D7yWA790w0ax7RXRHUgMO62Glh7pHEXQAzZosVDl Q+Zw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=paKVIhPz; 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-63772-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63772-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCWycZJQx6LuMyhLNQy5cxSRqqcU1JxHnvWi8tCFu9W7gwY4QtO4R7pdGkUzMlHYo8+3/zRjcW9tK7RO7EB+HhzYoRRsow== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id b5-20020a05620a270500b007872139a1bbsi1089054qkp.8.2024.02.13.07.13.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:13:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63772-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=paKVIhPz; 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-63772-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63772-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 48CC61C27CE9 for ; Tue, 13 Feb 2024 15:10:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DD5B260DFF; Tue, 13 Feb 2024 15:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="paKVIhPz" 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 C73A3604D6; Tue, 13 Feb 2024 15:04:47 +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=1707836690; cv=none; b=RF2tYGmW0XF01o115ZdEcQR55DC8i2HQVErdRtGX7pPyoq6ytbwRZ0Tug2+Zwqj8YjIBAyudJCbUNPo3s8gfjRuH1Sz6p6pu1qBesdykodb1fJ332OCPaFCTLHxcvOb6mpV1QAqLrDyel+R12SG0RWbRryQ5GaKdD90bY3BFEwg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836690; c=relaxed/simple; bh=16KqfcPkUpmKS7WFOs7XJQZU6z9ND52ZR6dJ4an9TP4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RXkQMgBOs+9baxoed/HfNOp/c/Dnt85AcdZ6CZiMYoqhw9LhwgwjhLpSRN35V1mTKg7ZDas0Xu7kav8FMobbcrR+F5RqfCXm6TcMBTTQ3n6MxLG3Nw5fziZaBiIhkGw9vDaMyAgkwjjnsfNfxMlEG61roURQ82Ayh/vZrPEw/sI= 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=paKVIhPz; 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 D6C581BF203; Tue, 13 Feb 2024 15:04:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836686; 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=SnfTkZefh7YI0ay4PeIeNci6oOxWWcBCcJ0nUOiOhVc=; b=paKVIhPzlOkVspNdXZ0FJ6HsmcNsyp0f/8wT8fsYAeJmCePV6Fqh/Rl0rNP/ILm3P8W0Xd 5v+rQ/nUZaHY2BbfDMsLX5yDcin9w81Xgttws2G3C4o4Lj/Ke5dAFoPtw0wsIEo2NYgxzX vYg1jW8jAjGIAOU+W2FlRHRj0I18xaZ9xAfj0iILEmLNPek4IfiU3PahQJFvNT+I4ZC+X2 n3Q7Oy0ORz6czlU6BV1LcKAKH0OG6BCFZ98hNFE376WhP2WVT1YPg/6ha67LeQaFZOEXg3 cTq6DGqmcdr+hsrDlf44uU/w3WPO2zgvKnKnTzEPUp0o95O1AQyDlErHGKBFEA== 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 07/13] net: ethtool: Introduce a command to list PHYs on an interface Date: Tue, 13 Feb 2024 16:04:24 +0100 Message-ID: <20240213150431.1796171-8-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: 1790797100678980446 X-GMAIL-MSGID: 1790797100678980446 As we have the ability to track the PHYs connected to a net_device through the link_topology, we can expose this list to userspace. This allows userspace to use these identifiers for phy-specific commands and take the decision of which PHY to target by knowing the link topology. Add PHY_GET and PHY_DUMP, which can be a filtered DUMP operation to list devices on only one interface. Signed-off-by: Maxime Chevallier --- V7: - Moved the netdev release into the .done() call for filtered DUMP requests V6: - Removed un-needed nest - Fixed the DUMP code - Fixed the documentation formatting V5: - Fixed xmas tree - Fixed uninitialized return variable (Simon) V4: - Fixed errors when not having SFP enabled, resulting in null names being passed as parameters to strlen. V3: - Fixed the documentation - Fixed the DUMP implementation V2: New patch Documentation/networking/ethtool-netlink.rst | 39 +++ include/uapi/linux/ethtool_netlink.h | 20 ++ net/ethtool/Makefile | 2 +- net/ethtool/netlink.c | 9 + net/ethtool/netlink.h | 5 + net/ethtool/phy.c | 297 +++++++++++++++++++ 6 files changed, 371 insertions(+), 1 deletion(-) create mode 100644 net/ethtool/phy.c diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst index 3ca6c21e74af..e498c3b0b28f 100644 --- a/Documentation/networking/ethtool-netlink.rst +++ b/Documentation/networking/ethtool-netlink.rst @@ -2011,6 +2011,44 @@ The attributes are propagated to the driver through the following structure: .. kernel-doc:: include/linux/ethtool.h :identifiers: ethtool_mm_cfg +PHY_GET +======= + +Retrieve information about a given Ethernet PHY sitting on the link. As there +can be more than one PHY, the DUMP operation can be used to list the PHYs +present on a given interface, by passing an interface index or name in +the dump request + +Request contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_PHY_HEADER`` nested request header + ==================================== ====== ========================== + +Kernel response contents: + + ===================================== ====== =============================== + ``ETHTOOL_A_PHY_HEADER`` nested request header + ``ETHTOOL_A_PHY_INDEX`` u32 the phy's unique index, that can + be used for phy-specific + requests + ``ETHTOOL_A_PHY_DRVNAME`` string the phy driver name + ``ETHTOOL_A_PHY_NAME`` string the phy device name + ``ETHTOOL_A_PHY_UPSTREAM_TYPE`` u32 the type of device this phy is + connected to + ``ETHTOOL_A_PHY_UPSTREAM_INDEX`` u32 the PHY index of the upstream + PHY + ``ETHTOOL_A_PHY_UPSTREAM_SFP_NAME`` string if this PHY is connected to + it's parent PHY through an SFP + bus, the name of this sfp bus + ``ETHTOOL_A_PHY_DOWNSTREAM_SFP_NAME`` string if the phy controls an sfp bus, + the name of the sfp bus + ``ETHTOOL_A_PHY_ID`` u32 the phy id if the phy is C22 + ===================================== ====== =============================== + +When ``ETHTOOL_A_PHY_UPSTREAM_TYPE`` is PHY_UPSTREAM_PHY, the PHY's parent is +another PHY. + Request translation =================== @@ -2117,4 +2155,5 @@ are netlink only. n/a ``ETHTOOL_MSG_PLCA_GET_STATUS`` n/a ``ETHTOOL_MSG_MM_GET`` n/a ``ETHTOOL_MSG_MM_SET`` + n/a ``ETHTOOL_MSG_PHY_GET`` =================================== ===================================== diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h index 422e8cfdd98c..f7a13e93ecb7 100644 --- a/include/uapi/linux/ethtool_netlink.h +++ b/include/uapi/linux/ethtool_netlink.h @@ -57,6 +57,7 @@ enum { ETHTOOL_MSG_PLCA_GET_STATUS, ETHTOOL_MSG_MM_GET, ETHTOOL_MSG_MM_SET, + ETHTOOL_MSG_PHY_GET, /* add new constants above here */ __ETHTOOL_MSG_USER_CNT, @@ -109,6 +110,8 @@ enum { ETHTOOL_MSG_PLCA_NTF, ETHTOOL_MSG_MM_GET_REPLY, ETHTOOL_MSG_MM_NTF, + ETHTOOL_MSG_PHY_GET_REPLY, + ETHTOOL_MSG_PHY_NTF, /* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT, @@ -977,6 +980,23 @@ enum { ETHTOOL_A_MM_MAX = (__ETHTOOL_A_MM_CNT - 1) }; +enum { + ETHTOOL_A_PHY_UNSPEC, + ETHTOOL_A_PHY_HEADER, /* nest - _A_HEADER_* */ + ETHTOOL_A_PHY_INDEX, /* u32 */ + ETHTOOL_A_PHY_DRVNAME, /* string */ + ETHTOOL_A_PHY_NAME, /* string */ + ETHTOOL_A_PHY_UPSTREAM_TYPE, /* u32 */ + ETHTOOL_A_PHY_UPSTREAM_INDEX, /* u32 */ + ETHTOOL_A_PHY_UPSTREAM_SFP_NAME, /* string */ + ETHTOOL_A_PHY_DOWNSTREAM_SFP_NAME, /* string */ + ETHTOOL_A_PHY_ID, /* u32 */ + + /* add new constants above here */ + __ETHTOOL_A_PHY_CNT, + ETHTOOL_A_PHY_MAX = (__ETHTOOL_A_PHY_CNT - 1) +}; + /* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool" #define ETHTOOL_GENL_VERSION 1 diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile index 504f954a1b28..0ccd0e9afd3f 100644 --- a/net/ethtool/Makefile +++ b/net/ethtool/Makefile @@ -8,4 +8,4 @@ ethtool_nl-y := netlink.o bitset.o strset.o linkinfo.o linkmodes.o rss.o \ linkstate.o debug.o wol.o features.o privflags.o rings.o \ channels.o coalesce.o pause.o eee.o tsinfo.o cabletest.o \ tunnels.o fec.o eeprom.o stats.o phc_vclocks.o mm.o \ - module.o pse-pd.o plca.o mm.o + module.o pse-pd.o plca.o mm.o phy.o diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c index 5a9beb09e5d4..6334e8ce95f7 100644 --- a/net/ethtool/netlink.c +++ b/net/ethtool/netlink.c @@ -1169,6 +1169,15 @@ static const struct genl_ops ethtool_genl_ops[] = { .policy = ethnl_mm_set_policy, .maxattr = ARRAY_SIZE(ethnl_mm_set_policy) - 1, }, + { + .cmd = ETHTOOL_MSG_PHY_GET, + .doit = ethnl_phy_doit, + .start = ethnl_phy_start, + .dumpit = ethnl_phy_dumpit, + .done = ethnl_phy_done, + .policy = ethnl_phy_get_policy, + .maxattr = ARRAY_SIZE(ethnl_phy_get_policy) - 1, + }, }; static const struct genl_multicast_group ethtool_nl_mcgrps[] = { diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h index d57a890b5d9e..0e71b53bdb1c 100644 --- a/net/ethtool/netlink.h +++ b/net/ethtool/netlink.h @@ -446,6 +446,7 @@ extern const struct nla_policy ethnl_plca_set_cfg_policy[ETHTOOL_A_PLCA_MAX + 1] extern const struct nla_policy ethnl_plca_get_status_policy[ETHTOOL_A_PLCA_HEADER + 1]; extern const struct nla_policy ethnl_mm_get_policy[ETHTOOL_A_MM_HEADER + 1]; extern const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1]; +extern const struct nla_policy ethnl_phy_get_policy[ETHTOOL_A_PHY_HEADER + 1]; int ethnl_set_features(struct sk_buff *skb, struct genl_info *info); int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info); @@ -453,6 +454,10 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info); int ethnl_tunnel_info_doit(struct sk_buff *skb, struct genl_info *info); int ethnl_tunnel_info_start(struct netlink_callback *cb); int ethnl_tunnel_info_dumpit(struct sk_buff *skb, struct netlink_callback *cb); +int ethnl_phy_start(struct netlink_callback *cb); +int ethnl_phy_doit(struct sk_buff *skb, struct genl_info *info); +int ethnl_phy_dumpit(struct sk_buff *skb, struct netlink_callback *cb); +int ethnl_phy_done(struct netlink_callback *cb); extern const char stats_std_names[__ETHTOOL_STATS_CNT][ETH_GSTRING_LEN]; extern const char stats_eth_phy_names[__ETHTOOL_A_STATS_ETH_PHY_CNT][ETH_GSTRING_LEN]; diff --git a/net/ethtool/phy.c b/net/ethtool/phy.c new file mode 100644 index 000000000000..fb73bf51c683 --- /dev/null +++ b/net/ethtool/phy.c @@ -0,0 +1,297 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright 2023 Bootlin + * + */ +#include "common.h" +#include "netlink.h" + +#include +#include +#include + +struct phy_req_info { + struct ethnl_req_info base; + struct phy_device_node pdn; +}; + +#define PHY_REQINFO(__req_base) \ + container_of(__req_base, struct phy_req_info, base) + +const struct nla_policy ethnl_phy_get_policy[ETHTOOL_A_PHY_HEADER + 1] = { + [ETHTOOL_A_PHY_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), +}; + +/* Caller holds rtnl */ +static ssize_t +ethnl_phy_reply_size(const struct ethnl_req_info *req_base, + struct netlink_ext_ack *extack) +{ + struct phy_req_info *req_info = PHY_REQINFO(req_base); + struct phy_device_node *pdn = &req_info->pdn; + struct phy_device *phydev = pdn->phy; + size_t size = 0; + + ASSERT_RTNL(); + + /* ETHTOOL_A_PHY_INDEX */ + size += nla_total_size(sizeof(u32)); + + /* ETHTOOL_A_DRVNAME */ + if (phydev->drv) + size += nla_total_size(strlen(phydev->drv->name) + 1); + + /* ETHTOOL_A_NAME */ + size += nla_total_size(strlen(dev_name(&phydev->mdio.dev)) + 1); + + /* ETHTOOL_A_PHY_UPSTREAM_TYPE */ + size += nla_total_size(sizeof(u32)); + + /* ETHTOOL_A_PHY_ID */ + size += nla_total_size(sizeof(u32)); + + if (phy_on_sfp(phydev)) { + const char *upstream_sfp_name = sfp_get_name(pdn->parent_sfp_bus); + + /* ETHTOOL_A_PHY_UPSTREAM_SFP_NAME */ + if (upstream_sfp_name) + size += nla_total_size(strlen(upstream_sfp_name) + 1); + + /* ETHTOOL_A_PHY_UPSTREAM_INDEX */ + size += nla_total_size(sizeof(u32)); + } + + /* ETHTOOL_A_PHY_DOWNSTREAM_SFP_NAME */ + if (phydev->sfp_bus) { + const char *sfp_name = sfp_get_name(phydev->sfp_bus); + + if (sfp_name) + size += nla_total_size(strlen(sfp_name) + 1); + } + + return size; +} + +static int +ethnl_phy_fill_reply(const struct ethnl_req_info *req_base, struct sk_buff *skb) +{ + struct phy_req_info *req_info = PHY_REQINFO(req_base); + struct phy_device_node *pdn = &req_info->pdn; + struct phy_device *phydev = pdn->phy; + enum phy_upstream ptype; + + ptype = pdn->upstream_type; + + if (nla_put_u32(skb, ETHTOOL_A_PHY_INDEX, phydev->phyindex) || + nla_put_string(skb, ETHTOOL_A_PHY_NAME, dev_name(&phydev->mdio.dev)) || + nla_put_u32(skb, ETHTOOL_A_PHY_UPSTREAM_TYPE, ptype) || + nla_put_u32(skb, ETHTOOL_A_PHY_ID, phydev->phy_id)) + return -EMSGSIZE; + + if (phydev->drv && nla_put_string(skb, ETHTOOL_A_PHY_DRVNAME, phydev->drv->name)) + return -EMSGSIZE; + + if (ptype == PHY_UPSTREAM_PHY) { + struct phy_device *upstream = pdn->upstream.phydev; + const char *sfp_upstream_name; + + /* Parent index */ + if (nla_put_u32(skb, ETHTOOL_A_PHY_UPSTREAM_INDEX, upstream->phyindex)) + return -EMSGSIZE; + + if (pdn->parent_sfp_bus) { + sfp_upstream_name = sfp_get_name(pdn->parent_sfp_bus); + if (sfp_upstream_name && nla_put_string(skb, + ETHTOOL_A_PHY_UPSTREAM_SFP_NAME, + sfp_upstream_name)) + return -EMSGSIZE; + } + } + + if (phydev->sfp_bus) { + const char *sfp_name = sfp_get_name(phydev->sfp_bus); + + if (sfp_name && + nla_put_string(skb, ETHTOOL_A_PHY_DOWNSTREAM_SFP_NAME, + sfp_name)) + return -EMSGSIZE; + } + + return 0; +} + +static int ethnl_phy_parse_request(struct ethnl_req_info *req_base, + struct nlattr **tb) +{ + struct phy_link_topology *topo = req_base->dev->link_topo; + struct phy_req_info *req_info = PHY_REQINFO(req_base); + struct phy_device_node *pdn; + + if (!req_base->phydev) + return 0; + + pdn = xa_load(&topo->phys, req_base->phydev->phyindex); + memcpy(&req_info->pdn, pdn, sizeof(*pdn)); + + return 0; +} + +int ethnl_phy_doit(struct sk_buff *skb, struct genl_info *info) +{ + struct phy_req_info req_info = {}; + struct nlattr **tb = info->attrs; + struct sk_buff *rskb; + void *reply_payload; + int reply_len; + int ret; + + ret = ethnl_parse_header_dev_get(&req_info.base, + tb[ETHTOOL_A_PHY_HEADER], + genl_info_net(info), info->extack, + true); + if (ret < 0) + return ret; + + rtnl_lock(); + + ret = ethnl_phy_parse_request(&req_info.base, tb); + if (ret < 0) + goto err_unlock_rtnl; + + /* No PHY, return early */ + if (!req_info.pdn.phy) + goto err_unlock_rtnl; + + ret = ethnl_phy_reply_size(&req_info.base, info->extack); + if (ret < 0) + goto err_unlock_rtnl; + reply_len = ret + ethnl_reply_header_size(); + + rskb = ethnl_reply_init(reply_len, req_info.base.dev, + ETHTOOL_MSG_PHY_GET_REPLY, + ETHTOOL_A_PHY_HEADER, + info, &reply_payload); + if (!rskb) { + ret = -ENOMEM; + goto err_unlock_rtnl; + } + + ret = ethnl_phy_fill_reply(&req_info.base, rskb); + if (ret) + goto err_free_msg; + + rtnl_unlock(); + ethnl_parse_header_dev_put(&req_info.base); + genlmsg_end(rskb, reply_payload); + + return genlmsg_reply(rskb, info); + +err_free_msg: + nlmsg_free(rskb); +err_unlock_rtnl: + rtnl_unlock(); + ethnl_parse_header_dev_put(&req_info.base); + return ret; +} + +struct ethnl_phy_dump_ctx { + struct phy_req_info *phy_req_info; + unsigned long ifindex; + unsigned long phy_index; +}; + +int ethnl_phy_start(struct netlink_callback *cb) +{ + const struct genl_dumpit_info *info = genl_dumpit_info(cb); + struct ethnl_phy_dump_ctx *ctx = (void *)cb->ctx; + struct nlattr **tb = info->info.attrs; + int ret; + + BUILD_BUG_ON(sizeof(*ctx) > sizeof(cb->ctx)); + + ctx->phy_req_info = kzalloc(sizeof(*ctx->phy_req_info), GFP_KERNEL); + if (!ctx->phy_req_info) + return -ENOMEM; + + ret = ethnl_parse_header_dev_get(&ctx->phy_req_info->base, + tb[ETHTOOL_A_PHY_HEADER], + sock_net(cb->skb->sk), cb->extack, + false); + ctx->ifindex = 0; + ctx->phy_index = 0; + return ret; +} + +int ethnl_phy_done(struct netlink_callback *cb) +{ + struct ethnl_phy_dump_ctx *ctx = (void *)cb->ctx; + + ethnl_parse_header_dev_put(&ctx->phy_req_info->base); + kfree(ctx->phy_req_info); + + return 0; +} + +static int ethnl_phy_dump_one_dev(struct sk_buff *skb, struct net_device *dev, + struct netlink_callback *cb) +{ + struct ethnl_phy_dump_ctx *ctx = (void *)cb->ctx; + struct phy_req_info *pri = ctx->phy_req_info; + struct phy_device_node *pdn; + int ret = 0; + void *ehdr; + + pri->base.dev = dev; + + xa_for_each_start(&dev->link_topo->phys, ctx->phy_index, pdn, ctx->phy_index) { + ehdr = ethnl_dump_put(skb, cb, + ETHTOOL_MSG_PHY_GET_REPLY); + if (!ehdr) { + ret = -EMSGSIZE; + break; + } + + ret = ethnl_fill_reply_header(skb, dev, + ETHTOOL_A_PHY_HEADER); + if (ret < 0) { + genlmsg_cancel(skb, ehdr); + break; + } + + memcpy(&pri->pdn, pdn, sizeof(*pdn)); + ret = ethnl_phy_fill_reply(&pri->base, skb); + + genlmsg_end(skb, ehdr); + } + + return ret; +} + +int ethnl_phy_dumpit(struct sk_buff *skb, struct netlink_callback *cb) +{ + struct ethnl_phy_dump_ctx *ctx = (void *)cb->ctx; + struct net *net = sock_net(skb->sk); + struct net_device *dev; + int ret = 0; + + rtnl_lock(); + + if (ctx->phy_req_info->base.dev) { + ret = ethnl_phy_dump_one_dev(skb, ctx->phy_req_info->base.dev, cb); + } else { + for_each_netdev_dump(net, dev, ctx->ifindex) { + ret = ethnl_phy_dump_one_dev(skb, dev, cb); + if (ret) + break; + + ctx->phy_index = 0; + } + } + rtnl_unlock(); + + if (ret == -EMSGSIZE && skb->len) + return skb->len; + + return ret; +} + From patchwork Tue Feb 13 15:04:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200481 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp603041dyb; Tue, 13 Feb 2024 07:13:31 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWxz8DVjUrzCcD5cNNO2VskzDDsrc+Gwi7xQfRE1RlhbheQnoio/pC7hujPrOG5cOUFPHXFKwWfTwyg7/iTFIuzxXlDDA== X-Google-Smtp-Source: AGHT+IFII1ziqjMZ8zHdv6b4aYJn8z6zPRl+wWA2RfScYtQ+RWUAwrUwsIGTLsecOTwTyixP7b2e X-Received: by 2002:a17:902:720b:b0:1db:2aed:786d with SMTP id ba11-20020a170902720b00b001db2aed786dmr2697689plb.29.1707837211186; Tue, 13 Feb 2024 07:13:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707837211; cv=pass; d=google.com; s=arc-20160816; b=t2t0OkH6sj0SgbgQpVVAOkgjxGvzbB5aWFPCqP0+5VnNfWmYcmOnRE1I7YwtXwu2eQ 0wjLFHVyzfOHhXRoss8EdlYntZTxi5Q+745IoEHtJYkmVNmSkvtTCiSW+tkgPoYZWmUt oboGE0hnd43z9u7vH47jt4p5JMuFoIcOyJfUPnMDKweyI0k5tyMZOeRWOxWpYPh3I4MG 7/OsojJQStCv6iHfsGggr63EdZU9RHM2UZpLhQTuRVXKgEi5bSdrv9iE2NMccJjhn9S2 5uC4pB1zYAC8lh2HcgHcZ01f1nZjdBH3RoIS/9msZXa+WPoimBzVb3/HvM2TsnBx4njZ ydwA== 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=C4RYso1bdjI1BwO/bVlMqy6V8aSjC8tPTMLgRYJlyIA=; fh=8Bh9AXv4QZHc4azJnn4Np9kTMW1VRhY1ow1Gs3lpp50=; b=IJhYkQ7UmVdS1t8CpY07FUFTQsTbOD7HqXtXkcI6Qp72xdDA+tugvHzqUV+VxWNy8B sZ/IPM/bG2GblBMXKs1AgPabJOhSP4laPUntqzE3cpaIMEchBmQFRli8oqBMxBO9TPhc sqSo/EHzcIb7P4PQRvTw4QfkUkA5j6oycZEGPHl3FEgNZ0M4EV5Ukkf9GGNZOzav8jrK 5CPEizM73109Tk9cfzEY/gY8aj/t3wJ6BrNdmqzzr3KaA8K2IZ0vdURHNHQ5PAea/UXv 822vNVhqhkoLw5bLBxtHvAQgXccjKEWunSqrWXjYxjHTc3mHQkwPAJfET4xLD9e8lHDg bhYA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b="Xk/WBPlP"; 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-63773-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63773-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCVi3PMeyBDgQPUJmA7s76nprXSOX5RYOOlXtq+KcRyKyzT01glIJUYne/SwnEYANGbxvWlqut2LTpuwBjshyupakFWgFw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id l3-20020a170902f68300b001d91df66e24si2139895plg.164.2024.02.13.07.13.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:13:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63773-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="Xk/WBPlP"; 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-63773-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63773-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 17C7F2835DE for ; Tue, 13 Feb 2024 15:09:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B683660BB3; Tue, 13 Feb 2024 15:04:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="Xk/WBPlP" 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 D9D1A605C2; Tue, 13 Feb 2024 15:04:48 +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=1707836690; cv=none; b=rXPi0TwKkWbOf+yV8mPiRIFqhErNp7WyoVhI4z5f6h2k7RkmNgsSib2AgH3SKohW7OfbBhlTww/fjy45ZXRujUlLdqSPTjM9ing1Xw+ZUcRUQxE6B3L/spD4ZhFPfiMP+4TfxGIGEU8W8E3hdPEcVlwfjDLkWXDuuiSv+bB786c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836690; c=relaxed/simple; bh=iBBewnB2kKbuDY1N2YWRJf9/pYhFwE10TTpPgZnLp+c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rBJdI0Kcmzm4d+kSauHObfWwUvPCvVWnf2oC0bHqjwtTGEOkRNEF0/5O2PQ9HBzpOWM/7gKpUcANCtqfKiPPo7A5jrYlGL82zfE6pdrJqJiT7wX7IJnj54374thWValXy1uAh7If2lxfDrsevGiKNJ9nm2+bHWAxHNTCig5tTrM= 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=Xk/WBPlP; 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 236F51BF20B; Tue, 13 Feb 2024 15:04:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836687; 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=C4RYso1bdjI1BwO/bVlMqy6V8aSjC8tPTMLgRYJlyIA=; b=Xk/WBPlPw8lzAKb5Gh1ddKo7lnRVaTi7CkbfYmO4vxBs7qOFxRHeFbCSj3EFyI/EhtooLE mToSi8e3Axa1bFxICTxEIZKSK2An+96HaYl85QH9Su6FoEscWDNPryhC3/cK2aTNfOGbJP /3wG1w9edDtCue0NxpaCoMHAOejTLBBkzIm8X8C0ann/76schcfw384b4quJOO7TLbfF0O zA8J9pjsmVXe8SCvETmHlone3XCNP1ePMc1wHFpv9fMd++qpAzprVGSjTWA0uSQEqKnxzl s+aOoPb0X/ksp3BqdPQwZ6fqQ7uHieNGJxMws2F7HxIHr3N07KPL+RXXLsPvmA== 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 08/13] netlink: specs: add ethnl PHY_GET command set Date: Tue, 13 Feb 2024 16:04:25 +0100 Message-ID: <20240213150431.1796171-9-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: 1790797111769551787 X-GMAIL-MSGID: 1790797111769551787 The PHY_GET command, supporting both DUMP and GET operations, is used to retrieve the list of PHYs connected to a netdevice, and get topology information to know where exactly it sits on the physical link. Add the netlink specs corresponding to that command. Signed-off-by: Maxime Chevallier --- V7: No changes V6: Updated the spec according to the new attributes V5: No changes V4: Remove the ethtool-user generated code V3: New patch Documentation/netlink/specs/ethtool.yaml | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml index bb6e1dc6d1c5..e98d78fbc2f3 100644 --- a/Documentation/netlink/specs/ethtool.yaml +++ b/Documentation/netlink/specs/ethtool.yaml @@ -16,6 +16,11 @@ definitions: name: stringset type: enum entries: [] + - + name: phy-upstream-type + enum-name: + type: enum + entries: [ mac, phy ] attribute-sets: - @@ -945,6 +950,38 @@ attribute-sets: - name: burst-tmr type: u32 + - + name: phy + attributes: + - + name: header + type: nest + nested-attributes: header + - + name: index + type: u32 + - + name: drvname + type: string + - + name: name + type: string + - + name: upstream-type + type: u32 + enum: phy-upstream-type + - + name: upstream-phy-index + type: u32 + - + name: upstream-sfp-name + type: string + - + name: downstream-sfp-name + type: string + - + name: id + type: u32 operations: enum-model: directional @@ -1696,3 +1733,25 @@ operations: name: mm-ntf doc: Notification for change in MAC Merge configuration. notify: mm-get + - + name: phy-get + doc: Get PHY devices attached to an interface + + attribute-set: phy + + do: &phy-get-op + request: + attributes: + - header + reply: + attributes: + - header + - index + - drvname + - name + - upstream-type + - upstream-phy-index + - upstream-sfp-name + - downstream-sfp-name + - id + dump: *phy-get-op From patchwork Tue Feb 13 15:04: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: 200496 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp618853dyb; Tue, 13 Feb 2024 07:37:36 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW5XqbGoDRyrTYISngVFczQgagBWWvDewjWqE3lG0GZLEJe++Ty7rx5q2O0CDDjkgthVsTRhWHTe4NDvUNWRKjjd83BTg== X-Google-Smtp-Source: AGHT+IHj7tU5xcV4qZcTFucl2b3awJnrfg6IPy+hkt5Aqf6Y7tNAyK48394hmVLMVamsvwOHbEuo X-Received: by 2002:a62:e518:0:b0:6e0:3cfd:501e with SMTP id n24-20020a62e518000000b006e03cfd501emr8433197pff.3.1707838656295; Tue, 13 Feb 2024 07:37:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707838656; cv=pass; d=google.com; s=arc-20160816; b=wv4RLaRcvne0b6nKM5KGUAYK9CyaWY4JZoS04M8oi7N/2AZ89wDVEaIB+JWVCpZBFW umShB8ZanQ7N80Zq+nl+W3wGiqVdOUB3y+8fHg5Aw69gsTaA4tnVraiZdFZdKy2HO3Xy 4NzZgOgsCCIwqn2ofQQOJ0BJoMWOYIetpU7WVO59yhmydtEppSGNs6j/wpa4lawTZkHV awD3skmR0nyUsOip5v9NLNGSHHmcKO0w6YmIIaZmu79uGvkA9mHuI8yu8l/7yCnb1XQl XOtT9/0vxISvUFhguldQ0olSoaspRYqqPsN/sNAAawiNB99R6syyeNFy12T+J+osMmA2 5Fag== 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=aWTuDer7pateN9r2X0Jl1ZpbA7JJOYc0nb5gl+3hDaA=; fh=eLstwzJTEJrAHaIFNeTEGkB0MtuzynUi7qawRV52Tzc=; b=H+JLwX9qcI21lQvJmOkrLJCWsRjX4+XbHSZMLUnm7y2biwoMLKvsDqxmUUabXf/axG yeUZ1gw+G6KD6xkQxlXrj8AqrDWnrb+jrOnPkoNHXrwZgHvqpFaf2hqbC6F3rfQPXbHE gsInPI/+3SLLkRBk+trgA0FC72x+29m1Q78VGmmLITq/rFk123YP1lH9TXDvt+8H/0O7 vjnxa5nUfOZrHJb3QBZMTzlTgt7K8SLHzWDLbW39fveBEsccnaH2Cu6DnGdz/zb2CSua Fr0sGPmiRFqQpzBZpEU9MmrDbIyx365wu8dqSf8S2rliTeftYfEVTzFOMTS78XGRASfJ y5VQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Sao55gVg; 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-63774-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63774-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCXcIpxNybrkXp/jBkHOASfCjXBxybZ/OghSMV6AjVsAumm/f7trOKA+zG2q51MrXaRHdZlUvLOHhhMJgkchU1WjzADKaw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id z23-20020a63ac57000000b005dc85635271si1264230pgn.605.2024.02.13.07.37.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:37:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63774-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Sao55gVg; 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-63774-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63774-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 DC1EBB2B005 for ; Tue, 13 Feb 2024 15:10:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4B29E60DE6; Tue, 13 Feb 2024 15:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="Sao55gVg" 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 EB89E60864; Tue, 13 Feb 2024 15:04:49 +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=1707836692; cv=none; b=QXhQJ2+OETdFFnsjcRZu+Qcg7/FT4Z8lq/WOmtVo7HHYjcN/vHEWn12yOYuGXGmw1+Tf4f9e9kmTIzSNjN56T01tSncA6rzS64DtKQNbmm2HuTONu73QyaGd6LzoXUzTS5uf1uZHgyGLvNnJkX9jTaNaGbbLLIdnYv+qY4QNqQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836692; c=relaxed/simple; bh=eikMrHfEtel/upPwWFp+EA1Ekjg5tsXxytsOi21E0R8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UgPapb7Jbm9XlfYpZ8qS2OOh+iWMmDN+mFSCjxDx36r9FAQAWIGdhwe9JUBCWgMJvbRINnc+Iqnov0i++84RqzDp9T7qfwfTCgB8g0kKN0td2m7A9ygtzXsVtA3xWPuCZy1OUetXhma7M4yzUrLB/riIxeF7DKDYRRE/kK1YeJU= 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=Sao55gVg; 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 5DF711BF204; Tue, 13 Feb 2024 15:04:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836688; 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=aWTuDer7pateN9r2X0Jl1ZpbA7JJOYc0nb5gl+3hDaA=; b=Sao55gVgc6fpoE4a5Djs3dBVgpi5WG05G1oMrPiw3/r9LhnWmtD4wuNi/ZMCZoGffZJLKY 92seeH3n2bRzJXEr0tPkUytbS46cIfN3PM1C0yt8cycDee7ul2bQoWNkYDBiGWjlFgRlAm ibx7l+0ANMGBqiHsc5XvaE6ArerPJgYBlo0vtVLXqTWRFOEfU2tVXo/GdNbyPnqtGMrOAF lBtdU52y+FZPc2LrxMi+KF67PDWRaJAro5tqr2JFf3uvczRgRFCditvWjgnGU1S7+zvtbF 8cPBX54nrLswGzmFGyEfom9wjQBmznqJFy1Dk5xmTo5QuR1p/wjI5OQnGXWlDw== 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 09/13] net: ethtool: plca: Target the command to the requested PHY Date: Tue, 13 Feb 2024 16:04:26 +0100 Message-ID: <20240213150431.1796171-10-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: 1790798627031478476 X-GMAIL-MSGID: 1790798627031478476 PLCA is a PHY-specific command. Instead of targeting the command towards dev->phydev, use the request to pick the targeted PHY. 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/plca.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/net/ethtool/plca.c b/net/ethtool/plca.c index b1e2e3b5027f..43b31a4a164e 100644 --- a/net/ethtool/plca.c +++ b/net/ethtool/plca.c @@ -25,7 +25,7 @@ struct plca_reply_data { const struct nla_policy ethnl_plca_get_cfg_policy[] = { [ETHTOOL_A_PLCA_HEADER] = - NLA_POLICY_NESTED(ethnl_header_policy), + NLA_POLICY_NESTED(ethnl_header_policy_phy), }; static void plca_update_sint(int *dst, struct nlattr **tb, u32 attrid, @@ -61,7 +61,7 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base, int ret; // check that the PHY device is available and connected - if (!dev->phydev) { + if (!req_base->phydev) { ret = -EOPNOTSUPP; goto out; } @@ -80,7 +80,7 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base, memset(&data->plca_cfg, 0xff, sizeof_field(struct plca_reply_data, plca_cfg)); - ret = ops->get_plca_cfg(dev->phydev, &data->plca_cfg); + ret = ops->get_plca_cfg(req_base->phydev, &data->plca_cfg); ethnl_ops_complete(dev); out: @@ -129,7 +129,7 @@ static int plca_get_cfg_fill_reply(struct sk_buff *skb, const struct nla_policy ethnl_plca_set_cfg_policy[] = { [ETHTOOL_A_PLCA_HEADER] = - NLA_POLICY_NESTED(ethnl_header_policy), + NLA_POLICY_NESTED(ethnl_header_policy_phy), [ETHTOOL_A_PLCA_ENABLED] = NLA_POLICY_MAX(NLA_U8, 1), [ETHTOOL_A_PLCA_NODE_ID] = NLA_POLICY_MAX(NLA_U32, 255), [ETHTOOL_A_PLCA_NODE_CNT] = NLA_POLICY_RANGE(NLA_U32, 1, 255), @@ -141,7 +141,6 @@ const struct nla_policy ethnl_plca_set_cfg_policy[] = { static int ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info) { - struct net_device *dev = req_info->dev; const struct ethtool_phy_ops *ops; struct nlattr **tb = info->attrs; struct phy_plca_cfg plca_cfg; @@ -149,7 +148,7 @@ ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info) int ret; // check that the PHY device is available and connected - if (!dev->phydev) + if (!req_info->phydev) return -EOPNOTSUPP; ops = ethtool_phy_ops; @@ -168,7 +167,7 @@ ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info) if (!mod) return 0; - ret = ops->set_plca_cfg(dev->phydev, &plca_cfg, info->extack); + ret = ops->set_plca_cfg(req_info->phydev, &plca_cfg, info->extack); return ret < 0 ? ret : 1; } @@ -191,7 +190,7 @@ const struct ethnl_request_ops ethnl_plca_cfg_request_ops = { const struct nla_policy ethnl_plca_get_status_policy[] = { [ETHTOOL_A_PLCA_HEADER] = - NLA_POLICY_NESTED(ethnl_header_policy), + NLA_POLICY_NESTED(ethnl_header_policy_phy), }; static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base, @@ -204,7 +203,7 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base, int ret; // check that the PHY device is available and connected - if (!dev->phydev) { + if (!req_base->phydev) { ret = -EOPNOTSUPP; goto out; } @@ -223,7 +222,7 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base, memset(&data->plca_st, 0xff, sizeof_field(struct plca_reply_data, plca_st)); - ret = ops->get_plca_status(dev->phydev, &data->plca_st); + ret = ops->get_plca_status(req_base->phydev, &data->plca_st); ethnl_ops_complete(dev); out: return ret; From patchwork Tue Feb 13 15:04:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200480 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp602942dyb; Tue, 13 Feb 2024 07:13:22 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXNheUrqlkdU9PSoOQz7FImOueiZUBicTqKe9377Y+Ii90hyzNVj30HvH0IUiV9mMRbAK9m/dfI8R5uGXCgS/xV/9KeRQ== X-Google-Smtp-Source: AGHT+IG1dLC+JGzk7/4ysgyWCBLZ1UzrdmMfAWBTq+/MunJzI4+BmME+PbbGsyNXqlynUBnB1IKq X-Received: by 2002:a05:620a:124f:b0:785:db11:4a7e with SMTP id a15-20020a05620a124f00b00785db114a7emr4235696qkl.56.1707837202477; Tue, 13 Feb 2024 07:13:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707837202; cv=pass; d=google.com; s=arc-20160816; b=h6cLt3/J04GACVk+LM8txxLU0+VeQW0P6xe0joK0iOdoPDGRzV6Hj4yBDA4WoK9JeV olI5eR3qhcIDEP2TBTCKYVbw56+FY1Raxx3c5Uwg+zfU7OHjsfg6OIRs3HL361kBUlzo OyzqKNFEkG9Bu/a3jJgQu7HNJnDU78t6xm+Q3pz5YAXiXvtKOsFovKK+1DK5qOr0fVJg +ITupL1SLcF7eefCzKPyvaxY0UeNS7g89LkEFBhcx0lmRC8jlGqiFn8033zU91SydIYP 6wXuh/QJ2/aJtVGWGbFbiOMPKbBRunJ0cep/ynEWEQ3a53WHhMx0YerObW4xNXI0JXqR /BpA== 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=cKWt/5oJoHfaiL4BUEaS6eUa1vxrw2RfNzNw8xM4Juw=; fh=ZrZq+KGIKmYbRiN9Atsz6Ft3RH/L4xyGt9j6Nl+jc5I=; b=nSYTYur6MSCLbcQXR8G2ZTQBRdsSIW4Jc7xTy73tperZJ4WUguyP6vZQ3kU02/NxK8 TO6hPzJwOv9nhO5ifUR4sjsqM86O1AvOFH1+4zmVQ8vqeR45owLmV+L1/LeULRn6OW4D mW+6nAU0P6wsaNJP7sHbWDTkSWedsGuN9D4bWYkEZHmep7QYTDBrl5iH0axJq5aJAA1b ne0kQq3RkwFa7rmhWyOZlZ6M3Sipds04AW9qIO3t/qwMF2Wl9qL4tcC31BEUJnksUdQI wF3FuBapX9/rkJltm2Y9UCgrs+VMkM/IKdSIGUV4q4Ypy/e6Ei6d2s+YDy7bxCj/oXC/ 9qKw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=ekwSQmXg; 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-63775-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63775-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCWcrlLvc9tbWUrbmWFSfC6uBfsL7GSK+C16l/u3hODqZ6erzcXM7THvlBwikPPEK3QQW77N/8FDZUAbW8HBv4uFkE0peQ== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id pe29-20020a05620a851d00b0078574c850dasi8115293qkn.124.2024.02.13.07.13.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:13:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63775-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=ekwSQmXg; 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-63775-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63775-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 24EDA1C27D72 for ; Tue, 13 Feb 2024 15:10:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2970360ECD; Tue, 13 Feb 2024 15:04:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="ekwSQmXg" 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 37D0C60888; Tue, 13 Feb 2024 15:04:51 +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=1707836693; cv=none; b=Ol1uqVxadDov9hBN42wC/m7IfIkDjtOqtaJ6lqL8ZH4vN46u3jpyNjx+DzZHOd1cm7uOMQg/jgZjnwGuMa0VJ29bMzJa3+lofDqI5HSbBBfK4jQVroadG33/ZIgGqhiKK5H+xDZw/K2Os8vht+JBRjL315QKVVcMtxfA9onMnlI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836693; c=relaxed/simple; bh=PRoPj9vmIk/WhxkPqGCA+tEdR4c30S4vfKve6QRCLJk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y/mfthQPmLjxO9CGN+45pbBLLSOcGA6O6kxtLAQU+0rhUHiYRSiOzunJvZ9OSD4MAgTL/LcZqdHmjE4hC7Vxu/OXteVsU3BP+qJVm/Ch2uzSVjWJof4mfu+4faG+HXYuDspBhQu85eLhm9FSRNTF6bVCpIC3llXOcLsTEPNlolE= 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=ekwSQmXg; 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 921401BF205; Tue, 13 Feb 2024 15:04:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836689; 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=cKWt/5oJoHfaiL4BUEaS6eUa1vxrw2RfNzNw8xM4Juw=; b=ekwSQmXgiANTDBFSLbbTWVfYid2lSwLzrVLqQ1EvLUS21HJ9ZSWvlhlysRY/w41tLcjU/N +3O/ks2ORyfdkvx/OQCp49+M1Y/MR2usNFIpYH7czt21Lq4+FysUZp7suNeD8eRFrdrHej 5CnPlc+Ehjvfxv5S30rlT1Kef2VCej0aW6sgfiOI5/fIbcsadVN0g7g4SmWVwHB4VUGVZ2 N8VyrNO7JvBwk61uMboiu2XmBoZznhuZP9r+V5P8W/LxFfwII9jRs6ZSeNJ217Udcb7saj s9Nd2BQXaVXnj/HyOUrhxYvA/BGb75Uapchcd4KO/Re6NhJ1sSYLIMYuWsuq5g== 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 10/13] net: ethtool: pse-pd: Target the command to the requested PHY Date: Tue, 13 Feb 2024 16:04:27 +0100 Message-ID: <20240213150431.1796171-11-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: 1790797102445564945 X-GMAIL-MSGID: 1790797102445564945 PSE and PD configuration is a PHY-specific command. Instead of targeting the command towards dev->phydev, use the request to pick the targeted PHY device. Signed-off-by: Maxime Chevallier --- V7: No changes V6: Use dedicated policy V5: Added-back an incorrectly removed check V4: No changes V3: No changes V2: New patch net/ethtool/pse-pd.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c index cc478af77111..be50d79122c4 100644 --- a/net/ethtool/pse-pd.c +++ b/net/ethtool/pse-pd.c @@ -28,15 +28,13 @@ struct pse_reply_data { /* PSE_GET */ const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1] = { - [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), + [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy_phy), }; -static int pse_get_pse_attributes(struct net_device *dev, +static int pse_get_pse_attributes(struct phy_device *phydev, struct netlink_ext_ack *extack, struct pse_reply_data *data) { - struct phy_device *phydev = dev->phydev; - if (!phydev) { NL_SET_ERR_MSG(extack, "No PHY is attached"); return -EOPNOTSUPP; @@ -64,7 +62,7 @@ static int pse_prepare_data(const struct ethnl_req_info *req_base, if (ret < 0) return ret; - ret = pse_get_pse_attributes(dev, info->extack, data); + ret = pse_get_pse_attributes(req_base->phydev, info->extack, data); ethnl_ops_complete(dev); @@ -109,7 +107,7 @@ static int pse_fill_reply(struct sk_buff *skb, /* PSE_SET */ const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = { - [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), + [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy_phy), [ETHTOOL_A_PODL_PSE_ADMIN_CONTROL] = NLA_POLICY_RANGE(NLA_U32, ETHTOOL_PODL_PSE_ADMIN_STATE_DISABLED, ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED), @@ -124,7 +122,6 @@ ethnl_set_pse_validate(struct ethnl_req_info *req_info, struct genl_info *info) static int ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) { - struct net_device *dev = req_info->dev; struct pse_control_config config = {}; struct nlattr **tb = info->attrs; struct phy_device *phydev; @@ -132,7 +129,7 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) /* this values are already validated by the ethnl_pse_set_policy */ config.admin_cotrol = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]); - phydev = dev->phydev; + phydev = req_info->phydev; if (!phydev) { NL_SET_ERR_MSG(info->extack, "No PHY is attached"); return -EOPNOTSUPP; From patchwork Tue Feb 13 15:04:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200482 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp603502dyb; Tue, 13 Feb 2024 07:14:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV1caXVsaclCsafoZpVMgNqwtgM5ZTTrigxIi6N9n6aG4zFqd7jXofiQs7a/hLwDGxKMbW5yuxb9IteZhqvW1pBA/JhNw== X-Google-Smtp-Source: AGHT+IEZGCuaOEaNxdheb928d7kCBpGcdsktehW0XTG+XcyGdqCK20C7g53nhSNDK2ewOeMH9x6U X-Received: by 2002:a05:6870:3046:b0:219:aa92:b8d7 with SMTP id u6-20020a056870304600b00219aa92b8d7mr13128647oau.15.1707837249680; Tue, 13 Feb 2024 07:14:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707837249; cv=pass; d=google.com; s=arc-20160816; b=S1q4WALShNKYn/3l1tL0YlKDlFFBzVLzH0qmIFf01NxzwuY3JmlmeSnI0QJpMRuLQL luR7pwRkcoUEwcNjR/G/yF3Pq9ShtAK8VGjkvfhy+CTmBK40lpxEFRfXcB6K1g8tJGfm HnNHTOOoi7/wSO1LcCCmBeXzWgfJ92nH7bF9duTTYDEwhhtuTrre/mugOLnrqJVG0DMX 5Ee/VFrEvcDjMB4B7d3m09sIi3xcEPfUJjwN7DmATo3nLFo2Z6CwYBhrwDUblFLLhgow lAXxTIGw0zJ4xlcOH5PsjXT303LtFRLxUDSl9UhJwqDqn5ZkgQt0CtKN0sGe+YxLkADz CSGg== 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=bO6KG76m4Nd9rZadZpKzqEv/4pO6oyFeFkjBHB+TjVQ=; fh=m+tOKJEGVlhgQmU/tWHoIc/OsmZaPUaN9bY5VzV2tNY=; b=z+oWmeSJETL+Kh6QgLeZMEH7QhG24wGd4A/gwCx6RaW80bl05K/iDNYg9d09fWrUVQ Fr5lswDDLy3hKLwn3B95uF7YmZzeuPdZPm5FoYcNGGyVkAqLn0VnTcvhKysdl0zhf8o3 CrQ8CfhWGQK7JO9vk3B1DTdko0Z9HyOyVVywGsM/bRgyJgCoAYkIVFVMW6Z+2It8xM/8 JtBy46NPdxUpaKZv8k35cD7LwU5BV2dD0yhdp+qZxbfJTm3I/lwkNJEfiNngqE5rgoxw dXHJHSVoozPU03tgBI4rT/7UTrnfstk2vBv9DMi9tD00e6vNUdiNyfNv9maOe9E1P+GF KJVw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=HLCQY+BB; 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-63776-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63776-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCX8bWdluEuwCMgEoFRSnLQKK7CD/Cjo10kB+4mVfXWvKSgVE3J/oe64pOWpILBKI8C+JfTs11fHsTQZp8MBES9g4l1IPw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id n187-20020a6327c4000000b005cee9117ef6si2162954pgn.810.2024.02.13.07.14.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:14:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63776-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=HLCQY+BB; 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-63776-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63776-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 7E6572852C9 for ; Tue, 13 Feb 2024 15:10:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 81D7B612C0; Tue, 13 Feb 2024 15:04:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="HLCQY+BB" 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 9ED235F551; Tue, 13 Feb 2024 15:04:52 +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=1707836694; cv=none; b=JAb/IdsEQOTvMY0ni5tz12LDFO2CQwAtLU+8xu3tzFYUmSJqyxKSDE6aDhGGITsIHtZjnVmlvf9bUgZcejctzCoUw+qwd7kMxxf0nMv7sm9ycLyQJ+vG1D8YEt8CYFfLri18/cSijm/kbnAqVhJST6O5Yi5Q9r+b3v+lWf4nmrk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836694; c=relaxed/simple; bh=X3c8gHGtjEXMd3BlGmG1D7pPDqJ8xb/YjEepUdeKZpY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uf7Wt1jjLlShgv5xeKVqZbciNAgiI6Er0bsjBTsbSyiRruRlUeqYNH1OPaeHvoGZSSVaQtmZ4kNGPh1SsY1Ocp0E/pMRg1qrorB4WAg4FNU/SpkaWxON1TVfOUtCLv7VYUosDDrLgMZZL/ay9q8pmqwIv1RXV/acQAMPum877Ow= 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=HLCQY+BB; 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 CECC11BF208; Tue, 13 Feb 2024 15:04:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836691; 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=bO6KG76m4Nd9rZadZpKzqEv/4pO6oyFeFkjBHB+TjVQ=; b=HLCQY+BBe8wVcrVRk88zAYSxqvNgUwMkS6FFNjtuxcnPn8zLqNuoQH5QfWl3CSnhRl6tqC cm2eIbC5cVPfsj9j6SihKvY7M8BizvxdL4cOOCraCqlXLJe3KSFszLPiWLzoRXPdJ0BIVd pKc49YV0qLQI61maF4MrvgOD6KQBQVpH02XCSkpPOSL8y9zsnqJvtLQfLftij2wXh/JngC gmte7iXNZKXnNn7CZHhrCw20A0Mykw4ZdrRHHjjV/fU2RGBCsoYg6f683JegsH4b477PwL tCnmNt0/TjhsSNg6/wVmyuR7NEIvk55aoWsfhnNrk0TOGdsl1KH4Djqe/WH3Qg== 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 11/13] net: ethtool: cable-test: Target the command to the requested PHY Date: Tue, 13 Feb 2024 16:04:28 +0100 Message-ID: <20240213150431.1796171-12-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: 1790797152074343650 X-GMAIL-MSGID: 1790797152074343650 Cable testing is a PHY-specific command. Instead of targeting the command towards dev->phydev, use the request to pick the targeted PHY. 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/cabletest.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net/ethtool/cabletest.c b/net/ethtool/cabletest.c index 06a151165c31..536800bbc379 100644 --- a/net/ethtool/cabletest.c +++ b/net/ethtool/cabletest.c @@ -13,7 +13,7 @@ const struct nla_policy ethnl_cable_test_act_policy[] = { [ETHTOOL_A_CABLE_TEST_HEADER] = - NLA_POLICY_NESTED(ethnl_header_policy), + NLA_POLICY_NESTED(ethnl_header_policy_phy), }; static int ethnl_cable_test_started(struct phy_device *phydev, u8 cmd) @@ -69,7 +69,7 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info) return ret; dev = req_info.dev; - if (!dev->phydev) { + if (!req_info.phydev) { ret = -EOPNOTSUPP; goto out_dev_put; } @@ -85,12 +85,12 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info) if (ret < 0) goto out_rtnl; - ret = ops->start_cable_test(dev->phydev, info->extack); + ret = ops->start_cable_test(req_info.phydev, info->extack); ethnl_ops_complete(dev); if (!ret) - ethnl_cable_test_started(dev->phydev, + ethnl_cable_test_started(req_info.phydev, ETHTOOL_MSG_CABLE_TEST_NTF); out_rtnl: @@ -220,7 +220,7 @@ static const struct nla_policy cable_test_tdr_act_cfg_policy[] = { const struct nla_policy ethnl_cable_test_tdr_act_policy[] = { [ETHTOOL_A_CABLE_TEST_TDR_HEADER] = - NLA_POLICY_NESTED(ethnl_header_policy), + NLA_POLICY_NESTED(ethnl_header_policy_phy), [ETHTOOL_A_CABLE_TEST_TDR_CFG] = { .type = NLA_NESTED }, }; @@ -321,7 +321,7 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info) return ret; dev = req_info.dev; - if (!dev->phydev) { + if (!req_info.phydev) { ret = -EOPNOTSUPP; goto out_dev_put; } @@ -342,12 +342,12 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info) if (ret < 0) goto out_rtnl; - ret = ops->start_cable_test_tdr(dev->phydev, info->extack, &cfg); + ret = ops->start_cable_test_tdr(req_info.phydev, info->extack, &cfg); ethnl_ops_complete(dev); if (!ret) - ethnl_cable_test_started(dev->phydev, + ethnl_cable_test_started(req_info.phydev, ETHTOOL_MSG_CABLE_TEST_TDR_NTF); out_rtnl: 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; } From patchwork Tue Feb 13 15:04:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200484 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp603655dyb; Tue, 13 Feb 2024 07:14:25 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV/UfA5NOnaJRxIOpccr9BmEqIBONVE1FnMT9Tv1FLw5QPlQhX5ZgZ8xyAMzjOczcLd1TDBl2tCtJRM3qgx8w51ineBaQ== X-Google-Smtp-Source: AGHT+IF8CP8QnwxwXIKC9HoDguYje8Tbya91t3B9Ad5rfCDqbTyZphx1+vEsp97Z8z8QFv2kDYNV X-Received: by 2002:a17:902:d58d:b0:1db:4c8d:9135 with SMTP id k13-20020a170902d58d00b001db4c8d9135mr721495plh.8.1707837265391; Tue, 13 Feb 2024 07:14:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707837265; cv=pass; d=google.com; s=arc-20160816; b=0E10G4ssr6zLAjGb48qKvN2S+zKAp6CPLLZAbivP+4BmcYWpbCT5g9IGfKkbMHXefT mSt53QxF4kNrljMj/kkNHcjTheynuq/ZL6LBYXvJYnCKTohfQPsgF5HCrDbPOPDdvQvU T9NFe3YZCny1PiCtltAsuSHAfXIkv0gFaO3gJp30KQTSZAhO+KBCGz0YJg1GRe8oUy0Q as2N9fKy5fyW1RMK2tVMKV0rtcCPO0hYYQh0sGrvzSEtgsfSUYRnAZ4DSA2XiuAI6uid ujwGq7V4rdL0wShBiSEyYuk//fdts2navQJ4ES4qg5FtJsnKCly/Z/DStlWxD+ZCVFa5 TtGw== 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=h7WMOt1ze7IKBjWKorPDQc+EzFaDeiOqVddzYKHv2ks=; fh=CPWSkVmmOY6DjMOz5d5UZNxLEWhmHEWK9V8KEu74EVM=; b=mGbSJjZwB8CepxtH0uzfZcMBVzzHaatl0f+BdSc66tUsTNP0AXTo+/ECvbbA1tqVpl 0lGb1xRXWGWoBG8YTic+oOu6nUOKfdt27dTUHTWLw7dAzT66VvuLV+aqdmLgrIrE4dq7 d4e9b+lpSUHvh342VDB/hEM8pnXmOVYQt3REueRui0QI/YIISXF3F2Ev9pNxmOmlJplt XoATt+U0tOLaE+7nl4zu5GPdSaabBgFUQizvURKeIg/uzetqtaIpBY7gHNgSPfY/36t4 AAtDpSLgnuCr4hs0WAqBCbGdQPZbMhMUl+OQ+yy5JbDvI2MwimM6Mblxr21CzESmn6fW s6wQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=GyPezfDS; 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-63778-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63778-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCVezJYm8aa3021K4Nh0BVNxCqdTXdH7U0+kjvEHzWlSjluEP7broqWB8dS2Denf+riDqLfV+qRBU5zw7wnYlTaFAUZJgQ== 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.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:14:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63778-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=GyPezfDS; 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-63778-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63778-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 B285F2859E3 for ; Tue, 13 Feb 2024 15:11:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 82F88612F3; Tue, 13 Feb 2024 15:05:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="GyPezfDS" 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 F133360DDC; Tue, 13 Feb 2024 15:04:54 +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=1707836697; cv=none; b=Z4RZbBlExaWHJhtOtkFt2aVrCq7Yv5bER0pWCDmDIwBUDgxzrq2Cfn0IEqDRXqnLUhx9wtjj+ulYMzsQPcz7Sx5slDbXZlVOo60jTzBuWON9AvzZtfSFiEfAFWFyYzxAhosywTGWnK+8xStbfaiGHqdoThv1447+mYoSO3098fA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836697; c=relaxed/simple; bh=vrBPISOOJ+7feBnFQa20LdUxn/SOlHalkdrgKO4Fq9E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ld49NueEQaISGeKay/yT8Kt7sJirtmQ+xyx0EcCy1mgMW6and4Cb3Ma3U9qWQLDWQAHD6wKoG8VId7M+yo5L+mGOemLZOXw1lhUvNL/WWtYQCwAWBwXb34KoS3SKmER6yASd3K+LZXwIp41LkNAXeWS91oBM25glsuMjpkUNxF0= 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=GyPezfDS; 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 527681BF210; Tue, 13 Feb 2024 15:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836693; 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=h7WMOt1ze7IKBjWKorPDQc+EzFaDeiOqVddzYKHv2ks=; b=GyPezfDSbZU0CQ5MR5q/6gSaqP7K1Od5Bz9MACY0kPiGfjqsb7CJziTgnKgdCkbNaQK4OK yF3MdSNxaBRO9s9FtYoN2woQznFCY/1ru5pb+1fPZujsAkW7O8tDW9iUsPOD5cqhlr/oAY vd9kBg4c7eYbWOyGHx9ak7g2LXuuThrABqOshoEZfzLV6xEHmEVes+8HA9upLng3w4bBsM 2l5c2EN4BZDjk/7Fi6zVxk0boMaolGuK88fEfgfDRJ22j14Lx5FIAcELeTjNEof6vENo4D ujnbYOCBCXpWT+eIC16JoD0mUv/lL42+jQxEVrbnZ15FjNg7z1nJ1GgsS8JIfg== 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 13/13] Documentation: networking: document phy_link_topology Date: Tue, 13 Feb 2024 16:04:30 +0100 Message-ID: <20240213150431.1796171-14-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: 1790797168358407444 X-GMAIL-MSGID: 1790797168358407444 The newly introduced phy_link_topology tracks all ethernet PHYs that are attached to a netdevice. Document the base principle, internal and external APIs. As the phy_link_topology is expected to be extended, this documentation will hold any further improvements and additions made relative to topology handling. Signed-off-by: Maxime Chevallier --- V7: No changes V6: No changes V5: Fixed a lot of typos V4: No changes V3: New patch Documentation/networking/index.rst | 1 + .../networking/phy-link-topology.rst | 121 ++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 Documentation/networking/phy-link-topology.rst diff --git a/Documentation/networking/index.rst b/Documentation/networking/index.rst index 69f3d6dcd9fd..a2c45a75a4a6 100644 --- a/Documentation/networking/index.rst +++ b/Documentation/networking/index.rst @@ -88,6 +88,7 @@ Contents: operstates packet_mmap phonet + phy-link-topology pktgen plip ppp_generic diff --git a/Documentation/networking/phy-link-topology.rst b/Documentation/networking/phy-link-topology.rst new file mode 100644 index 000000000000..1fd8e904ef4b --- /dev/null +++ b/Documentation/networking/phy-link-topology.rst @@ -0,0 +1,121 @@ +.. SPDX-License-Identifier: GPL-2.0 + +================= +PHY link topology +================= + +Overview +======== + +The PHY link topology representation in the networking stack aims at representing +the hardware layout for any given Ethernet link. + +An Ethernet Interface from userspace's point of view is nothing but a +:c:type:`struct net_device `, which exposes configuration options +through the legacy ioctls and the ethool netlink commands. The base assumption +when designing these configuration channels were that the link looked +something like this :: + + +-----------------------+ +----------+ +--------------+ + | Ethernet Controller / | | Ethernet | | Connector / | + | MAC | ------ | PHY | ---- | Port | ---... to LP + +-----------------------+ +----------+ +--------------+ + struct net_device struct phy_device + +Commands that needs to configure the PHY will go through the net_device.phydev +field to reach the PHY and perform the relevant configuration. + +This assumption falls apart in more complex topologies that can arise when, +for example, using SFP transceivers (although that's not the only specific case). + +Here, we have 2 basic scenarios. Either the MAC is able to output a serialized +interface, that can directly be fed to an SFP cage, such as SGMII, 1000BaseX, +10GBaseR, etc. + +The link topology then looks like this (when an SFP module is inserted) :: + + +-----+ SGMII +------------+ + | MAC | ------- | SFP Module | + +-----+ +------------+ + +Knowing that some modules embed a PHY, the actual link is more like :: + + +-----+ SGMII +--------------+ + | MAC | -------- | PHY (on SFP) | + +-----+ +--------------+ + +In this case, the SFP PHY is handled by phylib, and registered by phylink through +its SFP upstream ops. + +Now some Ethernet controllers aren't able to output a serialized interface, so +we can't directly connect them to an SFP cage. However, some PHYs can be used +as media-converters, to translate the non-serialized MAC MII interface to a +serialized MII interface fed to the SFP :: + + +-----+ RGMII +-----------------------+ SGMII +--------------+ + | MAC | ------- | PHY (media converter) | ------- | PHY (on SFP) | + +-----+ +-----------------------+ +--------------+ + +This is where the model of having a single net_device.phydev pointer shows its +limitations, as we now have 2 PHYs on the link. + +The phy_link topology framework aims at providing a way to keep track of every +PHY on the link, for use by both kernel drivers and subsystems, but also to +report the topology to userspace, allowing to target individual PHYs in configuration +commands. + +API +=== + +The :c:type:`struct phy_link_topology ` is a per-netdevice +resource, that gets initialized at netdevice creation. Once it's initialized, +it is then possible to register PHYs to the topology through : + +:c:func:`phy_link_topo_add_phy` + +Besides registering the PHY to the topology, this call will also assign a unique +index to the PHY, which can then be reported to userspace to refer to this PHY +(akin to the ifindex). This index is a u32, ranging from 1 to U32_MAX. The value +0 is reserved to indicate the PHY doesn't belong to any topology yet. + +The PHY can then be removed from the topology through + +:c:func:`phy_link_topo_del_phy` + +These function are already hooked into the phylib subsystem, so all PHYs that +are linked to a net_device through :c:func:`phy_attach_direct` will automatically +join the netdev's topology. + +PHYs that are on a SFP module will also be automatically registered IF the SFP +upstream is phylink (so, no media-converter). + +PHY drivers that can be used as SFP upstream need to call :c:func:`phy_sfp_attach_phy` +and :c:func:`phy_sfp_detach_phy`, which can be used as a +.attach_phy / .detach_phy implementation for the +:c:type:`struct sfp_upstream_ops `. + +UAPI +==== + +There exist a set of netlink commands to query the link topology from userspace, +see ``Documentation/networking/ethtool-netlink.rst``. + +The whole point of having a topology representation is to assign the phyindex +field in :c:type:`struct phy_device `. This index is reported to +userspace using the ``ETHTOOL_MSG_PHY_GET`` ethtnl command. Performing a DUMP operation +will result in all PHYs from all net_device being listed. The DUMP command +accepts either a ``ETHTOOL_A_HEADER_DEV_INDEX`` or ``ETHTOOL_A_HEADER_DEV_NAME`` +to be passed in the request to filter the DUMP to a single net_device. + +The retrieved index can then be passed as a request parameter using the +``ETHTOOL_A_HEADER_PHY_INDEX`` field in the following ethnl commands : + +* ``ETHTOOL_MSG_STRSET_GET`` to get the stats string set from a given PHY +* ``ETHTOOL_MSG_CABLE_TEST_ACT`` and ``ETHTOOL_MSG_CABLE_TEST_ACT``, to perform + cable testing on a given PHY on the link (most likely the outermost PHY) +* ``ETHTOOL_MSG_PSE_SET`` and ``ETHTOOL_MSG_PSE_GET`` for PHY-controlled PoE and PSE settings +* ``ETHTOOL_MSG_PLCA_GET_CFG``, ``ETHTOOL_MSG_PLCA_SET_CFG`` and ``ETHTOOL_MSG_PLCA_GET_STATUS`` + to set the PLCA (Physical Layer Collision Avoidance) parameters + +Note that the PHY index can be passed to other requests, which will silently +ignore it if present and irrelevant.