net/ice: fix hash action validation
authorJeff Guo <jia.guo@intel.com>
Mon, 27 Jul 2020 07:58:31 +0000 (15:58 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 29 Jul 2020 22:41:23 +0000 (00:41 +0200)
An invalid rule should not be validated successfully. If the rule is not
in the supporting list, just return failure to application.

Fixes: 5ad3db8d4bdd ("net/ice: enable advanced RSS")
Cc: stable@dpdk.org
Signed-off-by: Jeff Guo <jia.guo@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
drivers/net/ice/ice_hash.c

index 2845ca0..fdfaff7 100644 (file)
@@ -1012,6 +1012,7 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
        enum rte_flow_action_type action_type;
        const struct rte_flow_action_rss *rss;
        const struct rte_flow_action *action;
+       bool hash_map_found = false;
        uint64_t rss_attr_src_dst;
        uint64_t rss_attr_l3_pre;
        uint64_t rss_attr_symm;
@@ -1125,10 +1126,18 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                                if (rss_type == ht_map->hash_type) {
                                        hash_meta->hash_flds =
                                                        ht_map->hash_flds;
+                                       hash_map_found = true;
                                        break;
                                }
                        }
 
+                       if (pattern_match_item->pattern_list !=
+                           pattern_empty && !hash_map_found) {
+                               return rte_flow_error_set(error, ENOTSUP,
+                                       RTE_FLOW_ERROR_TYPE_ACTION, action,
+                                       "Not supported flow");
+                       }
+
                        /* update hash field for nat-t esp. */
                        if (rss_type == ETH_RSS_ESP &&
                            (m->eth_rss_hint & ETH_RSS_NONFRAG_IPV4_UDP ||