X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_flow.c;h=f32dfdd3fa59f85257d3c2b6cd84c3e1bc015aed;hb=0384f21dffc9081d1ae30f0a6e49926bfc4be85d;hp=13b78ce9bb37ff79aa05024434882698ce3c96fe;hpb=d5b854f2b129e813b9a81f8556da46d0851a87eb;p=dpdk.git

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 13b78ce9bb..f32dfdd3fa 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -479,6 +479,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;
@@ -865,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;
@@ -1009,15 +1010,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 +1036,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) {
@@ -1157,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;
@@ -1174,9 +1172,17 @@ priv_flow_convert(struct priv *priv,
 	 * Last step. Complete missing specification to reach the RSS
 	 * configuration.
 	 */
-	if (parser->queues_n > 1) {
+	if (parser->drop) {
+		/*
+		 * Drop queue priority needs to be adjusted to
+		 * their most specific layer priority.
+		 */
+		parser->drop_q.ibv_attr->priority =
+			attr->priority +
+			hash_rxq_init[parser->layer].flow_priority;
+	} else 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
@@ -1283,7 +1289,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;
 
@@ -1378,7 +1386,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,7 +1438,9 @@ 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;
 
@@ -1482,10 +1494,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 +1540,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 +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;
 }
@@ -1682,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");
@@ -1753,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 =
@@ -1762,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,
@@ -1902,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;
@@ -1993,10 +2022,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) {
@@ -2045,6 +2070,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);
@@ -2607,6 +2636,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 +2755,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 +2800,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 +2827,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 +2848,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 +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;
@@ -2863,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);