diff mbox series

net/i40e: fix i40e flow director merge

Message ID 1579622533-15909-1-git-send-email-bernard.iremonger@intel.com (mailing list archive)
State Superseded, archived
Headers
Series net/i40e: fix i40e flow director merge |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-intel-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-nxp-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed

Commit Message

Iremonger, Bernard Jan. 21, 2020, 4:02 p.m. UTC 
  Merge of i40e_fdir.c added checks on cus_pctype->index which are not
necessary and caused flow creation for ESP to fail.
Removed the added lines to fix the issue.

Fixes: c5f8365bc85d ("net/i40e: support flow director for L2TPv3 over IP")

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 drivers/net/i40e/i40e_fdir.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Iremonger, Bernard Jan. 21, 2020, 4:28 p.m. UTC | #1 
> -----Original Message-----
> From: Iremonger, Bernard <bernard.iremonger@intel.com>
> Sent: Tuesday, January 21, 2020 4:02 PM
> To: dev@dpdk.org; Xing, Beilei <beilei.xing@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>; Sexton, Rory
> <rory.sexton@intel.com>
> Cc: Iremonger, Bernard <bernard.iremonger@intel.com>
> Subject: [PATCH] net/i40e: fix i40e flow director merge
> 
> Merge of i40e_fdir.c added checks on cus_pctype->index which are not
> necessary and caused flow creation for ESP to fail.
> Removed the added lines to fix the issue.
> 
> Fixes: c5f8365bc85d ("net/i40e: support flow director for L2TPv3 over IP")
> 
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> ---
>  drivers/net/i40e/i40e_fdir.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index
> c346073..1d7c392 100644
> --- a/drivers/net/i40e/i40e_fdir.c
> +++ b/drivers/net/i40e/i40e_fdir.c
> @@ -1063,12 +1063,7 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf
> *pf,
>  		 pctype == I40E_FILTER_PCTYPE_NONF_IPV4_SCTP ||
>  		 pctype == I40E_FILTER_PCTYPE_NONF_IPV4_OTHER ||
>  		 pctype == I40E_FILTER_PCTYPE_FRAG_IPV4 ||
> -		 ((is_customized_pctype) &&
> -		  ((cus_pctype->index == I40E_CUSTOMIZED_GTPC) ||
> -		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV4) ||
> -		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV6) ||
> -		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU) ||
> -		   (cus_pctype->index ==
> I40E_CUSTOMIZED_IPV4_L2TPV3)))) {
> +		 is_customized_pctype) {
>  		ip = (struct rte_ipv4_hdr *)raw_pkt;
> 
>  		*ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
> --
> 2.7.4

NAK, causes problems for L2TPV3
Sexton, Rory Jan. 21, 2020, 4:42 p.m. UTC | #2 
Nack - if statement should look like this:
	else if (pctype == I40E_FILTER_PCTYPE_NONF_IPV4_TCP ||
		 pctype == I40E_FILTER_PCTYPE_NONF_IPV4_UDP ||
		 pctype == I40E_FILTER_PCTYPE_NONF_IPV4_SCTP ||
		 pctype == I40E_FILTER_PCTYPE_NONF_IPV4_OTHER ||
		 pctype == I40E_FILTER_PCTYPE_FRAG_IPV4 ||
		 ((is_customized_pctype) &&
		  ((cus_pctype->index == I40E_CUSTOMIZED_GTPC) ||
		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV4) ||
		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV6) ||
		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU) ||
		   (cus_pctype->index == I40E_CUSTOMIZED_ESP_IPV4) ||
		   (cus_pctype->index == I40E_CUSTOMIZED_ESP_IPV4_UDP) ||
		   (cus_pctype->index == I40E_CUSTOMIZED_IPV4_L2TPV3)))) {

-----Original Message-----
From: Iremonger, Bernard <bernard.iremonger@intel.com> 
Sent: Tuesday, January 21, 2020 4:29 PM
To: dev@dpdk.org; Xing, Beilei <beilei.xing@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>; Sexton, Rory <rory.sexton@intel.com>
Subject: RE: [PATCH] net/i40e: fix i40e flow director merge



> -----Original Message-----
> From: Iremonger, Bernard <bernard.iremonger@intel.com>
> Sent: Tuesday, January 21, 2020 4:02 PM
> To: dev@dpdk.org; Xing, Beilei <beilei.xing@intel.com>; Zhang, Qi Z 
> <qi.z.zhang@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>; 
> Sexton, Rory <rory.sexton@intel.com>
> Cc: Iremonger, Bernard <bernard.iremonger@intel.com>
> Subject: [PATCH] net/i40e: fix i40e flow director merge
> 
> Merge of i40e_fdir.c added checks on cus_pctype->index which are not 
> necessary and caused flow creation for ESP to fail.
> Removed the added lines to fix the issue.
> 
> Fixes: c5f8365bc85d ("net/i40e: support flow director for L2TPv3 over 
> IP")
> 
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> ---
>  drivers/net/i40e/i40e_fdir.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_fdir.c 
> b/drivers/net/i40e/i40e_fdir.c index
> c346073..1d7c392 100644
> --- a/drivers/net/i40e/i40e_fdir.c
> +++ b/drivers/net/i40e/i40e_fdir.c
> @@ -1063,12 +1063,7 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf 
> *pf,
>  		 pctype == I40E_FILTER_PCTYPE_NONF_IPV4_SCTP ||
>  		 pctype == I40E_FILTER_PCTYPE_NONF_IPV4_OTHER ||
>  		 pctype == I40E_FILTER_PCTYPE_FRAG_IPV4 ||
> -		 ((is_customized_pctype) &&
> -		  ((cus_pctype->index == I40E_CUSTOMIZED_GTPC) ||
> -		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV4) ||
> -		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV6) ||
> -		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU) ||
> -		   (cus_pctype->index ==
> I40E_CUSTOMIZED_IPV4_L2TPV3)))) {
> +		 is_customized_pctype) {
>  		ip = (struct rte_ipv4_hdr *)raw_pkt;
> 
>  		*ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
> --
> 2.7.4

NAK, causes problems for L2TPV3
diff mbox series

Patch

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index c346073..1d7c392 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -1063,12 +1063,7 @@  i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf,
 		 pctype == I40E_FILTER_PCTYPE_NONF_IPV4_SCTP ||
 		 pctype == I40E_FILTER_PCTYPE_NONF_IPV4_OTHER ||
 		 pctype == I40E_FILTER_PCTYPE_FRAG_IPV4 ||
-		 ((is_customized_pctype) &&
-		  ((cus_pctype->index == I40E_CUSTOMIZED_GTPC) ||
-		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV4) ||
-		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV6) ||
-		   (cus_pctype->index == I40E_CUSTOMIZED_GTPU) ||
-		   (cus_pctype->index == I40E_CUSTOMIZED_IPV4_L2TPV3)))) {
+		 is_customized_pctype) {
 		ip = (struct rte_ipv4_hdr *)raw_pkt;
 
 		*ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);