diff mbox series

[v2] net/ice: fix GTPU down/uplink and extension conflict

Message ID 1595601712-403946-1-git-send-email-simei.su@intel.com (mailing list archive)
State Changes Requested, archived
Delegated to: Qi Zhang
Headers
Series [v2] net/ice: fix GTPU down/uplink and extension conflict |

Checks

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

Commit Message

Simei Su July 24, 2020, 2:41 p.m. UTC 
  When adding a RSS rule with GTPU_DWN/UP, it will write from top to
bottom for profile due to firmware limitation. If a RSS rule with
GTPU_EH already exists, then GTPU_DWN/UP packet will match GTPU_EH
profile. This patch solves this issue by remembering a gtpu_eh RSS
configure and removing it before the corresponding RSS configure
for downlink/uplink rule is issued.

Fixes: 2e2810fc1868 ("net/ice: fix GTPU RSS")

Signed-off-by: Simei Su <simei.su@intel.com>
---

v2:
* Refine commit message.
* Clean code.
* Fix gtpu down/uplink can't be issued simultaneously.
* Fix gtpu down/uplink ipv4_udp/tcp or ipv6_udp/tcp for symmetric
  rule can't take effect.
---
 drivers/net/ice/ice_ethdev.c |  53 ++++++++++++
 drivers/net/ice/ice_ethdev.h |  15 ++++
 drivers/net/ice/ice_hash.c   | 201 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 269 insertions(+)
diff mbox series

Patch

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index a4a0390..84dbf6b 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2539,6 +2539,12 @@  static int ice_parse_devargs(struct rte_eth_dev *dev)
 			PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV4 rss flow fail %d",
 				    __func__, ret);
 
+		/* Store hash field and header for gtpu_eh ipv4 */
+		pf->gtpu_eh.ipv4.hash_fld = ICE_FLOW_HASH_IPV4;
+		pf->gtpu_eh.ipv4.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH |
+					   ICE_FLOW_SEG_HDR_IPV4 |
+					   ICE_FLOW_SEG_HDR_IPV_OTHER;
+
 		ret = ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV4,
 				ICE_FLOW_SEG_HDR_PPPOE |
 				ICE_FLOW_SEG_HDR_IPV4 |
@@ -2565,6 +2571,12 @@  static int ice_parse_devargs(struct rte_eth_dev *dev)
 			PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6 rss flow fail %d",
 				    __func__, ret);
 
+		/* Store hash field and header for gtpu_eh ipv6 */
+		pf->gtpu_eh.ipv6.hash_fld = ICE_FLOW_HASH_IPV6;
+		pf->gtpu_eh.ipv6.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH |
+					   ICE_FLOW_SEG_HDR_IPV6 |
+					   ICE_FLOW_SEG_HDR_IPV_OTHER;
+
 		ret = ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV6,
 				ICE_FLOW_SEG_HDR_PPPOE |
 				ICE_FLOW_SEG_HDR_IPV6 |
@@ -2587,6 +2599,10 @@  static int ice_parse_devargs(struct rte_eth_dev *dev)
 			PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV4_UDP rss flow fail %d",
 				    __func__, ret);
 
+		/* Store hash field and header for gtpu_eh ipv4_udp */
+		pf->gtpu_eh.ipv4_udp.hash_fld = ICE_HASH_UDP_IPV4;
+		pf->gtpu_eh.ipv4_udp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
+
 		ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_UDP_IPV4,
 				ICE_FLOW_SEG_HDR_PPPOE, 0);
 		if (ret)
@@ -2607,6 +2623,10 @@  static int ice_parse_devargs(struct rte_eth_dev *dev)
 			PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6_UDP rss flow fail %d",
 				    __func__, ret);
 
+		/* Store hash field and header for gtpu_eh ipv6_udp */
+		pf->gtpu_eh.ipv6_udp.hash_fld = ICE_HASH_UDP_IPV6;
+		pf->gtpu_eh.ipv6_udp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
+
 		ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_UDP_IPV6,
 				ICE_FLOW_SEG_HDR_PPPOE, 0);
 		if (ret)
