net/mlx5: E-switch, Offloads shift ACL programming during enable/disable vport

Currently legacy mode enables ACL while enabling vport, while offloads
mode enable ACL when moving to offloads mode.

Bring consistency to both modes by enabling/disabling ACL when
enabling/disabling a vport.

It also eliminates creating ingress ACL table on unused ECPF vport in
offloads mode.

Signed-off-by: Vu Pham <vuhuong@mellanox.com>
Signed-off-by: Parav Pandit <parav@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 0e5113167739956c10bb523d6ff722ebcc3b652e..1ce6ae1c446ede9807b877c88fe0882f840fda73 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1722,8 +1722,8 @@ static int esw_vport_setup_acl(struct mlx5_eswitch *esw,
 {
        if (esw->mode == MLX5_ESWITCH_LEGACY)
                return esw_vport_create_legacy_acl_tables(esw, vport);
-
-       return 0;
+       else
+               return esw_vport_create_offloads_acl_tables(esw, vport);
 }
 
 static void esw_vport_destroy_legacy_acl_tables(struct mlx5_eswitch *esw,
@@ -1747,6 +1747,8 @@ static void esw_vport_cleanup_acl(struct mlx5_eswitch *esw,
 {
        if (esw->mode == MLX5_ESWITCH_LEGACY)
                esw_vport_destroy_legacy_acl_tables(esw, vport);
+       else
+               esw_vport_destroy_offloads_acl_tables(esw, vport);
 }
 
 static int esw_enable_vport(struct mlx5_eswitch *esw, struct mlx5_vport *vport,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 36edee35f155f108a29f34870539944626f1fa7c..d926bdacbdccb0d8e099a19d8efaeeaed936ca8c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -614,6 +614,13 @@ mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw,
                                 enum mlx5_eswitch_vport_event enabled_events);
 void mlx5_eswitch_disable_pf_vf_vports(struct mlx5_eswitch *esw);
 
+int
+esw_vport_create_offloads_acl_tables(struct mlx5_eswitch *esw,
+                                    struct mlx5_vport *vport);
+void
+esw_vport_destroy_offloads_acl_tables(struct mlx5_eswitch *esw,
+                                     struct mlx5_vport *vport);
+
 #else  /* CONFIG_MLX5_ESWITCH */
 /* eswitch API stubs */
 static inline int  mlx5_eswitch_init(struct mlx5_core_dev *dev) { return 0; }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 94eb18ae33a42feb4ddd3ed9911f9a376d550220..ce30ead906178bdea590c54916d26fabe36ddbcc 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -1950,7 +1950,7 @@ esw_check_vport_match_metadata_supported(const struct mlx5_eswitch *esw)
        return true;
 }
 
-static int
+int
 esw_vport_create_offloads_acl_tables(struct mlx5_eswitch *esw,
                                     struct mlx5_vport *vport)
 {
@@ -1968,7 +1968,7 @@ esw_vport_create_offloads_acl_tables(struct mlx5_eswitch *esw,
        return err;
 }
 
-static void
+void
 esw_vport_destroy_offloads_acl_tables(struct mlx5_eswitch *esw,
                                      struct mlx5_vport *vport)
 {
@@ -1976,43 +1976,27 @@ esw_vport_destroy_offloads_acl_tables(struct mlx5_eswitch *esw,
        esw_vport_disable_ingress_acl(esw, vport);
 }
 
-static int esw_create_offloads_acl_tables(struct mlx5_eswitch *esw)
+static int esw_create_uplink_offloads_acl_tables(struct mlx5_eswitch *esw)
 {
        struct mlx5_vport *vport;
-       int i, j;
        int err;
 
        if (esw_check_vport_match_metadata_supported(esw))
                esw->flags |= MLX5_ESWITCH_VPORT_MATCH_METADATA;
 
-       mlx5_esw_for_all_vports(esw, i, vport) {
-               err = esw_vport_create_offloads_acl_tables(esw, vport);
-               if (err)
-                       goto err_acl_table;
-       }
-
-       if (mlx5_eswitch_vport_match_metadata_enabled(esw))
-               esw_info(esw->dev, "Use metadata reg_c as source vport to match\n");
-
-       return 0;
-
-err_acl_table:
-       for (j = MLX5_VPORT_PF; j < i; j++) {
-               vport = &esw->vports[j];
-               esw_vport_destroy_offloads_acl_tables(esw, vport);
-       }
-
+       vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_UPLINK);
+       err = esw_vport_create_offloads_acl_tables(esw, vport);
+       if (err)
+               esw->flags &= ~MLX5_ESWITCH_VPORT_MATCH_METADATA;
        return err;
 }
 
-static void esw_destroy_offloads_acl_tables(struct mlx5_eswitch *esw)
+static void esw_destroy_uplink_offloads_acl_tables(struct mlx5_eswitch *esw)
 {
        struct mlx5_vport *vport;
-       int i;
-
-       mlx5_esw_for_all_vports(esw, i, vport)
-               esw_vport_destroy_offloads_acl_tables(esw, vport);
 
+       vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_UPLINK);
+       esw_vport_destroy_offloads_acl_tables(esw, vport);
        esw->flags &= ~MLX5_ESWITCH_VPORT_MATCH_METADATA;
 }
 
@@ -2030,7 +2014,7 @@ static int esw_offloads_steering_init(struct mlx5_eswitch *esw)
        memset(&esw->fdb_table.offloads, 0, sizeof(struct offloads_fdb));
        mutex_init(&esw->fdb_table.offloads.fdb_prio_lock);
 
-       err = esw_create_offloads_acl_tables(esw);
+       err = esw_create_uplink_offloads_acl_tables(esw);
        if (err)
                return err;
 
@@ -2055,7 +2039,7 @@ create_ft_err:
        esw_destroy_offloads_fdb_tables(esw);
 
 create_fdb_err:
-       esw_destroy_offloads_acl_tables(esw);
+       esw_destroy_uplink_offloads_acl_tables(esw);
 
        return err;
 }
@@ -2065,7 +2049,7 @@ static void esw_offloads_steering_cleanup(struct mlx5_eswitch *esw)
        esw_destroy_vport_rx_group(esw);
        esw_destroy_offloads_table(esw);
        esw_destroy_offloads_fdb_tables(esw);
-       esw_destroy_offloads_acl_tables(esw);
+       esw_destroy_uplink_offloads_acl_tables(esw);
 }
 
 static void