Introduce PHY listing and link_topology tracking
Subsystems (13)
Maxime Chevallier
maintainerv15 cover Introduce PHY listing and link_topology tracking
Hello everyone,
This is V15 of the phy_link_topology series, aiming at improving support for multiple PHYs being attached to the same MAC.
The main change in V15 is the introduction of patch 12, that drops a non-needed check on the genl_info parameter passed on the ethnl ops for strset. This extra check shouldn't be needed as the genl_info shouldn't be NULL, but it tricks smatch into thinking it can, thus generating some warnings in patch 13. Thanks Simon and Dan for the report.
All other patches are left unchanged from V14, besides a net-next rebase.
As a remainder, here's what the PHY 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/mc/topo-v14
Link to V14: https://lore.kernel.org/netdev/[email protected]/
Link to V13: https://lore.kernel.org/netdev/[email protected]/
Link to v12: https://lore.kernel.org/netdev/[email protected]/
Link to v11: https://lore.kernel.org/netdev/[email protected]/
Link to V10: https://lore.kernel.org/netdev/[email protected]/
Link to V9: https://lore.kernel.org/netdev/[email protected]/
Link to V8: https://lore.kernel.org/netdev/[email protected]/
Link to V7: https://lore.kernel.org/netdev/[email protected]/
Link to V6: https://lore.kernel.org/netdev/[email protected]/
Link to V5: https://lore.kernel.org/netdev/[email protected]/
Link to V4: https://lore.kernel.org/netdev/[email protected]/
Link to V3: https://lore.kernel.org/netdev/[email protected]/
Link to V2: https://lore.kernel.org/netdev/[email protected]/
Link to V1: https://lore.kernel.org/netdev/[email protected]/
More discussions on specific issues that happened in 6.9-rc:
https://lore.kernel.org/netdev/[email protected]/
https://lore.kernel.org/netdev/[email protected]/
https://lore.kernel.org/netdev/[email protected]/
Maxime Chevallier (14):
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: Remove unnecessary check on genl_info
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 | 52 +++ Documentation/networking/index.rst | 1 + .../networking/phy-link-topology.rst | 121 +++++++ MAINTAINERS | 1 + drivers/net/phy/Makefile | 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 +++ drivers/net/phy/phy_link_topology.c | 105 ++++++ drivers/net/phy/phylink.c | 3 +- drivers/net/phy/qcom/at803x.c | 2 + drivers/net/phy/qcom/qca807x.c | 2 + drivers/net/phy/sfp-bus.c | 15 +- include/linux/netdevice.h | 4 +- include/linux/phy.h | 6 + include/linux/phy_link_topology.h | 82 +++++ include/linux/sfp.h | 8 +- include/uapi/linux/ethtool.h | 16 + include/uapi/linux/ethtool_netlink.h | 21 ++ net/core/dev.c | 15 + net/ethtool/Makefile | 3 +- net/ethtool/cabletest.c | 35 +- net/ethtool/netlink.c | 66 +++- net/ethtool/netlink.h | 33 ++ net/ethtool/phy.c | 312 ++++++++++++++++++ net/ethtool/plca.c | 30 +- net/ethtool/pse-pd.c | 30 +- net/ethtool/strset.c | 27 +- 30 files changed, 1056 insertions(+), 52 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 net/ethtool/phy.c
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 1/14 net: phy: Introduce ethernet link topology representation
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.
--- MAINTAINERS | 1 + drivers/net/phy/Makefile | 2 +- drivers/net/phy/phy_device.c | 6 ++ drivers/net/phy/phy_link_topology.c | 105 ++++++++++++++++++++++++++++ include/linux/netdevice.h | 4 +- include/linux/phy.h | 4 ++ include/linux/phy_link_topology.h | 82 ++++++++++++++++++++++ include/uapi/linux/ethtool.h | 16 +++++ net/core/dev.c | 15 ++++ 9 files changed, 233 insertions(+), 2 deletions(-) create mode 100644 drivers/net/phy/phy_link_topology.c create mode 100644 include/linux/phy_link_topology.h
MAINTAINERS +1 -0
@@ -8194,6 +8194,7 @@ 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/phylib_stubs.h F: include/linux/platform_data/mdio-bcm-unimac.h F: include/linux/platform_data/mdio-gpio.h
drivers/net/phy/Makefile +1 -1
@@ -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
drivers/net/phy/phy_device.c +6 -0
@@ -29,6 +29,7 @@#include <linux/phy.h> #include <linux/phylib_stubs.h> #include <linux/phy_led_triggers.h> +#include <linux/phy_link_topology.h> #include <linux/pse-pd/pse.h> #include <linux/property.h> #include <linux/rtnetlink.h>
@@ -1511,6 +1512,10 @@ 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, phydev,PHY_UPSTREAM_MAC , dev); +if (err) + goto error; }/* Some Ethernet drivers try to connect to a PHY device before
@@ -1938,6 +1943,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, phydev); } phydev->phylink =NULL ;
drivers/net/phy/phy_link_topology.c new file +105 -0
105 lines not on this page · raw message
include/linux/netdevice.h +3 -1
@@ -40,7 +40,6 @@#include <net/dcbnl.h> #endif #include <net/netprio_cgroup.h> -#include <linux/netdev_features.h> #include <linux/neighbour.h> #include <linux/netdevice_xmit.h>
@@ -81,6 +80,7 @@ struct xdp_frame;struct xdp_metadata_ops ;struct xdp_md ;struct ethtool_netdev_state ; +struct phy_link_topology ;typedef u32 xdp_features_t ;
@@ -1977,6 +1977,7 @@ enum netdev_reg_state {* @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.
@@ -2370,6 +2371,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;
include/linux/phy.h +4 -0
@@ -554,6 +554,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.
@@ -654,6 +657,7 @@ struct phy_device {struct device_link *devlink; +u32 phyindex;u32 phy_id;struct phy_c45_device_ids c45_ids;
include/linux/phy_link_topology.h new file +82 -0
82 lines not on this page · raw message
include/uapi/linux/ethtool.h +16 -0
@@ -2341,4 +2341,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 */
net/core/dev.c +15 -0
@@ -158,6 +158,7 @@#include <net/page_pool/types.h> #include <net/page_pool/helpers.h> #include <net/rps.h> +#include <linux/phy_link_topology.h> #include "dev.h" #include "net-sysfs.h"
@@ -10307,6 +10308,17 @@ static void netdev_do_free_pcpu_stats(struct net_device *dev) } } +static void netdev_free_phy_link_topology (struct net_device *dev) +{ +struct phy_link_topology *topo = dev->link_topo; + +if (IS_ENABLED (CONFIG_PHYLIB ) && topo) { +xa_destroy (&topo->phys); +kfree (topo); + dev->link_topo =NULL ; + } +} +/** * register_netdevice() - register a network device * @dev: device to register
@@ -11103,6 +11115,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,#ifdef CONFIG_NET_SCHED hash_init (dev->qdisc_hash);#endif + dev->priv_flags =IFF_XMIT_DST_RELEASE |IFF_XMIT_DST_RELEASE_PERM ;setup (dev);
@@ -11195,6 +11208,8 @@ void free_netdev(struct net_device *dev)free_percpu (dev->xdp_bulkq); dev->xdp_bulkq =NULL ; +netdev_free_phy_link_topology (dev); +/* Compatibility with error handling in drivers */ if (dev->reg_state ==NETREG_UNINITIALIZED || dev->reg_state ==NETREG_DUMMY ) {
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 2/14 net: sfp: pass the phy_device when disconnecting an sfp module's PHY
In reply to Maxime ChevallierPass 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.
--- 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(-)
drivers/net/phy/phylink.c +2 -1
@@ -3423,7 +3423,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); }
drivers/net/phy/sfp-bus.c +2 -2
@@ -487,7 +487,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; }
@@ -743,7 +743,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);
include/linux/sfp.h +1 -1
@@ -550,7 +550,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 )
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 3/14 net: phy: add helpers to handle sfp phy connect/disconnect
In reply to Maxime ChevallierThere 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.
--- 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 | 42 +++++++++++++++++++++++++++++++ drivers/net/phy/qcom/at803x.c | 2 ++ drivers/net/phy/qcom/qca807x.c | 2 ++ include/linux/phy.h | 2 ++ 7 files changed, 54 insertions(+)
drivers/net/phy/marvell-88x2222.c +2 -0
@@ -553,6 +553,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)
drivers/net/phy/marvell.c +2 -0
@@ -3613,6 +3613,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)
drivers/net/phy/marvell10g.c +2 -0
@@ -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, };
drivers/net/phy/phy_device.c +42 -0
48 lines not on this page · raw message
drivers/net/phy/qcom/at803x.c +2 -0
@@ -770,6 +770,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)
drivers/net/phy/qcom/qca807x.c +2 -0
@@ -699,6 +699,8 @@ static const struct sfp_upstream_ops qca807x_sfp_ops = { .detach = phy_sfp_detach, .module_insert = qca807x_sfp_insert, .module_remove = qca807x_sfp_remove, + .connect_phy = phy_sfp_connect_phy, + .disconnect_phy = phy_sfp_disconnect_phy, };static int qca807x_probe (struct phy_device *phydev)
include/linux/phy.h +2 -0
@@ -1762,6 +1762,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,
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 4/14 net: sfp: Add helper to return the SFP bus name
In reply to Maxime ChevallierKnowing the bus name is helpful when we want to expose the link topology to userspace, add a helper to return the SFP bus name.
--- drivers/net/phy/sfp-bus.c | 11 +++++++++++ include/linux/sfp.h | 6 ++++++ 2 files changed, 17 insertions(+)
drivers/net/phy/sfp-bus.c +11 -0
@@ -860,3 +860,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);
include/linux/sfp.h +6 -0
@@ -576,6 +576,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,
@@ -654,6 +655,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
Signature · 1 line
2.45.1
Russell King (Oracle)
maintainerRe: [PATCH net-next v15 04/14] net: sfp: Add helper to return the SFP bus name
Quoted 2 lines · Maxime Chevallier
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.
I think it's worth mentioning about the use case in this patch as well, something like:
"This call will always be made while holding the RTNL which ensures that the SFP driver won't unbind from the device. The returned pointer to the bus name will only be used while RTNL is held."
Quoted 17 lines
Signed-off-by Maxime Chevallier <[email protected]>Reviewed-by Andrew Lunn <[email protected]>--- drivers/net/phy/sfp-bus.c | 11 +++++++++++ include/linux/sfp.h | 6 ++++++ 2 files changed, 17 insertions(+)drivers/net/phy/sfp-bus.c +1
-0@@ -860,3 +860,14 @@ void sfp_unregister_socket(struct sfp_bus *bus)sfp_bus_put (bus); }EXPORT_SYMBOL_GPL (sfp_unregister_socket); +
drivers/net/phy/sfp-bus.c void sfp_unregister_socket(struct sfp_bus *bus) · line 873
Quoted 10 lines
drivers/net/phy/sfp-bus.c +10
-0+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);
Please move this to just below sfp_bus_del_upstream() since the functions in this file are organised as:
- internal functions
- upstream callable functions
- downstream (sfp driver) callable functions.
Note also that the upstream callable functions are all documented with kerneldoc, and sfp_get_name() is clearly a function called from the upstream side.
Thanks.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Maxime Chevallier
maintainerRe: [PATCH net-next v15 04/14] net: sfp: Add helper to return the SFP bus name
Hello Russell,
Quoted 10 lines · On Wed, 3 Jul 2024 16:36:20 +0100 "Russell King (Oracle)"…
Quoted 2 lines · Maxime Chevallier
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.
I think it's worth mentioning about the use case in this patch as well, something like:
"This call will always be made while holding the RTNL which ensures that the SFP driver won't unbind from the device. The returned pointer to the bus name will only be used while RTNL is held."
I'll add that in both the commit log and the documentation for the function.
[...]
Quoted 5 lines
Quoted 1 line
+EXPORT_SYMBOL_GPL(sfp_get_name);
Please move this to just below
sfp_bus_del_upstream()since the functions in this file are organised as:
Quoted 7 lines
- internal functions
- upstream callable functions
- downstream (sfp driver) callable functions.Note also that the upstream callable functions are all documented with kerneldoc, and
sfp_get_name()is clearly a function called from the upstream side.
No problem, I'll move it and a some proper documentation. Thanks for the review,
Maxime
Maxime Chevallier
maintainerPATCH v15 5/14 net: ethtool: Allow passing a phy index for some commands
In reply to Maxime ChevallierSome 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 passed phy_index.
Add a helper that netlink command handlers need to use to grab the targeted PHY from the req_info. This helper needs to hold rtnl_lock() while interacting with the PHY, as it may be removed at any point.
--- Documentation/networking/ethtool-netlink.rst | 7 +++ include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/netlink.c | 57 +++++++++++++++++++- net/ethtool/netlink.h | 28 ++++++++++ 4 files changed, 91 insertions(+), 2 deletions(-)
Documentation/networking/ethtool-netlink.rst +7 -0
@@ -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`` identifies the Ethernet PHY the message relates to. +As there are numerous commands that are related to PHY configuration, and because +there may be 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. Bit sets ========
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -134,6 +134,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,
net/ethtool/netlink.c +55 -2
92 lines not on this page · raw message
net/ethtool/netlink.h +28 -0
@@ -251,6 +251,9 @@ 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 +* @phy_index: phy_device index connected to @dev this request is for. Can be +* 0 if the request doesn't target a phy, or if the @dev's attached +* phy is targeted. * * This is a common base for request specific structures holding data from * parsed userspace request. These always embed struct ethnl_req_info at
@@ -260,6 +263,7 @@ struct ethnl_req_info {struct net_device *dev;netdevice_tracker dev_tracker;u32 flags; +u32 phy_index; };static inline void ethnl_parse_header_dev_put (struct ethnl_req_info *req_info)
@@ -267,6 +271,27 @@ static inline void ethnl_parse_header_dev_put(struct ethnl_req_info *req_info)netdev_put (req_info->dev, &req_info->dev_tracker); } +/** +* ethnl_req_get_phydev() - Gets the phy_device targeted by this request, +* if any. Must be called under rntl_lock(). +* @req_info: The ethnl request to get the phy from. +* @header: The netlink header, used for error reporting. +* @extack: The netlink extended ACK, for error reporting. +* +* The caller must hold RTNL, until it's done interacting with the returned +* phy_device. +* +* Return: A phy_device pointer corresponding either to the passed phy_index +* if one is provided. If not, the phy_device attached to the +* net_device targeted by this request is returned. If there's no +* targeted net_device, or no phy_device is attached, NULL is +* returned. If the provided phy_index is invalid, an error pointer +* is returned. +*/ +struct phy_device *ethnl_req_get_phydev (const struct ethnl_req_info *req_info, +const struct nlattr *header, +struct netlink_ext_ack *extack); +/** * struct ethnl_reply_data - base type of reply data for GET requests * @dev: device for current reply message; in single shot requests it is
@@ -409,9 +434,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 ];
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 6/14 netlink: specs: add phy-index as a header parameter
In reply to Maxime ChevallierUpdate the spec to take the newly introduced phy-index as a generic request parameter.
--- Documentation/netlink/specs/ethtool.yaml | 3 +++ 1 file changed, 3 insertions(+)
Documentation/netlink/specs/ethtool.yaml +3 -0
@@ -39,6 +39,9 @@ attribute-sets: name: flags type: u32 enum: header-flags + - + name: phy-index + type: u32 - name: bitset-bit
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 7/14 net: ethtool: Introduce a command to list PHYs on an interface
In reply to Maxime ChevallierAs 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.
--- Documentation/networking/ethtool-netlink.rst | 42 +++ include/uapi/linux/ethtool_netlink.h | 20 ++ net/ethtool/Makefile | 3 +- net/ethtool/netlink.c | 9 + net/ethtool/netlink.h | 5 + net/ethtool/phy.c | 312 +++++++++++++++++++ 6 files changed, 390 insertions(+), 1 deletion(-) create mode 100644 net/ethtool/phy.c
Documentation/networking/ethtool-netlink.rst +42 -0
@@ -2117,6 +2117,47 @@ string. The ``ETHTOOL_A_MODULE_FW_FLASH_DONE`` and ``ETHTOOL_A_MODULE_FW_FLASH_TOTAL`` attributes encode the completed and total amount of work, respectively. +PHY_GET +======= + +Retrieve information about a given Ethernet PHY sitting on the link. The DO +operation returns all available information about dev->phydev. User can also +specify a PHY_INDEX, in which case the DO request returns information about that +specific PHY. +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 + its 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 ===================
@@ -2224,4 +2265,5 @@ are netlink only. n/a ``ETHTOOL_MSG_MM_GET`` n/a ``ETHTOOL_MSG_MM_SET`` n/a ``ETHTOOL_MSG_MODULE_FW_FLASH_ACT`` + n/a ``ETHTOOL_MSG_PHY_GET`` =================================== =====================================
include/uapi/linux/ethtool_netlink.h +20 -0
@@ -58,6 +58,7 @@ enum {ETHTOOL_MSG_MM_GET ,ETHTOOL_MSG_MM_SET ,ETHTOOL_MSG_MODULE_FW_FLASH_ACT , +ETHTOOL_MSG_PHY_GET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
@@ -111,6 +112,8 @@ enum {ETHTOOL_MSG_MM_GET_REPLY ,ETHTOOL_MSG_MM_NTF ,ETHTOOL_MSG_MODULE_FW_FLASH_NTF , +ETHTOOL_MSG_PHY_GET_REPLY , +ETHTOOL_MSG_PHY_NTF ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
@@ -1038,6 +1041,23 @@ enum { ETHTOOL_A_MODULE_FW_FLASH_MAX = (__ETHTOOL_A_MODULE_FW_FLASH_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
net/ethtool/Makefile +2 -1
@@ -8,4 +8,5 @@ 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 cmis_fw_update.o cmis_cdb.o pse-pd.o plca.o mm.o + module.o cmis_fw_update.o cmis_cdb.o pse-pd.o plca.o mm.o \ + phy.o
net/ethtool/netlink.c +9 -0
@@ -1232,6 +1232,15 @@ static const struct genl_ops ethtool_genl_ops[] = { .policy = ethnl_module_fw_flash_act_policy, .maxattr = ARRAY_SIZE(ethnl_module_fw_flash_act_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[] = {
net/ethtool/netlink.h +5 -0
@@ -484,6 +484,7 @@ extern const struct nla_policy ethnl_plca_get_status_policy[ETHTOOL_A_PLCA_HEADEextern 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_module_fw_flash_act_policy[ETHTOOL_A_MODULE_FW_FLASH_PASSWORD +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);
@@ -492,6 +493,10 @@ 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_act_module_fw_flash (struct sk_buff *skb,struct genl_info *info); +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 ];
net/ethtool/phy.c new file +312 -0
312 lines not on this page · raw message
Signature · 1 line
2.45.1
Russell King (Oracle)
maintainerRe: [PATCH net-next v15 07/14] net: ethtool: Introduce a command to list PHYs on an interface
Quoted 5 lines · Maxime Chevallier
net/ethtool/phy.c new file +5
-0+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;
net/ethtool/phy.c line 89
Quoted 10 lines
net/ethtool/phy.c new file +10
-0+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 ;
I'm really not sure that it is a good idea to export phydev->phy_id through this API.
Clause 45-only PHYs don't have a phy_id, they have a whole bunch of IDs (actually, two per MMD - a device ID and a package ID. I think the package ID is supposed to be the same for all MMDs, but in practice it isn't.
For example, 88x3310 uses:
MMD devid pkgid
1 002b09aa 002b09aa
3 002b09aa 002b09aa
4 01410daa 01410daa
7 002b09aa 002b09aa
So, if we want to report the ID of the PHY, then really we need to report the clause 22 ID, and at least all the devids of each MMD in a clause 45 PHY. Alternatively, we may decide it isn't worth the effort of reporting any of these IDs.
However, reporting just the clause 22 ID would be a design error IMHO.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Maxime Chevallier
maintainerRe: [PATCH net-next v15 07/14] net: ethtool: Introduce a command to list PHYs on an interface
Hello Russell,
Quoted 7 lines · On Wed, 3 Jul 2024 15:52:12 +0100 "Russell King (Oracle)"…
So, if we want to report the ID of the PHY, then really we need to report the clause 22 ID, and at least all the devids of each MMD in a clause 45 PHY. Alternatively, we may decide it isn't worth the effort of reporting any of these IDs.
However, reporting just the clause 22 ID would be a design error IMHO.
I don't have any strong reason to keep exporting the PHY id. Reporting the driver name is enough to get a good idea of the nature of the device, I'll drop that field then.
Thanks for taking a look,
Maxime
Maxime Chevallier
maintainerPATCH v15 8/14 netlink: specs: add ethnl PHY_GET command set
In reply to Maxime ChevallierThe 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.
--- Documentation/netlink/specs/ethtool.yaml | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+)
Documentation/netlink/specs/ethtool.yaml +59 -0
@@ -24,6 +24,11 @@ definitions: name: module-fw-flash-status type: enum entries: [ started, in_progress, completed, error ] + - + name: phy-upstream-type + enum-name: + type: enum + entries: [ mac, phy ] attribute-sets: -
@@ -1037,6 +1042,38 @@ attribute-sets: - name: total type: uint + - + 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-index + type: u32 + - + name: upstream-sfp-name + type: string + - + name: downstream-sfp-name + type: string + - + name: id + type: u32 operations: enum-model: directional
@@ -1822,3 +1859,25 @@ operations: - status-msg - done - total + - + 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-index + - upstream-sfp-name + - downstream-sfp-name + - id + dump: *phy-get-op
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 9/14 net: ethtool: plca: Target the command to the requested PHY
In reply to Maxime ChevallierPLCA is a PHY-specific command. Instead of targeting the command towards dev->phydev, use the request to pick the targeted PHY.
--- net/ethtool/plca.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)
net/ethtool/plca.c +20 -10
@@ -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,
@@ -58,10 +58,14 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base,struct plca_reply_data *data =PLCA_REPDATA (reply_base);struct net_device *dev = reply_base->dev;const struct ethtool_phy_ops *ops; +struct nlattr **tb = info->attrs; +struct phy_device *phydev;int ret; + phydev =ethnl_req_get_phydev (req_base, tb[ETHTOOL_A_PLCA_HEADER ], + info->extack);// check that the PHY device is available and connected -if (!dev->phydev) { +if (IS_ERR_OR_NULL (phydev)) { ret = -EOPNOTSUPP ; goto out; }
@@ -80,7 +84,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 (phydev, &data->plca_cfg);ethnl_ops_complete (dev); out:
@@ -129,7 +133,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,15 +145,17 @@ 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; +struct phy_device *phydev;bool mod = false;int ret; + phydev =ethnl_req_get_phydev (req_info, tb[ETHTOOL_A_PLCA_HEADER ], + info->extack);// check that the PHY device is available and connected -if (!dev->phydev) +if (IS_ERR_OR_NULL (phydev))return -EOPNOTSUPP ; ops = ethtool_phy_ops;
@@ -168,7 +174,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 (phydev, &plca_cfg, info->extack);return ret <0 ? ret :1 ; }
@@ -191,7 +197,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,
@@ -201,10 +207,14 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base,struct plca_reply_data *data =PLCA_REPDATA (reply_base);struct net_device *dev = reply_base->dev;const struct ethtool_phy_ops *ops; +struct nlattr **tb = info->attrs; +struct phy_device *phydev;int ret; + phydev =ethnl_req_get_phydev (req_base, tb[ETHTOOL_A_PLCA_HEADER ], + info->extack);// check that the PHY device is available and connected -if (!dev->phydev) { +if (IS_ERR_OR_NULL (phydev)) { ret = -EOPNOTSUPP ; goto out; }
@@ -223,7 +233,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 (phydev, &data->plca_st);ethnl_ops_complete (dev); out:return ret;
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 10/14 net: ethtool: pse-pd: Target the command to the requested PHY
In reply to Maxime ChevallierPSE 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.
--- net/ethtool/pse-pd.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)
net/ethtool/pse-pd.c +19 -11
@@ -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 ;
@@ -58,13 +56,20 @@ static int pse_prepare_data(const struct ethnl_req_info *req_base, {struct pse_reply_data *data =PSE_REPDATA (reply_base);struct net_device *dev = reply_base->dev; +struct nlattr **tb = info->attrs; +struct phy_device *phydev;int ret; ret =ethnl_ops_begin (dev);if (ret <0 )return ret; - ret =pse_get_pse_attributes (dev, info->extack, data); + phydev =ethnl_req_get_phydev (req_base, tb[ETHTOOL_A_PSE_HEADER ], + info->extack); +if (IS_ERR_OR_NULL (phydev)) +return -ENODEV ; + + ret =pse_get_pse_attributes (phydev, info->extack, data);ethnl_ops_complete (dev);
@@ -123,7 +128,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 ),
@@ -135,12 +140,12 @@ const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = {static int ethnl_set_pse_validate (struct ethnl_req_info *req_info,struct genl_info *info) { -struct net_device *dev = req_info->dev;struct nlattr **tb = info->attrs;struct phy_device *phydev; - phydev = dev->phydev; -if (!phydev) { + phydev =ethnl_req_get_phydev (req_info, tb[ETHTOOL_A_PSE_HEADER ], + info->extack); +if (IS_ERR_OR_NULL (phydev)) {NL_SET_ERR_MSG (info->extack,"No PHY is attached" );return -EOPNOTSUPP ; }
@@ -171,12 +176,15 @@ 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; - phydev = dev->phydev; + phydev =ethnl_req_get_phydev (req_info, tb[ETHTOOL_A_PSE_HEADER ], + info->extack); +if (IS_ERR_OR_NULL (phydev)) +return -ENODEV ; +/* These values are already validated by the ethnl_pse_set_policy */ if (pse_has_podl (phydev->psec)) config.podl_admin_control =nla_get_u32 (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL ]);
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 11/14 net: ethtool: cable-test: Target the command to the requested PHY
In reply to Maxime ChevallierCable testing is a PHY-specific command. Instead of targeting the command towards dev->phydev, use the request to pick the targeted PHY.
--- net/ethtool/cabletest.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)
net/ethtool/cabletest.c +22 -13
@@ -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)
@@ -58,6 +58,7 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)struct ethnl_req_info req_info = {};const struct ethtool_phy_ops *ops;struct nlattr **tb = info->attrs; +struct phy_device *phydev;struct net_device *dev;int ret;
@@ -69,12 +70,16 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)return ret; dev = req_info.dev; -if (!dev->phydev) { + +rtnl_lock (); + phydev =ethnl_req_get_phydev (&req_info, + tb[ETHTOOL_A_CABLE_TEST_HEADER ], + info->extack); +if (IS_ERR_OR_NULL (phydev)) { ret = -EOPNOTSUPP ; goto out_dev_put; } -rtnl_lock (); ops = ethtool_phy_ops;if (!ops || !ops->start_cable_test) { ret = -EOPNOTSUPP ;
@@ -85,13 +90,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 (phydev, info->extack);ethnl_ops_complete (dev);if (!ret) -ethnl_cable_test_started (dev->phydev, -ETHTOOL_MSG_CABLE_TEST_NTF ); +ethnl_cable_test_started (phydev,ETHTOOL_MSG_CABLE_TEST_NTF ); out_rtnl:rtnl_unlock ();
@@ -216,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 }, };
@@ -305,6 +309,7 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)struct ethnl_req_info req_info = {};const struct ethtool_phy_ops *ops;struct nlattr **tb = info->attrs; +struct phy_device *phydev;struct phy_tdr_config cfg;struct net_device *dev;int ret;
@@ -317,10 +322,6 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)return ret; dev = req_info.dev; -if (!dev->phydev) { - ret = -EOPNOTSUPP ; - goto out_dev_put; - } ret =ethnl_act_cable_test_tdr_cfg (tb[ETHTOOL_A_CABLE_TEST_TDR_CFG ], info, &cfg);
@@ -328,6 +329,14 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info) goto out_dev_put;rtnl_lock (); + phydev =ethnl_req_get_phydev (&req_info, + tb[ETHTOOL_A_CABLE_TEST_TDR_HEADER ], + info->extack); +if (!IS_ERR_OR_NULL (phydev)) { + ret = -EOPNOTSUPP ; + goto out_dev_put; + } + ops = ethtool_phy_ops;if (!ops || !ops->start_cable_test_tdr) { ret = -EOPNOTSUPP ;
@@ -338,12 +347,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 (phydev, info->extack, &cfg);ethnl_ops_complete (dev);if (!ret) -ethnl_cable_test_started (dev->phydev, +ethnl_cable_test_started (phydev,ETHTOOL_MSG_CABLE_TEST_TDR_NTF ); out_rtnl:
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 12/14 net: ethtool: strset: Remove unnecessary check on genl_info
In reply to Maxime ChevallierAll call paths coming from genetlink initialize the genl_info structure, so that command handlers may use them.
Remove an un-needed check for NULL when crafting error messages in the strset command. This prevents smatch from assuming this pointer may be NULL, and therefore warn if it's being used without a NULL check.
--- net/ethtool/strset.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ethtool/strset.c +1 -2
@@ -289,8 +289,7 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,for (i =0 ; i <ETH_SS_COUNT ; i++) {if ((req_info->req_ids & (1U << i)) && data->sets[i].per_dev) { -if (info) -GENL_SET_ERR_MSG (info,"requested per device strings without dev" ); +GENL_SET_ERR_MSG (info,"requested per device strings without dev" );return -EINVAL ; } }
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 13/14 net: ethtool: strset: Allow querying phy stats by index
In reply to Maxime ChevallierThe 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.
--- net/ethtool/strset.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
net/ethtool/strset.c +17 -7
@@ -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;
@@ -279,6 +280,8 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,const struct strset_req_info *req_info =STRSET_REQINFO (req_base);struct strset_reply_data *data =STRSET_REPDATA (reply_base);struct net_device *dev = reply_base->dev; +struct nlattr **tb = info->attrs; +struct phy_device *phydev;unsigned int i;int ret;
@@ -296,6 +299,13 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,return 0 ; } + phydev =ethnl_req_get_phydev (req_base, tb[ETHTOOL_A_HEADER_FLAGS ], + info->extack); + +/* phydev can be NULL, check for errors only */ +if (IS_ERR (phydev)) +return PTR_ERR (phydev); + ret =ethnl_ops_begin (dev);if (ret <0 ) goto err_strset;
@@ -304,7 +314,7 @@ 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, + ret =strset_prepare_set (&data->sets[i], dev, phydev, i, req_info->counts_only);if (ret <0 ) goto err_ops;
Signature · 1 line
2.45.1
Maxime Chevallier
maintainerPATCH v15 14/14 Documentation: networking: document phy_link_topology
In reply to Maxime ChevallierThe 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.
--- Documentation/networking/ethtool-netlink.rst | 3 + Documentation/networking/index.rst | 1 + .../networking/phy-link-topology.rst | 121 ++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 Documentation/networking/phy-link-topology.rst
Documentation/networking/ethtool-netlink.rst +3 -0
@@ -2124,10 +2124,13 @@ Retrieve information about a given Ethernet PHY sitting on the link. The DO operation returns all available information about dev->phydev. User can also specify a PHY_INDEX, in which case the DO request returns information about that specific PHY. + 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. +For more information, refer to :ref:`phy_link_topology` + Request contents: ==================================== ====== ==========================
Documentation/networking/index.rst +1 -0
@@ -91,6 +91,7 @@ Contents: operstates packet_mmap phonet + phy-link-topology pktgen plip ppp_generic
Documentation/networking/phy-link-topology.rst new file +121 -0
121 lines not on this page · raw message
Signature · 1 line
2.45.1