net/mlx5: E-Switch, Pass metadata from FDB to eswitch manager

In order to do matching on metadata in slow path when demuxing traffic
to representors, explicitly enable the feature that allows HW to pass
metadata REG_C_0 from FDB to eswitch manager NIC_RX table.

Signed-off-by: Jianbo Liu <jianbol@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index a3cf787382ee02894f0869dff45d4164c9ab9385..178ff9b0525851c8753d0f28dfa640c02fe91fa4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -574,6 +574,59 @@ void mlx5_eswitch_del_send_to_vport_rule(struct mlx5_flow_handle *rule)
        mlx5_del_flow_rules(rule);
 }
 
+static int mlx5_eswitch_enable_passing_vport_metadata(struct mlx5_eswitch *esw)
+{
+       u32 out[MLX5_ST_SZ_DW(query_esw_vport_context_out)] = {};
+       u32 in[MLX5_ST_SZ_DW(modify_esw_vport_context_in)] = {};
+       u8 fdb_to_vport_reg_c_id;
+       int err;
+
+       err = mlx5_eswitch_query_esw_vport_context(esw, esw->manager_vport,
+                                                  out, sizeof(out));
+       if (err)
+               return err;
+
+       fdb_to_vport_reg_c_id = MLX5_GET(query_esw_vport_context_out, out,
+                                        esw_vport_context.fdb_to_vport_reg_c_id);
+
+       fdb_to_vport_reg_c_id |= MLX5_FDB_TO_VPORT_REG_C_0;
+       MLX5_SET(modify_esw_vport_context_in, in,
+                esw_vport_context.fdb_to_vport_reg_c_id, fdb_to_vport_reg_c_id);
+
+       MLX5_SET(modify_esw_vport_context_in, in,
+                field_select.fdb_to_vport_reg_c_id, 1);
+
+       return mlx5_eswitch_modify_esw_vport_context(esw, esw->manager_vport,
+                                                    in, sizeof(in));
+}
+
+static int mlx5_eswitch_disable_passing_vport_metadata(struct mlx5_eswitch *esw)
+{
+       u32 out[MLX5_ST_SZ_DW(query_esw_vport_context_out)] = {};
+       u32 in[MLX5_ST_SZ_DW(modify_esw_vport_context_in)] = {};
+       u8 fdb_to_vport_reg_c_id;
+       int err;
+
+       err = mlx5_eswitch_query_esw_vport_context(esw, esw->manager_vport,
+                                                  out, sizeof(out));
+       if (err)
+               return err;
+
+       fdb_to_vport_reg_c_id = MLX5_GET(query_esw_vport_context_out, out,
+                                        esw_vport_context.fdb_to_vport_reg_c_id);
+
+       fdb_to_vport_reg_c_id &= ~MLX5_FDB_TO_VPORT_REG_C_0;
+
+       MLX5_SET(modify_esw_vport_context_in, in,
+                esw_vport_context.fdb_to_vport_reg_c_id, fdb_to_vport_reg_c_id);
+
+       MLX5_SET(modify_esw_vport_context_in, in,
+                field_select.fdb_to_vport_reg_c_id, 1);
+
+       return mlx5_eswitch_modify_esw_vport_context(esw, esw->manager_vport,
+                                                    in, sizeof(in));
+}
+
 static void peer_miss_rules_setup(struct mlx5_core_dev *peer_dev,
                                  struct mlx5_flow_spec *spec,
                                  struct mlx5_flow_destination *dest)
@@ -1977,6 +2030,12 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int vf_nvports,
        if (err)
                return err;
 
+       if (mlx5_eswitch_vport_match_metadata_enabled(esw)) {
+               err = mlx5_eswitch_enable_passing_vport_metadata(esw);
+               if (err)
+                       goto err_vport_metadata;
+       }
+
        /* Only load special vports reps. VF reps will be loaded in
         * context of functions_changed event handler through real
         * or emulated event.
@@ -2004,6 +2063,9 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int vf_nvports,
        return 0;
 
 err_reps:
+       if (mlx5_eswitch_vport_match_metadata_enabled(esw))
+               mlx5_eswitch_disable_passing_vport_metadata(esw);
+err_vport_metadata:
        esw_offloads_steering_cleanup(esw);
        return err;
 }
@@ -2033,6 +2095,8 @@ void esw_offloads_cleanup(struct mlx5_eswitch *esw)
        mlx5_rdma_disable_roce(esw->dev);
        esw_offloads_devcom_cleanup(esw);
        esw_offloads_unload_all_reps(esw, esw->esw_funcs.num_vfs);
+       if (mlx5_eswitch_vport_match_metadata_enabled(esw))
+               mlx5_eswitch_disable_passing_vport_metadata(esw);
        esw_offloads_steering_cleanup(esw);
 }