diff mbox series

[v1] net/ice: fix wrong IP RSS configuration template

Message ID 20210508071147.4827-1-ting.xu@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v1] net/ice: fix wrong IP RSS configuration template |

Checks

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

Commit Message

Xu, Ting May 8, 2021, 7:11 a.m. UTC 
  To enable IP fragment RSS hash, ICE_FLOW_SEG_HDR_IPV_FRAG is added to the
IP RSS configuration template, together with ICE_FLOW_SEG_HDR_IPV_OTHER.
It will cause error when associating flow profile. And packet id field
for RSS is not correctly added when IP fragment is enabled. To fix this
issue, this patch only selects one of the above two segment header types
based on rss types.

Fixes: 672f321d09ed ("net/ice: support RSS hash for IP fragment")
Cc: stable@dpdk.org

Signed-off-by: Ting Xu <ting.xu@intel.com>
---
 drivers/net/ice/ice_hash.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

Comments

Qi Zhang May 10, 2021, 2:40 a.m. UTC | #1 
> -----Original Message-----
> From: Xu, Ting <ting.xu@intel.com>
> Sent: Saturday, May 8, 2021 3:12 PM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Xu, Ting <ting.xu@intel.com>; stable@dpdk.org
> Subject: [PATCH v1] net/ice: fix wrong IP RSS configuration template
> 
> To enable IP fragment RSS hash, ICE_FLOW_SEG_HDR_IPV_FRAG is added to
> the IP RSS configuration template, together with
> ICE_FLOW_SEG_HDR_IPV_OTHER.
> It will cause error when associating flow profile. And packet id field for RSS is
> not correctly added when IP fragment is enabled. To fix this issue, this patch
> only selects one of the above two segment header types based on rss types.
> 
> Fixes: 672f321d09ed ("net/ice: support RSS hash for IP fragment")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Ting Xu <ting.xu@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
diff mbox series

Patch

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 2bf8983f5a..3bc16139d1 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -111,7 +111,6 @@  ice_hash_parse_pattern_action(struct ice_adapter *ad,
 /* Rss configuration template */
 struct ice_rss_hash_cfg ipv4_tmplt = {
 	ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV4 |
-	ICE_FLOW_SEG_HDR_IPV_FRAG |
 	ICE_FLOW_SEG_HDR_IPV_OTHER,
 	ICE_FLOW_HASH_ETH | ICE_FLOW_HASH_IPV4,
 	ICE_RSS_OUTER_HEADERS,
@@ -152,8 +151,7 @@  struct ice_rss_hash_cfg ipv6_tmplt = {
 
 struct ice_rss_hash_cfg ipv6_frag_tmplt = {
 	ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV6 |
-	ICE_FLOW_SEG_HDR_IPV_FRAG |
-	ICE_FLOW_SEG_HDR_IPV_OTHER,
+	ICE_FLOW_SEG_HDR_IPV_FRAG,
 	ICE_FLOW_HASH_ETH | ICE_FLOW_HASH_IPV6,
 	ICE_RSS_ANY_HEADERS,
 	0
@@ -657,10 +655,13 @@  ice_refine_hash_cfg_l234(struct ice_rss_hash_cfg *hash_cfg,
 		    ETH_RSS_NONFRAG_IPV4_UDP |
 		    ETH_RSS_NONFRAG_IPV4_TCP |
 		    ETH_RSS_NONFRAG_IPV4_SCTP)) {
-			if (rss_type & ETH_RSS_FRAG_IPV4)
-				*hash_flds &=
-					~(BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_ID));
-			else if (rss_type & ETH_RSS_L3_SRC_ONLY)
+			if (rss_type & ETH_RSS_FRAG_IPV4) {
+				*addl_hdrs |= ICE_FLOW_SEG_HDR_IPV_FRAG;
+				*addl_hdrs &= ~(ICE_FLOW_SEG_HDR_IPV_OTHER);
+				*hash_flds |=
+					BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_ID);
+			}
+			if (rss_type & ETH_RSS_L3_SRC_ONLY)
 				*hash_flds &= ~(BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA));
 			else if (rss_type & ETH_RSS_L3_DST_ONLY)
 				*hash_flds &= ~(BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA));
@@ -680,9 +681,9 @@  ice_refine_hash_cfg_l234(struct ice_rss_hash_cfg *hash_cfg,
 		    ETH_RSS_NONFRAG_IPV6_TCP |
 		    ETH_RSS_NONFRAG_IPV6_SCTP)) {
 			if (rss_type & ETH_RSS_FRAG_IPV6)
-				*hash_flds &=
-					~(BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_ID));
-			else if (rss_type & ETH_RSS_L3_SRC_ONLY)
+				*hash_flds |=
+					BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_ID);
+			if (rss_type & ETH_RSS_L3_SRC_ONLY)
 				*hash_flds &= ~(BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA));
 			else if (rss_type & ETH_RSS_L3_DST_ONLY)
 				*hash_flds &= ~(BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA));