From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8DC77326C for ; Tue, 20 Nov 2018 20:15:57 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFD06309706E; Tue, 20 Nov 2018 19:15:56 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D77B600C3; Tue, 20 Nov 2018 19:15:55 +0000 (UTC) From: Kevin Traynor To: Shahed Shaikh Cc: dpdk stable Date: Tue, 20 Nov 2018 19:12:44 +0000 Message-Id: <20181120191252.30277-54-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 20 Nov 2018 19:15:57 +0000 (UTC) Subject: [dpdk-stable] patch 'net/qede: fix flow director for IPv6 filter' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Tue, 20 Nov 2018 19:15:58 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/23/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From ca9003cfcf89dee0030ddd60c5b179fe25a1cb52 Mon Sep 17 00:00:00 2001 From: Shahed Shaikh Date: Sat, 8 Sep 2018 13:31:00 -0700 Subject: [PATCH] net/qede: fix flow director for IPv6 filter [ upstream commit 7ffef6292b6d49fabbbc120663e433442146e263 ] - PMD does not fill vtc_flow field of IPv6 header while constructing a packet for IPv6 filter. Hence filter was not getting applied properly. - IPv6 addresses got swapped while copying src and dst addresses. - Same issue with UDP and TCP port ids. Fixes: 622075356e8f ("net/qede: support ntuple and flow director filter") Signed-off-by: Shahed Shaikh --- drivers/net/qede/qede_fdir.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/net/qede/qede_fdir.c b/drivers/net/qede/qede_fdir.c index 83580d04b..688f31ada 100644 --- a/drivers/net/qede/qede_fdir.c +++ b/drivers/net/qede/qede_fdir.c @@ -17,4 +17,5 @@ #define QEDE_FDIR_TCP_DEFAULT_DATAOFF (0x50) #define QEDE_FDIR_IPV4_DEF_TTL (64) +#define QEDE_FDIR_IPV6_DEFAULT_VTC_FLOW (0x60000000) /* Sum of length of header types of L2, L3, L4. @@ -339,9 +340,13 @@ qede_fdir_construct_pkt(struct rte_eth_dev *eth_dev, input->flow.ipv6_flow.proto : next_proto[input->flow_type]; - rte_memcpy(&ip6->src_addr, &input->flow.ipv6_flow.dst_ip, + ip6->vtc_flow = + rte_cpu_to_be_32(QEDE_FDIR_IPV6_DEFAULT_VTC_FLOW); + + rte_memcpy(&ip6->src_addr, &input->flow.ipv6_flow.src_ip, IPV6_ADDR_LEN); - rte_memcpy(&ip6->dst_addr, &input->flow.ipv6_flow.src_ip, + rte_memcpy(&ip6->dst_addr, &input->flow.ipv6_flow.dst_ip, IPV6_ADDR_LEN); len += sizeof(struct ipv6_hdr); + params->ipv6 = true; raw_pkt = (uint8_t *)buff; @@ -349,12 +354,12 @@ qede_fdir_construct_pkt(struct rte_eth_dev *eth_dev, if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_UDP) { udp = (struct udp_hdr *)(raw_pkt + len); - udp->src_port = input->flow.udp6_flow.dst_port; - udp->dst_port = input->flow.udp6_flow.src_port; + udp->src_port = input->flow.udp6_flow.src_port; + udp->dst_port = input->flow.udp6_flow.dst_port; len += sizeof(struct udp_hdr); params->udp = true; } else { /* TCP */ tcp = (struct tcp_hdr *)(raw_pkt + len); - tcp->src_port = input->flow.tcp4_flow.src_port; - tcp->dst_port = input->flow.tcp4_flow.dst_port; + tcp->src_port = input->flow.tcp6_flow.src_port; + tcp->dst_port = input->flow.tcp6_flow.dst_port; tcp->data_off = QEDE_FDIR_TCP_DEFAULT_DATAOFF; len += sizeof(struct tcp_hdr); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:08.750608184 +0000 +++ 0054-net-qede-fix-flow-director-for-IPv6-filter.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,8 +1,10 @@ -From 7ffef6292b6d49fabbbc120663e433442146e263 Mon Sep 17 00:00:00 2001 +From ca9003cfcf89dee0030ddd60c5b179fe25a1cb52 Mon Sep 17 00:00:00 2001 From: Shahed Shaikh Date: Sat, 8 Sep 2018 13:31:00 -0700 Subject: [PATCH] net/qede: fix flow director for IPv6 filter +[ upstream commit 7ffef6292b6d49fabbbc120663e433442146e263 ] + - PMD does not fill vtc_flow field of IPv6 header while constructing a packet for IPv6 filter. Hence filter was not getting applied properly. @@ -10,25 +12,23 @@ - Same issue with UDP and TCP port ids. Fixes: 622075356e8f ("net/qede: support ntuple and flow director filter") -Cc: stable@dpdk.org Signed-off-by: Shahed Shaikh --- - drivers/net/qede/qede_filter.c | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) + drivers/net/qede/qede_fdir.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) -diff --git a/drivers/net/qede/qede_filter.c b/drivers/net/qede/qede_filter.c -index b8460a086..4b709e64b 100644 ---- a/drivers/net/qede/qede_filter.c -+++ b/drivers/net/qede/qede_filter.c -@@ -122,5 +122,5 @@ const struct _qede_udp_tunn_types { +diff --git a/drivers/net/qede/qede_fdir.c b/drivers/net/qede/qede_fdir.c +index 83580d04b..688f31ada 100644 +--- a/drivers/net/qede/qede_fdir.c ++++ b/drivers/net/qede/qede_fdir.c +@@ -17,4 +17,5 @@ #define QEDE_FDIR_TCP_DEFAULT_DATAOFF (0x50) #define QEDE_FDIR_IPV4_DEF_TTL (64) -- +#define QEDE_FDIR_IPV6_DEFAULT_VTC_FLOW (0x60000000) + /* Sum of length of header types of L2, L3, L4. - * L2 : ether_hdr + vlan_hdr + vxlan_hdr -@@ -446,9 +446,13 @@ qede_fdir_construct_pkt(struct rte_eth_dev *eth_dev, +@@ -339,9 +340,13 @@ qede_fdir_construct_pkt(struct rte_eth_dev *eth_dev, input->flow.ipv6_flow.proto : next_proto[input->flow_type]; - rte_memcpy(&ip6->src_addr, &input->flow.ipv6_flow.dst_ip, @@ -44,7 +44,7 @@ + params->ipv6 = true; raw_pkt = (uint8_t *)buff; -@@ -456,12 +460,12 @@ qede_fdir_construct_pkt(struct rte_eth_dev *eth_dev, +@@ -349,12 +354,12 @@ qede_fdir_construct_pkt(struct rte_eth_dev *eth_dev, if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_UDP) { udp = (struct udp_hdr *)(raw_pkt + len); - udp->src_port = input->flow.udp6_flow.dst_port;