net/mlx5: fix flow director deletion

[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 1ea9d68..466d74b 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -866,7 +866,7 @@ priv_flow_convert_items_validate(struct priv *priv,
                                                   " VXLAN encapsulations");
                                return -rte_errno;
                        }
-                       parser->inner = 1;
+                       parser->inner = IBV_FLOW_SPEC_INNER;
                }
                if (parser->drop) {
                        parser->drop_q.offset += cur_item->dst_sz;
@@ -1155,7 +1155,7 @@ priv_flow_convert(struct priv *priv,
                                         cur_item->mask),
                                        parser);
                if (ret) {
-                       rte_flow_error_set(error, ENOTSUP,
+                       rte_flow_error_set(error, ret,
                                           RTE_FLOW_ERROR_TYPE_ITEM,
                                           items, "item not supported");
                        goto exit_free;
@@ -1602,6 +1602,16 @@ mlx5_flow_create_vxlan(const struct rte_flow_item *item,
                /* Remove unwanted bits from values. */
                vxlan.val.tunnel_id &= vxlan.mask.tunnel_id;
        }
+       /*
+        * Tunnel id 0 is equivalent as not adding a VXLAN layer, if only this
+        * layer is defined in the Verbs specification it is interpreted as
+        * wildcard and all packets will match this rule, if it follows a full
+        * stack layer (ex: eth / ipv4 / udp), all packets matching the layers
+        * before will also match this rule.
+        * To avoid such situation, VNI 0 is currently refused.
+        */
+       if (!vxlan.val.tunnel_id)
+               return EINVAL;
        mlx5_flow_create_copy(parser, &vxlan, size);
        return 0;
 }
@@ -1700,13 +1710,13 @@ priv_flow_create_action_queue_drop(struct priv *priv,
        ++parser->drop_q.ibv_attr->num_of_specs;
        parser->drop_q.offset += size;
        flow->drxq.ibv_attr = parser->drop_q.ibv_attr;
+       if (parser->count)
+               flow->cs = parser->cs;
        if (!priv->dev->data->dev_started)
                return 0;
        parser->drop_q.ibv_attr = NULL;
        flow->drxq.ibv_flow = ibv_create_flow(priv->flow_drop_queue->qp,
                                              flow->drxq.ibv_attr);
-       if (parser->count)
-               flow->cs = parser->cs;
        if (!flow->drxq.ibv_flow) {
                rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE,
                                   NULL, "flow rule creation failure");
@@ -1771,7 +1781,7 @@ priv_flow_create_action_queue_rss(struct priv *priv,
                                           parser->rss_conf.rss_key_len,
                                           hash_fields,
                                           parser->queues,
-                                          hash_fields ? parser->queues_n : 1);
+                                          parser->queues_n);
                if (flow->frxq[i].hrxq)
                        continue;
                flow->frxq[i].hrxq =
@@ -1780,7 +1790,7 @@ priv_flow_create_action_queue_rss(struct priv *priv,
                                           parser->rss_conf.rss_key_len,
                                           hash_fields,
                                           parser->queues,
-                                          hash_fields ? parser->queues_n : 1);
+                                          parser->queues_n);
                if (!flow->frxq[i].hrxq) {
                        rte_flow_error_set(error, ENOMEM,
                                           RTE_FLOW_ERROR_TYPE_HANDLE,
@@ -2011,10 +2021,6 @@ priv_flow_destroy(struct priv *priv,
 {
        unsigned int i;
 
-       if (flow->cs) {
-               claim_zero(ibv_destroy_counter_set(flow->cs));
-               flow->cs = NULL;
-       }
        if (flow->drop || !flow->mark)
                goto free;
        for (i = 0; i != flow->queues_n; ++i) {
@@ -2063,6 +2069,10 @@ free:
                                rte_free(frxq->ibv_attr);
                }
        }
+       if (flow->cs) {
+               claim_zero(ibv_destroy_counter_set(flow->cs));
+               flow->cs = NULL;
+       }
        TAILQ_REMOVE(list, flow, next);
        DEBUG("Flow destroyed %p", (void *)flow);
        rte_free(flow);
@@ -2744,7 +2754,7 @@ priv_fdir_filter_convert(struct priv *priv,
                        .spec = &attributes->l3,
                };
                attributes->items[2] = (struct rte_flow_item){
-                       .type = RTE_FLOW_ITEM_TYPE_UDP,
+                       .type = RTE_FLOW_ITEM_TYPE_TCP,
                        .spec = &attributes->l4,
                };
                break;
@@ -2837,7 +2847,9 @@ static int
 priv_fdir_filter_delete(struct priv *priv,
                        const struct rte_eth_fdir_filter *fdir_filter)
 {
-       struct mlx5_fdir attributes;
+       struct mlx5_fdir attributes = {
+               .attr.group = 0,
+       };
        struct mlx5_flow_parse parser = {
                .create = 1,
                .layer = HASH_RXQ_ETH,
@@ -2854,6 +2866,22 @@ priv_fdir_filter_delete(struct priv *priv,
                                attributes.actions, &error, &parser);
        if (ret)
                goto exit;
+       /*
+        * Special case for drop action which is only set in the
+        * specifications when the flow is created.  In this situation the
+        * drop specification is missing.
+        */
+       if (parser.drop) {
+               struct ibv_flow_spec_action_drop *drop;
+
+               drop = (void *)((uintptr_t)parser.drop_q.ibv_attr +
+                               parser.drop_q.offset);
+               *drop = (struct ibv_flow_spec_action_drop){
+                       .type = IBV_FLOW_SPEC_ACTION_DROP,
+                       .size = sizeof(struct ibv_flow_spec_action_drop),
+               };
+               parser.drop_q.ibv_attr->num_of_specs++;
+       }
        TAILQ_FOREACH(flow, &priv->flows, next) {
                struct ibv_flow_attr *attr;
                struct ibv_spec_header *attr_h;
@@ -2886,13 +2914,16 @@ priv_fdir_filter_delete(struct priv *priv,
                        flow_h = flow_spec;
                        if (memcmp(spec, flow_spec,
                                   RTE_MIN(attr_h->size, flow_h->size)))
-                               continue;
-                       spec = (void *)((uintptr_t)attr + attr_h->size);
-                       flow_spec = (void *)((uintptr_t)flow_attr +
+                               goto wrong_flow;
+                       spec = (void *)((uintptr_t)spec + attr_h->size);
+                       flow_spec = (void *)((uintptr_t)flow_spec +
                                             flow_h->size);
                }
                /* At this point, the flow match. */
                break;
+wrong_flow:
+               /* The flow does not match. */
+               continue;
        }
        if (flow)
                priv_flow_destroy(priv, &priv->flows, flow);