mlx4: avoid devlink port type not set warnings
Subsystems (3)
Jakub Kicinski
maintainerv2 cover mlx4: avoid devlink port type not set warnings
Hi!
This small set addresses the issue of mlx4 potentially not setting devlink port type when Ethernet or IB driver is not built, but port has that type.
v2:
- add patch 1
Jakub Kicinski (2):
devlink: don't crash if netdev is NULL
mlx4: make sure to always set the port type
drivers/net/ethernet/mellanox/mlx4/main.c | 11 +++++++++ net/core/devlink.c | 28 ++++++++++++++++------- 2 files changed, 31 insertions(+), 8 deletions(-)
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v2 1/2 devlink: don't crash if netdev is NULL
Following change will add support for a corner case where we may not have a netdev to pass to devlink_port_type_eth_set() but we still want to set port type.
This is definitely a corner case, and drivers should not normally pass NULL netdev - print a warning message when this happens.
Sadly for other port types (ib) switches don't have a device reference, the way we always do for Ethernet, so we can't put the warning in __devlink_port_type_set().
--- net/core/devlink.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
net/core/devlink.c +20 -8
@@ -7603,14 +7603,8 @@ static void __devlink_port_type_set(struct devlink_port *devlink_port,devlink_port_notify (devlink_port,DEVLINK_CMD_PORT_NEW ); } -/** -* devlink_port_type_eth_set - Set port type to Ethernet -* -* @devlink_port: devlink port -* @netdev: related netdevice -*/ -void devlink_port_type_eth_set (struct devlink_port *devlink_port, -struct net_device *netdev) +static void devlink_port_type_netdev_checks (struct devlink_port *devlink_port, +struct net_device *netdev) {const struct net_device_ops *ops = netdev->netdev_ops;
@@ -7644,6 +7638,24 @@ void devlink_port_type_eth_set(struct devlink_port *devlink_port, err = ops->ndo_get_port_parent_id (netdev, &ppid);WARN_ON (err != -EOPNOTSUPP ); } +} + +/** +* devlink_port_type_eth_set - Set port type to Ethernet +* +* @devlink_port: devlink port +* @netdev: related netdevice +*/ +void devlink_port_type_eth_set (struct devlink_port *devlink_port, +struct net_device *netdev) +{ +if (netdev) +devlink_port_type_netdev_checks (devlink_port, netdev); +else +dev_warn (devlink_port->devlink->dev, +"devlink port type for port %d set to Ethernet without a software interface reference, device type not supported by the kernel?\n" , + devlink_port->index); +__devlink_port_type_set (devlink_port,DEVLINK_PORT_TYPE_ETH , netdev); }EXPORT_SYMBOL_GPL (devlink_port_type_eth_set);
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v2 2/2 mlx4: make sure to always set the port type
In reply to Jakub KicinskiEven tho mlx4_core registers the devlink ports, it's mlx4_en and mlx4_ib which set their type. In situations where one of the two is not built yet the machine has ports of given type we see the devlink warning from devlink_port_type_warn() trigger.
Having ports of a type not supported by the kernel may seem surprising, but it does occur in practice - when the unsupported port is not plugged in to a switch anyway users are more than happy not to see it (and potentially allocate any resources to it).
Set the type in mlx4_core if type-specific driver is not built.
--- drivers/net/ethernet/mellanox/mlx4/main.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/ethernet/mellanox/mlx4/main.c +11 -0
@@ -3031,6 +3031,17 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port)if (err)return err; +/* Ethernet and IB drivers will normally set the port type, +* but if they are not built set the type now to prevent +* devlink_port_type_warn() from firing. +*/ +if (!IS_ENABLED (CONFIG_MLX4_EN ) && + dev->caps.port_type[port] ==MLX4_PORT_TYPE_ETH ) +devlink_port_type_eth_set (&info->devlink_port,NULL ); +else if (!IS_ENABLED (CONFIG_MLX4_INFINIBAND ) && + dev->caps.port_type[port] ==MLX4_PORT_TYPE_IB ) +devlink_port_type_ib_set (&info->devlink_port,NULL ); + info->dev = dev; info->port = port;if (!mlx4_is_slave (dev)) {
Signature · 1 line
2.26.2
Re: [PATCH net-next v2 2/2] mlx4: make sure to always set the port type
Quoted 30 lines · Jakub Kicinski
Even tho
mlx4_coreregisters the devlink ports, it'smlx4_enandmlx4_ibwhich set their type. In situations where one of the two is not built yet the machine has ports of given type we see the devlink warning fromdevlink_port_type_warn()trigger.Having ports of a type not supported by the kernel may seem surprising, but it does occur in practice - when the unsupported port is not plugged in to a switch anyway users are more than happy not to see it (and potentially allocate any resources to it).
Set the type in
mlx4_coreif type-specific driver is not built.Signed-off-by Jakub Kicinski <[email protected]>--- drivers/net/ethernet/mellanox/mlx4/main.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/net/ethernet/mellanox/mlx4/main.c +4
-0@@ -3031,6 +3031,17 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port)if (err)return err; +/* Ethernet and IB drivers will normally set the port type, +* but if they are not built set the type now to prevent +* devlink_port_type_warn() from firing. +*/
drivers/net/ethernet/mellanox/mlx4/main.c static int mlx4_init_port_info(struct mlx4_dev *dev, int port) · line 3047
Quoted 10 lines
drivers/net/ethernet/mellanox/mlx4/main.c +7
-0+if (!IS_ENABLED (CONFIG_MLX4_EN ) && + dev->caps.port_type[port] ==MLX4_PORT_TYPE_ETH ) +devlink_port_type_eth_set (&info->devlink_port,NULL ); +else if (!IS_ENABLED (CONFIG_MLX4_INFINIBAND ) && + dev->caps.port_type[port] ==MLX4_PORT_TYPE_IB ) +devlink_port_type_ib_set (&info->devlink_port,NULL ); + info->dev = dev; info->port = port;if (!mlx4_is_slave (dev)) {
David Miller
maintainerFrom: Jakub Kicinski <[email protected]>
Date: Tue, 8 Sep 2020 15:21:12 -0700
Quoted 6 lines
This small set addresses the issue of mlx4 potentially not setting devlink port type when Ethernet or IB driver is not built, but port has that type.
v2:
- add patch 1
Series applied, thank you.