Subject: Re: [net V2 8/9] net/mlx5: Query hca_cap_2 only when supported

From: Michal Kubiak <[email-masked]>
Date: Wed, 5 Jul 2023 21:51:03 +0200

On Wed, Jul 05, 2023 at 10:57:56AM -0700, Saeed Mahameed wrote:
> From: Maher Sanalla <[email-masked]>
> 
> On vport enable, where fw's hca caps are queried, the driver queries
> hca_caps_2 without checking if fw truly supports them, causing a false
> failure of vfs vport load and blocking SRIOV enablement on old devices
> such as CX4 where hca_caps_2 support is missing.
> 
> Thus, add a check for the said caps support before accessing them.
> 
> Fixes: e5b9642a33be ("net/mlx5: E-Switch, Implement devlink port function cmds to control migratable")
> Signed-off-by: Maher Sanalla <[email-masked]>
> Reviewed-by: Shay Drory <[email-masked]>
> Signed-off-by: Saeed Mahameed <[email-masked]>
> ---
>  drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
> index faec7d7a4400..243c455f1029 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
> @@ -807,6 +807,9 @@ static int mlx5_esw_vport_caps_get(struct mlx5_eswitch *esw, struct mlx5_vport *
>  	hca_caps = MLX5_ADDR_OF(query_hca_cap_out, query_ctx, capability);
>  	vport->info.roce_enabled = MLX5_GET(cmd_hca_cap, hca_caps, roce);
>  
> +	if (!MLX5_CAP_GEN_MAX(esw->dev, hca_cap_2))
> +		goto out_free;
> +
>  	memset(query_ctx, 0, query_out_sz);
>  	err = mlx5_vport_get_other_func_cap(esw->dev, vport->vport, query_ctx,
>  					    MLX5_CAP_GENERAL_2);
> -- 
> 2.41.0
> 
> 

LGTM

Thanks,
Reviewed-by: Michal Kubiak <[email-masked]>