From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (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 3BCBE406802; Mon, 15 Jun 2026 15:39:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781537960; cv=none; b=SyX7SxZZfP4HXHE9x6sQx6x2jw4vuC5pDFtAOjB0uU1DRSBWju2C5SbiQ5OAlmsG44xIt+nTx5IcCLBVlBmq5OEYafnWY0hRe1XPW3ubb7LugP7EzFYP+2NIuFaap9Q0Fi7uv8OikKGmMu2WnYCIVqkJQvmzMsB+qlGee98SiAo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781537960; c=relaxed/simple; bh=gVGqWBX6POkZ9QWrayAlUqAjttSrP84bzR0rOtOQwu0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=l7EsB+bYx087eS94TgloWdxRUozsdIqltKrnVYFPzQZ8Lu06O3KWPaGh5Mh4dXtNfLL9ryMvxTVvnrTYv6ozJQMJ+fSVy/B3fTl5TXNhCLPp/NhaUenPUYM81ZPvyw9QOJEq6c2GXZLo7ZOx3d08Fud7VRviEymsHDabUxrIo7E= 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=U1VjAdRj; arc=none smtp.client-ip=185.171.202.116 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="U1VjAdRj" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id C2E7CC5146A; Mon, 15 Jun 2026 15:39:20 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 9027660015; Mon, 15 Jun 2026 15:39:16 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 33A6C106C96F3; Mon, 15 Jun 2026 17:39:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1781537954; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding; bh=avhkiabVK9LamZOJ3lH8mWxTf1DrlMiIAqWFYX6FXpk=; b=U1VjAdRj82V54/qpMytAiXDMsN/xeOh2JArLCtotLkFy88+TUS68kqB2fKK7GBUlLeSdnb wlw2u7OVPgCRkhw1Cju7wDuJNeeNU+UpiAfeIXnqL84oFR7eTQWliSbDU6tlnsAsqp7+3I xlFuFIzFyFfiZVNa9b0MnOsTpY9EI/wTrmgYSE5Q3i8yVVHipIieNWaeK2DcLjfKcsYaOM CwYoDs8oGM5Lf71YjrMc8xewlmzLyDOH/ys4Mge6ylXERakNROlPRwP4a8ReqUJL5waCso cX3yNkdtNylGlKNMAS6Wlc3q6DfA0KRZZpBY5PLJf35CnmpqFvqMHDeZANtOUw== From: Maxime Chevallier To: davem@davemloft.net, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Russell King , Heiner Kallweit Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, Christophe Leroy , Herve Codina , Florian Fainelli , Vladimir Oltean , =?UTF-8?q?K=C3=B6ry=20Maincent?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Oleksij Rempel , =?UTF-8?q?Nicol=C3=B2=20Veronese?= , Simon Horman , mwojtas@chromium.org, Romain Gantois , Daniel Golle , Dimitri Fedrau , Frank Wunderlich Subject: [PATCH net-next v12 00/10] net: phy_port: SFP modules representation and phy_port listing Date: Mon, 15 Jun 2026 17:38:56 +0200 Message-ID: <20260615153907.862987-1-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 Hello everyone, Here's V12 for the phy_port netlink interface. V12 rebases on net-next, which includes some fixes for sashiko-reported issues. It also fixes some typos here and there in the documentation. This work extends on the recent addition of phy_port representation to enable listing the front-facing ports of an interface. For now, we don't control these ports, we merely list their presence and their capabilities. As the most common use-case of multi-port interfaces is combo-ports that provide both RJ45 and SFP connectors on a single MAC, there's a lot of SFP stuff in this series. This series is in 2 main parts. The first one aims at representing the SFP cages and modules using phy_port, as combo-ports with RJ45 + SFP are by far the most common cases for multi-connector setups. The second part is the netlink interface to list those ports, now that most use-cases are covered. Let's see what we can do with some examples of the new ethtool API : - Get MII interfaces supported by an empty SFP cage : # ethtool --show-ports eth3 Port for eth3: Port id: 1 Supported MII interfaces : sgmii, 1000base-x, 2500base-x Port type: sfp - Get Combo-ports supported modes, on each port : # ethtool --show-ports eth1 Port for eth1: Port id: 1 Supported link modes: 10baseT/Half 10baseT/Full 100baseT/Half 100baseT/Full 1000baseT/Full 10000baseT/Full 2500baseT/Full 5000baseT/Full Port type: mdi Port for eth1: Port id: 2 Supported MII interfaces : 10gbase-r Port type: sfp - Get Achievable linkmodes on a SFP module (combo port with a DAC in the SFP cage) # ethtool --show-ports eth1 Port for eth1: Port id: 1 Supported link modes: 10baseT/Half 10baseT/Full 100baseT/Half 100baseT/Full 1000baseT/Full 10000baseT/Full 2500baseT/Full 5000baseT/Full Port type: mdi Port for eth1: Port id: 2 Supported MII interfaces : 10gbase-r Port type: sfp Port for eth1: Port id: 3 Upstream id: 2 Supported link modes: 10000baseCR/Full Port type: mdi Note that here, we have 3 ports : - The Copper port - The SFP Cage itself, marked as 'occupied' - The SFP module This series builds on top of phy_port and phy_link_topology to allow tracking the ports of an interface. We maintain a list of supported linkmodes/interfaces on each port, which allows for fine-grained reporting of each port's capability. What this series doesn't do : - We don't support selecting which port is active. This is the next step. - We only support PHY-driven combo ports. The end-goal of this whole journey that started with phy_link_topology is to get support for MII muxes, such as the one we have on the Turris Omnia. This will eventually be upstreamed as well. If you want to play around with it, here's [1] the patched ethtool that I've been using to produce the outputs above. Thanks ! Maxime [1] : https://github.com/minimaxwell/ethtool/tree/mc/ethtool_port Changelog : Changes in V12: - Rebased on net-next, including fixes on the phy probing and cleanup paths - Rebased on Jakub's netdev_ops_locked changes in phy_link_topology - Fixed some typos reported by Andrew and sashiko in the documentation Changes in v11: V11:https://lore.kernel.org/r/20260521121040.1199622-1-maxime.chevallier@bootlin.com - Aggregated Andrew's reviews :) - Removed the "vacant" field, replaced it with "upstream_port" Changes in V10: V10: https://lore.kernel.org/r/20260513130521.1064094-1-maxime.chevallier@bootlin.com - Rebase on net-next - Rename phylink/phy_device sfp_bus_port to sfp_cage_port - Sashiko's reviews were mostly unrealistic or wrong :( Changes in V9: V9: https://lore.kernel.org/r/20260403123755.175742-1-maxime.chevallier@bootlin.com - Added missing netlink doc updates for u8->u32 conversion - Removed dead code with a condition that can never be true in phylink's mod_port code - Fixed the error path in phy_sfp_connect_phy Changes in v8: V8: https://lore.kernel.org/r/20260325081937.571115-1-maxime.chevallier@bootlin.com - Set the new phydev.has_sfp_mod_phy field when we're sure that no errors occured - Fix formatting of the copyright info in ethnl port - Use a policy to validate the range of port_id - Use GENL_REQ_ATTR_CHECK - alpha-sort headers - use u32 in netlink messages - return better error codes - don't check the skb len, the core does that Changes in V7: V7: https://lore.kernel.org/all/20260309152747.702373-1-maxime.chevallier@bootlin.com/ - Changed the port cleanup path to use list_for_each_entry_continue_reverse - Adjusted the cleanup path in phylink for the port vacant state - Pass the right cmd for the netlink dump message Changes in V6: V6: https://lore.kernel.org/r/20260304145444.442334-1-maxime.chevallier@bootlin.com - Added some comments in th mod_port cleanup - changed some kmalloc to kmalloc_obj - Removed some phy_link_topo_del_port that wasn't needed Changes in V5: V5: https://lore.kernel.org/r/20260205092317.755906-1-maxime.chevallier@bootlin.com - Fixed a check on a potentially un-initialized pointer, reported by Simon - Fixed a documentation formatting issue - Remove a stray pr_info - Rebased on net-next Changes in V4: V4 : https://lore.kernel.org/netdev/20260203172839.548524-1-maxime.chevallier@bootlin.com/ - Add a cleanup patch for the of port parsing - Added a match to sync the port's linkmodes with the PHY's for OF ports - Added RTNL assert in the port_get topo helper - nullify the bus port for phylink support - Fix some typos Changes in V3: V3: https://lore.kernel.org/netdev/20260201151249.642015-1-maxime.chevallier@bootlin.com/ - Remove the sfp bus ops for nophy, and use .module_start() as suggested by Russell - Added missing cleanup for the topology, as per AI review - Fixed a few typos as per Romain's review - Changed "occupied" to "vacant" as per Romain's review - Added missing checks for null ports, per AI review Changes in V2: V2: https://lore.kernel.org/netdev/20260128204526.170927-1-maxime.chevallier@bootlin.com/ - Fix the cleanup path of phy_link_topo_add_phy, as per AI review - Fix the cleanup path of phy_sfp_probe, as per AI review - Fix the call-site of the disconnect_nophy sfp bus ops, per AI review - Fix the netdev-less case uin phylink, per AI review - Fix the prototype of phy_link_topo_get_port for the stubs - Dropped patch 11. It ended-up breaking 'allnoconfig', so instead we built a phy_interface_names array in net/ethtool/netlink.c - Fix an ethool-netlink spec discrepancy with the type of an attribute - Fix the size computation in the netlink port API - Fix the cleanup path in the netlink port API V1: https://lore.kernel.org/netdev/20260127134202.8208-1-maxime.chevallier@bootlin.com/ Maxime Chevallier (10): net: phy: phy_link_topology: Add a helper for opportunistic alloc net: phy: phy_link_topology: Track ports in phy_link_topology net: phylink: Register a phy_port for MAC-driven SFP cages net: phy: Create SFP phy_port before registering upstream net: phy: Represent PHY-less SFP modules with phy_port net: phy: phy_port: Store information about a port's upstream net: phy: phy_link_topology: Add a helper to retrieve ports netlink: specs: Add ethernet port listing with ethtool net: ethtool: Introduce ethtool command to list ports Documentation: networking: Update the phy_port infrastructure description Documentation/netlink/specs/ethtool.yaml | 50 +++ Documentation/networking/ethtool-netlink.rst | 34 ++ Documentation/networking/phy-port.rst | 26 +- MAINTAINERS | 1 + drivers/net/phy/phy-caps.h | 2 + drivers/net/phy/phy_caps.c | 26 ++ drivers/net/phy/phy_device.c | 183 ++++++++- drivers/net/phy/phy_link_topology.c | 82 +++- drivers/net/phy/phylink.c | 128 +++++- include/linux/phy.h | 10 + include/linux/phy_link_topology.h | 39 ++ include/linux/phy_port.h | 5 + .../uapi/linux/ethtool_netlink_generated.h | 19 + net/core/dev.c | 1 + net/ethtool/Makefile | 2 +- net/ethtool/netlink.c | 25 ++ net/ethtool/netlink.h | 9 + net/ethtool/port.c | 373 ++++++++++++++++++ 18 files changed, 981 insertions(+), 34 deletions(-) create mode 100644 net/ethtool/port.c -- 2.54.0