net/mlx5: Don't register ops for non-PF/VF/SF port and avoid checks in ops

Currently each PF/VF/SF devlink port op called into mlx5 code calls
is_port_function_supported() to check if the port is either
PF, VF or SF. So make sure that the ops are registered with devlink
port only for those and avoid the is_port_function_supported() checks
in ops.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Shay Drory <shayd@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
index b7789350747699459be5ffdc38d39aad0d60d351..69084673e7e68f5ebf3c14de95490c7bb11cc220 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
@@ -173,8 +173,10 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_
 
        if (mlx5_esw_is_sf_vport(esw, vport_num))
                ops = &mlx5_esw_dl_sf_port_ops;
-       else
+       else if (mlx5_eswitch_is_pf_vf_vport(esw, vport_num))
                ops = &mlx5_esw_pf_vf_dl_port_ops;
+       else
+               ops = NULL;
 
        devlink = priv_to_devlink(dev);
        dl_port_index = mlx5_esw_vport_to_devlink_port_index(dev, vport_num);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index f77237401ee9e584eda4d582016a5c40943a0734..5d8d4a4f3e4eb0afa5a459b0c4f67e90bc64f87f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1970,6 +1970,12 @@ bool mlx5_eswitch_is_vf_vport(struct mlx5_eswitch *esw, u16 vport_num)
        return mlx5_esw_check_port_type(esw, vport_num, MLX5_ESW_VPT_VF);
 }
 
+bool mlx5_eswitch_is_pf_vf_vport(struct mlx5_eswitch *esw, u16 vport_num)
+{
+       return vport_num == MLX5_VPORT_PF ||
+               mlx5_eswitch_is_vf_vport(esw, vport_num);
+}
+
 bool mlx5_esw_is_sf_vport(struct mlx5_eswitch *esw, u16 vport_num)
 {
        return mlx5_esw_check_port_type(esw, vport_num, MLX5_ESW_VPT_SF);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index e1e808105e989217443800f98599404bff7e0dd5..ad2ebd843ed2f23502adaf1d772dbd64a5b07762 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -680,6 +680,7 @@ struct mlx5_vport *__must_check
 mlx5_eswitch_get_vport(struct mlx5_eswitch *esw, u16 vport_num);
 
 bool mlx5_eswitch_is_vf_vport(struct mlx5_eswitch *esw, u16 vport_num);
+bool mlx5_eswitch_is_pf_vf_vport(struct mlx5_eswitch *esw, u16 vport_num);
 bool mlx5_esw_is_sf_vport(struct mlx5_eswitch *esw, u16 vport_num);
 
 int mlx5_esw_funcs_changed_handler(struct notifier_block *nb, unsigned long type, void *data);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 4b03f2bf605d764a74ce5b6a0e9c06fcc49465d7..1aa404218817dbc595a200d060d48eebe201a4d1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -4218,14 +4218,6 @@ u32 mlx5_eswitch_get_vport_metadata_for_set(struct mlx5_eswitch *esw,
 }
 EXPORT_SYMBOL(mlx5_eswitch_get_vport_metadata_for_set);
 
-static bool
-is_port_function_supported(struct mlx5_eswitch *esw, u16 vport_num)
-{
-       return vport_num == MLX5_VPORT_PF ||
-              mlx5_eswitch_is_vf_vport(esw, vport_num) ||
-              mlx5_esw_is_sf_vport(esw, vport_num);
-}
-
 int mlx5_devlink_port_fn_hw_addr_get(struct devlink_port *port,
                                     u8 *hw_addr, int *hw_addr_len,
                                     struct netlink_ext_ack *extack)
@@ -4239,8 +4231,6 @@ int mlx5_devlink_port_fn_hw_addr_get(struct devlink_port *port,
                return PTR_ERR(esw);
 
        vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);
-       if (!is_port_function_supported(esw, vport_num))
-               return -EOPNOTSUPP;
 
        vport = mlx5_eswitch_get_vport(esw, vport_num);
        if (IS_ERR(vport)) {
@@ -4269,11 +4259,6 @@ int mlx5_devlink_port_fn_hw_addr_set(struct devlink_port *port,
        }
 
        vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);
-       if (!is_port_function_supported(esw, vport_num)) {
-               NL_SET_ERR_MSG_MOD(extack, "Port doesn't support set hw_addr");
-               return -EINVAL;
-       }
-
        return mlx5_eswitch_set_vport_mac(esw, vport_num, hw_addr);
 }
 
@@ -4286,9 +4271,6 @@ mlx5_devlink_port_fn_get_vport(struct devlink_port *port, struct mlx5_eswitch *e
                return ERR_PTR(-EOPNOTSUPP);
 
        vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);
-       if (!is_port_function_supported(esw, vport_num))
-               return ERR_PTR(-EOPNOTSUPP);
-
        return mlx5_eswitch_get_vport(esw, vport_num);
 }