net/mlx5: Introduce and use mlx5_esw_is_manager_vport()

Currently esw_enable_vport() does vport check for zero to enable drop
counters regardless of execution on ECPF/PF.
While esw_disable_vport() considers such scenario.

To keep consistency across code for checking for manager_vport,
introduce and use mlx5_esw_is_manager_vport() to check if a specified
vport is eswitch manager vport or not.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Vu Pham <vuhuong@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index ef7d84a1dbc2ebbff72e3d4e85146a6b81d404b9..fa1228a8005f23244b6db15076ed4d245dbefd7d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -501,7 +501,7 @@ static int esw_add_uc_addr(struct mlx5_eswitch *esw, struct vport_addr *vaddr)
        /* Skip mlx5_mpfs_add_mac for eswitch_managers,
         * it is already done by its netdev in mlx5e_execute_l2_action
         */
-       if (esw->manager_vport == vport)
+       if (mlx5_esw_is_manager_vport(esw, vport))
                goto fdb_add;
 
        err = mlx5_mpfs_add_mac(esw->dev, mac);
@@ -533,7 +533,7 @@ static int esw_del_uc_addr(struct mlx5_eswitch *esw, struct vport_addr *vaddr)
        /* Skip mlx5_mpfs_del_mac for eswitch managers,
         * it is already done by its netdev in mlx5e_execute_l2_action
         */
-       if (!vaddr->mpfs || esw->manager_vport == vport)
+       if (!vaddr->mpfs || mlx5_esw_is_manager_vport(esw, vport))
                goto fdb_del;
 
        err = mlx5_mpfs_del_mac(esw->dev, mac);
@@ -1639,7 +1639,7 @@ static void esw_apply_vport_conf(struct mlx5_eswitch *esw,
        u16 vport_num = vport->vport;
        int flags;
 
-       if (esw->manager_vport == vport_num)
+       if (mlx5_esw_is_manager_vport(esw, vport_num))
                return;
 
        mlx5_modify_vport_admin_state(esw->dev,
@@ -1713,7 +1713,8 @@ static void esw_enable_vport(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
        esw_debug(esw->dev, "Enabling VPORT(%d)\n", vport_num);
 
        /* Create steering drop counters for ingress and egress ACLs */
-       if (vport_num && esw->mode == MLX5_ESWITCH_LEGACY)
+       if (!mlx5_esw_is_manager_vport(esw, vport_num) &&
+           esw->mode == MLX5_ESWITCH_LEGACY)
                esw_vport_create_drop_counters(vport);
 
        /* Restore old vport configuration */
@@ -1731,7 +1732,7 @@ static void esw_enable_vport(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
        /* Esw manager is trusted by default. Host PF (vport 0) is trusted as well
         * in smartNIC as it's a vport group manager.
         */
-       if (esw->manager_vport == vport_num ||
+       if (mlx5_esw_is_manager_vport(esw, vport_num) ||
            (!vport_num && mlx5_core_is_ecpf(esw->dev)))
                vport->info.trusted = true;
 
@@ -1766,7 +1767,7 @@ static void esw_disable_vport(struct mlx5_eswitch *esw,
        esw_vport_change_handle_locked(vport);
        vport->enabled_events = 0;
        esw_vport_disable_qos(esw, vport);
-       if (esw->manager_vport != vport_num &&
+       if (!mlx5_esw_is_manager_vport(esw, vport_num) &&
            esw->mode == MLX5_ESWITCH_LEGACY) {
                mlx5_modify_vport_admin_state(esw->dev,
                                              MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 1824b0ad7c9fa615384357087152158c9519a5a4..75e69644d70ea5f3ac8d402584a565e34c14fe6f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -463,6 +463,12 @@ static inline u16 mlx5_eswitch_manager_vport(struct mlx5_core_dev *dev)
                MLX5_VPORT_ECPF : MLX5_VPORT_PF;
 }
 
+static inline bool
+mlx5_esw_is_manager_vport(const struct mlx5_eswitch *esw, u16 vport_num)
+{
+       return esw->manager_vport == vport_num;
+}
+
 static inline u16 mlx5_eswitch_first_host_vport_num(struct mlx5_core_dev *dev)
 {
        return mlx5_core_is_ecpf_esw_manager(dev) ?