net/mlx5: fix IPv6 header fields
[dpdk.git] / drivers / net / mlx5 / mlx5_flow.c
index 13b78ce..4396ea8 100644 (file)
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
 #include <rte_malloc.h>
+#include <rte_ip.h>
 
 #include "mlx5.h"
+#include "mlx5_defs.h"
 #include "mlx5_prm.h"
 
 /* Define minimal priority for control plane flows. */
@@ -250,11 +252,8 @@ struct rte_flow {
        uint8_t rss_key[40]; /**< copy of the RSS key. */
        struct ibv_counter_set *cs; /**< Holds the counters for the rule. */
        struct mlx5_flow_counter_stats counter_stats;/**<The counter stats. */
-       union {
-               struct mlx5_flow frxq[RTE_DIM(hash_rxq_init)];
-               /**< Flow with Rx queue. */
-               struct mlx5_flow_drop drxq; /**< Flow with drop Rx queue. */
-       };
+       struct mlx5_flow frxq[RTE_DIM(hash_rxq_init)];
+       /**< Flow with Rx queue. */
 };
 
 /** Static initializer for items. */
@@ -432,6 +431,7 @@ static const struct mlx5_flow_items mlx5_flow_items[] = {
 /** Structure to pass to the conversion function. */
 struct mlx5_flow_parse {
        uint32_t inner; /**< Set once VXLAN is encountered. */
+       uint32_t allmulti:1; /**< Set once allmulti dst MAC is encountered. */
        uint32_t create:1;
        /**< Whether resources should remain after a validate. */
        uint32_t drop:1; /**< Target is a drop queue. */
@@ -444,20 +444,12 @@ struct mlx5_flow_parse {
        uint8_t rss_key[40]; /**< copy of the RSS key. */
        enum hash_rxq_type layer; /**< Last pattern layer detected. */
        struct ibv_counter_set *cs; /**< Holds the counter set for the rule */
-       union {
-               struct {
-                       struct ibv_flow_attr *ibv_attr;
-                       /**< Pointer to Verbs attributes. */
-                       unsigned int offset;
-                       /**< Current position or total size of the attribute. */
-               } queue[RTE_DIM(hash_rxq_init)];
-               struct {
-                       struct ibv_flow_attr *ibv_attr;
-                       /**< Pointer to Verbs attributes. */
-                       unsigned int offset;
-                       /**< Current position or total size of the attribute. */
-               } drop_q;
-       };
+       struct {
+               struct ibv_flow_attr *ibv_attr;
+               /**< Pointer to Verbs attributes. */
+               unsigned int offset;
+               /**< Current position or total size of the attribute. */
+       } queue[RTE_DIM(hash_rxq_init)];
 };
 
 static const struct rte_flow_ops mlx5_flow_ops = {
@@ -479,6 +471,7 @@ struct mlx5_fdir {
        struct rte_flow_action actions[2];
        struct rte_flow_item items[4];
        struct rte_flow_item_eth l2;
+       struct rte_flow_item_eth l2_mask;
        union {
                struct rte_flow_item_ipv4 ipv4;
                struct rte_flow_item_ipv6 ipv6;
@@ -577,9 +570,15 @@ priv_flow_convert_rss_conf(struct priv *priv,
                           struct mlx5_flow_parse *parser,
                           const struct rte_eth_rss_conf *rss_conf)
 {
-       const struct rte_eth_rss_conf *rss =
-               rss_conf ? rss_conf : &priv->rss_conf;
+       const struct rte_eth_rss_conf *rss;
 
+       if (rss_conf) {
+               if (rss_conf->rss_hf & MLX5_RSS_HF_MASK)
+                       return EINVAL;
+               rss = rss_conf;
+       } else {
+               rss = &priv->rss_conf;
+       }
        if (rss->rss_key_len > 40)
                return EINVAL;
        parser->rss_conf.rss_key_len = rss->rss_key_len;
@@ -780,7 +779,7 @@ priv_flow_convert_actions(struct priv *priv,
                } else if (actions->type == RTE_FLOW_ACTION_TYPE_FLAG) {
                        parser->mark = 1;
                } else if (actions->type == RTE_FLOW_ACTION_TYPE_COUNT &&
-                          priv->counter_set_supported) {
+                          priv->config.flow_counter_en) {
                        parser->count = 1;
                } else {
                        goto exit_action_not_supported;
@@ -826,12 +825,8 @@ priv_flow_convert_items_validate(struct priv *priv,
 
        (void)priv;
        /* Initialise the offsets to start after verbs attribute. */
-       if (parser->drop) {
-               parser->drop_q.offset = sizeof(struct ibv_flow_attr);
-       } else {
-               for (i = 0; i != hash_rxq_init_n; ++i)
-                       parser->queue[i].offset = sizeof(struct ibv_flow_attr);
-       }
+       for (i = 0; i != hash_rxq_init_n; ++i)
+               parser->queue[i].offset = sizeof(struct ibv_flow_attr);
        for (; items->type != RTE_FLOW_ITEM_TYPE_END; ++items) {
                const struct mlx5_flow_items *token = NULL;
                unsigned int n;
@@ -865,17 +860,19 @@ 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;
-               } else if (parser->queues_n == 1) {
+               if (parser->drop || parser->queues_n == 1) {
                        parser->queue[HASH_RXQ_ETH].offset += cur_item->dst_sz;
                } else {
                        for (n = 0; n != hash_rxq_init_n; ++n)
                                parser->queue[n].offset += cur_item->dst_sz;
                }
        }
+       if (parser->drop) {
+               parser->queue[HASH_RXQ_ETH].offset +=
+                       sizeof(struct ibv_flow_spec_action_drop);
+       }
        if (parser->mark) {
                for (i = 0; i != hash_rxq_init_n; ++i)
                        parser->queue[i].offset +=
@@ -884,12 +881,8 @@ priv_flow_convert_items_validate(struct priv *priv,
        if (parser->count) {
                unsigned int size = sizeof(struct ibv_flow_spec_counter_action);
 
-               if (parser->drop) {
-                       parser->drop_q.offset += size;
-               } else {
-                       for (i = 0; i != hash_rxq_init_n; ++i)
-                               parser->queue[i].offset += size;
-               }
+               for (i = 0; i != hash_rxq_init_n; ++i)
+                       parser->queue[i].offset += size;
        }
        return 0;
 exit_item_not_supported:
@@ -1009,15 +1002,13 @@ fill:
                        if (hash_rxq_init[i].ip_version == MLX5_IPV4) {
                                size = sizeof(struct ibv_flow_spec_ipv4_ext);
                                specs.ipv4 = (struct ibv_flow_spec_ipv4_ext){
-                                       .type = IBV_FLOW_SPEC_IPV4_EXT |
-                                               parser->inner,
+                                       .type = IBV_FLOW_SPEC_IPV4_EXT,
                                        .size = size,
                                };
                        } else {
                                size = sizeof(struct ibv_flow_spec_ipv6);
                                specs.ipv6 = (struct ibv_flow_spec_ipv6){
-                                       .type = IBV_FLOW_SPEC_IPV6 |
-                                               parser->inner,
+                                       .type = IBV_FLOW_SPEC_IPV6,
                                        .size = size,
                                };
                        }
@@ -1037,8 +1028,7 @@ fill:
                                .type = ((i == HASH_RXQ_UDPV4 ||
                                          i == HASH_RXQ_UDPV6) ?
                                         IBV_FLOW_SPEC_UDP :
-                                        IBV_FLOW_SPEC_TCP) |
-                                       parser->inner,
+                                        IBV_FLOW_SPEC_TCP),
                                .size = size,
                        };
                        if (parser->queue[i].ibv_attr) {
@@ -1104,15 +1094,7 @@ priv_flow_convert(struct priv *priv,
         * Second step.
         * Allocate the memory space to store verbs specifications.
         */
-       if (parser->drop) {
-               parser->drop_q.ibv_attr =
-                       priv_flow_convert_allocate(priv, attr->priority,
-                                                  parser->drop_q.offset,
-                                                  error);
-               if (!parser->drop_q.ibv_attr)
-                       return ENOMEM;
-               parser->drop_q.offset = sizeof(struct ibv_flow_attr);
-       } else if (parser->queues_n == 1) {
+       if (parser->drop || parser->queues_n == 1) {
                unsigned int priority =
                        attr->priority +
                        hash_rxq_init[HASH_RXQ_ETH].flow_priority;
@@ -1157,7 +1139,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;
@@ -1176,7 +1158,7 @@ priv_flow_convert(struct priv *priv,
         */
        if (parser->queues_n > 1) {
                priv_flow_convert_finalise(priv, parser);
-       } else if (!parser->drop) {
+       } else {
                /*
                 * Action queue have their priority overridden with
                 * Ethernet priority, this priority needs to be adjusted to
@@ -1189,10 +1171,6 @@ priv_flow_convert(struct priv *priv,
 exit_free:
        /* Only verification is expected, all resources should be released. */
        if (!parser->create) {
-               if (parser->drop) {
-                       rte_free(parser->drop_q.ibv_attr);
-                       parser->drop_q.ibv_attr = NULL;
-               }
                for (i = 0; i != hash_rxq_init_n; ++i) {
                        if (parser->queue[i].ibv_attr) {
                                rte_free(parser->queue[i].ibv_attr);
@@ -1200,6 +1178,17 @@ exit_free:
                        }
                }
        }
+       if (parser->allmulti &&
+           parser->layer == HASH_RXQ_ETH) {
+               for (i = 0; i != hash_rxq_init_n; ++i) {
+                       if (!parser->queue[i].ibv_attr)
+                               continue;
+                       if (parser->queue[i].ibv_attr->num_of_specs != 1)
+                               break;
+                       parser->queue[i].ibv_attr->type =
+                                               IBV_FLOW_ATTR_MC_DEFAULT;
+               }
+       }
        return ret;
 exit_enomem:
        for (i = 0; i != hash_rxq_init_n; ++i) {
@@ -1234,14 +1223,6 @@ mlx5_flow_create_copy(struct mlx5_flow_parse *parser, void *src,
        unsigned int i;
        void *dst;
 
-       if (parser->drop) {
-               dst = (void *)((uintptr_t)parser->drop_q.ibv_attr +
-                               parser->drop_q.offset);
-               memcpy(dst, src, size);
-               ++parser->drop_q.ibv_attr->num_of_specs;
-               parser->drop_q.offset += size;
-               return;
-       }
        for (i = 0; i != hash_rxq_init_n; ++i) {
                if (!parser->queue[i].ibv_attr)
                        continue;
@@ -1283,7 +1264,9 @@ mlx5_flow_create_eth(const struct rte_flow_item *item,
                .size = eth_size,
        };
 
-       parser->layer = HASH_RXQ_ETH;
+       /* Don't update layer for the inner pattern. */
+       if (!parser->inner)
+               parser->layer = HASH_RXQ_ETH;
        if (spec) {
                unsigned int i;
 
@@ -1303,6 +1286,7 @@ mlx5_flow_create_eth(const struct rte_flow_item *item,
                eth.val.ether_type &= eth.mask.ether_type;
        }
        mlx5_flow_create_copy(parser, &eth, eth_size);
+       parser->allmulti = eth.val.dst_mac[0] & 1;
        return 0;
 }
 
@@ -1332,14 +1316,6 @@ mlx5_flow_create_vlan(const struct rte_flow_item *item,
                if (!mask)
                        mask = default_mask;
 
-               if (parser->drop) {
-                       eth = (void *)((uintptr_t)parser->drop_q.ibv_attr +
-                                      parser->drop_q.offset - eth_size);
-                       eth->val.vlan_tag = spec->tci;
-                       eth->mask.vlan_tag = mask->tci;
-                       eth->val.vlan_tag &= eth->mask.vlan_tag;
-                       return 0;
-               }
                for (i = 0; i != hash_rxq_init_n; ++i) {
                        if (!parser->queue[i].ibv_attr)
                                continue;
@@ -1378,7 +1354,9 @@ mlx5_flow_create_ipv4(const struct rte_flow_item *item,
                .size = ipv4_size,
        };
 
-       parser->layer = HASH_RXQ_IPV4;
+       /* Don't update layer for the inner pattern. */
+       if (!parser->inner)
+               parser->layer = HASH_RXQ_IPV4;
        if (spec) {
                if (!mask)
                        mask = default_mask;
@@ -1428,9 +1406,13 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item,
                .size = ipv6_size,
        };
 
-       parser->layer = HASH_RXQ_IPV6;
+       /* Don't update layer for the inner pattern. */
+       if (!parser->inner)
+               parser->layer = HASH_RXQ_IPV6;
        if (spec) {
                unsigned int i;
+               uint32_t vtc_flow_val;
+               uint32_t vtc_flow_mask;
 
                if (!mask)
                        mask = default_mask;
@@ -1442,7 +1424,20 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item,
                       RTE_DIM(ipv6.mask.src_ip));
                memcpy(&ipv6.mask.dst_ip, mask->hdr.dst_addr,
                       RTE_DIM(ipv6.mask.dst_ip));
-               ipv6.mask.flow_label = mask->hdr.vtc_flow;
+               vtc_flow_val = rte_be_to_cpu_32(spec->hdr.vtc_flow);
+               vtc_flow_mask = rte_be_to_cpu_32(mask->hdr.vtc_flow);
+               ipv6.val.flow_label =
+                       rte_cpu_to_be_32((vtc_flow_val & IPV6_HDR_FL_MASK) >>
+                                        IPV6_HDR_FL_SHIFT);
+               ipv6.val.traffic_class = (vtc_flow_val & IPV6_HDR_TC_MASK) >>
+                                        IPV6_HDR_TC_SHIFT;
+               ipv6.val.next_hdr = spec->hdr.proto;
+               ipv6.val.hop_limit = spec->hdr.hop_limits;
+               ipv6.mask.flow_label =
+                       rte_cpu_to_be_32((vtc_flow_mask & IPV6_HDR_FL_MASK) >>
+                                        IPV6_HDR_FL_SHIFT);
+               ipv6.mask.traffic_class = (vtc_flow_mask & IPV6_HDR_TC_MASK) >>
+                                         IPV6_HDR_TC_SHIFT;
                ipv6.mask.next_hdr = mask->hdr.proto;
                ipv6.mask.hop_limit = mask->hdr.hop_limits;
                /* Remove unwanted bits from values. */
@@ -1451,6 +1446,7 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item,
                        ipv6.val.dst_ip[i] &= ipv6.mask.dst_ip[i];
                }
                ipv6.val.flow_label &= ipv6.mask.flow_label;
+               ipv6.val.traffic_class &= ipv6.mask.traffic_class;
                ipv6.val.next_hdr &= ipv6.mask.next_hdr;
                ipv6.val.hop_limit &= ipv6.mask.hop_limit;
        }
@@ -1482,10 +1478,13 @@ mlx5_flow_create_udp(const struct rte_flow_item *item,
                .size = udp_size,
        };
 
-       if (parser->layer == HASH_RXQ_IPV4)
-               parser->layer = HASH_RXQ_UDPV4;
-       else
-               parser->layer = HASH_RXQ_UDPV6;
+       /* Don't update layer for the inner pattern. */
+       if (!parser->inner) {
+               if (parser->layer == HASH_RXQ_IPV4)
+                       parser->layer = HASH_RXQ_UDPV4;
+               else
+                       parser->layer = HASH_RXQ_UDPV6;
+       }
        if (spec) {
                if (!mask)
                        mask = default_mask;
@@ -1525,10 +1524,13 @@ mlx5_flow_create_tcp(const struct rte_flow_item *item,
                .size = tcp_size,
        };
 
-       if (parser->layer == HASH_RXQ_IPV4)
-               parser->layer = HASH_RXQ_TCPV4;
-       else
-               parser->layer = HASH_RXQ_TCPV6;
+       /* Don't update layer for the inner pattern. */
+       if (!parser->inner) {
+               if (parser->layer == HASH_RXQ_IPV4)
+                       parser->layer = HASH_RXQ_TCPV4;
+               else
+                       parser->layer = HASH_RXQ_TCPV6;
+       }
        if (spec) {
                if (!mask)
                        mask = default_mask;
@@ -1584,6 +1586,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;
 }
@@ -1673,23 +1685,25 @@ priv_flow_create_action_queue_drop(struct priv *priv,
        assert(priv->pd);
        assert(priv->ctx);
        flow->drop = 1;
-       drop = (void *)((uintptr_t)parser->drop_q.ibv_attr +
-                       parser->drop_q.offset);
+       drop = (void *)((uintptr_t)parser->queue[HASH_RXQ_ETH].ibv_attr +
+                       parser->queue[HASH_RXQ_ETH].offset);
        *drop = (struct ibv_flow_spec_action_drop){
                        .type = IBV_FLOW_SPEC_ACTION_DROP,
                        .size = size,
        };
-       ++parser->drop_q.ibv_attr->num_of_specs;
-       parser->drop_q.offset += size;
-       flow->drxq.ibv_attr = parser->drop_q.ibv_attr;
-       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);
+       ++parser->queue[HASH_RXQ_ETH].ibv_attr->num_of_specs;
+       parser->queue[HASH_RXQ_ETH].offset += size;
+       flow->frxq[HASH_RXQ_ETH].ibv_attr =
+               parser->queue[HASH_RXQ_ETH].ibv_attr;
        if (parser->count)
                flow->cs = parser->cs;
-       if (!flow->drxq.ibv_flow) {
+       if (!priv->dev->data->dev_started)
+               return 0;
+       parser->queue[HASH_RXQ_ETH].ibv_attr = NULL;
+       flow->frxq[HASH_RXQ_ETH].ibv_flow =
+               ibv_create_flow(priv->flow_drop_queue->qp,
+                               flow->frxq[HASH_RXQ_ETH].ibv_attr);
+       if (!flow->frxq[HASH_RXQ_ETH].ibv_flow) {
                rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE,
                                   NULL, "flow rule creation failure");
                err = ENOMEM;
@@ -1698,13 +1712,13 @@ priv_flow_create_action_queue_drop(struct priv *priv,
        return 0;
 error:
        assert(flow);
-       if (flow->drxq.ibv_flow) {
-               claim_zero(ibv_destroy_flow(flow->drxq.ibv_flow));
-               flow->drxq.ibv_flow = NULL;
+       if (flow->frxq[HASH_RXQ_ETH].ibv_flow) {
+               claim_zero(ibv_destroy_flow(flow->frxq[HASH_RXQ_ETH].ibv_flow));
+               flow->frxq[HASH_RXQ_ETH].ibv_flow = NULL;
        }
-       if (flow->drxq.ibv_attr) {
-               rte_free(flow->drxq.ibv_attr);
-               flow->drxq.ibv_attr = NULL;
+       if (flow->frxq[HASH_RXQ_ETH].ibv_attr) {
+               rte_free(flow->frxq[HASH_RXQ_ETH].ibv_attr);
+               flow->frxq[HASH_RXQ_ETH].ibv_attr = NULL;
        }
        if (flow->cs) {
                claim_zero(ibv_destroy_counter_set(flow->cs));
@@ -1753,7 +1767,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 =
@@ -1762,7 +1776,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,
@@ -1902,6 +1916,7 @@ priv_flow_create(struct priv *priv,
        flow->queues = (uint16_t (*)[])(flow + 1);
        memcpy(flow->queues, parser.queues, parser.queues_n * sizeof(uint16_t));
        flow->queues_n = parser.queues_n;
+       flow->mark = parser.mark;
        /* Copy RSS configuration. */
        flow->rss_conf = parser.rss_conf;
        flow->rss_conf.rss_key = flow->rss_key;
@@ -1918,13 +1933,9 @@ priv_flow_create(struct priv *priv,
        DEBUG("Flow created %p", (void *)flow);
        return flow;
 exit:
-       if (parser.drop) {
-               rte_free(parser.drop_q.ibv_attr);
-       } else {
-               for (i = 0; i != hash_rxq_init_n; ++i) {
-                       if (parser.queue[i].ibv_attr)
-                               rte_free(parser.queue[i].ibv_attr);
-               }
+       for (i = 0; i != hash_rxq_init_n; ++i) {
+               if (parser.queue[i].ibv_attr)
+                       rte_free(parser.queue[i].ibv_attr);
        }
        rte_free(flow);
        return NULL;
@@ -1993,10 +2004,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) {
@@ -2030,9 +2037,10 @@ priv_flow_destroy(struct priv *priv,
        }
 free:
        if (flow->drop) {
-               if (flow->drxq.ibv_flow)
-                       claim_zero(ibv_destroy_flow(flow->drxq.ibv_flow));
-               rte_free(flow->drxq.ibv_attr);
+               if (flow->frxq[HASH_RXQ_ETH].ibv_flow)
+                       claim_zero(ibv_destroy_flow
+                                  (flow->frxq[HASH_RXQ_ETH].ibv_flow));
+               rte_free(flow->frxq[HASH_RXQ_ETH].ibv_attr);
        } else {
                for (i = 0; i != hash_rxq_init_n; ++i) {
                        struct mlx5_flow *frxq = &flow->frxq[i];
@@ -2045,6 +2053,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);
@@ -2197,10 +2209,11 @@ priv_flow_stop(struct priv *priv, struct mlx5_flows *list)
                unsigned int i;
 
                if (flow->drop) {
-                       if (!flow->drxq.ibv_flow)
+                       if (!flow->frxq[HASH_RXQ_ETH].ibv_flow)
                                continue;
-                       claim_zero(ibv_destroy_flow(flow->drxq.ibv_flow));
-                       flow->drxq.ibv_flow = NULL;
+                       claim_zero(ibv_destroy_flow
+                                  (flow->frxq[HASH_RXQ_ETH].ibv_flow));
+                       flow->frxq[HASH_RXQ_ETH].ibv_flow = NULL;
                        /* Next flow. */
                        continue;
                }
@@ -2248,10 +2261,11 @@ priv_flow_start(struct priv *priv, struct mlx5_flows *list)
                unsigned int i;
 
                if (flow->drop) {
-                       flow->drxq.ibv_flow =
-                               ibv_create_flow(priv->flow_drop_queue->qp,
-                                               flow->drxq.ibv_attr);
-                       if (!flow->drxq.ibv_flow) {
+                       flow->frxq[HASH_RXQ_ETH].ibv_flow =
+                               ibv_create_flow
+                               (priv->flow_drop_queue->qp,
+                                flow->frxq[HASH_RXQ_ETH].ibv_attr);
+                       if (!flow->frxq[HASH_RXQ_ETH].ibv_flow) {
                                DEBUG("Flow %p cannot be applied",
                                      (void *)flow);
                                rte_errno = EINVAL;
@@ -2607,6 +2621,7 @@ priv_fdir_filter_convert(struct priv *priv,
        attributes->items[0] = (struct rte_flow_item) {
                .type = RTE_FLOW_ITEM_TYPE_ETH,
                .spec = &attributes->l2,
+               .mask = &attributes->l2_mask,
        };
        switch (fdir_filter->action.behavior) {
        case RTE_ETH_FDIR_ACCEPT:
@@ -2725,7 +2740,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;
@@ -2770,6 +2785,11 @@ priv_fdir_filter_add(struct priv *priv,
 {
        struct mlx5_fdir attributes = {
                .attr.group = 0,
+               .l2_mask = {
+                       .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+                       .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+                       .type = 0,
+               },
        };
        struct mlx5_flow_parse parser = {
                .layer = HASH_RXQ_ETH,
@@ -2792,7 +2812,6 @@ priv_fdir_filter_add(struct priv *priv,
                                attributes.actions,
                                &error);
        if (flow) {
-               TAILQ_INSERT_TAIL(&priv->flows, flow, next);
                DEBUG("FDIR created %p", (void *)flow);
                return 0;
        }
@@ -2814,7 +2833,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,
@@ -2831,6 +2852,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.queue[HASH_RXQ_ETH].ibv_attr +
+                               parser.queue[HASH_RXQ_ETH].offset);
+               *drop = (struct ibv_flow_spec_action_drop){
+                       .type = IBV_FLOW_SPEC_ACTION_DROP,
+                       .size = sizeof(struct ibv_flow_spec_action_drop),
+               };
+               parser.queue[HASH_RXQ_ETH].ibv_attr->num_of_specs++;
+       }
        TAILQ_FOREACH(flow, &priv->flows, next) {
                struct ibv_flow_attr *attr;
                struct ibv_spec_header *attr_h;
@@ -2840,14 +2877,8 @@ priv_fdir_filter_delete(struct priv *priv,
                void *flow_spec;
                unsigned int specs_n;
 
-               if (parser.drop)
-                       attr = parser.drop_q.ibv_attr;
-               else
-                       attr = parser.queue[HASH_RXQ_ETH].ibv_attr;
-               if (flow->drop)
-                       flow_attr = flow->drxq.ibv_attr;
-               else
-                       flow_attr = flow->frxq[HASH_RXQ_ETH].ibv_attr;
+               attr = parser.queue[HASH_RXQ_ETH].ibv_attr;
+               flow_attr = flow->frxq[HASH_RXQ_ETH].ibv_attr;
                /* Compare first the attributes. */
                if (memcmp(attr, flow_attr, sizeof(struct ibv_flow_attr)))
                        continue;
@@ -2863,24 +2894,23 @@ 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);
 exit:
-       if (parser.drop) {
-               rte_free(parser.drop_q.ibv_attr);
-       } else {
-               for (i = 0; i != hash_rxq_init_n; ++i) {
-                       if (parser.queue[i].ibv_attr)
-                               rte_free(parser.queue[i].ibv_attr);
-               }
+       for (i = 0; i != hash_rxq_init_n; ++i) {
+               if (parser.queue[i].ibv_attr)
+                       rte_free(parser.queue[i].ibv_attr);
        }
        return -ret;
 }