diff mbox

[dpdk-dev] net/i40e: fix issue during customized info update

Message ID 1517298807-8148-1-git-send-email-beilei.xing@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Helin Zhang
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Xing, Beilei Jan. 30, 2018, 7:53 a.m. UTC 
  Customized info is updated without checking package
operation - ADD or DEL, it only covers ADD operation
currently. This patch adds process for DEL operation.

Fixes: e163c18a15b0 ("net/i40e: update ptype and pctype info")
Cc: stable@dpdk.org

Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c  | 48 +++++++++++++++++++++++++++++++++--------
 drivers/net/i40e/i40e_ethdev.h  |  4 +++-
 drivers/net/i40e/i40e_flow.c    |  2 +-
 drivers/net/i40e/rte_pmd_i40e.c |  6 ++++--
 4 files changed, 47 insertions(+), 13 deletions(-)

Comments

Jingjing Wu Feb. 7, 2018, 7:56 a.m. UTC | #1 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Beilei Xing
> Sent: Tuesday, January 30, 2018 3:53 PM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Chilikin, Andrey <andrey.chilikin@intel.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/i40e: fix issue during customized info update
> 
> Customized info is updated without checking package
> operation - ADD or DEL, it only covers ADD operation
> currently. This patch adds process for DEL operation.
> 
> Fixes: e163c18a15b0 ("net/i40e: update ptype and pctype info")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Beilei Xing <beilei.xing@intel.com>
> ---
>  drivers/net/i40e/i40e_ethdev.c  | 48 +++++++++++++++++++++++++++++++++--------
>  drivers/net/i40e/i40e_ethdev.h  |  4 +++-
>  drivers/net/i40e/i40e_flow.c    |  2 +-
>  drivers/net/i40e/rte_pmd_i40e.c |  6 ++++--
>  4 files changed, 47 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 1ba18f2..f228a03 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -11206,7 +11206,8 @@ i40e_find_customized_pctype(struct i40e_pf *pf, uint8_t
> index)
>  static int
>  i40e_update_customized_pctype(struct rte_eth_dev *dev, uint8_t *pkg,
>  			      uint32_t pkg_size, uint32_t proto_num,
> -			      struct rte_pmd_i40e_proto_info *proto)
> +			      struct rte_pmd_i40e_proto_info *proto,
> +			      enum rte_pmd_i40e_package_op op)
>  {
>  	struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
>  	uint32_t pctype_num;
> @@ -11219,6 +11220,12 @@ i40e_update_customized_pctype(struct rte_eth_dev *dev,
> uint8_t *pkg,
>  	uint32_t i, j, n;
>  	int ret;
> 
> +	if (op != RTE_PMD_I40E_PKG_OP_WR_ADD &&
> +	    op != RTE_PMD_I40E_PKG_OP_WR_DEL) {
> +		PMD_DRV_LOG(ERR, "Unsupported operation.");
> +		return -1;
> +	}
> +
>  	ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
>  				(uint8_t *)&pctype_num, sizeof(pctype_num),
>  				RTE_PMD_I40E_PKG_INFO_PCTYPE_NUM);
> @@ -11281,8 +11288,13 @@ i40e_update_customized_pctype(struct rte_eth_dev *dev,
> uint8_t *pkg,
>  				i40e_find_customized_pctype(pf,
>  						      I40E_CUSTOMIZED_GTPU);
>  		if (new_pctype) {
> -			new_pctype->pctype = pctype_value;
> -			new_pctype->valid = true;
> +			if (op == RTE_PMD_I40E_PKG_OP_WR_ADD) {
> +				new_pctype->pctype = pctype_value;
> +				new_pctype->valid = true;
> +			} else {
> +				new_pctype->pctype = I40E_FILTER_PCTYPE_INVALID;
> +				new_pctype->valid = false;
> +			}
>  		}
>  	}
> 
> @@ -11292,8 +11304,9 @@ i40e_update_customized_pctype(struct rte_eth_dev *dev,
> uint8_t *pkg,
> 
>  static int
>  i40e_update_customized_ptype(struct rte_eth_dev *dev, uint8_t *pkg,
> -			       uint32_t pkg_size, uint32_t proto_num,
> -			       struct rte_pmd_i40e_proto_info *proto)
> +			     uint32_t pkg_size, uint32_t proto_num,
> +			     struct rte_pmd_i40e_proto_info *proto,
> +			     enum rte_pmd_i40e_package_op op)
>  {
>  	struct rte_pmd_i40e_ptype_mapping *ptype_mapping;
>  	uint16_t port_id = dev->data->port_id;
> @@ -11306,6 +11319,12 @@ i40e_update_customized_ptype(struct rte_eth_dev *dev,
> uint8_t *pkg,
>  	bool in_tunnel;
>  	int ret;
> 
> +	if (op != RTE_PMD_I40E_PKG_OP_WR_ADD &&
> +	    op != RTE_PMD_I40E_PKG_OP_WR_DEL) {
> +		PMD_DRV_LOG(ERR, "Unsupported operation.");
> +		return -1;
> +	}
> +
>  	/* get information about new ptype num */
>  	ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
>  				(uint8_t *)&ptype_num, sizeof(ptype_num),
> @@ -11348,6 +11367,8 @@ i40e_update_customized_ptype(struct rte_eth_dev *dev,
> uint8_t *pkg,
>  	for (i = 0; i < ptype_num; i++) {
>  		ptype_mapping[i].hw_ptype = ptype[i].ptype_id;
>  		ptype_mapping[i].sw_ptype = 0;
> +		if (op == RTE_PMD_I40E_PKG_OP_WR_DEL)
> +			continue;
Think about if the original ptype is replaced. How about
Just use rte_pmd_i40e_ptype_mapping_reset?

Thanks
Jingjing
diff mbox

Patch

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 1ba18f2..f228a03 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -11206,7 +11206,8 @@  i40e_find_customized_pctype(struct i40e_pf *pf, uint8_t index)
 static int
 i40e_update_customized_pctype(struct rte_eth_dev *dev, uint8_t *pkg,
 			      uint32_t pkg_size, uint32_t proto_num,
-			      struct rte_pmd_i40e_proto_info *proto)
+			      struct rte_pmd_i40e_proto_info *proto,
+			      enum rte_pmd_i40e_package_op op)
 {
 	struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
 	uint32_t pctype_num;
@@ -11219,6 +11220,12 @@  i40e_update_customized_pctype(struct rte_eth_dev *dev, uint8_t *pkg,
 	uint32_t i, j, n;
 	int ret;
 
+	if (op != RTE_PMD_I40E_PKG_OP_WR_ADD &&
+	    op != RTE_PMD_I40E_PKG_OP_WR_DEL) {
+		PMD_DRV_LOG(ERR, "Unsupported operation.");
+		return -1;
+	}
+
 	ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
 				(uint8_t *)&pctype_num, sizeof(pctype_num),
 				RTE_PMD_I40E_PKG_INFO_PCTYPE_NUM);
@@ -11281,8 +11288,13 @@  i40e_update_customized_pctype(struct rte_eth_dev *dev, uint8_t *pkg,
 				i40e_find_customized_pctype(pf,
 						      I40E_CUSTOMIZED_GTPU);
 		if (new_pctype) {
-			new_pctype->pctype = pctype_value;
-			new_pctype->valid = true;
+			if (op == RTE_PMD_I40E_PKG_OP_WR_ADD) {
+				new_pctype->pctype = pctype_value;
+				new_pctype->valid = true;
+			} else {
+				new_pctype->pctype = I40E_FILTER_PCTYPE_INVALID;
+				new_pctype->valid = false;
+			}
 		}
 	}
 
@@ -11292,8 +11304,9 @@  i40e_update_customized_pctype(struct rte_eth_dev *dev, uint8_t *pkg,
 
 static int
 i40e_update_customized_ptype(struct rte_eth_dev *dev, uint8_t *pkg,
-			       uint32_t pkg_size, uint32_t proto_num,
-			       struct rte_pmd_i40e_proto_info *proto)
+			     uint32_t pkg_size, uint32_t proto_num,
+			     struct rte_pmd_i40e_proto_info *proto,
+			     enum rte_pmd_i40e_package_op op)
 {
 	struct rte_pmd_i40e_ptype_mapping *ptype_mapping;
 	uint16_t port_id = dev->data->port_id;
@@ -11306,6 +11319,12 @@  i40e_update_customized_ptype(struct rte_eth_dev *dev, uint8_t *pkg,
 	bool in_tunnel;
 	int ret;
 
+	if (op != RTE_PMD_I40E_PKG_OP_WR_ADD &&
+	    op != RTE_PMD_I40E_PKG_OP_WR_DEL) {
+		PMD_DRV_LOG(ERR, "Unsupported operation.");
+		return -1;
+	}
+
 	/* get information about new ptype num */
 	ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
 				(uint8_t *)&ptype_num, sizeof(ptype_num),
@@ -11348,6 +11367,8 @@  i40e_update_customized_ptype(struct rte_eth_dev *dev, uint8_t *pkg,
 	for (i = 0; i < ptype_num; i++) {
 		ptype_mapping[i].hw_ptype = ptype[i].ptype_id;
 		ptype_mapping[i].sw_ptype = 0;
+		if (op == RTE_PMD_I40E_PKG_OP_WR_DEL)
+			continue;
 		in_tunnel = false;
 		for (j = 0; j < RTE_PMD_I40E_PROTO_NUM; j++) {
 			proto_id = ptype[i].protocols[j];
@@ -11478,7 +11499,7 @@  i40e_update_customized_ptype(struct rte_eth_dev *dev, uint8_t *pkg,
 
 void
 i40e_update_customized_info(struct rte_eth_dev *dev, uint8_t *pkg,
-			      uint32_t pkg_size)
+			    uint32_t pkg_size, enum rte_pmd_i40e_package_op op)
 {
 	struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
 	uint32_t proto_num;
@@ -11487,6 +11508,12 @@  i40e_update_customized_info(struct rte_eth_dev *dev, uint8_t *pkg,
 	uint32_t i;
 	int ret;
 
+	if (op != RTE_PMD_I40E_PKG_OP_WR_ADD &&
+	    op != RTE_PMD_I40E_PKG_OP_WR_DEL) {
+		PMD_DRV_LOG(ERR, "Unsupported operation.");
+		return;
+	}
+
 	/* get information about protocol number */
 	ret = rte_pmd_i40e_get_ddp_info(pkg, pkg_size,
 				       (uint8_t *)&proto_num, sizeof(proto_num),
@@ -11520,20 +11547,23 @@  i40e_update_customized_info(struct rte_eth_dev *dev, uint8_t *pkg,
 	/* Check if GTP is supported. */
 	for (i = 0; i < proto_num; i++) {
 		if (!strncmp(proto[i].name, "GTP", 3)) {
-			pf->gtp_support = true;
+			if (op == RTE_PMD_I40E_PKG_OP_WR_ADD)
+				pf->gtp_support = true;
+			else
+				pf->gtp_support = false;
 			break;
 		}
 	}
 
 	/* Update customized pctype info */
 	ret = i40e_update_customized_pctype(dev, pkg, pkg_size,
-					    proto_num, proto);
+					    proto_num, proto, op);
 	if (ret)
 		PMD_DRV_LOG(INFO, "No pctype is updated.");
 
 	/* Update customized ptype info */
 	ret = i40e_update_customized_ptype(dev, pkg, pkg_size,
-					   proto_num, proto);
+					   proto_num, proto, op);
 	if (ret)
 		PMD_DRV_LOG(INFO, "No ptype is updated.");
 
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 69ea6c1..861143e 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -11,6 +11,7 @@ 
 #include <rte_hash.h>
 #include <rte_flow_driver.h>
 #include <rte_tm_driver.h>
+#include "rte_pmd_i40e.h"
 
 #define I40E_VLAN_TAG_SIZE        4
 
@@ -1178,7 +1179,8 @@  void i40e_tm_conf_uninit(struct rte_eth_dev *dev);
 struct i40e_customized_pctype*
 i40e_find_customized_pctype(struct i40e_pf *pf, uint8_t index);
 void i40e_update_customized_info(struct rte_eth_dev *dev, uint8_t *pkg,
-				 uint32_t pkg_size);
+				 uint32_t pkg_size,
+				 enum rte_pmd_i40e_package_op op);
 int i40e_dcb_init_configure(struct rte_eth_dev *dev, bool sw_dcb);
 int i40e_flush_queue_region_all_conf(struct rte_eth_dev *dev,
 		struct i40e_hw *hw, struct i40e_pf *pf, uint16_t on);
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 8bf1304..68a95fc 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -2399,7 +2399,7 @@  i40e_flow_fdir_get_pctype_value(struct i40e_pf *pf,
 		break;
 	}
 
-	if (cus_pctype)
+	if (cus_pctype && cus_pctype->valid)
 		return cus_pctype->pctype;
 
 	return I40E_FILTER_PCTYPE_INVALID;
diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c
index 5436db4..2965a24 100644
--- a/drivers/net/i40e/rte_pmd_i40e.c
+++ b/drivers/net/i40e/rte_pmd_i40e.c
@@ -1580,8 +1580,6 @@  rte_pmd_i40e_process_ddp_package(uint16_t port, uint8_t *buff,
 		return -EINVAL;
 	}
 
-	i40e_update_customized_info(dev, buff, size);
-
 	/* Find metadata segment */
 	metadata_seg_hdr = i40e_find_segment_in_package(SEGMENT_TYPE_METADATA,
 							pkg_hdr);
@@ -1676,6 +1674,10 @@  rte_pmd_i40e_process_ddp_package(uint16_t port, uint8_t *buff,
 		}
 	}
 
+	if (op == RTE_PMD_I40E_PKG_OP_WR_ADD ||
+	    op == RTE_PMD_I40E_PKG_OP_WR_DEL)
+		i40e_update_customized_info(dev, buff, size, op);
+
 	rte_free(profile_info_sec);
 	return status;
 }