@@ -2627,6 +2647,10 @@  static int ice_parse_devargs(struct rte_eth_dev *dev)
 			PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV4_TCP rss flow fail %d",
 				    __func__, ret);
 
+		/* Store hash field and header for gtpu_eh ipv4_tcp */
+		pf->gtpu_eh.ipv4_tcp.hash_fld = ICE_HASH_TCP_IPV4;
+		pf->gtpu_eh.ipv4_tcp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
+
 		ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_TCP_IPV4,
 				ICE_FLOW_SEG_HDR_PPPOE, 0);
 		if (ret)
@@ -2647,6 +2671,10 @@  static int ice_parse_devargs(struct rte_eth_dev *dev)
 			PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6_TCP rss flow fail %d",
 				    __func__, ret);
 
+		/* Store hash field and header for gtpu_eh ipv6_tcp */
+		pf->gtpu_eh.ipv6_tcp.hash_fld = ICE_HASH_TCP_IPV6;
+		pf->gtpu_eh.ipv6_tcp.pkt_hdr = ICE_FLOW_SEG_HDR_GTPU_EH;
+
 		ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_TCP_IPV6,
 				ICE_FLOW_SEG_HDR_PPPOE, 0);
 		if (ret)
@@ -2695,6 +2723,28 @@  static int ice_parse_devargs(struct rte_eth_dev *dev)
 	}
 }
 
+static void
+ice_rss_ctx_init(struct ice_pf *pf)
+{
+	pf->gtpu_eh.ipv4.hash_fld = 0;
+	pf->gtpu_eh.ipv4.pkt_hdr = 0;
+
+	pf->gtpu_eh.ipv6.hash_fld = 0;
+	pf->gtpu_eh.ipv6.pkt_hdr = 0;
+
+	pf->gtpu_eh.ipv4_udp.hash_fld = 0;
+	pf->gtpu_eh.ipv4_udp.pkt_hdr = 0;
+
+	pf->gtpu_eh.ipv6_udp.hash_fld = 0;
+	pf->gtpu_eh.ipv6_udp.pkt_hdr = 0;
+
+	pf->gtpu_eh.ipv4_tcp.hash_fld = 0;
+	pf->gtpu_eh.ipv4_tcp.pkt_hdr = 0;
+
+	pf->gtpu_eh.ipv6_tcp.hash_fld = 0;
+	pf->gtpu_eh.ipv6_tcp.pkt_hdr = 0;
+}
+
 static int ice_init_rss(struct ice_pf *pf)
 {
 	struct ice_hw *hw = ICE_PF_TO_HW(pf);
@@ -2755,6 +2805,9 @@  static int ice_init_rss(struct ice_pf *pf)
 		(1 << VSIQF_HASH_CTL_HASH_SCHEME_S);
 	ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg);
 
+	/* Initialize RSS context for gtpu_eh */
+	ice_rss_ctx_init(pf);
+
 	/* RSS hash configuration */
 	ice_rss_hash_set(pf, rss_conf->rss_hf);
 
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 87984ef..e20503f 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -358,6 +358,20 @@  struct ice_fdir_info {
 	struct ice_fdir_counter_pool_container counter;
 };
 
