[net-next,v6,00/13] Introduce PHY listing and link_topology tracking

Message

Maxime Chevallier Jan. 26, 2024, 6:38 p.m. UTC

Hello everyone,

Here's a V6 for the link topo and multi-phy support series.

Most of the changes were from Jakub's and Russell's reviews, the main
point being a rework of the netlink API, removing uneeded nests and
cleaning-up the dump code. Thanks's Jakub for all the tips, hopefulle
the API is cleaner now.

Another change is that we now try to re-use the phy index if possible,
but I couldn't reliably have this and the alloc-topology-on-first-attached-phy
feature as well, with the risk of assigning the same index to different
PHYs when setting an interface down then up again.

Here's what the new listings would look like :
 - eth0 has a 88x3310 acting as media converter, and an SFP module with
   an embedded 88e1111 PHY
 - eth2 has a 88e1510 PHY

# ethtool --show-phys *

PHY for eth0:
PHY index: 1
Driver name: mv88x3310
PHY device name: f212a600.mdio-mii:00
Downstream SFP bus name: sfp-eth0
PHY id: 0
Upstream type: MAC

PHY for eth0:
PHY index: 2
Driver name: Marvell 88E1111
PHY device name: i2c:sfp-eth0:16
PHY id: 21040322
Upstream type: PHY
Upstream PHY index: 1
Upstream SFP name: sfp-eth0

PHY for eth2:
PHY index: 1
Driver name: Marvell 88E1510
PHY device name: f212a200.mdio-mii:00
PHY id: 21040593
Upstream type: MAC

Ethtool patches : https://github.com/minimaxwell/ethtool/tree/link-topo-v6

Link to V5: https://lore.kernel.org/netdev/[e-mail]/
Link to V4: https://lore.kernel.org/netdev/[e-mail]/
Link to V3: https://lore.kernel.org/netdev/[e-mail]/
Link to V2: https://lore.kernel.org/netdev/[e-mail]/
Link to V1: https://lore.kernel.org/netdev/[e-mail]/

Maxime Chevallier (13):
  net: phy: Introduce ethernet link topology representation
  net: sfp: pass the phy_device when disconnecting an sfp module's PHY
  net: phy: add helpers to handle sfp phy connect/disconnect
  net: sfp: Add helper to return the SFP bus name
  net: ethtool: Allow passing a phy index for some commands
  netlink: specs: add phy-index as a header parameter
  net: ethtool: Introduce a command to list PHYs on an interface
  netlink: specs: add ethnl PHY_GET command set
  net: ethtool: plca: Target the command to the requested PHY
  net: ethtool: pse-pd: Target the command to the requested PHY
  net: ethtool: cable-test: Target the command to the requested PHY
  net: ethtool: strset: Allow querying phy stats by index
  Documentation: networking: document phy_link_topology

 Documentation/netlink/specs/ethtool.yaml      |  62 ++++
 Documentation/networking/ethtool-netlink.rst  |  46 +++
 Documentation/networking/index.rst            |   1 +
 .../networking/phy-link-topology.rst          | 121 +++++++
 MAINTAINERS                                   |   2 +
 drivers/net/phy/Makefile                      |   2 +-
 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                  |  55 ++++
 drivers/net/phy/phy_link_topology.c           | 105 ++++++
 drivers/net/phy/phylink.c                     |   3 +-
 drivers/net/phy/sfp-bus.c                     |  15 +-
 include/linux/netdevice.h                     |   4 +-
 include/linux/phy.h                           |   6 +
 include/linux/phy_link_topology.h             |  72 +++++
 include/linux/phy_link_topology_core.h        |  25 ++
 include/linux/sfp.h                           |   8 +-
 include/uapi/linux/ethtool.h                  |  16 +
 include/uapi/linux/ethtool_netlink.h          |  21 ++
 net/core/dev.c                                |   9 +
 net/ethtool/Makefile                          |   2 +-
 net/ethtool/cabletest.c                       |  16 +-
 net/ethtool/netlink.c                         |  53 +++-
 net/ethtool/netlink.h                         |  10 +
 net/ethtool/phy.c                             | 298 ++++++++++++++++++
 net/ethtool/plca.c                            |  19 +-
 net/ethtool/pse-pd.c                          |  13 +-
 net/ethtool/strset.c                          |  17 +-
 30 files changed, 966 insertions(+), 43 deletions(-)
 create mode 100644 Documentation/networking/phy-link-topology.rst
 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
 create mode 100644 net/ethtool/phy.c

Comments

Jakub Kicinski Jan. 27, 2024, 1:29 a.m. UTC | #1

On Fri, 26 Jan 2024 19:38:37 +0100 Maxime Chevallier wrote:
> Most of the changes were from Jakub's and Russell's reviews, the main
> point being a rework of the netlink API, removing uneeded nests and
> cleaning-up the dump code. Thanks's Jakub for all the tips, hopefulle
> the API is cleaner now.

Didn't get a chance to look today, sorry, but it appears to break
allmodconfig build:

ld: net/core/dev.o: in function `free_netdev':
dev.c:(.text+0x76e1): undefined reference to `phy_link_topo_destroy'
ld: net/core/dev.o: in function `alloc_netdev_mqs':
dev.c:(.text+0x79c2): undefined reference to `phy_link_topo_create'

so maybe fix up and post v7?