New upstream version 18.11-rc1

[deb_dpdk.git] / drivers / net / mlx5 / mlx5_glue.c

diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c
index 84f9492..1afb114 100644 (file)
--- a/drivers/net/mlx5/mlx5_glue.c
+++ b/drivers/net/mlx5/mlx5_glue.c
@@ -215,7 +215,7 @@ static struct ibv_counter_set *
 mlx5_glue_create_counter_set(struct ibv_context *context,
                             struct ibv_counter_set_init_attr *init_attr)
 {
-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42
        (void)context;
        (void)init_attr;
        return NULL;
@@ -227,7 +227,7 @@ mlx5_glue_create_counter_set(struct ibv_context *context,
 static int
 mlx5_glue_destroy_counter_set(struct ibv_counter_set *cs)
 {
-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42
        (void)cs;
        return ENOTSUP;
 #else
@@ -240,7 +240,7 @@ mlx5_glue_describe_counter_set(struct ibv_context *context,
                               uint16_t counter_set_id,
                               struct ibv_counter_set_description *cs_desc)
 {
-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42
        (void)context;
        (void)counter_set_id;
        (void)cs_desc;
@@ -254,7 +254,7 @@ static int
 mlx5_glue_query_counter_set(struct ibv_query_counter_set_attr *query_attr,
                            struct ibv_counter_set_data *cs_data)
 {
-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V42
        (void)query_attr;
        (void)cs_data;
        return ENOTSUP;
@@ -263,6 +263,62 @@ mlx5_glue_query_counter_set(struct ibv_query_counter_set_attr *query_attr,
 #endif
 }
 
+static struct ibv_counters *
+mlx5_glue_create_counters(struct ibv_context *context,
+                         struct ibv_counters_init_attr *init_attr)
+{
+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45
+       (void)context;
+       (void)init_attr;
+       return NULL;
+#else
+       return ibv_create_counters(context, init_attr);
+#endif
+}
+
+static int
+mlx5_glue_destroy_counters(struct ibv_counters *counters)
+{
+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45
+       (void)counters;
+       return ENOTSUP;
+#else
+       return ibv_destroy_counters(counters);
+#endif
+}
+
+static int
+mlx5_glue_attach_counters(struct ibv_counters *counters,
+                         struct ibv_counter_attach_attr *attr,
+                         struct ibv_flow *flow)
+{
+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45
+       (void)counters;
+       (void)attr;
+       (void)flow;
+       return ENOTSUP;
+#else
+       return ibv_attach_counters_point_flow(counters, attr, flow);
+#endif
+}
+
+static int
+mlx5_glue_query_counters(struct ibv_counters *counters,
+                        uint64_t *counters_value,
+                        uint32_t ncounters,
+                        uint32_t flags)
+{
+#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45
+       (void)counters;
+       (void)counters_value;
+       (void)ncounters;
+       (void)flags;
+       return ENOTSUP;
+#else
+       return ibv_read_counters(counters, counters_value, ncounters, flags);
+#endif
+}
+
 static void
 mlx5_glue_ack_async_event(struct ibv_async_event *event)
 {
@@ -346,6 +402,48 @@ mlx5_glue_dv_create_qp(struct ibv_context *context,
 #endif
 }
 
+static struct mlx5dv_flow_matcher *
+mlx5_glue_dv_create_flow_matcher(struct ibv_context *context,
+                                struct mlx5dv_flow_matcher_attr *matcher_attr)
+{
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+       return mlx5dv_create_flow_matcher(context, matcher_attr);
+#else
+       (void)context;
+       (void)matcher_attr;
+       return NULL;
+#endif
+}
+
+static struct ibv_flow *
+mlx5_glue_dv_create_flow(struct mlx5dv_flow_matcher *matcher,
+                        struct mlx5dv_flow_match_parameters *match_value,
+                        size_t num_actions,
+                        struct mlx5dv_flow_action_attr *actions_attr)
+{
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+       return mlx5dv_create_flow(matcher, match_value,
+                                 num_actions, actions_attr);
+#else
+       (void)matcher;
+       (void)match_value;
+       (void)num_actions;
+       (void)actions_attr;
+       return NULL;
+#endif
+}
+
+static int
+mlx5_glue_dv_destroy_flow_matcher(struct mlx5dv_flow_matcher *matcher)
+{
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+       return mlx5dv_destroy_flow_matcher(matcher);
+#else
+       (void)matcher;
+       return 0;
+#endif
+}
+
 alignas(RTE_CACHE_LINE_SIZE)
 const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){
        .version = MLX5_GLUE_VERSION,
@@ -382,6 +480,10 @@ const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){
        .destroy_counter_set = mlx5_glue_destroy_counter_set,
        .describe_counter_set = mlx5_glue_describe_counter_set,
        .query_counter_set = mlx5_glue_query_counter_set,
+       .create_counters = mlx5_glue_create_counters,
+       .destroy_counters = mlx5_glue_destroy_counters,
+       .attach_counters = mlx5_glue_attach_counters,
+       .query_counters = mlx5_glue_query_counters,
        .ack_async_event = mlx5_glue_ack_async_event,
        .get_async_event = mlx5_glue_get_async_event,
        .port_state_str = mlx5_glue_port_state_str,
@@ -392,4 +494,7 @@ const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){
        .dv_set_context_attr = mlx5_glue_dv_set_context_attr,
        .dv_init_obj = mlx5_glue_dv_init_obj,
        .dv_create_qp = mlx5_glue_dv_create_qp,
+       .dv_create_flow_matcher = mlx5_glue_dv_create_flow_matcher,
+       .dv_destroy_flow_matcher = mlx5_glue_dv_destroy_flow_matcher,
+       .dv_create_flow = mlx5_glue_dv_create_flow,
 };