net/ice: fix hash action validation

[dpdk.git] / drivers / net / ice / ice_hash.c

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index e535e4b..fdfaff7 100644 (file)
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -204,10 +204,6 @@ struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = {
        ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
        ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
        ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_TCP};
-struct rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = {
-       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
-       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
-       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_SCTP};
 struct rss_type_match_hdr hint_eth_ipv4_esp = {
        ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_ESP,
@@ -313,10 +309,6 @@ struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = {
        ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
        ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
        ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_TCP};
-struct rss_type_match_hdr hint_eth_pppoes_ipv6_sctp = {
-       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
-       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
-       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_SCTP};
 struct rss_type_match_hdr hint_eth_pppoes = {
        ICE_FLOW_SEG_HDR_PPPOE,
        ETH_RSS_ETH | ETH_RSS_PPPOE};
@@ -400,8 +392,6 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
                &hint_eth_pppoes_ipv4_udp},
        {pattern_eth_pppoes_ipv4_tcp,       ICE_INSET_NONE,
                &hint_eth_pppoes_ipv4_tcp},
-       {pattern_eth_pppoes_ipv4_sctp,      ICE_INSET_NONE,
-               &hint_eth_pppoes_ipv4_sctp},
        {pattern_eth_ipv4_esp,              ICE_INSET_NONE,
                &hint_eth_ipv4_esp},
        {pattern_eth_ipv4_udp_esp,          ICE_INSET_NONE,
@@ -452,8 +442,6 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
                &hint_eth_pppoes_ipv6_udp},
        {pattern_eth_pppoes_ipv6_tcp,       ICE_INSET_NONE,
                &hint_eth_pppoes_ipv6_tcp},
-       {pattern_eth_pppoes_ipv6_sctp,      ICE_INSET_NONE,
-               &hint_eth_pppoes_ipv6_sctp},
        {pattern_eth_pppoes,                ICE_INSET_NONE,
                &hint_eth_pppoes},
 };
@@ -1024,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;
@@ -1137,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 ||