mbox series

[net-next,v2,0/2] mlx4: avoid devlink port type not set warnings

Message ID 20200908222114.190718-1-kuba@kernel.org
Headers show
Series mlx4: avoid devlink port type not set warnings | expand

Message

Jakub Kicinski Sept. 8, 2020, 10:21 p.m. UTC 
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(-)

Comments

Tariq Toukan Sept. 9, 2020, 7:21 a.m. UTC | #1 
On 9/9/2020 1:21 AM, Jakub Kicinski wrote:
> Even 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.
> 
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
>   drivers/net/ethernet/mellanox/mlx4/main.c | 11 +++++++++++
>   1 file changed, 11 insertions(+)
> 
> diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
> index 258c7a96f269..70cf24ba71e4 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/main.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/main.c
> @@ -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)) {
> 

Reviewed-by: Tariq Toukan <tariqt@mellanox.com>