net/mlx5: fix packet type offload for tunnels

[dpdk.git] / drivers / net / mlx5 / mlx5_flow.c

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 3285419..923fc28 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -490,7 +490,7 @@ mlx5_flow_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id)
        struct mlx5_flow_counter *cnt;
 
        LIST_FOREACH(cnt, &priv->flow_counters, next) {
-               if (cnt->shared != shared)
+               if (!cnt->shared || cnt->shared != shared)
                        continue;
                if (cnt->id != id)
                        continue;
@@ -2762,22 +2762,20 @@ mlx5_flow_rxq_flags_clear(struct rte_eth_dev *dev)
 {
        struct priv *priv = dev->data->dev_private;
        unsigned int i;
-       unsigned int idx;
 
-       for (idx = 0, i = 0; idx != priv->rxqs_n; ++i) {
+       for (i = 0; i != priv->rxqs_n; ++i) {
                struct mlx5_rxq_ctrl *rxq_ctrl;
                unsigned int j;
 
-               if (!(*priv->rxqs)[idx])
+               if (!(*priv->rxqs)[i])
                        continue;
-               rxq_ctrl = container_of((*priv->rxqs)[idx],
+               rxq_ctrl = container_of((*priv->rxqs)[i],
                                        struct mlx5_rxq_ctrl, rxq);
                rxq_ctrl->flow_mark_n = 0;
                rxq_ctrl->rxq.mark = 0;
                for (j = 0; j != MLX5_FLOW_TUNNEL; ++j)
                        rxq_ctrl->flow_tunnels_n[j] = 0;
                rxq_ctrl->rxq.tunnel = 0;
-               ++idx;
        }
 }
 
@@ -2881,7 +2879,9 @@ mlx5_flow_apply(struct rte_eth_dev *dev, struct rte_flow *flow,
                                                     MLX5_RSS_HASH_KEY_LEN,
                                                     verbs->hash_fields,
                                                     (*flow->queue),
-                                                    flow->rss.queue_num);
+                                                    flow->rss.queue_num,
+                                                    !!(flow->layers &
+                                                     MLX5_FLOW_LAYER_TUNNEL));
                        if (!hrxq) {
                                rte_flow_error_set
                                        (error, rte_errno,
@@ -3303,32 +3303,40 @@ mlx5_flow_query_count(struct rte_flow *flow __rte_unused,
                      struct rte_flow_error *error)
 {
 #ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
-       struct rte_flow_query_count *qc = data;
-       uint64_t counters[2] = {0, 0};
-       struct ibv_query_counter_set_attr query_cs_attr = {
-               .cs = flow->counter->cs,
-               .query_flags = IBV_COUNTER_SET_FORCE_UPDATE,
-       };
-       struct ibv_counter_set_data query_out = {
-               .out = counters,
-               .outlen = 2 * sizeof(uint64_t),
-       };
-       int err = mlx5_glue->query_counter_set(&query_cs_attr, &query_out);
+       if (flow->modifier & MLX5_FLOW_MOD_COUNT) {
+               struct rte_flow_query_count *qc = data;
+               uint64_t counters[2] = {0, 0};
+               struct ibv_query_counter_set_attr query_cs_attr = {
+                       .cs = flow->counter->cs,
+                       .query_flags = IBV_COUNTER_SET_FORCE_UPDATE,
+               };
+               struct ibv_counter_set_data query_out = {
+                       .out = counters,
+                       .outlen = 2 * sizeof(uint64_t),
+               };
+               int err = mlx5_glue->query_counter_set(&query_cs_attr,
+                                                      &query_out);
 
-       if (err)
-               return rte_flow_error_set(error, err,
-                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                         NULL,
-                                         "cannot read counter");
-       qc->hits_set = 1;
-       qc->bytes_set = 1;
-       qc->hits = counters[0] - flow->counter->hits;
-       qc->bytes = counters[1] - flow->counter->bytes;
-       if (qc->reset) {
-               flow->counter->hits = counters[0];
-               flow->counter->bytes = counters[1];
+               if (err)
+                       return rte_flow_error_set
+                               (error, err,
+                                RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                NULL,
+                                "cannot read counter");
+               qc->hits_set = 1;
+               qc->bytes_set = 1;
+               qc->hits = counters[0] - flow->counter->hits;
+               qc->bytes = counters[1] - flow->counter->bytes;
+               if (qc->reset) {
+                       flow->counter->hits = counters[0];
+                       flow->counter->bytes = counters[1];
+               }
+               return 0;
        }
-       return 0;
+       return rte_flow_error_set(error, ENOTSUP,
+                                 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                 NULL,
+                                 "flow does not have counter");
 #endif
        return rte_flow_error_set(error, ENOTSUP,
                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,