diff mbox series

[1/2] net/i40e: fix ether pattern rule for fdir

Message ID 20190722120639.62468-1-xiaolong.ye@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [1/2] net/i40e: fix ether pattern rule for fdir |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-Compile-Testing success Compile Testing PASS
ci/Intel-compilation fail Compilation issues
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS

Commit Message

Xiaolong Ye July 22, 2019, 12:06 p.m. UTC 
  i40e FDIR doesn't allow to create flow with empty spec and mask for
ethertype pattern. Without this patch, below flow would be created
successfully which is unexpected.

> flow create 0 ingress pattern eth / end actions drop / end

Fixes: 7d83c152a207 ("net/i40e: parse flow director filter")
Cc: stable@dpdk.org
Cc: beilei.xing@intel.com

Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
---
 drivers/net/i40e/i40e_flow.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Comments

Xing, Beilei July 23, 2019, 5:28 a.m. UTC | #1 
> -----Original Message-----
> From: Ye, Xiaolong
> Sent: Monday, July 22, 2019 8:07 PM
> To: Yigit, Ferruh <ferruh.yigit@intel.com>; Xing, Beilei
> <beilei.xing@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Ye, Xiaolong <xiaolong.ye@intel.com>; stable@dpdk.org
> Subject: [PATCH 1/2] net/i40e: fix ether pattern rule for fdir
> 
> i40e FDIR doesn't allow to create flow with empty spec and mask for
> ethertype pattern. Without this patch, below flow would be created
> successfully which is unexpected.
> 
> > flow create 0 ingress pattern eth / end actions drop / end
> 
> Fixes: 7d83c152a207 ("net/i40e: parse flow director filter")
> Cc: stable@dpdk.org
> Cc: beilei.xing@intel.com
> 
> Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
> ---
>  drivers/net/i40e/i40e_flow.c | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> 48a6782a8..3c0af70c0 100644
> --- a/drivers/net/i40e/i40e_flow.c
> +++ b/drivers/net/i40e/i40e_flow.c
> @@ -2442,6 +2442,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev
> *dev,
>  	uint64_t input_set = I40E_INSET_NONE;
>  	uint16_t frag_off;
>  	enum rte_flow_item_type item_type;
> +	enum rte_flow_item_type next_type;
>  	enum rte_flow_item_type l3 = RTE_FLOW_ITEM_TYPE_END;
>  	enum rte_flow_item_type cus_proto = RTE_FLOW_ITEM_TYPE_END;
>  	uint32_t i, j;
> @@ -2482,6 +2483,16 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev
> *dev,
>  		case RTE_FLOW_ITEM_TYPE_ETH:
>  			eth_spec = item->spec;
>  			eth_mask = item->mask;
> +			next_type = (item + 1)->type;
> +
> +			if (next_type == RTE_FLOW_ITEM_TYPE_END &&
> +						(!eth_spec || !eth_mask)) {
> +				rte_flow_error_set(error, EINVAL,
> +
> RTE_FLOW_ERROR_TYPE_ITEM,
> +						   item,
> +						   "NULL eth spec/mask.");
> +				return -rte_errno;
> +			}
> 
>  			if (eth_spec && eth_mask) {
>  				if (!rte_is_zero_ether_addr(&eth_mask->src)
> || @@ -2494,8 +2505,6 @@ i40e_flow_parse_fdir_pattern(struct
> rte_eth_dev *dev,
>  				}
>  			}
>  			if (eth_spec && eth_mask && eth_mask->type) {
> -				enum rte_flow_item_type next = (item + 1)-
> >type;
> -
>  				if (eth_mask->type != RTE_BE16(0xffff)) {
>  					rte_flow_error_set(error, EINVAL,
> 
> RTE_FLOW_ERROR_TYPE_ITEM,
> @@ -2506,7 +2515,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev
> *dev,
> 
>  				ether_type = rte_be_to_cpu_16(eth_spec-
> >type);
> 
> -				if (next == RTE_FLOW_ITEM_TYPE_VLAN ||
> +				if (next_type ==
> RTE_FLOW_ITEM_TYPE_VLAN ||
>  				    ether_type == RTE_ETHER_TYPE_IPV4 ||
>  				    ether_type == RTE_ETHER_TYPE_IPV6 ||
>  				    ether_type == RTE_ETHER_TYPE_ARP ||
> --
> 2.17.0

Acked-by: Beilei Xing <beilei.xing@intel.com>
Qi Zhang July 23, 2019, 7:08 a.m. UTC | #2 
> -----Original Message-----
> From: Xing, Beilei
> Sent: Tuesday, July 23, 2019 1:28 PM
> To: Ye, Xiaolong <xiaolong.ye@intel.com>; Yigit, Ferruh
> <ferruh.yigit@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: RE: [PATCH 1/2] net/i40e: fix ether pattern rule for fdir
> 
> 
> 
> > -----Original Message-----
> > From: Ye, Xiaolong
> > Sent: Monday, July 22, 2019 8:07 PM
> > To: Yigit, Ferruh <ferruh.yigit@intel.com>; Xing, Beilei
> > <beilei.xing@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> > Cc: dev@dpdk.org; Ye, Xiaolong <xiaolong.ye@intel.com>;
> > stable@dpdk.org
> > Subject: [PATCH 1/2] net/i40e: fix ether pattern rule for fdir
> >
> > i40e FDIR doesn't allow to create flow with empty spec and mask for
> > ethertype pattern. Without this patch, below flow would be created
> > successfully which is unexpected.
> >
> > > flow create 0 ingress pattern eth / end actions drop / end
> >
> > Fixes: 7d83c152a207 ("net/i40e: parse flow director filter")
> > Cc: stable@dpdk.org
> > Cc: beilei.xing@intel.com
> >
> > Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
> > ---
> Acked-by: Beilei Xing <beilei.xing@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
diff mbox series

Patch

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 48a6782a8..3c0af70c0 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -2442,6 +2442,7 @@  i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 	uint64_t input_set = I40E_INSET_NONE;
 	uint16_t frag_off;
 	enum rte_flow_item_type item_type;
+	enum rte_flow_item_type next_type;
 	enum rte_flow_item_type l3 = RTE_FLOW_ITEM_TYPE_END;
 	enum rte_flow_item_type cus_proto = RTE_FLOW_ITEM_TYPE_END;
 	uint32_t i, j;
@@ -2482,6 +2483,16 @@  i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 		case RTE_FLOW_ITEM_TYPE_ETH:
 			eth_spec = item->spec;
 			eth_mask = item->mask;
+			next_type = (item + 1)->type;
+
+			if (next_type == RTE_FLOW_ITEM_TYPE_END &&
+						(!eth_spec || !eth_mask)) {
+				rte_flow_error_set(error, EINVAL,
+						   RTE_FLOW_ERROR_TYPE_ITEM,
+						   item,
+						   "NULL eth spec/mask.");
+				return -rte_errno;
+			}
 
 			if (eth_spec && eth_mask) {
 				if (!rte_is_zero_ether_addr(&eth_mask->src) ||
@@ -2494,8 +2505,6 @@  i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 				}
 			}
 			if (eth_spec && eth_mask && eth_mask->type) {
-				enum rte_flow_item_type next = (item + 1)->type;
-
 				if (eth_mask->type != RTE_BE16(0xffff)) {
 					rte_flow_error_set(error, EINVAL,
 						      RTE_FLOW_ERROR_TYPE_ITEM,
@@ -2506,7 +2515,7 @@  i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 
 				ether_type = rte_be_to_cpu_16(eth_spec->type);
 
-				if (next == RTE_FLOW_ITEM_TYPE_VLAN ||
+				if (next_type == RTE_FLOW_ITEM_TYPE_VLAN ||
 				    ether_type == RTE_ETHER_TYPE_IPV4 ||
 				    ether_type == RTE_ETHER_TYPE_IPV6 ||
 				    ether_type == RTE_ETHER_TYPE_ARP ||