+struct ice_hash_gtpu_eh_ctx {
+	uint32_t pkt_hdr;
+	uint64_t hash_fld;
+};
+
+struct ice_hash_gtpu_eh {
+	struct ice_hash_gtpu_eh_ctx ipv4;
+	struct ice_hash_gtpu_eh_ctx ipv6;
+	struct ice_hash_gtpu_eh_ctx ipv4_udp;
+	struct ice_hash_gtpu_eh_ctx ipv6_udp;
+	struct ice_hash_gtpu_eh_ctx ipv4_tcp;
+	struct ice_hash_gtpu_eh_ctx ipv6_tcp;
+};
+
 struct ice_pf {
 	struct ice_adapter *adapter; /* The adapter this PF associate to */
 	struct ice_vsi *main_vsi; /* pointer to main VSI structure */
@@ -381,6 +395,7 @@  struct ice_pf {
 	uint16_t fdir_nb_qps; /* The number of queue pairs of Flow Director */
 	uint16_t fdir_qp_offset;
 	struct ice_fdir_info fdir; /* flow director info */
+	struct ice_hash_gtpu_eh gtpu_eh;
 	uint16_t hw_prof_cnt[ICE_FLTR_PTYPE_MAX][ICE_FD_HW_SEG_MAX];
 	uint16_t fdir_fltr_cnt[ICE_FLTR_PTYPE_MAX][ICE_FD_HW_SEG_MAX];
 	struct ice_hw_port_stats stats_offset;
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index e535e4b..83f1a3c 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -1232,6 +1232,179 @@  struct ice_hash_match_type ice_hash_type_list[] = {
 }
 
 static int
+ice_add_rss_cfg_pre(struct ice_pf *pf, uint32_t hdr, uint64_t fld)
+{
+	struct ice_hw *hw = ICE_PF_TO_HW(pf);
+	struct ice_vsi *vsi = pf->main_vsi;
+	int ret;
+
+	uint32_t ipv4_hdr = pf->gtpu_eh.ipv4.pkt_hdr;
+	uint64_t ipv4_fld = pf->gtpu_eh.ipv4.hash_fld;
+
+	uint32_t ipv6_hdr = pf->gtpu_eh.ipv6.pkt_hdr;
+	uint64_t ipv6_fld = pf->gtpu_eh.ipv6.hash_fld;
+
+	uint32_t ipv4_udp_hdr = pf->gtpu_eh.ipv4_udp.pkt_hdr;
+	uint64_t ipv4_udp_fld = pf->gtpu_eh.ipv4_udp.hash_fld;
+
+	uint32_t ipv6_udp_hdr = pf->gtpu_eh.ipv6_udp.pkt_hdr;
+	uint32_t ipv6_udp_fld = pf->gtpu_eh.ipv6_udp.hash_fld;
+
+	uint32_t ipv4_tcp_hdr = pf->gtpu_eh.ipv4_tcp.pkt_hdr;
+	uint64_t ipv4_tcp_fld = pf->gtpu_eh.ipv4_tcp.hash_fld;
+
+	uint32_t ipv6_tcp_hdr = pf->gtpu_eh.ipv6_tcp.pkt_hdr;
+	uint64_t ipv6_tcp_fld = pf->gtpu_eh.ipv6_tcp.hash_fld;
+
+	/**
+	 * If header field contains GTPU_EH, store gtpu_eh context.
+	 * If header field contains GTPU_DWN/UP, remove existed gtpu_eh.
+	 */
+	if (hdr & ICE_FLOW_SEG_HDR_GTPU_EH) {
+		if ((hdr & ICE_FLOW_SEG_HDR_IPV4) &&
+			(hdr & ICE_FLOW_SEG_HDR_UDP)) {
+				ipv4_udp_hdr = hdr;
+				ipv4_udp_fld = fld;
+		} else if ((hdr & ICE_FLOW_SEG_HDR_IPV6) &&
+			(hdr & ICE_FLOW_SEG_HDR_UDP)) {
+				ipv6_udp_hdr = hdr;
+				ipv6_udp_fld = fld;
+		} else if ((hdr & ICE_FLOW_SEG_HDR_IPV4) &&
+			(hdr & ICE_FLOW_SEG_HDR_TCP)) {
+				ipv4_tcp_hdr = hdr;
+				ipv4_tcp_fld = fld;
+		} else if ((hdr & ICE_FLOW_SEG_HDR_IPV6) &&
+			(hdr & ICE_FLOW_SEG_HDR_TCP)) {
+				ipv6_tcp_hdr = hdr;
+				ipv6_tcp_fld = fld;
+		} else if ((hdr & ICE_FLOW_SEG_HDR_IPV4) &&
+			(hdr & (ICE_FLOW_SEG_HDR_UDP |
+				ICE_FLOW_SEG_HDR_TCP)) == 0) {
+				ipv4_hdr = hdr;
+				ipv4_fld = fld;
+		} else if ((hdr & ICE_FLOW_SEG_HDR_IPV6) &&
+			(hdr & (ICE_FLOW_SEG_HDR_UDP |
+				ICE_FLOW_SEG_HDR_TCP)) == 0) {
+				ipv6_hdr = hdr;
+				ipv6_fld = fld;
+		}
+	} else if (hdr & (ICE_FLOW_SEG_HDR_GTPU_DWN |
+		   ICE_FLOW_SEG_HDR_GTPU_UP)) {
+		if ((hdr & ICE_FLOW_SEG_HDR_IPV4) &&
+			(hdr & ICE_FLOW_SEG_HDR_UDP)) {
+			if (ipv4_udp_fld && ipv4_udp_hdr) {
+				ret = ice_rem_rss_cfg(hw, vsi->idx,
+					ipv4_udp_fld, ipv4_udp_hdr);
+				if (ret)
+					return -rte_errno;
+
+				ipv4_udp_fld = 0;
+				ipv4_udp_hdr = 0;
+			}
+
+			if (ipv4_fld && ipv4_hdr) {
+				ret = ice_rem_rss_cfg(hw, vsi->idx,
+					ipv4_fld, ipv4_hdr);
+				if (ret)
+					return -rte_errno;
+
+				ipv4_fld = 0;
+				ipv4_hdr = 0;
+			}
+		} else if ((hdr & ICE_FLOW_SEG_HDR_IPV6) &&
+			(hdr & ICE_FLOW_SEG_HDR_UDP)) {
+			if (ipv6_udp_fld && ipv6_udp_hdr) {
+				ret = ice_rem_rss_cfg(hw, vsi->idx,
+					ipv6_udp_fld, ipv6_udp_hdr);
+				if (ret)
+					return -rte_errno;
+
+				ipv6_udp_fld = 0;
+				ipv6_udp_hdr = 0;
+			}
+
+			if (ipv6_fld && ipv6_hdr) {
+				ret = ice_rem_rss_cfg(hw, vsi->idx,
+					ipv6_fld, ipv6_hdr);
+				if (ret)
+					return -rte_errno;
+
+				ipv6_fld = 0;
+				ipv6_hdr = 0;
+			}
+		} else if ((hdr & ICE_FLOW_SEG_HDR_IPV4) &&
+			(hdr & ICE_FLOW_SEG_HDR_TCP)) {
+			if (ipv4_tcp_fld && ipv4_tcp_hdr) {
+				ret = ice_rem_rss_cfg(hw, vsi->idx,
+					ipv4_tcp_fld, ipv4_tcp_hdr);
+				if (ret)
+					return -rte_errno;
+
+				ipv4_tcp_fld = 0;
+				ipv4_tcp_hdr = 0;
+			}
+
+			if (ipv4_fld & ipv4_hdr) {
+				ret = ice_rem_rss_cfg(hw, vsi->idx,
+					ipv4_fld, ipv4_hdr);
+				if (ret)
+					return -rte_errno;
+
+				ipv4_fld = 0;
+				ipv4_hdr = 0;
+			}
+		} else if ((hdr & ICE_FLOW_SEG_HDR_IPV6) &&
+			(hdr & ICE_FLOW_SEG_HDR_TCP)) {
+			if (ipv6_tcp_fld && ipv6_tcp_hdr) {
+				ret = ice_rem_rss_cfg(hw, vsi->idx,
+					ipv6_tcp_fld, ipv6_tcp_hdr);
+				if (ret)
+					return -rte_errno;
+
+				ipv6_tcp_fld = 0;
+				ipv6_tcp_hdr = 0;
+			}
+
+			if (ipv6_fld && ipv6_hdr) {
+				ret = ice_rem_rss_cfg(hw, vsi->idx,
+					ipv6_fld, ipv6_hdr);
+				if (ret)
+					return -rte_errno;
+
+				ipv6_fld = 0;
+				ipv6_hdr = 0;
+			}
+		} else if ((hdr & ICE_FLOW_SEG_HDR_IPV4) &&
+			(hdr & (ICE_FLOW_SEG_HDR_UDP |
+				ICE_FLOW_SEG_HDR_TCP)) == 0) {
+			if (ipv4_fld && ipv4_hdr) {
+				ret = ice_rem_rss_cfg(hw, vsi->idx,
+					ipv4_fld, ipv4_hdr);
+				if (ret)
+					return -rte_errno;
+
+				ipv4_fld = 0;
+				ipv4_hdr = 0;
+			}
+		} else if ((hdr & ICE_FLOW_SEG_HDR_IPV6) &&
+			(hdr & (ICE_FLOW_SEG_HDR_UDP |
+				ICE_FLOW_SEG_HDR_TCP)) == 0) {
+			if (ipv6_fld && ipv6_hdr) {
+				ret = ice_rem_rss_cfg(hw, vsi->idx,
+					ipv6_fld, ipv6_hdr);
+				if (ret)
+					return -rte_errno;
+
+				ipv6_fld = 0;
+				ipv6_hdr = 0;
+			}
+		}
+	}
+
+	return 0;
+}
+
+static int
 ice_hash_create(struct ice_adapter *ad,
 		struct rte_flow *flow,
 		void *meta,
@@ -1248,6 +1421,10 @@  struct ice_hash_match_type ice_hash_type_list[] = {
 	uint64_t hash_field = ((struct rss_meta *)meta)->hash_flds;
 	uint8_t hash_function = ((struct rss_meta *)meta)->hash_function;
 
+	ret = ice_add_rss_cfg_pre(pf, headermask, hash_field);
+	if (ret)
+		return -rte_errno;
+
 	filter_ptr = rte_zmalloc("ice_rss_filter",
 				sizeof(struct ice_hash_flow_cfg), 0);
 	if (!filter_ptr) {
@@ -1297,6 +1474,28 @@  struct ice_hash_match_type ice_hash_type_list[] = {
 	return -rte_errno;
 }
 
+static void
+ice_rem_rss_cfg_post(struct ice_pf *pf)
+{
+	pf->gtpu_eh.ipv4.hash_fld = 0;
+	pf->gtpu_eh.ipv4.pkt_hdr = 0;
+
+	pf->gtpu_eh.ipv6.hash_fld = 0;
+	pf->gtpu_eh.ipv6.pkt_hdr = 0;
+
+	pf->gtpu_eh.ipv4_udp.hash_fld = 0;
+	pf->gtpu_eh.ipv4_udp.pkt_hdr = 0;
+
+	pf->gtpu_eh.ipv6_udp.hash_fld = 0;
+	pf->gtpu_eh.ipv6_udp.pkt_hdr = 0;
+
+	pf->gtpu_eh.ipv4_tcp.hash_fld = 0;
+	pf->gtpu_eh.ipv4_tcp.pkt_hdr = 0;
+
+	pf->gtpu_eh.ipv6_tcp.hash_fld = 0;
+	pf->gtpu_eh.ipv6_tcp.pkt_hdr = 0;
+}
+
 static int
 ice_hash_destroy(struct ice_adapter *ad,
 		struct rte_flow *flow,
@@ -1334,6 +1533,8 @@  struct ice_hash_match_type ice_hash_type_list[] = {
 		}
 	}
 
+	ice_rem_rss_cfg_post(pf);
+
 	rte_free(filter_ptr);
 	return 0;