From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C2174A04C2 for ; Thu, 21 Nov 2019 04:31:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9BA7E2BAF; Thu, 21 Nov 2019 04:31:22 +0100 (CET) Received: from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130]) by dpdk.org (Postfix) with ESMTP id A1505271; Thu, 21 Nov 2019 04:31:19 +0100 (CET) From: Suanming Mou To: matan@mellanox.com, viacheslavo@mellanox.com Cc: dev@dpdk.org, stable@dpdk.org, dekelp@mellanox.com Date: Thu, 21 Nov 2019 05:31:11 +0200 Message-Id: <1574307071-152513-1-git-send-email-suanmingm@mellanox.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-stable] [PATCH] net/mlx5: fix incorrect L3 layer chosen in TTL action X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- 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