patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] net/mlx5: fix incorrect L3 layer chosen in TTL action
@ 2019-11-21  3:31 Suanming Mou
  2019-11-21  7:39 ` Matan Azrad
  2019-11-21 12:09 ` [dpdk-stable] [PATCH v2] net/mlx5: fix incorrect L3/L4 layer chosen with tunnel Suanming Mou
  0 siblings, 2 replies; 7+ messages in thread
From: Suanming Mou @ 2019-11-21  3:31 UTC (permalink / raw)
  To: matan, viacheslavo; +Cc: dev, stable, dekelp

For IPINIP flow, there are two L3 layer match pattern items, the inner
layer follows the outer layer as the latter L3 layer item, the TTL action
handles the outer layer.

Current the outer and inner L3 layers are both regared as the outer L3
layer, it caueses TTL action uses the incorrect latter inner protocal in
flow_dv_convert_action_modify_ttl() for header modifier.

Check former L3 outer layer existence avoid set the incorrect inner layer
to the flow attr.

Fixes: 4bb14c83df95 ("net/mlx5: support modify header using Direct Verbs")
Cc: dekelp@mellanox.com
Cc: stable@dpdk.org

Signed-off-by: Suanming Mou <suanmingm@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index c402a8d..7cef5d3 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -84,10 +84,18 @@
 	for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
 		switch (item->type) {
 		case RTE_FLOW_ITEM_TYPE_IPV4:
-			attr->ipv4 = 1;
+			/*
+			 * flow_dv_validate() avoids multiple L3 layers case
+			 * other than IPINIP. If attr->ipv6 set, ipv4 should
+			 * be the IPINIP inner layer.
+			 */
+			if (!attr->ipv6)
+				attr->ipv4 = 1;
 			break;
 		case RTE_FLOW_ITEM_TYPE_IPV6:
-			attr->ipv6 = 1;
+			/* If ipv4 set, ipv6 is the IPINIP inner layer. */
+			if (!attr->ipv4)
+				attr->ipv6 = 1;
 			break;
 		case RTE_FLOW_ITEM_TYPE_UDP:
 			attr->udp = 1;
-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-11-24  9:15 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-21  3:31 [dpdk-stable] [PATCH] net/mlx5: fix incorrect L3 layer chosen in TTL action Suanming Mou
2019-11-21  7:39 ` Matan Azrad
2019-11-21  9:41   ` Suanming Mou
2019-11-21 12:09 ` [dpdk-stable] [PATCH v2] net/mlx5: fix incorrect L3/L4 layer chosen with tunnel Suanming Mou
2019-11-22  1:29   ` [dpdk-stable] [dpdk-dev] " Suanming Mou
2019-11-24  7:05     ` Matan Azrad
2019-11-24  9:15   ` Raslan Darawsheh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).