net/mlx5: fix flow mark action on port start

[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 bcb06f8..f32dfdd 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1930,6 +1930,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;
@@ -2866,6 +2867,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;
@@ -2898,13 +2915,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);