net/ice: fix 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: f1ea76eb6394 ("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>

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 2bf8983f5a6eea975daf28ab1dbcbb53fa9d053d..3bc16139d114f09f368526b11af5aca8d9f81dd5 100644 (file)
--- 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));