net/ice: enable new input set for rss hash
PF could add or delete a RSS rule base on the PF's hash capability. Some new rss input set will be supported, the protocols as below:
eth src/eth dst/svlan/cvlan/l2tpv3/esp/ah/pfcp/gtpu down/gtpu up.
--- drivers/net/ice/ice_hash.c | 1557 +++++++++++++++++++++++++++++++----- 1 file changed, 1370 insertions(+), 187 deletions(-)
drivers/net/ice/ice_hash.c +1370 -187
@@ -25,14 +25,42 @@#include "ice_ethdev.h" #include "ice_generic_flow.h" -struct rss_type_match_hdr { -uint32_t hdr_mask; -uint64_t eth_rss_hint; +enum ice_pattern_hint_type { +ICE_PHINT_NONE , +ICE_PHINT_IPV4 , +ICE_PHINT_IPV4_UDP , +ICE_PHINT_IPV4_TCP , +ICE_PHINT_IPV4_SCTP , +ICE_PHINT_IPV6 , +ICE_PHINT_IPV6_UDP , +ICE_PHINT_IPV6_TCP , +ICE_PHINT_IPV6_SCTP , +ICE_PHINT_IPV4_GTPU_IPV4 , +ICE_PHINT_IPV4_GTPU_EH_IPV4 , +ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP , +ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP , +}; + +enum ice_gtpu_hint { +ICE_GTPU_HINT_DOWNLINK , +ICE_GTPU_HINT_UPLINK , +ICE_GTPU_HINT_NONE , +}; + +struct ice_pattern_match_type { +enum ice_pattern_hint_type phint_type; +}; + +struct ice_hash_cfg { +uint32_t hdrs; +uint64_t flds; };struct ice_hash_match_type { +enum ice_pattern_hint_type phint_type;uint64_t hash_type; -uint64_t hash_flds; +struct ice_hash_cfg *hcfg; +enum ice_gtpu_hint gtpu_hint; };struct rss_meta {
@@ -75,144 +103,1304 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad,void **meta, struct rte_flow_error *error); -/* The first member is protocol header, the second member is ETH_RSS_*. */ -struct rss_type_match_hdr hint_0 = { -ICE_FLOW_SEG_HDR_NONE ,0 }; -struct rss_type_match_hdr hint_1 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_2 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_3 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_4 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_5 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV6 }; -struct rss_type_match_hdr hint_6 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_7 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_8 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_9 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_10 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_11 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_12 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_13 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_14 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_15 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_TCP }; +static struct ice_pattern_match_type phint_empty = { +ICE_PHINT_NONE }; +static struct ice_pattern_match_type phint_eth_ipv4 = { +ICE_PHINT_IPV4 }; +static struct ice_pattern_match_type phint_eth_ipv4_udp = { +ICE_PHINT_IPV4_UDP }; +static struct ice_pattern_match_type phint_eth_ipv4_tcp = { +ICE_PHINT_IPV4_TCP }; +static struct ice_pattern_match_type phint_eth_ipv4_sctp = { +ICE_PHINT_IPV4_SCTP }; +static struct ice_pattern_match_type phint_eth_ipv4_gtpu_ipv4 = { +ICE_PHINT_IPV4_GTPU_IPV4 }; +static struct ice_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4 = { +ICE_PHINT_IPV4_GTPU_EH_IPV4 }; +static struct ice_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_udp = { +ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP }; +static struct ice_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_tcp = { +ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP }; +static struct ice_pattern_match_type phint_eth_ipv4_esp = { +ICE_PHINT_IPV4 }; +static struct ice_pattern_match_type phint_eth_ipv4_ah = { +ICE_PHINT_IPV4 }; +static struct ice_pattern_match_type phint_eth_ipv4_l2tpv3 = { +ICE_PHINT_IPV4 }; +static struct ice_pattern_match_type phint_eth_ipv4_pfcp = { +ICE_PHINT_IPV4_UDP }; +static struct ice_pattern_match_type phint_eth_pppoes_ipv4 = { +ICE_PHINT_IPV4 }; +static struct ice_pattern_match_type phint_eth_pppoes_ipv4_udp = { +ICE_PHINT_IPV4_UDP }; +static struct ice_pattern_match_type phint_eth_pppoes_ipv4_tcp = { +ICE_PHINT_IPV4_TCP }; +static struct ice_pattern_match_type phint_eth_pppoes_ipv4_sctp = { +ICE_PHINT_IPV4_SCTP }; +static struct ice_pattern_match_type phint_eth_ipv6 = { +ICE_PHINT_IPV6 }; +static struct ice_pattern_match_type phint_eth_ipv6_udp = { +ICE_PHINT_IPV6_UDP }; +static struct ice_pattern_match_type phint_eth_ipv6_tcp = { +ICE_PHINT_IPV6_TCP }; +static struct ice_pattern_match_type phint_eth_ipv6_sctp = { +ICE_PHINT_IPV6_SCTP }; +static struct ice_pattern_match_type phint_eth_ipv6_esp = { +ICE_PHINT_IPV6 }; +static struct ice_pattern_match_type phint_eth_ipv6_ah = { +ICE_PHINT_IPV6 }; +static struct ice_pattern_match_type phint_eth_ipv6_l2tpv3 = { +ICE_PHINT_IPV6 }; +static struct ice_pattern_match_type phint_eth_ipv6_pfcp = { +ICE_PHINT_IPV6_UDP };/* Supported pattern for os default package. */ static struct ice_pattern_match_item ice_hash_pattern_list_os[] = { - {pattern_eth_ipv4,ICE_INSET_NONE , &hint_1}, - {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_2}, - {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_3}, - {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_4}, - {pattern_eth_ipv6,ICE_INSET_NONE , &hint_5}, - {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_6}, - {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_7}, - {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_8}, - {pattern_empty,ICE_INSET_NONE , &hint_0}, + {pattern_eth_ipv4,ICE_INSET_NONE , &phint_eth_ipv4}, + {pattern_eth_ipv4_udp,ICE_INSET_NONE , &phint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &phint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &phint_eth_ipv4_sctp}, + {pattern_eth_ipv6,ICE_INSET_NONE , &phint_eth_ipv6}, + {pattern_eth_ipv6_udp,ICE_INSET_NONE , &phint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &phint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &phint_eth_ipv6_sctp}, + {pattern_empty,ICE_INSET_NONE , &phint_empty}, };/* Supported pattern for comms package. */ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { - {pattern_eth_ipv4,ICE_INSET_NONE , &hint_1}, - {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_2}, - {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_3}, - {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_4}, - {pattern_eth_ipv6,ICE_INSET_NONE , &hint_5}, - {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_6}, - {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_7}, - {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_8}, - {pattern_empty,ICE_INSET_NONE , &hint_0}, - {pattern_eth_ipv4_gtpu_eh_ipv4,ICE_INSET_NONE , &hint_9}, - {pattern_eth_ipv4_gtpu_eh_ipv4_udp,ICE_INSET_NONE , &hint_14}, - {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,ICE_INSET_NONE , &hint_15}, - {pattern_eth_pppoes_ipv4,ICE_INSET_NONE , &hint_10}, - {pattern_eth_pppoes_ipv4_udp,ICE_INSET_NONE , &hint_11}, - {pattern_eth_pppoes_ipv4_tcp,ICE_INSET_NONE , &hint_12}, - {pattern_eth_pppoes_ipv4_sctp,ICE_INSET_NONE , &hint_13}, + {pattern_empty,ICE_INSET_NONE , &phint_empty}, + {pattern_eth_ipv4,ICE_INSET_NONE , &phint_eth_ipv4}, + {pattern_eth_ipv4_udp,ICE_INSET_NONE , &phint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &phint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &phint_eth_ipv4_sctp}, + {pattern_eth_ipv4_gtpu_ipv4,ICE_INSET_NONE , + &phint_eth_ipv4_gtpu_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4,ICE_INSET_NONE , + &phint_eth_ipv4_gtpu_eh_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4_udp,ICE_INSET_NONE , + &phint_eth_ipv4_gtpu_eh_ipv4_udp}, + {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,ICE_INSET_NONE , + &phint_eth_ipv4_gtpu_eh_ipv4_tcp}, + {pattern_eth_pppoes_ipv4,ICE_INSET_NONE , + &phint_eth_pppoes_ipv4}, + {pattern_eth_pppoes_ipv4_udp,ICE_INSET_NONE , + &phint_eth_pppoes_ipv4_udp}, + {pattern_eth_pppoes_ipv4_tcp,ICE_INSET_NONE , + &phint_eth_pppoes_ipv4_tcp}, + {pattern_eth_pppoes_ipv4_sctp,ICE_INSET_NONE , + &phint_eth_pppoes_ipv4_sctp}, + {pattern_eth_ipv4_esp,ICE_INSET_NONE , &phint_eth_ipv4_esp}, + {pattern_eth_ipv4_ah,ICE_INSET_NONE , &phint_eth_ipv4_ah}, + {pattern_eth_ipv4_l2tp,ICE_INSET_NONE , &phint_eth_ipv4_l2tpv3}, + {pattern_eth_ipv4_pfcp,ICE_INSET_NONE , &phint_eth_ipv4_pfcp}, + {pattern_eth_ipv6,ICE_INSET_NONE , &phint_eth_ipv6}, + {pattern_eth_ipv6_udp,ICE_INSET_NONE , &phint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &phint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &phint_eth_ipv6_sctp}, + {pattern_eth_ipv6_esp,ICE_INSET_NONE , &phint_eth_ipv6_esp}, + {pattern_eth_ipv6_ah,ICE_INSET_NONE , &phint_eth_ipv6_ah}, + {pattern_eth_ipv6_l2tp,ICE_INSET_NONE , &phint_eth_ipv6_l2tpv3}, + {pattern_eth_ipv6_pfcp,ICE_INSET_NONE , &phint_eth_ipv6_pfcp}, +}; + +/* ETH */ + +struct ice_hash_cfg cfg_hint_eth_src = { +ICE_FLOW_SEG_HDR_ETH , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA ), +}; + +struct ice_hash_cfg cfg_hint_eth_dst = { +ICE_FLOW_SEG_HDR_ETH , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA ), +}; + +struct ice_hash_cfg cfg_hint_eth = { +ICE_FLOW_SEG_HDR_ETH , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA ), +}; + +struct ice_hash_cfg cfg_hint_svlan = { +ICE_FLOW_SEG_HDR_VLAN , +BIT_ULL (ICE_FLOW_FIELD_IDX_S_VLAN ), +}; + +struct ice_hash_cfg cfg_hint_cvlan = { +ICE_FLOW_SEG_HDR_VLAN , +BIT_ULL (ICE_FLOW_FIELD_IDX_C_VLAN ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_esp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_ESP , +BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_ah = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , +BIT_ULL (ICE_FLOW_FIELD_IDX_AH_SPI ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , +BIT_ULL (ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_pfcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +BIT_ULL (ICE_FLOW_FIELD_IDX_PFCP_SEID ), +}; + +struct ice_hash_cfg cfg_hint_ipv4 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ICE_FLOW_HASH_IPV4 , +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_udp_src_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_udp_dst_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_udp_src_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_udp_dst_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_udp_src_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_udp_dst_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_udp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +ICE_HASH_UDP_IPV4 |BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_tcp_src_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_tcp_dst_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_src_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_dst_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_tcp_src_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_tcp_dst_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_tcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +ICE_HASH_TCP_IPV4 |BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_sctp_src_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_sctp_dst_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_sctp_src_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_sctp_dst_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_sctp_src_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_sctp_dst_port = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_sctp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +ICE_HASH_SCTP_IPV4 |BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ), +}; + +/* GTPU UP */ + +struct ice_hash_cfg cfg_hint_ipv4_udp_src_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_udp_dst_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_tcp_src_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_tcp_dst_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_udp_src_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_udp_dst_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_tcp_src_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_tcp_dst_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_udp_src_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_udp_dst_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_src_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_dst_gtpu_up = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_UP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +/* GPTU DWN */ + +struct ice_hash_cfg cfg_hint_ipv4_udp_src_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_udp_dst_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_tcp_src_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_tcp_dst_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_udp_src_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_udp_dst_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_tcp_src_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_src_tcp_dst_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_udp_src_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_udp_dst_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_src_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_dst_gtpu_dwn = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP | +ICE_FLOW_SEG_HDR_GTPU_DWN , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +/* IPV6 */ + +struct ice_hash_cfg cfg_hint_ipv6_src = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_dst = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_ESP , +BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_ah = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , +BIT_ULL (ICE_FLOW_FIELD_IDX_AH_SPI ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , +BIT_ULL (ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_pfcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +BIT_ULL (ICE_FLOW_FIELD_IDX_PFCP_SEID ), +}; + +struct ice_hash_cfg cfg_hint_ipv6 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ICE_FLOW_HASH_IPV6 , +}; + +struct ice_hash_cfg cfg_hint_ipv6_src_udp_src_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_src_udp_dst_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_dst_udp_src_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_dst_udp_dst_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_udp_src_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_udp_dst_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_udp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +ICE_HASH_UDP_IPV6 |BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_src_tcp_src_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_src_tcp_dst_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_dst_tcp_src_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_dst_tcp_dst_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_tcp_src_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_tcp_dst_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_tcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +ICE_HASH_TCP_IPV6 |BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_src_sctp_src_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_src_sctp_dst_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_dst_sctp_src_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_dst_sctp_dst_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_sctp_src_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_sctp_dst_port = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ), +}; + +struct ice_hash_cfg cfg_hint_ipv6_sctp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +ICE_HASH_SCTP_IPV6 |BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ), };/** -* The first member is input set combination, -* the second member is hash fields. +* The first member is pattern hint type, +* the second member is hash type, +* the third member is hash cfg (hdrs/fields). +* the forth member is downlink/uplink type. */ struct ice_hash_match_type ice_hash_type_list[] = { - {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_IPV4 ,ICE_FLOW_HASH_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP ,ICE_HASH_UDP_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP ,ICE_HASH_TCP_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP ,ICE_HASH_SCTP_IPV4 }, - {ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_IPV6 ,ICE_FLOW_HASH_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP ,ICE_HASH_UDP_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP ,ICE_HASH_TCP_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP ,ICE_HASH_SCTP_IPV6 }, +/* IPV4 */ + {ICE_PHINT_IPV4 ,ETH_RSS_L2_SRC_ONLY , + &cfg_hint_eth_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_L2_DST_ONLY , + &cfg_hint_eth_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_ETH |ETH_RSS_L2_SRC_ONLY , + &cfg_hint_eth_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_ETH |ETH_RSS_L2_DST_ONLY , + &cfg_hint_eth_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_ETH , + &cfg_hint_eth,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_S_VLAN , + &cfg_hint_svlan,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_C_VLAN , + &cfg_hint_cvlan,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_L3_SRC_ONLY , + &cfg_hint_ipv4_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_L3_DST_ONLY , + &cfg_hint_ipv4_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY , + &cfg_hint_ipv4_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY , + &cfg_hint_ipv4_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_IPV4 , + &cfg_hint_ipv4,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_ESP , + &cfg_hint_ipv4_esp,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_AH , + &cfg_hint_ipv4_ah,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4 ,ETH_RSS_L2TPV3 , + &cfg_hint_ipv4_l2tpv3,ICE_GTPU_HINT_NONE }, +/* IPV4 UDP */ + {ICE_PHINT_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_src_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_src_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY , + &cfg_hint_ipv4_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_dst_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_dst_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_L3_DST_ONLY , + &cfg_hint_ipv4_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_src_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_src_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY , &cfg_hint_ipv4_src, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_dst_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_dst_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY , &cfg_hint_ipv4_dst, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_PFCP , + &cfg_hint_ipv4_pfcp,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP , + &cfg_hint_ipv4_udp,ICE_GTPU_HINT_NONE }, +/* IPV4 TCP */ + {ICE_PHINT_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_src_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_src_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY , + &cfg_hint_ipv4_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_dst_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_dst_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_L3_DST_ONLY , + &cfg_hint_ipv4_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_src_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_src_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY , &cfg_hint_ipv4_src, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_dst_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_dst_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY , &cfg_hint_ipv4_dst, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP , + &cfg_hint_ipv4_tcp,ICE_GTPU_HINT_NONE }, +/* IPV4 SCTP */ + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_src_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_src_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_L3_SRC_ONLY , + &cfg_hint_ipv4_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_dst_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_dst_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_L3_DST_ONLY , + &cfg_hint_ipv4_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_src_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_src_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP | +ETH_RSS_L3_SRC_ONLY , &cfg_hint_ipv4_src, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_dst_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_dst_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP | +ETH_RSS_L3_DST_ONLY , &cfg_hint_ipv4_dst, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv4_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv4_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP , + &cfg_hint_ipv4_sctp,ICE_GTPU_HINT_NONE }, +/* IPV6 */ + {ICE_PHINT_IPV6 ,ETH_RSS_L2_SRC_ONLY , + &cfg_hint_eth_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_L2_DST_ONLY , + &cfg_hint_eth_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_ETH |ETH_RSS_L2_SRC_ONLY , + &cfg_hint_eth_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_ETH |ETH_RSS_L2_DST_ONLY , + &cfg_hint_eth_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_ETH , + &cfg_hint_eth,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_S_VLAN , + &cfg_hint_svlan,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_C_VLAN , + &cfg_hint_cvlan,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_L3_SRC_ONLY , + &cfg_hint_ipv6_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_L3_DST_ONLY , + &cfg_hint_ipv6_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY , + &cfg_hint_ipv6_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY , + &cfg_hint_ipv6_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_IPV6 , + &cfg_hint_ipv6,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_ESP , + &cfg_hint_ipv6_esp,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_AH , + &cfg_hint_ipv6_ah,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6 ,ETH_RSS_L2TPV3 , + &cfg_hint_ipv6_l2tpv3,ICE_GTPU_HINT_NONE }, +/* IPV6 UDP */ + {ICE_PHINT_IPV6_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_src_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_src_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_L3_SRC_ONLY , + &cfg_hint_ipv6_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_dst_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_dst_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_L3_DST_ONLY , + &cfg_hint_ipv6_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_src_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_src_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP | +ETH_RSS_L3_SRC_ONLY , &cfg_hint_ipv6_src, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_dst_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_dst_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP | +ETH_RSS_L3_DST_ONLY , &cfg_hint_ipv6_dst, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_udp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_udp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_PFCP , + &cfg_hint_ipv6_pfcp,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP , + &cfg_hint_ipv6_udp,ICE_GTPU_HINT_NONE }, +/* IPV6 TCP */ + {ICE_PHINT_IPV6_TCP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_src_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_src_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_L3_SRC_ONLY , + &cfg_hint_ipv6_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_dst_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_dst_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_L3_DST_ONLY , + &cfg_hint_ipv6_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_src_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_src_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP | +ETH_RSS_L3_SRC_ONLY , &cfg_hint_ipv6_src, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_dst_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_dst_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP | +ETH_RSS_L3_DST_ONLY , &cfg_hint_ipv6_dst, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_tcp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_tcp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP , + &cfg_hint_ipv6_tcp,ICE_GTPU_HINT_NONE }, +/* IPV6 SCTP */ + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_src_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_src_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_L3_SRC_ONLY , + &cfg_hint_ipv6_src,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_dst_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_dst_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_L3_DST_ONLY , + &cfg_hint_ipv6_dst,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_src_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_src_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP | +ETH_RSS_L3_SRC_ONLY , &cfg_hint_ipv6_src, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_dst_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_dst_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP | +ETH_RSS_L3_DST_ONLY , &cfg_hint_ipv6_dst, +ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_SRC_ONLY , + &cfg_hint_ipv6_sctp_src_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_DST_ONLY , + &cfg_hint_ipv6_sctp_dst_port,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP , + &cfg_hint_ipv6_sctp,ICE_GTPU_HINT_NONE }, +/* GTPU */ +/* GTPU IPV4*/ + {ICE_PHINT_IPV4_GTPU_IPV4 ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_up,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_GTPU_IPV4 ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_dwn,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_GTPU_IPV4 ,ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_up,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_GTPU_IPV4 ,ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_dwn,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_GTPU_IPV4 ,ETH_RSS_IPV4 | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_up,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_GTPU_IPV4 ,ETH_RSS_IPV4 | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_dwn,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_GTPU_IPV4 ,ETH_RSS_IPV4 | +ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_up,ICE_GTPU_HINT_NONE }, + {ICE_PHINT_IPV4_GTPU_IPV4 ,ETH_RSS_IPV4 | +ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_dwn,ICE_GTPU_HINT_NONE }, +/* GTPU EH*/ +/* Inner IPV4 */ + {ICE_PHINT_IPV4_GTPU_EH_IPV4 ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4 ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4 ,ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4 ,ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4 ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4 ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4 ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4 ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, +/* Inner IPV4->UDP */ + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_udp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_udp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_udp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_udp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_udp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_udp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_udp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_udp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_udp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_udp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_udp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_udp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_udp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_udp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_udp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_udp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_udp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_udp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_udp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_udp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_udp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_udp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_udp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_udp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, +/* Inner IPV4->TCP */ + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_tcp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_tcp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_tcp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_tcp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_tcp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_tcp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_tcp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_tcp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_tcp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_tcp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_tcp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_tcp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_tcp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_tcp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_tcp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_tcp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_tcp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_tcp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_tcp_src_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_tcp_src_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_tcp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_tcp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_tcp_dst_gtpu_up,ICE_GTPU_HINT_UPLINK }, + {ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L4_DST_ONLY |ETH_RSS_GTPU , + &cfg_hint_ipv4_tcp_dst_gtpu_dwn,ICE_GTPU_HINT_DOWNLINK }, };static struct ice_flow_engine ice_hash_engine = {
@@ -279,33 +1467,47 @@ ice_hash_check_inset(const struct rte_flow_item pattern[], "Not support range");return -rte_errno; } - -/* Ignore spec and mask. */ -if (item->spec || item->mask) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , item, -"Invalid spec/mask." ); -return -rte_errno; - } }return 0 ; } +static void +ice_hash_refine_type (uint64_t *rss_type,const struct rte_flow_item pattern[], +enum ice_gtpu_hint *gtpu_hint) +{ +const struct rte_flow_item *item; + +for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { +if (item->type ==RTE_FLOW_ITEM_TYPE_GTPU || + item->type ==RTE_FLOW_ITEM_TYPE_GTP_PSC ) { +const struct rte_flow_item_gtp_psc *psc = item->spec; + +if (psc && (psc->pdu_type ==ICE_GTPU_HINT_UPLINK || + psc->pdu_type ==ICE_GTPU_HINT_DOWNLINK )) + *gtpu_hint = psc->pdu_type; + + *rss_type |=ETH_RSS_GTPU ; + } + } +} +static int ice_hash_parse_action (struct ice_pattern_match_item *pattern_match_item, +const struct rte_flow_item pattern[],const struct rte_flow_action actions[],void **meta,struct rte_flow_error *error) { -const struct rte_flow_action *action; +struct ice_pattern_match_type *mt = (struct ice_pattern_match_type *) + (pattern_match_item->meta); +uint32_t type_list_len =RTE_DIM (ice_hash_type_list); +enum ice_gtpu_hint gtpu_hint =ICE_GTPU_HINT_NONE ;enum rte_flow_action_type action_type;const struct rte_flow_action_rss *rss; -struct rss_type_match_hdr *m = (struct rss_type_match_hdr *) - (pattern_match_item->meta); -uint32_t type_list_len =RTE_DIM (ice_hash_type_list); -struct ice_hash_match_type *type_match_item; -uint64_t rss_hf; +const struct rte_flow_action *action; +bool match_item_found = false; +uint64_t rss_type;uint16_t i;/* Supported action is RSS. */
@@ -315,13 +1517,19 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,switch (action_type) {case RTE_FLOW_ACTION_TYPE_RSS : rss = action->conf; - rss_hf = rss->types; + rss_type = rss->types;/** * Check simultaneous use of SRC_ONLY and DST_ONLY * of the same level. */ - rss_hf =rte_eth_rss_hf_refine (rss_hf); + rss_type =rte_eth_rss_hf_refine (rss_type); + +/** +* Refine the hash type base on some specific item of +* the pattern, such as identify the gtpu hash. +*/ +ice_hash_refine_type (&rss_type, pattern, >pu_hint);/* Check if pattern is empty. */ if (pattern_match_item->pattern_list !=
@@ -330,22 +1538,6 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,return rte_flow_error_set (error,ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , action,"Not supported flow" ); - -/* Check if rss types match pattern. */ -if (rss->func !=RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) { -if (((rss_hf Ð_RSS_IPV4 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_SCTP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_IPV6 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_SCTP ) != m->eth_rss_hint)) -return rte_flow_error_set (error, -ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , - action,"Not supported RSS types" ); - } -if (rss->level) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, action,
@@ -372,31 +1564,26 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, ((struct rss_meta *)*meta)->hash_function =RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; - type_match_item =rte_zmalloc ("ice_type_match_item" , -sizeof (struct ice_hash_match_type ),0 ); -if (!type_match_item) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"No memory for type_match_item" ); -return -ENOMEM ; - } -/* Find matched hash fields according to hash type. */ for (i =0 ; i < type_list_len; i++) { -if (rss_hf == - ice_hash_type_list[i].hash_type) { - type_match_item->hash_type = - ice_hash_type_list[i].hash_type; - type_match_item->hash_flds = - ice_hash_type_list[i].hash_flds; +struct ice_hash_match_type *ht_map = + &ice_hash_type_list[i]; +if (rss_type == ht_map->hash_type && + mt->phint_type == ht_map->phint_type && + gtpu_hint == ht_map->gtpu_hint) { + ((struct rss_meta *)*meta)->pkt_hdr = + ht_map->hcfg->hdrs; + ((struct rss_meta *)*meta)->hash_flds = + ht_map->hcfg->flds; + match_item_found = true; +break ; } } -/* Save hash fileds to rss_meta. */ - ((struct rss_meta *)*meta)->hash_flds = - type_match_item->hash_flds; - -rte_free (type_match_item); +if (!match_item_found) +return rte_flow_error_set (error, +ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , + action,"Not supported RSS types" );break ;case RTE_FLOW_ACTION_TYPE_END :
@@ -446,12 +1633,8 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad,if (ret) goto error; -/* Save protocol header to rss_meta. */ - rss_meta_ptr->pkt_hdr = ((struct rss_type_match_hdr *) - (pattern_match_item->meta))->hdr_mask; -/* Check rss action. */ - ret =ice_hash_parse_action (pattern_match_item, actions, + ret =ice_hash_parse_action (pattern_match_item, pattern, actions, (void **)&rss_meta_ptr, error); error:
Signature · 1 line
2.20.1
PATCH v2 1/1 net/ice: enable new input set for rss hash
PF could add or delete a RSS rule base on the PF's hash capability. Some new rss input set will be supported, the protocols as below:
eth/vlan/l2tpv3/esp/ah/pfcp/gtpu.
---v2->v1:
separate hdrs and fields parsing
--- drivers/net/ice/ice_hash.c | 597 +++++++++++++++++++++++++++---------- 1 file changed, 432 insertions(+), 165 deletions(-)
drivers/net/ice/ice_hash.c +432 -165
@@ -25,6 +25,9 @@#include "ice_ethdev.h" #include "ice_generic_flow.h" +#define ICE_GTPU_EH_DWNLINK 0 +#define ICE_GTPU_EH_UPLINK 1 +struct rss_type_match_hdr {uint32_t hdr_mask;uint64_t eth_rss_hint;
@@ -76,76 +79,151 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad, struct rte_flow_error *error);/* The first member is protocol header, the second member is ETH_RSS_*. */ -struct rss_type_match_hdr hint_0 = { +struct rss_type_match_hdr hint_empty = {ICE_FLOW_SEG_HDR_NONE ,0 }; -struct rss_type_match_hdr hint_1 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_2 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_3 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_4 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_5 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV6 }; -struct rss_type_match_hdr hint_6 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_7 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_8 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_9 = { +struct rss_type_match_hdr hint_eth_ipv4 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_udp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP ,ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_ipv4_tcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP ,ETH_RSS_NONFRAG_IPV4_TCP }; +struct rss_type_match_hdr hint_eth_ipv4_sctp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_IP ,ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = {ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_10 = { +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = { +ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = { +ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_TCP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv4 = {ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_11 = { +struct rss_type_match_hdr hint_eth_pppoes_ipv4_udp = {ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_12 = { +struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = {ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_13 = { +struct rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = {ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_14 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_15 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_TCP }; +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 ,ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv4_eh = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH ,ETH_RSS_AH }; +struct rss_type_match_hdr hint_eth_ipv4_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 ,ETH_RSS_L2TPV3 }; +struct rss_type_match_hdr hint_eth_ipv4_pfcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_PFCP }; +struct rss_type_match_hdr hint_eth_vlan_ipv4 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_C_VLAN }; +struct rss_type_match_hdr hint_eth_ipv6 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_IPV6 }; +struct rss_type_match_hdr hint_eth_ipv6_udp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP ,ETH_RSS_NONFRAG_IPV6_UDP }; +struct rss_type_match_hdr hint_eth_ipv6_tcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP ,ETH_RSS_NONFRAG_IPV6_TCP }; +struct rss_type_match_hdr hint_eth_ipv6_sctp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP }; +struct rss_type_match_hdr hint_eth_ipv6_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_ESP ,ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv6_ah = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH ,ETH_RSS_AH }; +struct rss_type_match_hdr hint_eth_ipv6_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 ,ETH_RSS_L2TPV3 }; +struct rss_type_match_hdr hint_eth_ipv6_pfcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_PFCP }; +struct rss_type_match_hdr hint_eth_vlan_ipv6 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV6 | +ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_C_VLAN };/* Supported pattern for os default package. */ static struct ice_pattern_match_item ice_hash_pattern_list_os[] = { - {pattern_eth_ipv4,ICE_INSET_NONE , &hint_1}, - {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_2}, - {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_3}, - {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_4}, - {pattern_eth_ipv6,ICE_INSET_NONE , &hint_5}, - {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_6}, - {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_7}, - {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_8}, - {pattern_empty,ICE_INSET_NONE , &hint_0}, + {pattern_eth_ipv4,ICE_INSET_NONE , &hint_eth_ipv4}, + {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_eth_ipv4_sctp}, + {pattern_eth_ipv6,ICE_INSET_NONE , &hint_eth_ipv6}, + {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_eth_ipv6_sctp}, + {pattern_empty,ICE_INSET_NONE , &hint_empty}, };/* Supported pattern for comms package. */ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { - {pattern_eth_ipv4,ICE_INSET_NONE , &hint_1}, - {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_2}, - {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_3}, - {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_4}, - {pattern_eth_ipv6,ICE_INSET_NONE , &hint_5}, - {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_6}, - {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_7}, - {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_8}, - {pattern_empty,ICE_INSET_NONE , &hint_0}, - {pattern_eth_ipv4_gtpu_eh_ipv4,ICE_INSET_NONE , &hint_9}, - {pattern_eth_ipv4_gtpu_eh_ipv4_udp,ICE_INSET_NONE , &hint_14}, - {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,ICE_INSET_NONE , &hint_15}, - {pattern_eth_pppoes_ipv4,ICE_INSET_NONE , &hint_10}, - {pattern_eth_pppoes_ipv4_udp,ICE_INSET_NONE , &hint_11}, - {pattern_eth_pppoes_ipv4_tcp,ICE_INSET_NONE , &hint_12}, - {pattern_eth_pppoes_ipv4_sctp,ICE_INSET_NONE , &hint_13}, + {pattern_empty,ICE_INSET_NONE , + &hint_empty}, + {pattern_eth_ipv4,ICE_INSET_NONE , + &hint_eth_ipv4}, + {pattern_eth_ipv4_udp,ICE_INSET_NONE , + &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp,ICE_INSET_NONE , + &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp,ICE_INSET_NONE , + &hint_eth_ipv4_sctp}, + {pattern_eth_ipv4_gtpu_ipv4,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4_udp,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4_udp}, + {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4_tcp}, + {pattern_eth_pppoes_ipv4,ICE_INSET_NONE , + &hint_eth_pppoes_ipv4}, + {pattern_eth_pppoes_ipv4_udp,ICE_INSET_NONE , + &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_ah,ICE_INSET_NONE , + &hint_eth_ipv4_eh}, + {pattern_eth_ipv4_l2tp,ICE_INSET_NONE , + &hint_eth_ipv4_l2tpv3}, + {pattern_eth_ipv4_pfcp,ICE_INSET_NONE , + &hint_eth_ipv4_pfcp}, + {pattern_eth_vlan_ipv4,ICE_INSET_NONE , + &hint_eth_vlan_ipv4}, + {pattern_eth_ipv6,ICE_INSET_NONE , + &hint_eth_ipv6}, + {pattern_eth_ipv6_udp,ICE_INSET_NONE , + &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp,ICE_INSET_NONE , + &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp,ICE_INSET_NONE , + &hint_eth_ipv6_sctp}, + {pattern_eth_ipv6_esp,ICE_INSET_NONE , + &hint_eth_ipv6_esp}, + {pattern_eth_ipv6_ah,ICE_INSET_NONE , + &hint_eth_ipv6_ah}, + {pattern_eth_ipv6_l2tp,ICE_INSET_NONE , + &hint_eth_ipv6_l2tpv3}, + {pattern_eth_ipv6_pfcp,ICE_INSET_NONE , + &hint_eth_ipv6_pfcp}, + {pattern_eth_vlan_ipv6,ICE_INSET_NONE , + &hint_eth_vlan_ipv6}, };/**
@@ -153,66 +231,226 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {* the second member is hash fields. */ struct ice_hash_match_type ice_hash_type_list[] = { - {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_IPV4 ,ICE_FLOW_HASH_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP ,ICE_HASH_UDP_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP ,ICE_HASH_TCP_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP ,ICE_HASH_SCTP_IPV4 }, - {ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_IPV6 ,ICE_FLOW_HASH_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP ,ICE_HASH_UDP_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP ,ICE_HASH_TCP_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP ,ICE_HASH_SCTP_IPV6 }, + {ETH_RSS_C_VLAN , +BIT_ULL (ICE_FLOW_FIELD_IDX_C_VLAN )}, + {ETH_RSS_S_VLAN , +BIT_ULL (ICE_FLOW_FIELD_IDX_S_VLAN )}, + {ETH_RSS_ESP , +BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI )}, + {ETH_RSS_AH , +BIT_ULL (ICE_FLOW_FIELD_IDX_AH_SPI )}, + {ETH_RSS_L2TPV3 , +BIT_ULL (ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID )}, + {ETH_RSS_PFCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_PFCP_SEID )}, +/* IPV4 */ + {ETH_RSS_IPV4 |ETH_RSS_L2_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_IPV4 |ETH_RSS_L2_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_IPV4 |ETH_RSS_ETH , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_IPV4 ,ICE_FLOW_HASH_IPV4 }, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_UDP , +ICE_HASH_UDP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP , +ICE_HASH_TCP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP , +ICE_HASH_SCTP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, +/* IPV6 */ + {ETH_RSS_IPV6 |ETH_RSS_L2_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_IPV6 |ETH_RSS_L2_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_IPV6 |ETH_RSS_ETH , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_IPV6 |ETH_RSS_ESP , +BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI )}, + {ETH_RSS_IPV6 |ETH_RSS_AH , +BIT_ULL (ICE_FLOW_FIELD_IDX_AH_SPI )}, + {ETH_RSS_IPV6 |ETH_RSS_L2TPV3 , +BIT_ULL (ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID )}, + {ETH_RSS_IPV6 ,ICE_FLOW_HASH_IPV6 }, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_PFCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_PFCP_SEID )}, + {ETH_RSS_NONFRAG_IPV6_UDP , +ICE_HASH_UDP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP , +ICE_HASH_TCP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP , +ICE_HASH_SCTP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, };static struct ice_flow_engine ice_hash_engine = {
@@ -267,10 +505,13 @@ ice_hash_init(struct ice_adapter *ad) }static int -ice_hash_check_inset (const struct rte_flow_item pattern[], -struct rte_flow_error *error) +ice_hash_parse_pattern (struct ice_pattern_match_item *pattern_match_item, +const struct rte_flow_item pattern[],void **meta, +struct rte_flow_error *error) {const struct rte_flow_item *item = pattern; +const struct rte_flow_item_gtp_psc *psc; +uint32_t hdrs =0 ;for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {
@@ -280,15 +521,30 @@ ice_hash_check_inset(const struct rte_flow_item pattern[],return -rte_errno; } -/* Ignore spec and mask. */ -if (item->spec || item->mask) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , item, -"Invalid spec/mask." ); -return -rte_errno; +switch (item->type) { +case RTE_FLOW_ITEM_TYPE_GTPU : + hdrs |=ICE_FLOW_SEG_HDR_GTPU_IP ; +break ; +case RTE_FLOW_ITEM_TYPE_GTP_PSC : + psc = item->spec; + hdrs &= ~ICE_FLOW_SEG_HDR_GTPU_IP ; +if (!psc) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_EH ; +else if (psc->pdu_type ==ICE_GTPU_EH_UPLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_UP ; +else if (psc->pdu_type ==ICE_GTPU_EH_DWNLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_DWN ; +break ; +default : +break ; } } +/* Save protocol header to rss_meta. */ + ((struct rss_meta *)*meta)->pkt_hdr |= + ((struct rss_type_match_hdr *) + (pattern_match_item->meta))->hdr_mask | hdrs; +return 0 ; }
@@ -298,14 +554,14 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,void **meta, struct rte_flow_error *error) { - const struct rte_flow_action *action; -enum rte_flow_action_type action_type; -const struct rte_flow_action_rss *rss; struct rss_type_match_hdr *m = (struct rss_type_match_hdr *) (pattern_match_item->meta);uint32_t type_list_len =RTE_DIM (ice_hash_type_list); -struct ice_hash_match_type *type_match_item; -uint64_t rss_hf; +enum rte_flow_action_type action_type; +const struct rte_flow_action_rss *rss; +const struct rte_flow_action *action; +bool match_item_found = false; +uint64_t rss_type;uint16_t i;/* Supported action is RSS. */
@@ -315,13 +571,13 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,switch (action_type) {case RTE_FLOW_ACTION_TYPE_RSS : rss = action->conf; - rss_hf = rss->types; + rss_type = rss->types;/** * Check simultaneous use of SRC_ONLY and DST_ONLY * of the same level. */ - rss_hf =rte_eth_rss_hf_refine (rss_hf); + rss_type =rte_eth_rss_hf_refine (rss_type);/* Check if pattern is empty. */ if (pattern_match_item->pattern_list !=
@@ -333,14 +589,36 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,/* Check if rss types match pattern. */ if (rss->func !=RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) { -if (((rss_hf Ð_RSS_IPV4 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_SCTP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_IPV6 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_SCTP ) != m->eth_rss_hint)) +if (((rss_type Ð_RSS_IPV4 ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_NONFRAG_IPV4_UDP ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_NONFRAG_IPV4_TCP ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_NONFRAG_IPV4_SCTP ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_IPV6 ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_NONFRAG_IPV6_UDP ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_NONFRAG_IPV6_TCP ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_NONFRAG_IPV6_SCTP ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_ETH ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_S_VLAN ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_C_VLAN ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_ESP ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_L2TPV3 ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_PFCP ) != + m->eth_rss_hint) && + ((rss_type Ð_RSS_AH ) != + m->eth_rss_hint))return rte_flow_error_set (error,ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , action,"Not supported RSS types" );
@@ -372,31 +650,23 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, ((struct rss_meta *)*meta)->hash_function =RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; - type_match_item =rte_zmalloc ("ice_type_match_item" , -sizeof (struct ice_hash_match_type ),0 ); -if (!type_match_item) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"No memory for type_match_item" ); -return -ENOMEM ; - } -/* Find matched hash fields according to hash type. */ for (i =0 ; i < type_list_len; i++) { -if (rss_hf == - ice_hash_type_list[i].hash_type) { - type_match_item->hash_type = - ice_hash_type_list[i].hash_type; - type_match_item->hash_flds = - ice_hash_type_list[i].hash_flds; +struct ice_hash_match_type *ht_map = + &ice_hash_type_list[i]; + +if (rss_type == ht_map->hash_type) { + ((struct rss_meta *)*meta)->hash_flds = + ht_map->hash_flds; + match_item_found = true; +break ; } } -/* Save hash fileds to rss_meta. */ - ((struct rss_meta *)*meta)->hash_flds = - type_match_item->hash_flds; - -rte_free (type_match_item); +if (!match_item_found) +return rte_flow_error_set (error, +ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , + action,"Not supported RSS types" );break ;case RTE_FLOW_ACTION_TYPE_END :
@@ -442,14 +712,11 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad, goto error; } - ret =ice_hash_check_inset (pattern, error); + ret =ice_hash_parse_pattern (pattern_match_item, pattern, + (void **)&rss_meta_ptr, error);if (ret) goto error; -/* Save protocol header to rss_meta. */ - rss_meta_ptr->pkt_hdr = ((struct rss_type_match_hdr *) - (pattern_match_item->meta))->hdr_mask; -/* Check rss action. */ ret =ice_hash_parse_action (pattern_match_item, actions, (void **)&rss_meta_ptr, error);
Signature · 1 line
2.20.1
PATCH v3 1/2 app/testpmd: add GTPU to RSS hash commands
Add testpmd cmdline support for GTPU, it could be used to configure gtpu teid hash. The commands as below:
testpmd> flow create 0 ingress pattern eth / ipv4 / udp / gtpu / \
ipv4 / end actions rss types gtpu end key_len 0 queues end / end
---
v3->v2:
add gtpu hash
--- app/test-pmd/cmdline.c | 8 +++++--- app/test-pmd/config.c | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-)
app/test-pmd/cmdline.c +5 -3
@@ -2274,7 +2274,7 @@ cmd_config_rss_parsed(void *parsed_result, rss_conf.rss_hf =ETH_RSS_ETH |ETH_RSS_VLAN |ETH_RSS_IP |ETH_RSS_TCP |ETH_RSS_UDP |ETH_RSS_SCTP |ETH_RSS_L2_PAYLOAD |ETH_RSS_L2TPV3 |ETH_RSS_ESP | -ETH_RSS_AH |ETH_RSS_PFCP ; +ETH_RSS_AH |ETH_RSS_PFCP |ETH_RSS_GTPU ; else if (!strcmp(res->value, "eth")) rss_conf.rss_hf =ETH_RSS_ETH ; else if (!strcmp(res->value, "vlan"))
@@ -2319,6 +2319,8 @@ cmd_config_rss_parsed(void *parsed_result, rss_conf.rss_hf =ETH_RSS_PFCP ; else if (!strcmp(res->value, "pppoe")) rss_conf.rss_hf =ETH_RSS_PPPOE ; + else if (!strcmp(res->value, "gtpu")) + rss_conf.rss_hf =ETH_RSS_GTPU ; else if (!strcmp(res->value, "none")) rss_conf.rss_hf =0 ; else if (!strcmp(res->value, "default"))
@@ -2492,7 +2494,7 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_type ="ipv6-tcp-ex#ipv6-udp-ex#" "l3-src-only#l3-dst-only#l4-src-only#l4-dst-only#" "l2-src-only#l2-dst-only#s-vlan#c-vlan#" - "l2tpv3#esp#ah#pfcp#pppoe"); + "l2tpv3#esp#ah#pfcp#pppoe#gtpu");cmdline_parse_token_string_t cmd_config_rss_hash_key_value = TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, key, NULL);
@@ -2505,7 +2507,7 @@ cmdline_parse_inst_t cmd_config_rss_hash_key = {"l2-payload|ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex|" "l3-src-only|l3-dst-only|l4-src-only|l4-dst-only|" "l2-src-only|l2-dst-only|s-vlan|c-vlan|" -"l2tpv3|esp|ah|pfcp|pppoe " +"l2tpv3|esp|ah|pfcp|pppoe|gtpu " "<string of hex digits (variable length, NIC dependent)>", .tokens = { (void *)&cmd_config_rss_hash_key_port,
app/test-pmd/config.c +3 -1
@@ -77,7 +77,8 @@ static const struct {const struct rss_type_info rss_type_table[] = { {"all" ,ETH_RSS_ETH |ETH_RSS_VLAN |ETH_RSS_IP |ETH_RSS_TCP |ETH_RSS_UDP |ETH_RSS_SCTP |ETH_RSS_L2_PAYLOAD | -ETH_RSS_L2TPV3 |ETH_RSS_ESP |ETH_RSS_AH |ETH_RSS_PFCP }, +ETH_RSS_L2TPV3 |ETH_RSS_ESP |ETH_RSS_AH |ETH_RSS_PFCP | +ETH_RSS_GTPU }, {"none" ,0 }, {"eth" ,ETH_RSS_ETH }, {"l2-src-only" ,ETH_RSS_L2_SRC_ONLY },
@@ -119,6 +120,7 @@ const struct rss_type_info rss_type_table[] = { { "l2tpv3", ETH_RSS_L2TPV3 }, { "pfcp", ETH_RSS_PFCP }, { "pppoe", ETH_RSS_PPPOE }, + { "gtpu", ETH_RSS_GTPU }, { NULL, 0 }, };
Signature · 1 line
2.20.1
PATCH v3 2/2 net/ice: enable new input set for rss hash
PF could add or delete a RSS rule base on the PF's hash capability. Some new rss input set will be supported, the protocols as below:
eth/vlan/l2tpv3/esp/ah/pfcp/gtpu.
---v3->v2:
refince code sturcture and fix simple xor issue
fix some typos
--- drivers/net/ice/ice_hash.c | 719 ++++++++++++++++++++++++++----------- 1 file changed, 500 insertions(+), 219 deletions(-)
drivers/net/ice/ice_hash.c +500 -219
@@ -25,6 +25,9 @@#include "ice_ethdev.h" #include "ice_generic_flow.h" +#define ICE_GTPU_EH_DWNLINK 0 +#define ICE_GTPU_EH_UPLINK 1 +struct rss_type_match_hdr {uint32_t hdr_mask;uint64_t eth_rss_hint;
@@ -76,91 +79,213 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad, struct rte_flow_error *error);/* The first member is protocol header, the second member is ETH_RSS_*. */ -struct rss_type_match_hdr hint_0 = { +struct rss_type_match_hdr hint_empty = {ICE_FLOW_SEG_HDR_NONE ,0 }; -struct rss_type_match_hdr hint_1 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_2 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_3 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_4 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_5 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV6 }; -struct rss_type_match_hdr hint_6 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_7 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_8 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_9 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_10 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_11 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_12 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_13 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_14 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_15 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_16 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV6 }; -struct rss_type_match_hdr hint_17 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_18 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_19 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_20 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_ETH |ETH_RSS_PPPOE }; +struct rss_type_match_hdr hint_eth_ipv4 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_udp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_ipv4_tcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_TCP }; +struct rss_type_match_hdr hint_eth_ipv4_sctp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_SCTP }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_IP |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_GTPU |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_GTPU |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_GTPU |ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_GTPU |ETH_RSS_NONFRAG_IPV4_TCP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv4 = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_pppoes_ipv4_udp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = { +ICE_FLOW_SEG_HDR_PPPOE , +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 , +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 , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv4_udp_esp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_NAT_T_ESP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv4_eh = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_AH }; +struct rss_type_match_hdr hint_eth_ipv4_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_L2TPV3 }; +struct rss_type_match_hdr hint_eth_ipv4_pfcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_PFCP }; +struct rss_type_match_hdr hint_eth_vlan_ipv4 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_C_VLAN }; +struct rss_type_match_hdr hint_eth_ipv6 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV6 }; +struct rss_type_match_hdr hint_eth_ipv6_udp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP }; +struct rss_type_match_hdr hint_eth_ipv6_tcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_TCP }; +struct rss_type_match_hdr hint_eth_ipv6_sctp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_SCTP }; +struct rss_type_match_hdr hint_eth_ipv6_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_ESP , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv6_udp_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_NAT_T_ESP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv6_ah = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_AH }; +struct rss_type_match_hdr hint_eth_ipv6_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_L2TPV3 }; +struct rss_type_match_hdr hint_eth_ipv6_pfcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_PFCP }; +struct rss_type_match_hdr hint_eth_vlan_ipv6 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV6 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_C_VLAN }; +struct rss_type_match_hdr hint_eth_pppoes_ipv6 = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_IPV6 }; +struct rss_type_match_hdr hint_eth_pppoes_ipv6_udp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV6_UDP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = { +ICE_FLOW_SEG_HDR_PPPOE , +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 , +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 };/* Supported pattern for os default package. */ static struct ice_pattern_match_item ice_hash_pattern_list_os[] = { - {pattern_eth_ipv4,ICE_INSET_NONE , &hint_1}, - {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_2}, - {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_3}, - {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_4}, - {pattern_eth_ipv6,ICE_INSET_NONE , &hint_5}, - {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_6}, - {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_7}, - {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_8}, - {pattern_empty,ICE_INSET_NONE , &hint_0}, + {pattern_eth_ipv4,ICE_INSET_NONE , &hint_eth_ipv4}, + {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_eth_ipv4_sctp}, + {pattern_eth_ipv6,ICE_INSET_NONE , &hint_eth_ipv6}, + {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_eth_ipv6_sctp}, + {pattern_empty,ICE_INSET_NONE , &hint_empty}, };/* Supported pattern for comms package. */ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { - {pattern_eth_ipv4,ICE_INSET_NONE , &hint_1}, - {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_2}, - {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_3}, - {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_4}, - {pattern_eth_ipv6,ICE_INSET_NONE , &hint_5}, - {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_6}, - {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_7}, - {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_8}, - {pattern_empty,ICE_INSET_NONE , &hint_0}, - {pattern_eth_ipv4_gtpu_eh_ipv4,ICE_INSET_NONE , &hint_9}, - {pattern_eth_ipv4_gtpu_eh_ipv4_udp,ICE_INSET_NONE , &hint_14}, - {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,ICE_INSET_NONE , &hint_15}, - {pattern_eth_pppoes_ipv4,ICE_INSET_NONE , &hint_10}, - {pattern_eth_pppoes_ipv4_udp,ICE_INSET_NONE , &hint_11}, - {pattern_eth_pppoes_ipv4_tcp,ICE_INSET_NONE , &hint_12}, - {pattern_eth_pppoes_ipv4_sctp,ICE_INSET_NONE , &hint_13}, - {pattern_eth_pppoes_ipv6,ICE_INSET_NONE , &hint_16}, - {pattern_eth_pppoes_ipv6_udp,ICE_INSET_NONE , &hint_17}, - {pattern_eth_pppoes_ipv6_tcp,ICE_INSET_NONE , &hint_18}, - {pattern_eth_pppoes_ipv6_sctp,ICE_INSET_NONE , &hint_19}, - {pattern_eth_pppoes,ICE_INSET_NONE , &hint_20}, + {pattern_empty,ICE_INSET_NONE , + &hint_empty}, + {pattern_eth_ipv4,ICE_INSET_NONE , + &hint_eth_ipv4}, + {pattern_eth_ipv4_udp,ICE_INSET_NONE , + &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp,ICE_INSET_NONE , + &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp,ICE_INSET_NONE , + &hint_eth_ipv4_sctp}, + {pattern_eth_ipv4_gtpu_ipv4,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4_udp,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4_udp}, + {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4_tcp}, + {pattern_eth_pppoes_ipv4,ICE_INSET_NONE , + &hint_eth_pppoes_ipv4}, + {pattern_eth_pppoes_ipv4_udp,ICE_INSET_NONE , + &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 , + &hint_eth_ipv4_udp_esp}, + {pattern_eth_ipv4_ah,ICE_INSET_NONE , + &hint_eth_ipv4_eh}, + {pattern_eth_ipv4_l2tp,ICE_INSET_NONE , + &hint_eth_ipv4_l2tpv3}, + {pattern_eth_ipv4_pfcp,ICE_INSET_NONE , + &hint_eth_ipv4_pfcp}, + {pattern_eth_vlan_ipv4,ICE_INSET_NONE , + &hint_eth_vlan_ipv4}, + {pattern_eth_ipv6,ICE_INSET_NONE , + &hint_eth_ipv6}, + {pattern_eth_ipv6_udp,ICE_INSET_NONE , + &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp,ICE_INSET_NONE , + &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp,ICE_INSET_NONE , + &hint_eth_ipv6_sctp}, + {pattern_eth_ipv6_esp,ICE_INSET_NONE , + &hint_eth_ipv6_esp}, + {pattern_eth_ipv6_udp_esp,ICE_INSET_NONE , + &hint_eth_ipv6_udp_esp}, + {pattern_eth_ipv6_ah,ICE_INSET_NONE , + &hint_eth_ipv6_ah}, + {pattern_eth_ipv6_l2tp,ICE_INSET_NONE , + &hint_eth_ipv6_l2tpv3}, + {pattern_eth_ipv6_pfcp,ICE_INSET_NONE , + &hint_eth_ipv6_pfcp}, + {pattern_eth_vlan_ipv6,ICE_INSET_NONE , + &hint_eth_vlan_ipv6}, + {pattern_eth_pppoes_ipv6,ICE_INSET_NONE , + &hint_eth_pppoes_ipv6}, + {pattern_eth_pppoes_ipv6_udp,ICE_INSET_NONE , + &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}, };/**
@@ -168,69 +293,227 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {* the second member is hash fields. */ struct ice_hash_match_type ice_hash_type_list[] = { - {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_IPV4 ,ICE_FLOW_HASH_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP ,ICE_HASH_UDP_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP ,ICE_HASH_TCP_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP ,ICE_HASH_SCTP_IPV4 }, - {ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_IPV6 ,ICE_FLOW_HASH_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP ,ICE_HASH_UDP_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP ,ICE_HASH_TCP_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP ,ICE_HASH_SCTP_IPV6 }, - {ETH_RSS_ETH |ETH_RSS_L2_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, - {ETH_RSS_PPPOE ,ICE_FLOW_HASH_PPPOE_SESS_ID }, - {ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_L2_SRC_ONLY ,ICE_FLOW_HASH_PPPOE_SESS_ID |BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_L2_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_L2_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_ETH |ETH_RSS_L2_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_ETH |ETH_RSS_L2_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_ETH , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_PPPOE , +ICE_FLOW_HASH_PPPOE_SESS_ID }, + {ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_L2_SRC_ONLY , +ICE_FLOW_HASH_PPPOE_SESS_ID | +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_C_VLAN , +BIT_ULL (ICE_FLOW_FIELD_IDX_C_VLAN )}, + {ETH_RSS_S_VLAN , +BIT_ULL (ICE_FLOW_FIELD_IDX_S_VLAN )}, + {ETH_RSS_ESP , +BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI )}, + {ETH_RSS_AH , +BIT_ULL (ICE_FLOW_FIELD_IDX_AH_SPI )}, + {ETH_RSS_L2TPV3 , +BIT_ULL (ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID )}, + {ETH_RSS_PFCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_PFCP_SEID )}, + {ETH_RSS_GTPU , +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_IP_TEID ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_EH_TEID ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_UP_TEID ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID )}, +/* IPV4 */ + {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_IPV4 ,ICE_FLOW_HASH_IPV4 }, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_UDP , +ICE_HASH_UDP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP , +ICE_HASH_TCP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP , +ICE_HASH_SCTP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, +/* IPV6 */ + {ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_IPV6 ,ICE_FLOW_HASH_IPV6 }, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_PFCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_PFCP_SEID )}, + {ETH_RSS_NONFRAG_IPV6_UDP , +ICE_HASH_UDP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP , +ICE_HASH_TCP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP , +ICE_HASH_SCTP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, };static struct ice_flow_engine ice_hash_engine = {
@@ -285,10 +568,13 @@ ice_hash_init(struct ice_adapter *ad) }static int -ice_hash_check_inset (const struct rte_flow_item pattern[], -struct rte_flow_error *error) +ice_hash_parse_pattern (struct ice_pattern_match_item *pattern_match_item, +const struct rte_flow_item pattern[],void **meta, +struct rte_flow_error *error) {const struct rte_flow_item *item = pattern; +const struct rte_flow_item_gtp_psc *psc; +uint32_t hdrs =0 ;for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {
@@ -298,15 +584,30 @@ ice_hash_check_inset(const struct rte_flow_item pattern[],return -rte_errno; } -/* Ignore spec and mask. */ -if (item->spec || item->mask) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , item, -"Invalid spec/mask." ); -return -rte_errno; +switch (item->type) { +case RTE_FLOW_ITEM_TYPE_GTPU : + hdrs |=ICE_FLOW_SEG_HDR_GTPU_IP ; +break ; +case RTE_FLOW_ITEM_TYPE_GTP_PSC : + psc = item->spec; + hdrs &= ~ICE_FLOW_SEG_HDR_GTPU_IP ; +if (!psc) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_EH ; +else if (psc->pdu_type ==ICE_GTPU_EH_UPLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_UP ; +else if (psc->pdu_type ==ICE_GTPU_EH_DWNLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_DWN ; +break ; +default : +break ; } } +/* Save protocol header to rss_meta. */ + ((struct rss_meta *)*meta)->pkt_hdr |= + ((struct rss_type_match_hdr *) + (pattern_match_item->meta))->hdr_mask | hdrs; +return 0 ; }
@@ -316,14 +617,14 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,void **meta, struct rte_flow_error *error) { - const struct rte_flow_action *action; -enum rte_flow_action_type action_type; -const struct rte_flow_action_rss *rss; struct rss_type_match_hdr *m = (struct rss_type_match_hdr *) (pattern_match_item->meta); +struct rss_meta *hash_meta = (struct rss_meta *)*meta;uint32_t type_list_len =RTE_DIM (ice_hash_type_list); -struct ice_hash_match_type *type_match_item; -uint64_t rss_hf; +enum rte_flow_action_type action_type; +const struct rte_flow_action_rss *rss; +const struct rte_flow_action *action; +uint64_t rss_type;uint16_t i;/* Supported action is RSS. */
@@ -333,46 +634,24 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,switch (action_type) {case RTE_FLOW_ACTION_TYPE_RSS : rss = action->conf; - rss_hf = rss->types; + rss_type = rss->types; -/** -* Check simultaneous use of SRC_ONLY and DST_ONLY -* of the same level. -*/ - rss_hf =rte_eth_rss_hf_refine (rss_hf); - -/* Check if pattern is empty. */ +/* Check hash function and save it to rss_meta. */ if (pattern_match_item->pattern_list != - pattern_empty && rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) + pattern_empty && rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) {return rte_flow_error_set (error,ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , action,"Not supported flow" ); - -if ((rss_hf Ð_RSS_ETH ) && (rss_hf & ~ETH_RSS_PPPOE )) - m->eth_rss_hint =ETH_RSS_ETH ; -else if ((rss_hf Ð_RSS_PPPOE ) && (rss_hf & ~ETH_RSS_ETH )) - m->eth_rss_hint =ETH_RSS_PPPOE ; -else if ((rss_hf Ð_RSS_ETH ) && (rss_hf Ð_RSS_PPPOE )) - m->eth_rss_hint =ETH_RSS_ETH |ETH_RSS_PPPOE ; - -/* Check if rss types match pattern. */ -if (rss->func !=RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) { -if (((rss_hf Ð_RSS_IPV4 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_SCTP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_IPV6 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_SCTP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_ETH ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_PPPOE ) != m->eth_rss_hint) && - (((rss_hf & (ETH_RSS_ETH |ETH_RSS_PPPOE )) != - m->eth_rss_hint))) -return rte_flow_error_set (error, -ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , - action,"Not supported RSS types" ); + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ){ + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +return 0 ; + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) { + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; }if (rss->level)
@@ -390,42 +669,47 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,RTE_FLOW_ERROR_TYPE_ACTION , action, "a non-NULL RSS queue is not supported"); -/* Check hash function and save it to rss_meta. */ -if (rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +/** +* Check simultaneous use of SRC_ONLY and DST_ONLY +* of the same level. +*/ + rss_type =rte_eth_rss_hf_refine (rss_type); -if (rss->func == -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; +uint64_t combine_type =ETH_RSS_L2_SRC_ONLY | +ETH_RSS_L2_DST_ONLY | +ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY | +ETH_RSS_L4_DST_ONLY ; - type_match_item =rte_zmalloc ("ice_type_match_item" , -sizeof (struct ice_hash_match_type ),0 ); -if (!type_match_item) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"No memory for type_match_item" ); -return -ENOMEM ; +/* Check if rss types match pattern. */ +if (rss_type & ~combine_type & ~m->eth_rss_hint) { +return rte_flow_error_set (error, +ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , + action,"Not supported RSS types" ); }/* Find matched hash fields according to hash type. */ for (i =0 ; i < type_list_len; i++) { -if (rss_hf == - ice_hash_type_list[i].hash_type) { - type_match_item->hash_type = - ice_hash_type_list[i].hash_type; - type_match_item->hash_flds = - ice_hash_type_list[i].hash_flds; +struct ice_hash_match_type *ht_map = + &ice_hash_type_list[i]; + +if (rss_type == ht_map->hash_type) { + hash_meta->hash_flds = + ht_map->hash_flds; +break ; } } -/* Save hash fileds to rss_meta. */ - ((struct rss_meta *)*meta)->hash_flds = - type_match_item->hash_flds; +/* update hash field for nat-t esp. */ +if ((rss_type ==ETH_RSS_ESP ) && + (m->eth_rss_hint ||ETH_RSS_NONFRAG_IPV4_UDP )) { + hash_meta->hash_flds &= + ~(BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI )); + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI ); + } -rte_free (type_match_item);break ;case RTE_FLOW_ACTION_TYPE_END :
@@ -471,14 +755,11 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad, goto error; } - ret =ice_hash_check_inset (pattern, error); + ret =ice_hash_parse_pattern (pattern_match_item, pattern, + (void **)&rss_meta_ptr, error);if (ret) goto error; -/* Save protocol header to rss_meta. */ - rss_meta_ptr->pkt_hdr = ((struct rss_type_match_hdr *) - (pattern_match_item->meta))->hdr_mask; -/* Check rss action. */ ret =ice_hash_parse_action (pattern_match_item, actions, (void **)&rss_meta_ptr, error);
Signature · 1 line
2.20.1
Please also separate this patch into code refactor purpose and new features
Quoted 997 lines
-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Sunday, June 21, 2020 10:09 PM
To: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Cc: Ye, Xiaolong <[email protected]>; [email protected]; Wu, Jingjing <[email protected]>; Guo, Junfeng <[email protected]>; Su, Simei <[email protected]>; Guo, Jia <[email protected]>
Subject: [dpdk-dev v3 2/2] net/ice: enable new input set for rss hashPF could add or delete a RSS rule base on the PF's hash capability. Some new rss input set will be supported, the protocols as below:
eth/vlan/l2tpv3/esp/ah/pfcp/gtpu.Signed-off-by Jeff Guo <[email protected]>---
v3->v2:
refince code sturcture and fix simple xor issue fix some typos--- drivers/net/ice/ice_hash.c | 719 ++++++++++++++++++++++++++----------- 1 file changed, 500 insertions(+), 219 deletions(-)drivers/net/ice/ice_hash.c index renamed from drivers/net/ice/ice_hash.c +0
-0
eaf6a35a1..d77c67f19100644drivers/net/ice/ice_hash.c +11
-46@@ -25,6 +25,9 @@#include "ice_ethdev.h" #include "ice_generic_flow.h" +#define ICE_GTPU_EH_DWNLINK 0 +#define ICE_GTPU_EH_UPLINK 1 +struct rss_type_match_hdr {uint32_t hdr_mask;uint64_t eth_rss_hint;@@ -76,91 +79,213 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad, struct rte_flow_error *error);/* The first member is protocol header, the second member is ETH_RSS_*. */ -struct rss_type_match_hdr hint_0 = { +struct rss_type_match_hdr hint_empty = { ICE_FLOW_SEG_HDR_NONE, 0}; -struct rss_type_match_hdr hint_1 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_2 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_3 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_4 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_5 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , ETH_RSS_IPV6}; -struct rss_type_match_hdr hint_6 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_7 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_8 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_9 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_10 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_11 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_12 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_13 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_14 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_15 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_16 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV6 }; -struct rss_type_match_hdr hint_17 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_18 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_19 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_20 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_ETH |ETH_RSS_PPPOE }; +struct rss_type_match_hdr hint_eth_ipv4 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_udp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_UDP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv4_tcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_TCP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv4_sctp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_SCTP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +12
-0+hint_eth_ipv4_gtpu_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_IP |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , + ETH_RSS_GTPU | ETH_RSS_IPV4}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_GTPU |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_UDP , + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv4_gtpu_eh_ipv4_tcp = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +3
-0+hint_eth_pppoes_ipv4 = { +ICE_FLOW_SEG_HDR_PPPOE , + ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV4}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +3
-0+hint_eth_pppoes_ipv4_udp = { +ICE_FLOW_SEG_HDR_PPPOE , + ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_UDP};struct
drivers/net/ice/ice_hash.c +3
-0+rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_TCP };struct
drivers/net/ice/ice_hash.c +3
-0+rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_SCTP };struct
drivers/net/ice/ice_hash.c +4
-0+rss_type_match_hdr hint_eth_ipv4_esp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_ESP , + ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_ESP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +8
-0+hint_eth_ipv4_udp_esp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_NAT_T_ESP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_ESP}; struct +rss_type_match_hdr hint_eth_ipv4_eh = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , + ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_AH}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +8
-0+hint_eth_ipv4_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , + ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_L2TPV3}; struct +rss_type_match_hdr hint_eth_ipv4_pfcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_PFCP };struct
drivers/net/ice/ice_hash.c +11
-0+rss_type_match_hdr hint_eth_vlan_ipv4 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_C_VLAN };struct +rss_type_match_hdr hint_eth_ipv6 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV6 }; +struct rss_type_match_hdr hint_eth_ipv6_udp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_UDP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv6_tcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_TCP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv6_sctp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_SCTP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv6_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_ESP , + ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_ESP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +8
-0+hint_eth_ipv6_udp_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_NAT_T_ESP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_ESP}; struct +rss_type_match_hdr hint_eth_ipv6_ah = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , + ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_AH}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +8
-0+hint_eth_ipv6_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , + ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_L2TPV3}; struct +rss_type_match_hdr hint_eth_ipv6_pfcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_PFCP };struct
drivers/net/ice/ice_hash.c +7
-0+rss_type_match_hdr hint_eth_vlan_ipv6 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV6 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_C_VLAN };struct +rss_type_match_hdr hint_eth_pppoes_ipv6 = { +ICE_FLOW_SEG_HDR_PPPOE , + ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV6}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +3
-0+hint_eth_pppoes_ipv6_udp = { +ICE_FLOW_SEG_HDR_PPPOE , + ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_UDP};struct
drivers/net/ice/ice_hash.c +3
-0+rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV6_TCP };struct
drivers/net/ice/ice_hash.c +3
-0+rss_type_match_hdr hint_eth_pppoes_ipv6_sctp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV6_SCTP };struct
drivers/net/ice/ice_hash.c +3
-0+rss_type_match_hdr hint_eth_pppoes = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE }; /* Supported pattern for os default package. */ static struct
ice_pattern_match_itemice_hash_pattern_list_os[] = {drivers/net/ice/ice_hash.c +9
-9- {pattern_eth_ipv4, ICE_INSET_NONE, &hint_1}, - {pattern_eth_ipv4_udp, ICE_INSET_NONE, &hint_2}, - {pattern_eth_ipv4_tcp, ICE_INSET_NONE, &hint_3}, - {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_4}, - {pattern_eth_ipv6, ICE_INSET_NONE, &hint_5}, - {pattern_eth_ipv6_udp, ICE_INSET_NONE, &hint_6}, - {pattern_eth_ipv6_tcp, ICE_INSET_NONE, &hint_7}, - {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_8}, - {pattern_empty, ICE_INSET_NONE, &hint_0}, + {pattern_eth_ipv4, ICE_INSET_NONE, &hint_eth_ipv4}, + {pattern_eth_ipv4_udp, ICE_INSET_NONE, &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp, ICE_INSET_NONE, &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_eth_ipv4_sctp}, + {pattern_eth_ipv6, ICE_INSET_NONE, &hint_eth_ipv6}, + {pattern_eth_ipv6_udp, ICE_INSET_NONE, &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp, ICE_INSET_NONE, &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_eth_ipv6_sctp}, + {pattern_empty, ICE_INSET_NONE, &hint_empty}, }; /* Supported pattern for comms package. */ static struct
ice_pattern_match_itemice_hash_pattern_list_comms[] = {drivers/net/ice/ice_hash.c +0
-10- {pattern_eth_ipv4, ICE_INSET_NONE, &hint_1}, - {pattern_eth_ipv4_udp, ICE_INSET_NONE, &hint_2}, - {pattern_eth_ipv4_tcp, ICE_INSET_NONE, &hint_3}, - {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_4}, - {pattern_eth_ipv6, ICE_INSET_NONE, &hint_5}, - {pattern_eth_ipv6_udp, ICE_INSET_NONE, &hint_6}, - {pattern_eth_ipv6_tcp, ICE_INSET_NONE, &hint_7}, - {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_8}, - {pattern_empty, ICE_INSET_NONE, &hint_0}, - {pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE,
&hint_9},drivers/net/ice/ice_hash.c +68
-15- {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE, &hint_14}, - {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, &hint_15}, - {pattern_eth_pppoes_ipv4, ICE_INSET_NONE, &hint_10}, - {pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE, &hint_11}, - {pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE, &hint_12}, - {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE, &hint_13}, - {pattern_eth_pppoes_ipv6, ICE_INSET_NONE, &hint_16}, - {pattern_eth_pppoes_ipv6_udp, ICE_INSET_NONE, &hint_17}, - {pattern_eth_pppoes_ipv6_tcp, ICE_INSET_NONE, &hint_18}, - {pattern_eth_pppoes_ipv6_sctp, ICE_INSET_NONE, &hint_19}, - {pattern_eth_pppoes, ICE_INSET_NONE, &hint_20}, + {pattern_empty,ICE_INSET_NONE , + &hint_empty}, + {pattern_eth_ipv4, ICE_INSET_NONE, + &hint_eth_ipv4}, + {pattern_eth_ipv4_udp, ICE_INSET_NONE, + &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp, ICE_INSET_NONE, + &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp, ICE_INSET_NONE, + &hint_eth_ipv4_sctp}, + {pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_eh_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_eh_ipv4_udp}, + {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_eh_ipv4_tcp}, + {pattern_eth_pppoes_ipv4, ICE_INSET_NONE, + &hint_eth_pppoes_ipv4}, + {pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE, + &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, + &hint_eth_ipv4_udp_esp}, + {pattern_eth_ipv4_ah, ICE_INSET_NONE, + &hint_eth_ipv4_eh}, + {pattern_eth_ipv4_l2tp, ICE_INSET_NONE, + &hint_eth_ipv4_l2tpv3}, + {pattern_eth_ipv4_pfcp, ICE_INSET_NONE, + &hint_eth_ipv4_pfcp}, + {pattern_eth_vlan_ipv4, ICE_INSET_NONE, + &hint_eth_vlan_ipv4}, + {pattern_eth_ipv6, ICE_INSET_NONE, + &hint_eth_ipv6}, + {pattern_eth_ipv6_udp, ICE_INSET_NONE, + &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp, ICE_INSET_NONE, + &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp, ICE_INSET_NONE, + &hint_eth_ipv6_sctp}, + {pattern_eth_ipv6_esp, ICE_INSET_NONE, + &hint_eth_ipv6_esp}, + {pattern_eth_ipv6_udp_esp, ICE_INSET_NONE, + &hint_eth_ipv6_udp_esp}, + {pattern_eth_ipv6_ah, ICE_INSET_NONE, + &hint_eth_ipv6_ah}, + {pattern_eth_ipv6_l2tp, ICE_INSET_NONE, + &hint_eth_ipv6_l2tpv3}, + {pattern_eth_ipv6_pfcp, ICE_INSET_NONE, + &hint_eth_ipv6_pfcp}, + {pattern_eth_vlan_ipv6, ICE_INSET_NONE, + &hint_eth_vlan_ipv6}, + {pattern_eth_pppoes_ipv6, ICE_INSET_NONE, + &hint_eth_pppoes_ipv6}, + {pattern_eth_pppoes_ipv6_udp, ICE_INSET_NONE, + &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}, };/** @@ -168,69 +293,227 @@ static struct ice_pattern_match_itemice_hash_pattern_list_comms[] = { * the second member is hash fields. */ struct ice_hash_match_type ice_hash_type_list[] = { - {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY , BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, - {ETH_RSS_IPV4 , ICE_FLOW_HASH_IPV4}, - {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP,ICE_HASH_UDP_IPV4},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP,ICE_HASH_TCP_IPV4},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP,ICE_HASH_SCTP_IPV4},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_IPV6,ICE_FLOW_HASH_IPV6},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP,ICE_HASH_UDP_IPV6},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP,ICE_HASH_TCP_IPV6},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP,ICE_HASH_SCTP_IPV6},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_PPPOE,
ICE_FLOW_HASH_PPPOE_SESS_ID},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_L2_SRC_ONLY,
ICE_FLOW_HASH_PPPOE_SESS_ID|BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},drivers/net/ice/ice_hash.c +40
-0+ {ETH_RSS_L2_SRC_ONLY , + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)}, + {ETH_RSS_L2_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)}, + {ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)}, + {ETH_RSS_ETH | ETH_RSS_L2_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)}, + {ETH_RSS_ETH, +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)}, + {ETH_RSS_PPPOE, + ICE_FLOW_HASH_PPPOE_SESS_ID}, + {ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_L2_SRC_ONLY, +ICE_FLOW_HASH_PPPOE_SESS_ID | + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)}, + {ETH_RSS_C_VLAN, + BIT_ULL(ICE_FLOW_FIELD_IDX_C_VLAN)}, + {ETH_RSS_S_VLAN, + BIT_ULL(ICE_FLOW_FIELD_IDX_S_VLAN)}, + {ETH_RSS_ESP, + BIT_ULL(ICE_FLOW_FIELD_IDX_ESP_SPI)}, + {ETH_RSS_AH, + BIT_ULL(ICE_FLOW_FIELD_IDX_AH_SPI)}, + {ETH_RSS_L2TPV3, + BIT_ULL(ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID)}, + {ETH_RSS_PFCP, + BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)}, + {ETH_RSS_GTPU, +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_IP_TEID ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_EH_TEID ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_UP_TEID ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID)}, +/* IPV4 */ + {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, + {ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, + {ETH_RSS_IPV4, ICE_FLOW_HASH_IPV4}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +15
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_UDP, +ICE_HASH_UDP_IPV4 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +15
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_TCP, +ICE_HASH_TCP_IPV4 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +21
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP, +ICE_HASH_SCTP_IPV4 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, +/* IPV6 */ + {ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, + {ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, + {ETH_RSS_IPV6, ICE_FLOW_HASH_IPV6}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +17
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_PFCP, + BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)}, + {ETH_RSS_NONFRAG_IPV6_UDP, +ICE_HASH_UDP_IPV6 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +15
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_TCP, +ICE_HASH_TCP_IPV6 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +14
-0+ BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP, + ICE_HASH_SCTP_IPV6 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, }; static struct ice_flow_engine ice_hash_engine = { @@ -285,10 +568,13 @@
ice_hash_init(struct ice_adapter *ad)}static int
drivers/net/ice/ice_hash.c +1
-2-ice_hash_check_inset(const struct rte_flow_item pattern[], - struct rte_flow_error *error) +ice_hash_parse_pattern(struct ice_pattern_match_item
*pattern_match_item,drivers/net/ice/ice_hash.c +4
-0+ const struct rte_flow_item pattern[], void **meta, + struct rte_flow_error *error) { const struct rte_flow_item *item = pattern; +const struct rte_flow_item_gtp_psc *psc; +uint32_t hdrs =0 ;for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++){
drivers/net/ice/ice_hash.c +26
-11if (item->last) {@@ -298,15 +584,30 @@ ice_hash_check_inset(const struct rte_flow_item pattern[], return -rte_errno; } -/* Ignore spec and mask. */ -if (item->spec || item->mask) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , item, -"Invalid spec/mask." ); -return -rte_errno; +switch (item->type) { +case RTE_FLOW_ITEM_TYPE_GTPU : + hdrs |=ICE_FLOW_SEG_HDR_GTPU_IP ; +break ; +case RTE_FLOW_ITEM_TYPE_GTP_PSC : + psc = item->spec; + hdrs &= ~ICE_FLOW_SEG_HDR_GTPU_IP ; +if (!psc) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_EH ; +else if (psc->pdu_type ==ICE_GTPU_EH_UPLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_UP ; +else if (psc->pdu_type ==ICE_GTPU_EH_DWNLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_DWN ; +break ; +default : +break ; } } +/* Save protocol header to rss_meta. */ + ((struct rss_meta *)*meta)->pkt_hdr |= + ((struct rss_type_match_hdr *) + (pattern_match_item->meta))->hdr_mask | hdrs; +return 0 ; }@@ -316,14 +617,14 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, void **meta, struct rte_flow_error *error) { -const struct rte_flow_action *action; -enum rte_flow_action_type action_type; -const struct rte_flow_action_rss *rss;struct rss_type_match_hdr *m = (struct rss_type_match_hdr *) (pattern_match_item->meta); +struct rss_meta *hash_meta = (struct rss_meta *)*meta;uint32_t type_list_len =RTE_DIM (ice_hash_type_list); -struct ice_hash_match_type *type_match_item; -uint64_t rss_hf; +enum rte_flow_action_type action_type; +const struct rte_flow_action_rss *rss; +const struct rte_flow_action *action; +uint64_t rss_type;uint16_t i;drivers/net/ice/ice_hash.c +4
-22/* Supported action is RSS. */ @@ -333,46 +634,24 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, switch (action_type) {case RTE_FLOW_ACTION_TYPE_RSS : rss = action->conf; - rss_hf = rss->types; + rss_type = rss->types; -/** -* Check simultaneous use of SRC_ONLY and DST_ONLY -* of the same level. -*/ - rss_hf =rte_eth_rss_hf_refine (rss_hf); - -/* Check if pattern is empty. */ +/* Check hash function and save it to rss_meta. */ if (pattern_match_item->pattern_list != - pattern_empty && rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) + pattern_empty && rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) {return rte_flow_error_set (error,ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , action,"Not supported flow" ); - -if ((rss_hf Ð_RSS_ETH ) && (rss_hf & ~ETH_RSS_PPPOE )) - m->eth_rss_hint =ETH_RSS_ETH ; -else if ((rss_hf Ð_RSS_PPPOE ) && (rss_hf & ~ETH_RSS_ETH)) - m->eth_rss_hint =ETH_RSS_PPPOE ; -else if ((rss_hf Ð_RSS_ETH ) && (rss_hf & ETH_RSS_PPPOE)) - m->eth_rss_hint =ETH_RSS_ETH |ETH_RSS_PPPOE ; - -/* Check if rss types match pattern. */ -if (rss->func !=RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) { - if (((rss_hf & ETH_RSS_IPV4) != m->eth_rss_hint) && - ((rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +0
-1- ((rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +0
-1- ((rss_hf & ETH_RSS_NONFRAG_IPV4_SCTP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +0
-2- ((rss_hf & ETH_RSS_IPV6) != m->eth_rss_hint) && - ((rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +0
-1- ((rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +0
-1- ((rss_hf & ETH_RSS_NONFRAG_IPV6_SCTP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +40
-33- ((rss_hf & ETH_RSS_ETH) != m->eth_rss_hint) && - ((rss_hf & ETH_RSS_PPPOE) != m->eth_rss_hint) && - (((rss_hf & (ETH_RSS_ETH | ETH_RSS_PPPOE)) != - m->eth_rss_hint))) -return rte_flow_error_set (error, -ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , - action,"Not supported RSS types" ); + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ){ + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +return 0 ; + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) { + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; }if (rss->level)@@ -390,42 +669,47 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,RTE_FLOW_ERROR_TYPE_ACTION , action, "a non-NULL RSS queue is not supported"); -/* Check hash function and save it to rss_meta. */ -if (rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +/** +* Check simultaneous use of SRC_ONLY and DST_ONLY +* of the same level. +*/ + rss_type =rte_eth_rss_hf_refine (rss_type); -if (rss->func == -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; +uint64_t combine_type =ETH_RSS_L2_SRC_ONLY | +ETH_RSS_L2_DST_ONLY | +ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY | +ETH_RSS_L4_DST_ONLY ; - type_match_item =rte_zmalloc ("ice_type_match_item" , -sizeof (struct ice_hash_match_type ),0 ); -if (!type_match_item) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"No memory for type_match_item" ); -return -ENOMEM ; +/* Check if rss types match pattern. */ +if (rss_type & ~combine_type & ~m->eth_rss_hint) { +return rte_flow_error_set (error, +ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , + action,"Not supported RSS types" ); }/* Find matched hash fields according to hash type. */ for (i =0 ; i < type_list_len; i++) { -if (rss_hf == - ice_hash_type_list[i].hash_type) { - type_match_item->hash_type = - ice_hash_type_list[i].hash_type; - type_match_item->hash_flds = - ice_hash_type_list[i].hash_flds; +struct ice_hash_match_type *ht_map = + &ice_hash_type_list[i]; + +if (rss_type == ht_map->hash_type) { + hash_meta->hash_flds = + ht_map->hash_flds; +break ; } } -/* Save hash fileds to rss_meta. */ - ((struct rss_meta *)*meta)->hash_flds = - type_match_item->hash_flds; +/* update hash field for nat-t esp. */ +if ((rss_type ==ETH_RSS_ESP ) && + (m->eth_rss_hint ||ETH_RSS_NONFRAG_IPV4_UDP )) { + hash_meta->hash_flds &= + ~(BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI )); + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI ); + } -rte_free (type_match_item);break ;drivers/net/ice/ice_hash.c +2
-5case RTE_FLOW_ACTION_TYPE_END :@@ -471,14 +755,11 @@ ice_hash_parse_pattern_action(__rte_unusedstruct ice_adapter *ad, goto error; } - ret =ice_hash_check_inset (pattern, error); + ret =ice_hash_parse_pattern (pattern_match_item, pattern, + (void **)&rss_meta_ptr, error);if (ret) goto error; -/* Save protocol header to rss_meta. */ - rss_meta_ptr->pkt_hdr = ((struct rss_type_match_hdr *) - (pattern_match_item->meta))->hdr_mask; -/* Check rss action. */ ret = ice_hash_parse_action(pattern_match_item, actions,(void **)&rss_meta_ptr, error);
--
2.20.1
hi, qi
Please expect the separate patch on next version and hope it would help to review again, thanks.
Quoted 999 lines · Qi Z
Please also separate this patch into code refactor purpose and new features
Quoted 997 lines
-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Sunday, June 21, 2020 10:09 PM
To: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Cc: Ye, Xiaolong <[email protected]>; [email protected]; Wu, Jingjing <[email protected]>; Guo, Junfeng <[email protected]>; Su, Simei <[email protected]>; Guo, Jia <[email protected]>
Subject: [dpdk-dev v3 2/2] net/ice: enable new input set for rss hashPF could add or delete a RSS rule base on the PF's hash capability. Some new rss input set will be supported, the protocols as below:
eth/vlan/l2tpv3/esp/ah/pfcp/gtpu.Signed-off-by Jeff Guo <[email protected]>---
v3->v2:
refince code sturcture and fix simple xor issue fix some typos--- drivers/net/ice/ice_hash.c | 719 ++++++++++++++++++++++++++----------- 1 file changed, 500 insertions(+), 219 deletions(-)drivers/net/ice/ice_hash.c index renamed from drivers/net/ice/ice_hash.c +0
-0
eaf6a35a1..d77c67f19100644drivers/net/ice/ice_hash.c +11
-46@@ -25,6 +25,9 @@#include "ice_ethdev.h" #include "ice_generic_flow.h" +#define ICE_GTPU_EH_DWNLINK 0 +#define ICE_GTPU_EH_UPLINK 1 +struct rss_type_match_hdr {uint32_t hdr_mask;uint64_t eth_rss_hint;@@ -76,91 +79,213 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad, struct rte_flow_error *error);/* The first member is protocol header, the second member is ETH_RSS_*. */ -struct rss_type_match_hdr hint_0 = { +struct rss_type_match_hdr hint_empty = { ICE_FLOW_SEG_HDR_NONE, 0}; -struct rss_type_match_hdr hint_1 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_2 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_3 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_4 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_5 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , ETH_RSS_IPV6}; -struct rss_type_match_hdr hint_6 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_7 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_8 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_9 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_10 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_11 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_12 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_13 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_14 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_15 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_16 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV6 }; -struct rss_type_match_hdr hint_17 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_18 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_19 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_20 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_ETH |ETH_RSS_PPPOE }; +struct rss_type_match_hdr hint_eth_ipv4 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_udp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_UDP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv4_tcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_TCP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv4_sctp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_SCTP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +12
-0+hint_eth_ipv4_gtpu_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_IP |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , + ETH_RSS_GTPU | ETH_RSS_IPV4}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_GTPU |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_UDP , + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv4_gtpu_eh_ipv4_tcp = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +3
-0+hint_eth_pppoes_ipv4 = { +ICE_FLOW_SEG_HDR_PPPOE , + ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV4}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +3
-0+hint_eth_pppoes_ipv4_udp = { +ICE_FLOW_SEG_HDR_PPPOE , + ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_UDP};struct
drivers/net/ice/ice_hash.c +3
-0+rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_TCP };struct
drivers/net/ice/ice_hash.c +3
-0+rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_SCTP };struct
drivers/net/ice/ice_hash.c +4
-0+rss_type_match_hdr hint_eth_ipv4_esp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_ESP , + ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_ESP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +8
-0+hint_eth_ipv4_udp_esp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_NAT_T_ESP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_ESP}; struct +rss_type_match_hdr hint_eth_ipv4_eh = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , + ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_AH}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +8
-0+hint_eth_ipv4_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , + ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_L2TPV3}; struct +rss_type_match_hdr hint_eth_ipv4_pfcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_PFCP };struct
drivers/net/ice/ice_hash.c +11
-0+rss_type_match_hdr hint_eth_vlan_ipv4 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_C_VLAN };struct +rss_type_match_hdr hint_eth_ipv6 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV6 }; +struct rss_type_match_hdr hint_eth_ipv6_udp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_UDP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv6_tcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_TCP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv6_sctp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_SCTP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +4
-0+hint_eth_ipv6_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_ESP , + ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_ESP}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +8
-0+hint_eth_ipv6_udp_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_NAT_T_ESP , + ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_ESP}; struct +rss_type_match_hdr hint_eth_ipv6_ah = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , + ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_AH}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +8
-0+hint_eth_ipv6_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , + ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_L2TPV3}; struct +rss_type_match_hdr hint_eth_ipv6_pfcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_PFCP };struct
drivers/net/ice/ice_hash.c +7
-0+rss_type_match_hdr hint_eth_vlan_ipv6 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV6 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_C_VLAN };struct +rss_type_match_hdr hint_eth_pppoes_ipv6 = { +ICE_FLOW_SEG_HDR_PPPOE , + ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV6}; struct
rss_type_match_hdrdrivers/net/ice/ice_hash.c +3
-0+hint_eth_pppoes_ipv6_udp = { +ICE_FLOW_SEG_HDR_PPPOE , + ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_UDP};struct
drivers/net/ice/ice_hash.c +3
-0+rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV6_TCP };struct
drivers/net/ice/ice_hash.c +3
-0+rss_type_match_hdr hint_eth_pppoes_ipv6_sctp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV6_SCTP };struct
drivers/net/ice/ice_hash.c +3
-0+rss_type_match_hdr hint_eth_pppoes = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE }; /* Supported pattern for os default package. */ static struct
ice_pattern_match_itemice_hash_pattern_list_os[] = {drivers/net/ice/ice_hash.c +9
-9- {pattern_eth_ipv4, ICE_INSET_NONE, &hint_1}, - {pattern_eth_ipv4_udp, ICE_INSET_NONE, &hint_2}, - {pattern_eth_ipv4_tcp, ICE_INSET_NONE, &hint_3}, - {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_4}, - {pattern_eth_ipv6, ICE_INSET_NONE, &hint_5}, - {pattern_eth_ipv6_udp, ICE_INSET_NONE, &hint_6}, - {pattern_eth_ipv6_tcp, ICE_INSET_NONE, &hint_7}, - {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_8}, - {pattern_empty, ICE_INSET_NONE, &hint_0}, + {pattern_eth_ipv4, ICE_INSET_NONE, &hint_eth_ipv4}, + {pattern_eth_ipv4_udp, ICE_INSET_NONE, &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp, ICE_INSET_NONE, &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_eth_ipv4_sctp}, + {pattern_eth_ipv6, ICE_INSET_NONE, &hint_eth_ipv6}, + {pattern_eth_ipv6_udp, ICE_INSET_NONE, &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp, ICE_INSET_NONE, &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_eth_ipv6_sctp}, + {pattern_empty, ICE_INSET_NONE, &hint_empty}, }; /* Supported pattern for comms package. */ static struct
ice_pattern_match_itemice_hash_pattern_list_comms[] = {drivers/net/ice/ice_hash.c +0
-10- {pattern_eth_ipv4, ICE_INSET_NONE, &hint_1}, - {pattern_eth_ipv4_udp, ICE_INSET_NONE, &hint_2}, - {pattern_eth_ipv4_tcp, ICE_INSET_NONE, &hint_3}, - {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_4}, - {pattern_eth_ipv6, ICE_INSET_NONE, &hint_5}, - {pattern_eth_ipv6_udp, ICE_INSET_NONE, &hint_6}, - {pattern_eth_ipv6_tcp, ICE_INSET_NONE, &hint_7}, - {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_8}, - {pattern_empty, ICE_INSET_NONE, &hint_0}, - {pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE,
&hint_9},drivers/net/ice/ice_hash.c +68
-15- {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE, &hint_14}, - {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, &hint_15}, - {pattern_eth_pppoes_ipv4, ICE_INSET_NONE, &hint_10}, - {pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE, &hint_11}, - {pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE, &hint_12}, - {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE, &hint_13}, - {pattern_eth_pppoes_ipv6, ICE_INSET_NONE, &hint_16}, - {pattern_eth_pppoes_ipv6_udp, ICE_INSET_NONE, &hint_17}, - {pattern_eth_pppoes_ipv6_tcp, ICE_INSET_NONE, &hint_18}, - {pattern_eth_pppoes_ipv6_sctp, ICE_INSET_NONE, &hint_19}, - {pattern_eth_pppoes, ICE_INSET_NONE, &hint_20}, + {pattern_empty,ICE_INSET_NONE , + &hint_empty}, + {pattern_eth_ipv4, ICE_INSET_NONE, + &hint_eth_ipv4}, + {pattern_eth_ipv4_udp, ICE_INSET_NONE, + &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp, ICE_INSET_NONE, + &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp, ICE_INSET_NONE, + &hint_eth_ipv4_sctp}, + {pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_eh_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_eh_ipv4_udp}, + {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_eh_ipv4_tcp}, + {pattern_eth_pppoes_ipv4, ICE_INSET_NONE, + &hint_eth_pppoes_ipv4}, + {pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE, + &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, + &hint_eth_ipv4_udp_esp}, + {pattern_eth_ipv4_ah, ICE_INSET_NONE, + &hint_eth_ipv4_eh}, + {pattern_eth_ipv4_l2tp, ICE_INSET_NONE, + &hint_eth_ipv4_l2tpv3}, + {pattern_eth_ipv4_pfcp, ICE_INSET_NONE, + &hint_eth_ipv4_pfcp}, + {pattern_eth_vlan_ipv4, ICE_INSET_NONE, + &hint_eth_vlan_ipv4}, + {pattern_eth_ipv6, ICE_INSET_NONE, + &hint_eth_ipv6}, + {pattern_eth_ipv6_udp, ICE_INSET_NONE, + &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp, ICE_INSET_NONE, + &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp, ICE_INSET_NONE, + &hint_eth_ipv6_sctp}, + {pattern_eth_ipv6_esp, ICE_INSET_NONE, + &hint_eth_ipv6_esp}, + {pattern_eth_ipv6_udp_esp, ICE_INSET_NONE, + &hint_eth_ipv6_udp_esp}, + {pattern_eth_ipv6_ah, ICE_INSET_NONE, + &hint_eth_ipv6_ah}, + {pattern_eth_ipv6_l2tp, ICE_INSET_NONE, + &hint_eth_ipv6_l2tpv3}, + {pattern_eth_ipv6_pfcp, ICE_INSET_NONE, + &hint_eth_ipv6_pfcp}, + {pattern_eth_vlan_ipv6, ICE_INSET_NONE, + &hint_eth_vlan_ipv6}, + {pattern_eth_pppoes_ipv6, ICE_INSET_NONE, + &hint_eth_pppoes_ipv6}, + {pattern_eth_pppoes_ipv6_udp, ICE_INSET_NONE, + &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}, };/** @@ -168,69 +293,227 @@ static struct ice_pattern_match_itemice_hash_pattern_list_comms[] = { * the second member is hash fields. */ struct ice_hash_match_type ice_hash_type_list[] = { - {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY , BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, - {ETH_RSS_IPV4 , ICE_FLOW_HASH_IPV4}, - {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_UDP,ICE_HASH_UDP_IPV4},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_TCP,ICE_HASH_TCP_IPV4},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV4_SCTP,ICE_HASH_SCTP_IPV4},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_IPV6,ICE_FLOW_HASH_IPV6},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_UDP,ICE_HASH_UDP_IPV6},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_TCP,ICE_HASH_TCP_IPV6},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)|BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_NONFRAG_IPV6_SCTP,ICE_HASH_SCTP_IPV6},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY,BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_PPPOE,
ICE_FLOW_HASH_PPPOE_SESS_ID},drivers/net/ice/ice_hash.c +0
-1- {ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_L2_SRC_ONLY,
ICE_FLOW_HASH_PPPOE_SESS_ID|BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},drivers/net/ice/ice_hash.c +40
-0+ {ETH_RSS_L2_SRC_ONLY , + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)}, + {ETH_RSS_L2_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)}, + {ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)}, + {ETH_RSS_ETH | ETH_RSS_L2_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)}, + {ETH_RSS_ETH, +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)}, + {ETH_RSS_PPPOE, + ICE_FLOW_HASH_PPPOE_SESS_ID}, + {ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_L2_SRC_ONLY, +ICE_FLOW_HASH_PPPOE_SESS_ID | + BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)}, + {ETH_RSS_C_VLAN, + BIT_ULL(ICE_FLOW_FIELD_IDX_C_VLAN)}, + {ETH_RSS_S_VLAN, + BIT_ULL(ICE_FLOW_FIELD_IDX_S_VLAN)}, + {ETH_RSS_ESP, + BIT_ULL(ICE_FLOW_FIELD_IDX_ESP_SPI)}, + {ETH_RSS_AH, + BIT_ULL(ICE_FLOW_FIELD_IDX_AH_SPI)}, + {ETH_RSS_L2TPV3, + BIT_ULL(ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID)}, + {ETH_RSS_PFCP, + BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)}, + {ETH_RSS_GTPU, +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_IP_TEID ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_EH_TEID ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_UP_TEID ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID)}, +/* IPV4 */ + {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, + {ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, + {ETH_RSS_IPV4, ICE_FLOW_HASH_IPV4}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +15
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_UDP, +ICE_HASH_UDP_IPV4 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +15
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_TCP, +ICE_HASH_TCP_IPV4 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +21
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, + {ETH_RSS_NONFRAG_IPV4_SCTP, +ICE_HASH_SCTP_IPV4 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)}, +/* IPV6 */ + {ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, + {ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, + {ETH_RSS_IPV6, ICE_FLOW_HASH_IPV6}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +17
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_PFCP, + BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)}, + {ETH_RSS_NONFRAG_IPV6_UDP, +ICE_HASH_UDP_IPV6 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +15
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_TCP, +ICE_HASH_TCP_IPV6 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +6
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY,drivers/net/ice/ice_hash.c +4
-0+BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_DST_ONLY,drivers/net/ice/ice_hash.c +14
-0+ BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT) | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, + {ETH_RSS_NONFRAG_IPV6_SCTP, + ICE_HASH_SCTP_IPV6 | + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)}, }; static struct ice_flow_engine ice_hash_engine = { @@ -285,10 +568,13 @@
ice_hash_init(struct ice_adapter *ad)}static int
drivers/net/ice/ice_hash.c +1
-2-ice_hash_check_inset(const struct rte_flow_item pattern[], - struct rte_flow_error *error) +ice_hash_parse_pattern(struct ice_pattern_match_item
*pattern_match_item,drivers/net/ice/ice_hash.c +4
-0+ const struct rte_flow_item pattern[], void **meta, + struct rte_flow_error *error) { const struct rte_flow_item *item = pattern; +const struct rte_flow_item_gtp_psc *psc; +uint32_t hdrs =0 ;for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++){
if (item->last) {drivers/net/ice/ice_hash.c +26
-11@@ -298,15 +584,30 @@ ice_hash_check_inset(const struct rte_flow_item pattern[], return -rte_errno; } -/* Ignore spec and mask. */ -if (item->spec || item->mask) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , item, -"Invalid spec/mask." ); -return -rte_errno; +switch (item->type) { +case RTE_FLOW_ITEM_TYPE_GTPU : + hdrs |=ICE_FLOW_SEG_HDR_GTPU_IP ; +break ; +case RTE_FLOW_ITEM_TYPE_GTP_PSC : + psc = item->spec; + hdrs &= ~ICE_FLOW_SEG_HDR_GTPU_IP ; +if (!psc) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_EH ; +else if (psc->pdu_type ==ICE_GTPU_EH_UPLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_UP ; +else if (psc->pdu_type ==ICE_GTPU_EH_DWNLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_DWN ; +break ; +default : +break ; } } +/* Save protocol header to rss_meta. */ + ((struct rss_meta *)*meta)->pkt_hdr |= + ((struct rss_type_match_hdr *) + (pattern_match_item->meta))->hdr_mask | hdrs; +return 0 ; }@@ -316,14 +617,14 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, void **meta, struct rte_flow_error *error) { -const struct rte_flow_action *action; -enum rte_flow_action_type action_type; -const struct rte_flow_action_rss *rss;struct rss_type_match_hdr *m = (struct rss_type_match_hdr *) (pattern_match_item->meta); +struct rss_meta *hash_meta = (struct rss_meta *)*meta;uint32_t type_list_len =RTE_DIM (ice_hash_type_list); -struct ice_hash_match_type *type_match_item; -uint64_t rss_hf; +enum rte_flow_action_type action_type; +const struct rte_flow_action_rss *rss; +const struct rte_flow_action *action; +uint64_t rss_type;uint16_t i;/* Supported action is RSS. */
drivers/net/ice/ice_hash.c +4
-22@@ -333,46 +634,24 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, switch (action_type) {case RTE_FLOW_ACTION_TYPE_RSS : rss = action->conf; - rss_hf = rss->types; + rss_type = rss->types; -/** -* Check simultaneous use of SRC_ONLY and DST_ONLY -* of the same level. -*/ - rss_hf =rte_eth_rss_hf_refine (rss_hf); - -/* Check if pattern is empty. */ +/* Check hash function and save it to rss_meta. */ if (pattern_match_item->pattern_list != - pattern_empty && rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) + pattern_empty && rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) {return rte_flow_error_set (error,ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , action,"Not supported flow" ); - -if ((rss_hf Ð_RSS_ETH ) && (rss_hf & ~ETH_RSS_PPPOE )) - m->eth_rss_hint =ETH_RSS_ETH ; -else if ((rss_hf Ð_RSS_PPPOE ) && (rss_hf & ~ETH_RSS_ETH)) - m->eth_rss_hint =ETH_RSS_PPPOE ; -else if ((rss_hf Ð_RSS_ETH ) && (rss_hf & ETH_RSS_PPPOE)) - m->eth_rss_hint =ETH_RSS_ETH |ETH_RSS_PPPOE ; - -/* Check if rss types match pattern. */ -if (rss->func !=RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) { - if (((rss_hf & ETH_RSS_IPV4) != m->eth_rss_hint) && - ((rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +0
-1- ((rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +0
-1- ((rss_hf & ETH_RSS_NONFRAG_IPV4_SCTP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +0
-2- ((rss_hf & ETH_RSS_IPV6) != m->eth_rss_hint) && - ((rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +0
-1- ((rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +0
-1- ((rss_hf & ETH_RSS_NONFRAG_IPV6_SCTP) !=
m->eth_rss_hint) &&drivers/net/ice/ice_hash.c +40
-33- ((rss_hf & ETH_RSS_ETH) != m->eth_rss_hint) && - ((rss_hf & ETH_RSS_PPPOE) != m->eth_rss_hint) && - (((rss_hf & (ETH_RSS_ETH | ETH_RSS_PPPOE)) != - m->eth_rss_hint))) -return rte_flow_error_set (error, -ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , - action,"Not supported RSS types" ); + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ){ + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +return 0 ; + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) { + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; }if (rss->level)@@ -390,42 +669,47 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,RTE_FLOW_ERROR_TYPE_ACTION , action, "a non-NULL RSS queue is not supported"); -/* Check hash function and save it to rss_meta. */ -if (rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +/** +* Check simultaneous use of SRC_ONLY and DST_ONLY +* of the same level. +*/ + rss_type =rte_eth_rss_hf_refine (rss_type); -if (rss->func == -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; +uint64_t combine_type =ETH_RSS_L2_SRC_ONLY | +ETH_RSS_L2_DST_ONLY | +ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY | +ETH_RSS_L4_DST_ONLY ; - type_match_item =rte_zmalloc ("ice_type_match_item" , -sizeof (struct ice_hash_match_type ),0 ); -if (!type_match_item) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"No memory for type_match_item" ); -return -ENOMEM ; +/* Check if rss types match pattern. */ +if (rss_type & ~combine_type & ~m->eth_rss_hint) { +return rte_flow_error_set (error, +ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , + action,"Not supported RSS types" ); }/* Find matched hash fields according to hash type. */ for (i =0 ; i < type_list_len; i++) { -if (rss_hf == - ice_hash_type_list[i].hash_type) { - type_match_item->hash_type = - ice_hash_type_list[i].hash_type; - type_match_item->hash_flds = - ice_hash_type_list[i].hash_flds; +struct ice_hash_match_type *ht_map = + &ice_hash_type_list[i]; + +if (rss_type == ht_map->hash_type) { + hash_meta->hash_flds = + ht_map->hash_flds; +break ; } } -/* Save hash fileds to rss_meta. */ - ((struct rss_meta *)*meta)->hash_flds = - type_match_item->hash_flds; +/* update hash field for nat-t esp. */ +if ((rss_type ==ETH_RSS_ESP ) && + (m->eth_rss_hint ||ETH_RSS_NONFRAG_IPV4_UDP )) { + hash_meta->hash_flds &= + ~(BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI )); + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI ); + } -rte_free (type_match_item);break ;case
RTE_FLOW_ACTION_TYPE_END:drivers/net/ice/ice_hash.c +2
-5@@ -471,14 +755,11 @@ ice_hash_parse_pattern_action(__rte_unusedstruct ice_adapter *ad, goto error; } - ret =ice_hash_check_inset (pattern, error); + ret =ice_hash_parse_pattern (pattern_match_item, pattern, + (void **)&rss_meta_ptr, error);if (ret) goto error; -/* Save protocol header to rss_meta. */ - rss_meta_ptr->pkt_hdr = ((struct rss_type_match_hdr *) - (pattern_match_item->meta))->hdr_mask; -/* Check rss action. */ ret = ice_hash_parse_action(pattern_match_item, actions,(void **)&rss_meta_ptr, error);
--
2.20.1
v4 cover enable new hash flow for pf
In reply to Jeff GuoPF could add or delete a RSS rule base on the PF's hash capability. Some new rss input set will be supported, the protocols as below:
eth/vlan/l2tpv3/esp/ah/pfcp/gtpu downlink/gtpu uplink.
Jeff Guo (4):
net/ice: refactor for pf hash flow
net/ice: support hash for new GTPU protocols
net/ice: enable new input set for rss hash
app/testpmd: add GTPU to RSS hash commands
app/test-pmd/cmdline.c | 8 +- app/test-pmd/config.c | 4 +- drivers/net/ice/ice_hash.c | 731 ++++++++++++++++++++++++++----------- 3 files changed, 520 insertions(+), 223 deletions(-)
Signature · 1 line
2.20.1
PATCH v4 1/4 net/ice: refactor for pf hash flow
Refactor hash flow by change the action parser and clean some code.
--- drivers/net/ice/ice_hash.c | 562 +++++++++++++++++++++++-------------- 1 file changed, 355 insertions(+), 207 deletions(-)
drivers/net/ice/ice_hash.c +355 -207
@@ -76,91 +76,135 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad, struct rte_flow_error *error);/* The first member is protocol header, the second member is ETH_RSS_*. */ -struct rss_type_match_hdr hint_0 = { +struct rss_type_match_hdr hint_empty = {ICE_FLOW_SEG_HDR_NONE ,0 }; -struct rss_type_match_hdr hint_1 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_2 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_3 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_4 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_5 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV6 }; -struct rss_type_match_hdr hint_6 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_7 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_8 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_9 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_10 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_11 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_12 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_13 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_14 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_15 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_16 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV6 }; -struct rss_type_match_hdr hint_17 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_18 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_19 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_20 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_ETH |ETH_RSS_PPPOE }; +struct rss_type_match_hdr hint_eth_ipv4 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_udp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_ipv4_tcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_TCP }; +struct rss_type_match_hdr hint_eth_ipv4_sctp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_SCTP }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_GTPU |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_GTPU |ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_GTPU |ETH_RSS_NONFRAG_IPV4_TCP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv4 = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_pppoes_ipv4_udp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = { +ICE_FLOW_SEG_HDR_PPPOE , +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 , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_SCTP }; +struct rss_type_match_hdr hint_eth_ipv6 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV6 }; +struct rss_type_match_hdr hint_eth_ipv6_udp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP }; +struct rss_type_match_hdr hint_eth_ipv6_tcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_TCP }; +struct rss_type_match_hdr hint_eth_ipv6_sctp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_SCTP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv6 = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_IPV6 }; +struct rss_type_match_hdr hint_eth_pppoes_ipv6_udp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV6_UDP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = { +ICE_FLOW_SEG_HDR_PPPOE , +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 , +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 };/* Supported pattern for os default package. */ static struct ice_pattern_match_item ice_hash_pattern_list_os[] = { - {pattern_eth_ipv4,ICE_INSET_NONE , &hint_1}, - {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_2}, - {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_3}, - {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_4}, - {pattern_eth_ipv6,ICE_INSET_NONE , &hint_5}, - {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_6}, - {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_7}, - {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_8}, - {pattern_empty,ICE_INSET_NONE , &hint_0}, + {pattern_eth_ipv4,ICE_INSET_NONE , &hint_eth_ipv4}, + {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_eth_ipv4_sctp}, + {pattern_eth_ipv6,ICE_INSET_NONE , &hint_eth_ipv6}, + {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_eth_ipv6_sctp}, + {pattern_empty,ICE_INSET_NONE , &hint_empty}, };/* Supported pattern for comms package. */ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { - {pattern_eth_ipv4,ICE_INSET_NONE , &hint_1}, - {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_2}, - {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_3}, - {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_4}, - {pattern_eth_ipv6,ICE_INSET_NONE , &hint_5}, - {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_6}, - {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_7}, - {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_8}, - {pattern_empty,ICE_INSET_NONE , &hint_0}, - {pattern_eth_ipv4_gtpu_eh_ipv4,ICE_INSET_NONE , &hint_9}, - {pattern_eth_ipv4_gtpu_eh_ipv4_udp,ICE_INSET_NONE , &hint_14}, - {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,ICE_INSET_NONE , &hint_15}, - {pattern_eth_pppoes_ipv4,ICE_INSET_NONE , &hint_10}, - {pattern_eth_pppoes_ipv4_udp,ICE_INSET_NONE , &hint_11}, - {pattern_eth_pppoes_ipv4_tcp,ICE_INSET_NONE , &hint_12}, - {pattern_eth_pppoes_ipv4_sctp,ICE_INSET_NONE , &hint_13}, - {pattern_eth_pppoes_ipv6,ICE_INSET_NONE , &hint_16}, - {pattern_eth_pppoes_ipv6_udp,ICE_INSET_NONE , &hint_17}, - {pattern_eth_pppoes_ipv6_tcp,ICE_INSET_NONE , &hint_18}, - {pattern_eth_pppoes_ipv6_sctp,ICE_INSET_NONE , &hint_19}, - {pattern_eth_pppoes,ICE_INSET_NONE , &hint_20}, + {pattern_empty,ICE_INSET_NONE , + &hint_empty}, + {pattern_eth_ipv4,ICE_INSET_NONE , + &hint_eth_ipv4}, + {pattern_eth_ipv4_udp,ICE_INSET_NONE , + &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp,ICE_INSET_NONE , + &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp,ICE_INSET_NONE , + &hint_eth_ipv4_sctp}, + {pattern_eth_ipv4_gtpu_eh_ipv4,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4_udp,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4_udp}, + {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4_tcp}, + {pattern_eth_pppoes_ipv4,ICE_INSET_NONE , + &hint_eth_pppoes_ipv4}, + {pattern_eth_pppoes_ipv4_udp,ICE_INSET_NONE , + &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_ipv6,ICE_INSET_NONE , + &hint_eth_ipv6}, + {pattern_eth_ipv6_udp,ICE_INSET_NONE , + &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp,ICE_INSET_NONE , + &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp,ICE_INSET_NONE , + &hint_eth_ipv6_sctp}, + {pattern_eth_pppoes_ipv6,ICE_INSET_NONE , + &hint_eth_pppoes_ipv6}, + {pattern_eth_pppoes_ipv6_udp,ICE_INSET_NONE , + &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}, };/**
@@ -168,69 +212,199 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {* the second member is hash fields. */ struct ice_hash_match_type ice_hash_type_list[] = { - {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_IPV4 ,ICE_FLOW_HASH_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP ,ICE_HASH_UDP_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP ,ICE_HASH_TCP_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP ,ICE_HASH_SCTP_IPV4 }, - {ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_IPV6 ,ICE_FLOW_HASH_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP ,ICE_HASH_UDP_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP ,ICE_HASH_TCP_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP ,ICE_HASH_SCTP_IPV6 }, - {ETH_RSS_ETH |ETH_RSS_L2_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, - {ETH_RSS_PPPOE ,ICE_FLOW_HASH_PPPOE_SESS_ID }, - {ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_L2_SRC_ONLY ,ICE_FLOW_HASH_PPPOE_SESS_ID |BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_PPPOE , +ICE_FLOW_HASH_PPPOE_SESS_ID }, + {ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_L2_SRC_ONLY , +ICE_FLOW_HASH_PPPOE_SESS_ID | +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, +/* IPV4 */ + {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_IPV4 ,ICE_FLOW_HASH_IPV4 }, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_UDP , +ICE_HASH_UDP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP , +ICE_HASH_TCP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP , +ICE_HASH_SCTP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, +/* IPV6 */ + {ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_IPV6 ,ICE_FLOW_HASH_IPV6 }, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_PFCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_PFCP_SEID )}, + {ETH_RSS_NONFRAG_IPV6_UDP , +ICE_HASH_UDP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP , +ICE_HASH_TCP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP , +ICE_HASH_SCTP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, };static struct ice_flow_engine ice_hash_engine = {
@@ -316,14 +490,14 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,void **meta, struct rte_flow_error *error) { - const struct rte_flow_action *action; -enum rte_flow_action_type action_type; -const struct rte_flow_action_rss *rss; struct rss_type_match_hdr *m = (struct rss_type_match_hdr *) (pattern_match_item->meta); +struct rss_meta *hash_meta = (struct rss_meta *)*meta;uint32_t type_list_len =RTE_DIM (ice_hash_type_list); -struct ice_hash_match_type *type_match_item; -uint64_t rss_hf; +enum rte_flow_action_type action_type; +const struct rte_flow_action_rss *rss; +const struct rte_flow_action *action; +uint64_t rss_type;uint16_t i;/* Supported action is RSS. */
@@ -333,46 +507,24 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,switch (action_type) {case RTE_FLOW_ACTION_TYPE_RSS : rss = action->conf; - rss_hf = rss->types; - -/** -* Check simultaneous use of SRC_ONLY and DST_ONLY -* of the same level. -*/ - rss_hf =rte_eth_rss_hf_refine (rss_hf); + rss_type = rss->types; -/* Check if pattern is empty. */ +/* Check hash function and save it to rss_meta. */ if (pattern_match_item->pattern_list != - pattern_empty && rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) + pattern_empty && rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) {return rte_flow_error_set (error,ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , action,"Not supported flow" ); - -if ((rss_hf Ð_RSS_ETH ) && (rss_hf & ~ETH_RSS_PPPOE )) - m->eth_rss_hint =ETH_RSS_ETH ; -else if ((rss_hf Ð_RSS_PPPOE ) && (rss_hf & ~ETH_RSS_ETH )) - m->eth_rss_hint =ETH_RSS_PPPOE ; -else if ((rss_hf Ð_RSS_ETH ) && (rss_hf Ð_RSS_PPPOE )) - m->eth_rss_hint =ETH_RSS_ETH |ETH_RSS_PPPOE ; - -/* Check if rss types match pattern. */ -if (rss->func !=RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) { -if (((rss_hf Ð_RSS_IPV4 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_SCTP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_IPV6 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_SCTP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_ETH ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_PPPOE ) != m->eth_rss_hint) && - (((rss_hf & (ETH_RSS_ETH |ETH_RSS_PPPOE )) != - m->eth_rss_hint))) -return rte_flow_error_set (error, -ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , - action,"Not supported RSS types" ); + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ){ + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +return 0 ; + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) { + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; }if (rss->level)
@@ -390,42 +542,38 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,RTE_FLOW_ERROR_TYPE_ACTION , action, "a non-NULL RSS queue is not supported"); -/* Check hash function and save it to rss_meta. */ -if (rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +/** +* Check simultaneous use of SRC_ONLY and DST_ONLY +* of the same level. +*/ + rss_type =rte_eth_rss_hf_refine (rss_type); -if (rss->func == -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; +uint64_t combine_type =ETH_RSS_L2_SRC_ONLY | +ETH_RSS_L2_DST_ONLY | +ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY | +ETH_RSS_L4_DST_ONLY ; - type_match_item =rte_zmalloc ("ice_type_match_item" , -sizeof (struct ice_hash_match_type ),0 ); -if (!type_match_item) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"No memory for type_match_item" ); -return -ENOMEM ; +/* Check if rss types match pattern. */ +if (rss_type & ~combine_type & ~m->eth_rss_hint) { +return rte_flow_error_set (error, +ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , + action,"Not supported RSS types" ); }/* Find matched hash fields according to hash type. */ for (i =0 ; i < type_list_len; i++) { -if (rss_hf == - ice_hash_type_list[i].hash_type) { - type_match_item->hash_type = - ice_hash_type_list[i].hash_type; - type_match_item->hash_flds = - ice_hash_type_list[i].hash_flds; +struct ice_hash_match_type *ht_map = + &ice_hash_type_list[i]; + +if (rss_type == ht_map->hash_type) { + hash_meta->hash_flds = + ht_map->hash_flds; +break ; } } -/* Save hash fileds to rss_meta. */ - ((struct rss_meta *)*meta)->hash_flds = - type_match_item->hash_flds; - -rte_free (type_match_item);break ;case RTE_FLOW_ACTION_TYPE_END :
Signature · 1 line
2.20.1
PATCH v4 2/4 net/ice: support hash for new GTPU protocols
In reply to Jeff GuoSupport hash flow for the new protoclos of GTPU_EH UPLINK, GTPU_EH DOWNLINK and GTPU_IP.
--- drivers/net/ice/ice_hash.c | 67 ++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 13 deletions(-)
drivers/net/ice/ice_hash.c +54 -13
@@ -25,6 +25,9 @@#include "ice_ethdev.h" #include "ice_generic_flow.h" +#define ICE_GTPU_EH_DWNLINK 0 +#define ICE_GTPU_EH_UPLINK 1 +struct rss_type_match_hdr {uint32_t hdr_mask;uint64_t eth_rss_hint;
@@ -93,6 +96,10 @@ struct rss_type_match_hdr hint_eth_ipv4_sctp = {ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_SCTP , ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_SCTP}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_IP |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_GTPU |ETH_RSS_IPV4 };struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = {ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER,
@@ -173,6 +180,8 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_ipv4_tcp}, {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_eth_ipv4_sctp}, + {pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_ipv4}, {pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE, &hint_eth_ipv4_gtpu_eh_ipv4}, {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
@@ -459,10 +468,15 @@ ice_hash_init(struct ice_adapter *ad) }static int -ice_hash_check_inset (const struct rte_flow_item pattern[], -struct rte_flow_error *error) +ice_hash_parse_pattern (struct ice_pattern_match_item *pattern_match_item, +const struct rte_flow_item pattern[],void **meta, +struct rte_flow_error *error) { +uint32_t hdr_mask = ((struct rss_type_match_hdr *) + (pattern_match_item->meta))->hdr_mask;const struct rte_flow_item *item = pattern; +const struct rte_flow_item_gtp_psc *psc; +uint32_t hdrs =0 ;for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {
@@ -472,15 +486,29 @@ ice_hash_check_inset(const struct rte_flow_item pattern[],return -rte_errno; } -/* Ignore spec and mask. */ -if (item->spec || item->mask) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , item, -"Invalid spec/mask." ); -return -rte_errno; +switch (item->type) { +case RTE_FLOW_ITEM_TYPE_GTPU : + hdrs |=ICE_FLOW_SEG_HDR_GTPU_IP ; +break ; +case RTE_FLOW_ITEM_TYPE_GTP_PSC : + psc = item->spec; + hdr_mask &= ~ICE_FLOW_SEG_HDR_GTPU_EH ; + hdrs &= ~ICE_FLOW_SEG_HDR_GTPU_IP ; +if (!psc) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_EH ; +else if (psc->pdu_type ==ICE_GTPU_EH_UPLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_UP ; +else if (psc->pdu_type ==ICE_GTPU_EH_DWNLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_DWN ; +break ; +default : +break ; } } +/* Save protocol header to rss_meta. */ + ((struct rss_meta *)*meta)->pkt_hdr |= hdr_mask | hdrs; +return 0 ; }
@@ -574,6 +602,22 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, } } +/* update hash field for gtpu-ip and gtpu-eh. */ +if (rss_type !=ETH_RSS_GTPU ) +break ; +else if (hash_meta->pkt_hdr &ICE_FLOW_SEG_HDR_GTPU_IP ) + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_IP_TEID ); +else if (hash_meta->pkt_hdr &ICE_FLOW_SEG_HDR_GTPU_EH ) + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_EH_TEID ); +else if (hash_meta->pkt_hdr &ICE_FLOW_SEG_HDR_GTPU_DWN ) + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID ); +else if (hash_meta->pkt_hdr &ICE_FLOW_SEG_HDR_GTPU_UP ) + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_UP_TEID ); +break ;case RTE_FLOW_ACTION_TYPE_END :
@@ -619,14 +663,11 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad, goto error; } - ret =ice_hash_check_inset (pattern, error); + ret =ice_hash_parse_pattern (pattern_match_item, pattern, + (void **)&rss_meta_ptr, error);if (ret) goto error; -/* Save protocol header to rss_meta. */ - rss_meta_ptr->pkt_hdr = ((struct rss_type_match_hdr *) - (pattern_match_item->meta))->hdr_mask; -/* Check rss action. */ ret =ice_hash_parse_action (pattern_match_item, actions, (void **)&rss_meta_ptr, error);
Signature · 1 line
2.20.1
PATCH v4 3/4 net/ice: enable new input set for rss hash
In reply to Jeff GuoPF could add or delete a RSS rule base on the PF's hash capability. Some new rss input set will be supported, the protocols as below:
eth/vlan/l2tpv3/esp/ah/pfcp.
--- drivers/net/ice/ice_hash.c | 104 +++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)
drivers/net/ice/ice_hash.c +104 -0
@@ -124,6 +124,30 @@ struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = {struct rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = {ICE_FLOW_SEG_HDR_PPPOE ,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 , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv4_udp_esp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_NAT_T_ESP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv4_ah = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_AH }; +struct rss_type_match_hdr hint_eth_ipv4_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_L2TPV3 }; +struct rss_type_match_hdr hint_eth_ipv4_pfcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_PFCP }; +struct rss_type_match_hdr hint_eth_vlan_ipv4 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_C_VLAN };struct rss_type_match_hdr hint_eth_ipv6 = {ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_ETH |ETH_RSS_IPV6 };
@@ -139,6 +163,30 @@ struct rss_type_match_hdr hint_eth_ipv6_sctp = {ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_SCTP , ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_SCTP}; +struct rss_type_match_hdr hint_eth_ipv6_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_ESP , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv6_udp_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_NAT_T_ESP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv6_ah = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_AH }; +struct rss_type_match_hdr hint_eth_ipv6_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_L2TPV3 }; +struct rss_type_match_hdr hint_eth_ipv6_pfcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_PFCP }; +struct rss_type_match_hdr hint_eth_vlan_ipv6 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV6 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_C_VLAN };struct rss_type_match_hdr hint_eth_pppoes_ipv6 = {ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_IPV6 };
@@ -196,6 +244,18 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &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, + &hint_eth_ipv4_udp_esp}, + {pattern_eth_ipv4_ah, ICE_INSET_NONE, + &hint_eth_ipv4_ah}, + {pattern_eth_ipv4_l2tp, ICE_INSET_NONE, + &hint_eth_ipv4_l2tpv3}, + {pattern_eth_ipv4_pfcp, ICE_INSET_NONE, + &hint_eth_ipv4_pfcp}, + {pattern_eth_vlan_ipv4, ICE_INSET_NONE, + &hint_eth_vlan_ipv4}, {pattern_eth_ipv6, ICE_INSET_NONE, &hint_eth_ipv6}, {pattern_eth_ipv6_udp, ICE_INSET_NONE,
@@ -204,6 +264,18 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_ipv6_tcp}, {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_eth_ipv6_sctp}, + {pattern_eth_ipv6_esp, ICE_INSET_NONE, + &hint_eth_ipv6_esp}, + {pattern_eth_ipv6_udp_esp, ICE_INSET_NONE, + &hint_eth_ipv6_udp_esp}, + {pattern_eth_ipv6_ah, ICE_INSET_NONE, + &hint_eth_ipv6_ah}, + {pattern_eth_ipv6_l2tp, ICE_INSET_NONE, + &hint_eth_ipv6_l2tpv3}, + {pattern_eth_ipv6_pfcp, ICE_INSET_NONE, + &hint_eth_ipv6_pfcp}, + {pattern_eth_vlan_ipv6, ICE_INSET_NONE, + &hint_eth_vlan_ipv6}, {pattern_eth_pppoes_ipv6, ICE_INSET_NONE, &hint_eth_pppoes_ipv6}, {pattern_eth_pppoes_ipv6_udp, ICE_INSET_NONE,
@@ -221,11 +293,34 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {* the second member is hash fields. */ struct ice_hash_match_type ice_hash_type_list[] = { + {ETH_RSS_L2_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_L2_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_ETH |ETH_RSS_L2_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_ETH |ETH_RSS_L2_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_ETH , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, {ETH_RSS_PPPOE ,ICE_FLOW_HASH_PPPOE_SESS_ID }, {ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_L2_SRC_ONLY ,ICE_FLOW_HASH_PPPOE_SESS_ID |BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_C_VLAN , +BIT_ULL (ICE_FLOW_FIELD_IDX_C_VLAN )}, + {ETH_RSS_S_VLAN , +BIT_ULL (ICE_FLOW_FIELD_IDX_S_VLAN )}, + {ETH_RSS_ESP , +BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI )}, + {ETH_RSS_AH , +BIT_ULL (ICE_FLOW_FIELD_IDX_AH_SPI )}, + {ETH_RSS_L2TPV3 , +BIT_ULL (ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID )}, + {ETH_RSS_PFCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_PFCP_SEID )},/* IPV4 */ {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )},
@@ -602,6 +697,15 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, } } +/* update hash field for nat-t esp. */ +if ((rss_type ==ETH_RSS_ESP ) && + (m->eth_rss_hint Ð_RSS_NONFRAG_IPV4_UDP )) { + hash_meta->hash_flds &= + ~(BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI )); + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI ); + } +/* update hash field for gtpu-ip and gtpu-eh. */ if (rss_type !=ETH_RSS_GTPU )break ;
Signature · 1 line
2.20.1
PATCH v4 4/4 app/testpmd: add GTPU to RSS hash commands
In reply to Jeff GuoAdd testpmd cmdline support for GTPU, it could be used to configure gtpu teid hash. The commands as below:
testpmd> flow create 0 ingress pattern eth / ipv4 / udp / gtpu / \
ipv4 / end actions rss types gtpu end key_len 0 queues end / end
--- app/test-pmd/cmdline.c | 8 +++++--- app/test-pmd/config.c | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-)
app/test-pmd/cmdline.c +5 -3
@@ -2274,7 +2274,7 @@ cmd_config_rss_parsed(void *parsed_result, rss_conf.rss_hf =ETH_RSS_ETH |ETH_RSS_VLAN |ETH_RSS_IP |ETH_RSS_TCP |ETH_RSS_UDP |ETH_RSS_SCTP |ETH_RSS_L2_PAYLOAD |ETH_RSS_L2TPV3 |ETH_RSS_ESP | -ETH_RSS_AH |ETH_RSS_PFCP ; +ETH_RSS_AH |ETH_RSS_PFCP |ETH_RSS_GTPU ; else if (!strcmp(res->value, "eth")) rss_conf.rss_hf =ETH_RSS_ETH ; else if (!strcmp(res->value, "vlan"))
@@ -2319,6 +2319,8 @@ cmd_config_rss_parsed(void *parsed_result, rss_conf.rss_hf =ETH_RSS_PFCP ; else if (!strcmp(res->value, "pppoe")) rss_conf.rss_hf =ETH_RSS_PPPOE ; + else if (!strcmp(res->value, "gtpu")) + rss_conf.rss_hf =ETH_RSS_GTPU ; else if (!strcmp(res->value, "none")) rss_conf.rss_hf =0 ; else if (!strcmp(res->value, "default"))
@@ -2492,7 +2494,7 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_type ="ipv6-tcp-ex#ipv6-udp-ex#" "l3-src-only#l3-dst-only#l4-src-only#l4-dst-only#" "l2-src-only#l2-dst-only#s-vlan#c-vlan#" - "l2tpv3#esp#ah#pfcp#pppoe"); + "l2tpv3#esp#ah#pfcp#pppoe#gtpu");cmdline_parse_token_string_t cmd_config_rss_hash_key_value = TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, key, NULL);
@@ -2505,7 +2507,7 @@ cmdline_parse_inst_t cmd_config_rss_hash_key = {"l2-payload|ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex|" "l3-src-only|l3-dst-only|l4-src-only|l4-dst-only|" "l2-src-only|l2-dst-only|s-vlan|c-vlan|" -"l2tpv3|esp|ah|pfcp|pppoe " +"l2tpv3|esp|ah|pfcp|pppoe|gtpu " "<string of hex digits (variable length, NIC dependent)>", .tokens = { (void *)&cmd_config_rss_hash_key_port,
app/test-pmd/config.c +3 -1
@@ -77,7 +77,8 @@ static const struct {const struct rss_type_info rss_type_table[] = { {"all" ,ETH_RSS_ETH |ETH_RSS_VLAN |ETH_RSS_IP |ETH_RSS_TCP |ETH_RSS_UDP |ETH_RSS_SCTP |ETH_RSS_L2_PAYLOAD | -ETH_RSS_L2TPV3 |ETH_RSS_ESP |ETH_RSS_AH |ETH_RSS_PFCP }, +ETH_RSS_L2TPV3 |ETH_RSS_ESP |ETH_RSS_AH |ETH_RSS_PFCP | +ETH_RSS_GTPU }, {"none" ,0 }, {"eth" ,ETH_RSS_ETH }, {"l2-src-only" ,ETH_RSS_L2_SRC_ONLY },
@@ -119,6 +120,7 @@ const struct rss_type_info rss_type_table[] = { { "l2tpv3", ETH_RSS_L2TPV3 }, { "pfcp", ETH_RSS_PFCP }, { "pppoe", ETH_RSS_PPPOE }, + { "gtpu", ETH_RSS_GTPU }, { NULL, 0 }, };
Signature · 1 line
2.20.1
v5 cover enable new hash flow for pf
In reply to Jeff GuoPF could add or delete a RSS rule base on the PF's hash capability. Some new rss input set will be supported, the protocols as below:
eth/vlan/l2tpv3/esp/ah/pfcp/gtpu downlink/gtpu uplink.
v5->v4:
fix checkpatch issue
refine for eth/vlan hash
v4->v3:
split patch set
Jeff Guo (4):
net/ice: refactor for pf hash flow
net/ice: support hash for new GTPU protocols
net/ice: enable new input set for rss hash
app/testpmd: add GTPU to RSS hash commands
app/test-pmd/cmdline.c | 8 +- app/test-pmd/config.c | 4 +- drivers/net/ice/ice_hash.c | 773 ++++++++++++++++++++++++++----------- 3 files changed, 562 insertions(+), 223 deletions(-)
Signature · 1 line
2.20.1
PATCH v5 1/4 net/ice: refactor for pf hash flow
Refactor hash flow by change the action parser and clean some code.
---v5->v4:
no change
--- drivers/net/ice/ice_hash.c | 562 +++++++++++++++++++++++-------------- 1 file changed, 355 insertions(+), 207 deletions(-)
drivers/net/ice/ice_hash.c +355 -207
@@ -76,91 +76,135 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad, struct rte_flow_error *error);/* The first member is protocol header, the second member is ETH_RSS_*. */ -struct rss_type_match_hdr hint_0 = { +struct rss_type_match_hdr hint_empty = {ICE_FLOW_SEG_HDR_NONE ,0 }; -struct rss_type_match_hdr hint_1 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_2 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_3 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_4 = { -ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_5 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_IPV6 }; -struct rss_type_match_hdr hint_6 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_7 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_TCP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_8 = { -ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_SCTP | -ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_9 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_10 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV4 }; -struct rss_type_match_hdr hint_11 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_12 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_13 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV4_SCTP }; -struct rss_type_match_hdr hint_14 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_UDP }; -struct rss_type_match_hdr hint_15 = { -ICE_FLOW_SEG_HDR_GTPU_EH ,ETH_RSS_NONFRAG_IPV4_TCP }; -struct rss_type_match_hdr hint_16 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_IPV6 }; -struct rss_type_match_hdr hint_17 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_UDP }; -struct rss_type_match_hdr hint_18 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_TCP }; -struct rss_type_match_hdr hint_19 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_NONFRAG_IPV6_SCTP }; -struct rss_type_match_hdr hint_20 = { -ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_ETH |ETH_RSS_PPPOE }; +struct rss_type_match_hdr hint_eth_ipv4 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_udp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_ipv4_tcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_TCP }; +struct rss_type_match_hdr hint_eth_ipv4_sctp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_SCTP }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_GTPU |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_GTPU |ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = { +ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_GTPU |ETH_RSS_NONFRAG_IPV4_TCP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv4 = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_IPV4 }; +struct rss_type_match_hdr hint_eth_pppoes_ipv4_udp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = { +ICE_FLOW_SEG_HDR_PPPOE , +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 , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV4_SCTP }; +struct rss_type_match_hdr hint_eth_ipv6 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV6 }; +struct rss_type_match_hdr hint_eth_ipv6_udp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP }; +struct rss_type_match_hdr hint_eth_ipv6_tcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_TCP }; +struct rss_type_match_hdr hint_eth_ipv6_sctp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_SCTP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_SCTP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv6 = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_IPV6 }; +struct rss_type_match_hdr hint_eth_pppoes_ipv6_udp = { +ICE_FLOW_SEG_HDR_PPPOE , +ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_NONFRAG_IPV6_UDP }; +struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = { +ICE_FLOW_SEG_HDR_PPPOE , +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 , +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 };/* Supported pattern for os default package. */ static struct ice_pattern_match_item ice_hash_pattern_list_os[] = { - {pattern_eth_ipv4,ICE_INSET_NONE , &hint_1}, - {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_2}, - {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_3}, - {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_4}, - {pattern_eth_ipv6,ICE_INSET_NONE , &hint_5}, - {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_6}, - {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_7}, - {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_8}, - {pattern_empty,ICE_INSET_NONE , &hint_0}, + {pattern_eth_ipv4,ICE_INSET_NONE , &hint_eth_ipv4}, + {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_eth_ipv4_sctp}, + {pattern_eth_ipv6,ICE_INSET_NONE , &hint_eth_ipv6}, + {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_eth_ipv6_sctp}, + {pattern_empty,ICE_INSET_NONE , &hint_empty}, };/* Supported pattern for comms package. */ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { - {pattern_eth_ipv4,ICE_INSET_NONE , &hint_1}, - {pattern_eth_ipv4_udp,ICE_INSET_NONE , &hint_2}, - {pattern_eth_ipv4_tcp,ICE_INSET_NONE , &hint_3}, - {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_4}, - {pattern_eth_ipv6,ICE_INSET_NONE , &hint_5}, - {pattern_eth_ipv6_udp,ICE_INSET_NONE , &hint_6}, - {pattern_eth_ipv6_tcp,ICE_INSET_NONE , &hint_7}, - {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_8}, - {pattern_empty,ICE_INSET_NONE , &hint_0}, - {pattern_eth_ipv4_gtpu_eh_ipv4,ICE_INSET_NONE , &hint_9}, - {pattern_eth_ipv4_gtpu_eh_ipv4_udp,ICE_INSET_NONE , &hint_14}, - {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,ICE_INSET_NONE , &hint_15}, - {pattern_eth_pppoes_ipv4,ICE_INSET_NONE , &hint_10}, - {pattern_eth_pppoes_ipv4_udp,ICE_INSET_NONE , &hint_11}, - {pattern_eth_pppoes_ipv4_tcp,ICE_INSET_NONE , &hint_12}, - {pattern_eth_pppoes_ipv4_sctp,ICE_INSET_NONE , &hint_13}, - {pattern_eth_pppoes_ipv6,ICE_INSET_NONE , &hint_16}, - {pattern_eth_pppoes_ipv6_udp,ICE_INSET_NONE , &hint_17}, - {pattern_eth_pppoes_ipv6_tcp,ICE_INSET_NONE , &hint_18}, - {pattern_eth_pppoes_ipv6_sctp,ICE_INSET_NONE , &hint_19}, - {pattern_eth_pppoes,ICE_INSET_NONE , &hint_20}, + {pattern_empty,ICE_INSET_NONE , + &hint_empty}, + {pattern_eth_ipv4,ICE_INSET_NONE , + &hint_eth_ipv4}, + {pattern_eth_ipv4_udp,ICE_INSET_NONE , + &hint_eth_ipv4_udp}, + {pattern_eth_ipv4_tcp,ICE_INSET_NONE , + &hint_eth_ipv4_tcp}, + {pattern_eth_ipv4_sctp,ICE_INSET_NONE , + &hint_eth_ipv4_sctp}, + {pattern_eth_ipv4_gtpu_eh_ipv4,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4}, + {pattern_eth_ipv4_gtpu_eh_ipv4_udp,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4_udp}, + {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,ICE_INSET_NONE , + &hint_eth_ipv4_gtpu_eh_ipv4_tcp}, + {pattern_eth_pppoes_ipv4,ICE_INSET_NONE , + &hint_eth_pppoes_ipv4}, + {pattern_eth_pppoes_ipv4_udp,ICE_INSET_NONE , + &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_ipv6,ICE_INSET_NONE , + &hint_eth_ipv6}, + {pattern_eth_ipv6_udp,ICE_INSET_NONE , + &hint_eth_ipv6_udp}, + {pattern_eth_ipv6_tcp,ICE_INSET_NONE , + &hint_eth_ipv6_tcp}, + {pattern_eth_ipv6_sctp,ICE_INSET_NONE , + &hint_eth_ipv6_sctp}, + {pattern_eth_pppoes_ipv6,ICE_INSET_NONE , + &hint_eth_pppoes_ipv6}, + {pattern_eth_pppoes_ipv6_udp,ICE_INSET_NONE , + &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}, };/**
@@ -168,69 +212,199 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {* the second member is hash fields. */ struct ice_hash_match_type ice_hash_type_list[] = { - {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_IPV4 ,ICE_FLOW_HASH_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_UDP ,ICE_HASH_UDP_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_TCP ,ICE_HASH_TCP_IPV4 }, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV4_SCTP ,ICE_HASH_SCTP_IPV4 }, - {ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_IPV6 ,ICE_FLOW_HASH_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_UDP ,ICE_HASH_UDP_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_TCP ,ICE_HASH_TCP_IPV6 }, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) |BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_DST_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, - {ETH_RSS_NONFRAG_IPV6_SCTP ,ICE_HASH_SCTP_IPV6 }, - {ETH_RSS_ETH |ETH_RSS_L2_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, - {ETH_RSS_PPPOE ,ICE_FLOW_HASH_PPPOE_SESS_ID }, - {ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_L2_SRC_ONLY ,ICE_FLOW_HASH_PPPOE_SESS_ID |BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_PPPOE , +ICE_FLOW_HASH_PPPOE_SESS_ID }, + {ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_L2_SRC_ONLY , +ICE_FLOW_HASH_PPPOE_SESS_ID | +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, +/* IPV4 */ + {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_IPV4 ,ICE_FLOW_HASH_IPV4 }, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_UDP , +ICE_HASH_UDP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_TCP , +ICE_HASH_TCP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_DA )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, + {ETH_RSS_NONFRAG_IPV4_SCTP , +ICE_HASH_SCTP_IPV4 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_PROT )}, +/* IPV6 */ + {ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_IPV6 ,ICE_FLOW_HASH_IPV6 }, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_UDP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_PFCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_PFCP_SEID )}, + {ETH_RSS_NONFRAG_IPV6_UDP , +ICE_HASH_UDP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_TCP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_TCP , +ICE_HASH_TCP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_SA )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_DA )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L4_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_SCTP_DST_PORT ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, + {ETH_RSS_NONFRAG_IPV6_SCTP , +ICE_HASH_SCTP_IPV6 | +BIT_ULL (ICE_FLOW_FIELD_IDX_IPV6_PROT )}, };static struct ice_flow_engine ice_hash_engine = {
@@ -316,14 +490,14 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,void **meta, struct rte_flow_error *error) { - const struct rte_flow_action *action; -enum rte_flow_action_type action_type; -const struct rte_flow_action_rss *rss; struct rss_type_match_hdr *m = (struct rss_type_match_hdr *) (pattern_match_item->meta); +struct rss_meta *hash_meta = (struct rss_meta *)*meta;uint32_t type_list_len =RTE_DIM (ice_hash_type_list); -struct ice_hash_match_type *type_match_item; -uint64_t rss_hf; +enum rte_flow_action_type action_type; +const struct rte_flow_action_rss *rss; +const struct rte_flow_action *action; +uint64_t rss_type;uint16_t i;/* Supported action is RSS. */
@@ -333,46 +507,24 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,switch (action_type) {case RTE_FLOW_ACTION_TYPE_RSS : rss = action->conf; - rss_hf = rss->types; - -/** -* Check simultaneous use of SRC_ONLY and DST_ONLY -* of the same level. -*/ - rss_hf =rte_eth_rss_hf_refine (rss_hf); + rss_type = rss->types; -/* Check if pattern is empty. */ +/* Check hash function and save it to rss_meta. */ if (pattern_match_item->pattern_list != - pattern_empty && rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) + pattern_empty && rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) {return rte_flow_error_set (error,ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , action,"Not supported flow" ); - -if ((rss_hf Ð_RSS_ETH ) && (rss_hf & ~ETH_RSS_PPPOE )) - m->eth_rss_hint =ETH_RSS_ETH ; -else if ((rss_hf Ð_RSS_PPPOE ) && (rss_hf & ~ETH_RSS_ETH )) - m->eth_rss_hint =ETH_RSS_PPPOE ; -else if ((rss_hf Ð_RSS_ETH ) && (rss_hf Ð_RSS_PPPOE )) - m->eth_rss_hint =ETH_RSS_ETH |ETH_RSS_PPPOE ; - -/* Check if rss types match pattern. */ -if (rss->func !=RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) { -if (((rss_hf Ð_RSS_IPV4 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_SCTP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_IPV6 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_SCTP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_ETH ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_PPPOE ) != m->eth_rss_hint) && - (((rss_hf & (ETH_RSS_ETH |ETH_RSS_PPPOE )) != - m->eth_rss_hint))) -return rte_flow_error_set (error, -ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , - action,"Not supported RSS types" ); + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ){ + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +return 0 ; + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) { + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; }if (rss->level)
@@ -390,42 +542,38 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,RTE_FLOW_ERROR_TYPE_ACTION , action, "a non-NULL RSS queue is not supported"); -/* Check hash function and save it to rss_meta. */ -if (rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +/** +* Check simultaneous use of SRC_ONLY and DST_ONLY +* of the same level. +*/ + rss_type =rte_eth_rss_hf_refine (rss_type); -if (rss->func == -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; +uint64_t combine_type =ETH_RSS_L2_SRC_ONLY | +ETH_RSS_L2_DST_ONLY | +ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY | +ETH_RSS_L4_DST_ONLY ; - type_match_item =rte_zmalloc ("ice_type_match_item" , -sizeof (struct ice_hash_match_type ),0 ); -if (!type_match_item) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"No memory for type_match_item" ); -return -ENOMEM ; +/* Check if rss types match pattern. */ +if (rss_type & ~combine_type & ~m->eth_rss_hint) { +return rte_flow_error_set (error, +ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , + action,"Not supported RSS types" ); }/* Find matched hash fields according to hash type. */ for (i =0 ; i < type_list_len; i++) { -if (rss_hf == - ice_hash_type_list[i].hash_type) { - type_match_item->hash_type = - ice_hash_type_list[i].hash_type; - type_match_item->hash_flds = - ice_hash_type_list[i].hash_flds; +struct ice_hash_match_type *ht_map = + &ice_hash_type_list[i]; + +if (rss_type == ht_map->hash_type) { + hash_meta->hash_flds = + ht_map->hash_flds; +break ; } } -/* Save hash fileds to rss_meta. */ - ((struct rss_meta *)*meta)->hash_flds = - type_match_item->hash_flds; - -rte_free (type_match_item);break ;case RTE_FLOW_ACTION_TYPE_END :
Signature · 1 line
2.20.1
Re: [dpdk-dev] [dpdk-dev v5 1/4] net/ice: refactor for pf hash flow
Quoted 3 lines · Jeff Guo
Refactor hash flow by change the action parser and clean some code.
Signed-off-by Jeff Guo <[email protected]>
<...>
Quoted 75 lines
drivers/net/ice/ice_hash.c +18
-40@@ -333,46 +507,24 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,switch (action_type) {case RTE_FLOW_ACTION_TYPE_RSS : rss = action->conf; - rss_hf = rss->types; - -/** -* Check simultaneous use of SRC_ONLY and DST_ONLY -* of the same level. -*/ - rss_hf =rte_eth_rss_hf_refine (rss_hf); + rss_type = rss->types; -/* Check if pattern is empty. */ +/* Check hash function and save it to rss_meta. */ if (pattern_match_item->pattern_list != - pattern_empty && rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) + pattern_empty && rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) {return rte_flow_error_set (error,ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , action,"Not supported flow" ); - -if ((rss_hf Ð_RSS_ETH ) && (rss_hf & ~ETH_RSS_PPPOE )) - m->eth_rss_hint =ETH_RSS_ETH ; -else if ((rss_hf Ð_RSS_PPPOE ) && (rss_hf & ~ETH_RSS_ETH )) - m->eth_rss_hint =ETH_RSS_PPPOE ; -else if ((rss_hf Ð_RSS_ETH ) && (rss_hf Ð_RSS_PPPOE )) - m->eth_rss_hint =ETH_RSS_ETH |ETH_RSS_PPPOE ; - -/* Check if rss types match pattern. */ -if (rss->func !=RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) { -if (((rss_hf Ð_RSS_IPV4 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV4_SCTP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_IPV6 ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_UDP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_TCP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_NONFRAG_IPV6_SCTP ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_ETH ) != m->eth_rss_hint) && - ((rss_hf Ð_RSS_PPPOE ) != m->eth_rss_hint) && - (((rss_hf & (ETH_RSS_ETH |ETH_RSS_PPPOE )) != - m->eth_rss_hint))) -return rte_flow_error_set (error, -ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , - action,"Not supported RSS types" ); + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ){ + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +return 0 ; + }else if (rss->func == +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) { + ((struct rss_meta *)*meta)->hash_function = +RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; }if (rss->level)@@ -390,42 +542,38 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,RTE_FLOW_ERROR_TYPE_ACTION , action, "a non-NULL RSS queue is not supported"); -/* Check hash function and save it to rss_meta. */ -if (rss->func == -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ; +/** +* Check simultaneous use of SRC_ONLY and DST_ONLY +* of the same level. +*/ + rss_type =rte_eth_rss_hf_refine (rss_type);
drivers/net/ice/ice_hash.c ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, · line 556
Quoted 10 lines
drivers/net/ice/ice_hash.c +6
-4-if (rss->func == -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ) - ((struct rss_meta *)*meta)->hash_function = -RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ ; +uint64_t combine_type =ETH_RSS_L2_SRC_ONLY | +ETH_RSS_L2_DST_ONLY | +ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY | +ETH_RSS_L4_DST_ONLY ;
Declaring and initializing a varible in switch case causing warning with icc [1], I will fix this while mergin by moving declaration out of switch.
[1]
.../dpdk/drivers/net/ice/ice_hash.c(672):
warning #589: transfer of control bypasses initialization of:
variable "combine_type" (declared at line 716)
switch (action_type) {
^<...>
PATCH v5 2/4 net/ice: support hash for new GTPU protocols
In reply to Jeff GuoSupport hash flow for the new protoclos of GTPU_EH UPLINK, GTPU_EH DOWNLINK and GTPU_IP.
---v5->v4:
no change
--- drivers/net/ice/ice_hash.c | 67 ++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 13 deletions(-)
drivers/net/ice/ice_hash.c +54 -13
@@ -25,6 +25,9 @@#include "ice_ethdev.h" #include "ice_generic_flow.h" +#define ICE_GTPU_EH_DWNLINK 0 +#define ICE_GTPU_EH_UPLINK 1 +struct rss_type_match_hdr {uint32_t hdr_mask;uint64_t eth_rss_hint;
@@ -93,6 +96,10 @@ struct rss_type_match_hdr hint_eth_ipv4_sctp = {ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_SCTP , ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_SCTP}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = { +ICE_FLOW_SEG_HDR_GTPU_IP |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_GTPU |ETH_RSS_IPV4 };struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = {ICE_FLOW_SEG_HDR_GTPU_EH |ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER,
@@ -173,6 +180,8 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_ipv4_tcp}, {pattern_eth_ipv4_sctp,ICE_INSET_NONE , &hint_eth_ipv4_sctp}, + {pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_ipv4}, {pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE, &hint_eth_ipv4_gtpu_eh_ipv4}, {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
@@ -459,10 +468,15 @@ ice_hash_init(struct ice_adapter *ad) }static int -ice_hash_check_inset (const struct rte_flow_item pattern[], -struct rte_flow_error *error) +ice_hash_parse_pattern (struct ice_pattern_match_item *pattern_match_item, +const struct rte_flow_item pattern[],void **meta, +struct rte_flow_error *error) { +uint32_t hdr_mask = ((struct rss_type_match_hdr *) + (pattern_match_item->meta))->hdr_mask;const struct rte_flow_item *item = pattern; +const struct rte_flow_item_gtp_psc *psc; +uint32_t hdrs =0 ;for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {
@@ -472,15 +486,29 @@ ice_hash_check_inset(const struct rte_flow_item pattern[],return -rte_errno; } -/* Ignore spec and mask. */ -if (item->spec || item->mask) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , item, -"Invalid spec/mask." ); -return -rte_errno; +switch (item->type) { +case RTE_FLOW_ITEM_TYPE_GTPU : + hdrs |=ICE_FLOW_SEG_HDR_GTPU_IP ; +break ; +case RTE_FLOW_ITEM_TYPE_GTP_PSC : + psc = item->spec; + hdr_mask &= ~ICE_FLOW_SEG_HDR_GTPU_EH ; + hdrs &= ~ICE_FLOW_SEG_HDR_GTPU_IP ; +if (!psc) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_EH ; +else if (psc->pdu_type ==ICE_GTPU_EH_UPLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_UP ; +else if (psc->pdu_type ==ICE_GTPU_EH_DWNLINK ) + hdrs |=ICE_FLOW_SEG_HDR_GTPU_DWN ; +break ; +default : +break ; } } +/* Save protocol header to rss_meta. */ + ((struct rss_meta *)*meta)->pkt_hdr |= hdr_mask | hdrs; +return 0 ; }
@@ -574,6 +602,22 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, } } +/* update hash field for gtpu-ip and gtpu-eh. */ +if (rss_type !=ETH_RSS_GTPU ) +break ; +else if (hash_meta->pkt_hdr &ICE_FLOW_SEG_HDR_GTPU_IP ) + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_IP_TEID ); +else if (hash_meta->pkt_hdr &ICE_FLOW_SEG_HDR_GTPU_EH ) + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_EH_TEID ); +else if (hash_meta->pkt_hdr &ICE_FLOW_SEG_HDR_GTPU_DWN ) + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID ); +else if (hash_meta->pkt_hdr &ICE_FLOW_SEG_HDR_GTPU_UP ) + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_GTPU_UP_TEID ); +break ;case RTE_FLOW_ACTION_TYPE_END :
@@ -619,14 +663,11 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad, goto error; } - ret =ice_hash_check_inset (pattern, error); + ret =ice_hash_parse_pattern (pattern_match_item, pattern, + (void **)&rss_meta_ptr, error);if (ret) goto error; -/* Save protocol header to rss_meta. */ - rss_meta_ptr->pkt_hdr = ((struct rss_type_match_hdr *) - (pattern_match_item->meta))->hdr_mask; -/* Check rss action. */ ret =ice_hash_parse_action (pattern_match_item, actions, (void **)&rss_meta_ptr, error);
Signature · 1 line
2.20.1
PATCH v5 3/4 net/ice: enable new input set for rss hash
In reply to Jeff GuoPF could add or delete a RSS rule base on the PF's hash capability. Some new rss input set will be supported, the protocols as below:
eth/vlan/l2tpv3/esp/ah/pfcp.
---v5->v4:
fix checkpatch issue
refine for eth/vlan hash
--- drivers/net/ice/ice_hash.c | 146 +++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+)
drivers/net/ice/ice_hash.c +146 -0
@@ -124,6 +124,45 @@ struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = {struct rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = {ICE_FLOW_SEG_HDR_PPPOE ,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 , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv4_udp_esp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_NAT_T_ESP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv4_ah = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_AH }; +struct rss_type_match_hdr hint_eth_ipv4_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_L2TPV3 }; +struct rss_type_match_hdr hint_eth_ipv4_pfcp = { +ICE_FLOW_SEG_HDR_IPV4 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_PFCP }; +struct rss_type_match_hdr hint_eth_vlan_ipv4 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV4 |ETH_RSS_C_VLAN }; +struct rss_type_match_hdr hint_eth_vlan_ipv4_udp = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_ETH |ETH_RSS_C_VLAN | +ETH_RSS_NONFRAG_IPV4_UDP }; +struct rss_type_match_hdr hint_eth_vlan_ipv4_tcp = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_ETH |ETH_RSS_C_VLAN | +ETH_RSS_NONFRAG_IPV4_TCP }; +struct rss_type_match_hdr hint_eth_vlan_ipv4_sctp = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV4 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_SCTP , +ETH_RSS_ETH |ETH_RSS_C_VLAN | +ETH_RSS_NONFRAG_IPV4_SCTP };struct rss_type_match_hdr hint_eth_ipv6 = {ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER ,ETH_RSS_ETH |ETH_RSS_IPV6 };
@@ -139,6 +178,45 @@ struct rss_type_match_hdr hint_eth_ipv6_sctp = {ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_SCTP , ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_SCTP}; +struct rss_type_match_hdr hint_eth_ipv6_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_ESP , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv6_udp_esp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_NAT_T_ESP , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_ESP }; +struct rss_type_match_hdr hint_eth_ipv6_ah = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_AH , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_AH }; +struct rss_type_match_hdr hint_eth_ipv6_l2tpv3 = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_L2TPV3 , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_L2TPV3 }; +struct rss_type_match_hdr hint_eth_ipv6_pfcp = { +ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_OTHER | +ICE_FLOW_SEG_HDR_PFCP_SESSION , +ETH_RSS_ETH |ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_PFCP }; +struct rss_type_match_hdr hint_eth_vlan_ipv6 = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV6 | +ICE_FLOW_SEG_HDR_IPV_OTHER , +ETH_RSS_ETH |ETH_RSS_IPV6 |ETH_RSS_C_VLAN }; +struct rss_type_match_hdr hint_eth_vlan_ipv6_udp = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV6 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_UDP , +ETH_RSS_ETH |ETH_RSS_C_VLAN | +ETH_RSS_NONFRAG_IPV6_UDP }; +struct rss_type_match_hdr hint_eth_vlan_ipv6_tcp = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV6 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_TCP , +ETH_RSS_ETH |ETH_RSS_C_VLAN | +ETH_RSS_NONFRAG_IPV6_TCP }; +struct rss_type_match_hdr hint_eth_vlan_ipv6_sctp = { +ICE_FLOW_SEG_HDR_VLAN |ICE_FLOW_SEG_HDR_IPV6 | +ICE_FLOW_SEG_HDR_IPV_OTHER |ICE_FLOW_SEG_HDR_SCTP , +ETH_RSS_ETH |ETH_RSS_C_VLAN | +ETH_RSS_NONFRAG_IPV6_SCTP };struct rss_type_match_hdr hint_eth_pppoes_ipv6 = {ICE_FLOW_SEG_HDR_PPPOE ,ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_IPV6 };
@@ -196,6 +274,24 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &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, + &hint_eth_ipv4_udp_esp}, + {pattern_eth_ipv4_ah, ICE_INSET_NONE, + &hint_eth_ipv4_ah}, + {pattern_eth_ipv4_l2tp, ICE_INSET_NONE, + &hint_eth_ipv4_l2tpv3}, + {pattern_eth_ipv4_pfcp, ICE_INSET_NONE, + &hint_eth_ipv4_pfcp}, + {pattern_eth_vlan_ipv4, ICE_INSET_NONE, + &hint_eth_vlan_ipv4}, + {pattern_eth_vlan_ipv4_udp, ICE_INSET_NONE, + &hint_eth_vlan_ipv4_udp}, + {pattern_eth_vlan_ipv4_tcp, ICE_INSET_NONE, + &hint_eth_vlan_ipv4_tcp}, + {pattern_eth_vlan_ipv4_sctp, ICE_INSET_NONE, + &hint_eth_vlan_ipv4_sctp}, {pattern_eth_ipv6, ICE_INSET_NONE, &hint_eth_ipv6}, {pattern_eth_ipv6_udp, ICE_INSET_NONE,
@@ -204,6 +300,24 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_ipv6_tcp}, {pattern_eth_ipv6_sctp,ICE_INSET_NONE , &hint_eth_ipv6_sctp}, + {pattern_eth_ipv6_esp, ICE_INSET_NONE, + &hint_eth_ipv6_esp}, + {pattern_eth_ipv6_udp_esp, ICE_INSET_NONE, + &hint_eth_ipv6_udp_esp}, + {pattern_eth_ipv6_ah, ICE_INSET_NONE, + &hint_eth_ipv6_ah}, + {pattern_eth_ipv6_l2tp, ICE_INSET_NONE, + &hint_eth_ipv6_l2tpv3}, + {pattern_eth_ipv6_pfcp, ICE_INSET_NONE, + &hint_eth_ipv6_pfcp}, + {pattern_eth_vlan_ipv6, ICE_INSET_NONE, + &hint_eth_vlan_ipv6}, + {pattern_eth_vlan_ipv6_udp, ICE_INSET_NONE, + &hint_eth_vlan_ipv6_udp}, + {pattern_eth_vlan_ipv6_tcp, ICE_INSET_NONE, + &hint_eth_vlan_ipv6_tcp}, + {pattern_eth_vlan_ipv6_sctp, ICE_INSET_NONE, + &hint_eth_vlan_ipv6_sctp}, {pattern_eth_pppoes_ipv6, ICE_INSET_NONE, &hint_eth_pppoes_ipv6}, {pattern_eth_pppoes_ipv6_udp, ICE_INSET_NONE,
@@ -221,11 +335,34 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {* the second member is hash fields. */ struct ice_hash_match_type ice_hash_type_list[] = { + {ETH_RSS_L2_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_L2_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_ETH |ETH_RSS_L2_SRC_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_ETH |ETH_RSS_L2_DST_ONLY , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, + {ETH_RSS_ETH , +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA ) | +BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_DA )}, {ETH_RSS_PPPOE ,ICE_FLOW_HASH_PPPOE_SESS_ID }, {ETH_RSS_ETH |ETH_RSS_PPPOE |ETH_RSS_L2_SRC_ONLY ,ICE_FLOW_HASH_PPPOE_SESS_ID |BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_SA )}, + {ETH_RSS_C_VLAN , +BIT_ULL (ICE_FLOW_FIELD_IDX_C_VLAN )}, + {ETH_RSS_S_VLAN , +BIT_ULL (ICE_FLOW_FIELD_IDX_S_VLAN )}, + {ETH_RSS_ESP , +BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI )}, + {ETH_RSS_AH , +BIT_ULL (ICE_FLOW_FIELD_IDX_AH_SPI )}, + {ETH_RSS_L2TPV3 , +BIT_ULL (ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID )}, + {ETH_RSS_PFCP , +BIT_ULL (ICE_FLOW_FIELD_IDX_PFCP_SEID )},/* IPV4 */ {ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY ,BIT_ULL (ICE_FLOW_FIELD_IDX_IPV4_SA )},
@@ -602,6 +739,15 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, } } +/* update hash field for nat-t esp. */ +if (rss_type ==ETH_RSS_ESP && + (m->eth_rss_hint Ð_RSS_NONFRAG_IPV4_UDP )) { + hash_meta->hash_flds &= + ~(BIT_ULL (ICE_FLOW_FIELD_IDX_ESP_SPI )); + hash_meta->hash_flds |= +BIT_ULL (ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI ); + } +/* update hash field for gtpu-ip and gtpu-eh. */ if (rss_type !=ETH_RSS_GTPU )break ;
Signature · 1 line
2.20.1
PATCH v5 4/4 app/testpmd: add GTPU to RSS hash commands
In reply to Jeff GuoAdd testpmd cmdline support for GTPU, it could be used to configure gtpu teid hash. The commands as below:
testpmd> flow create 0 ingress pattern eth / ipv4 / udp / gtpu / \
ipv4 / end actions rss types gtpu end key_len 0 queues end / end
---v5->v4:
no change.
--- app/test-pmd/cmdline.c | 8 +++++--- app/test-pmd/config.c | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-)
app/test-pmd/cmdline.c +5 -3
@@ -2274,7 +2274,7 @@ cmd_config_rss_parsed(void *parsed_result, rss_conf.rss_hf =ETH_RSS_ETH |ETH_RSS_VLAN |ETH_RSS_IP |ETH_RSS_TCP |ETH_RSS_UDP |ETH_RSS_SCTP |ETH_RSS_L2_PAYLOAD |ETH_RSS_L2TPV3 |ETH_RSS_ESP | -ETH_RSS_AH |ETH_RSS_PFCP ; +ETH_RSS_AH |ETH_RSS_PFCP |ETH_RSS_GTPU ; else if (!strcmp(res->value, "eth")) rss_conf.rss_hf =ETH_RSS_ETH ; else if (!strcmp(res->value, "vlan"))
@@ -2319,6 +2319,8 @@ cmd_config_rss_parsed(void *parsed_result, rss_conf.rss_hf =ETH_RSS_PFCP ; else if (!strcmp(res->value, "pppoe")) rss_conf.rss_hf =ETH_RSS_PPPOE ; + else if (!strcmp(res->value, "gtpu")) + rss_conf.rss_hf =ETH_RSS_GTPU ; else if (!strcmp(res->value, "none")) rss_conf.rss_hf =0 ; else if (!strcmp(res->value, "default"))
@@ -2492,7 +2494,7 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_type ="ipv6-tcp-ex#ipv6-udp-ex#" "l3-src-only#l3-dst-only#l4-src-only#l4-dst-only#" "l2-src-only#l2-dst-only#s-vlan#c-vlan#" - "l2tpv3#esp#ah#pfcp#pppoe"); + "l2tpv3#esp#ah#pfcp#pppoe#gtpu");cmdline_parse_token_string_t cmd_config_rss_hash_key_value = TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, key, NULL);
@@ -2505,7 +2507,7 @@ cmdline_parse_inst_t cmd_config_rss_hash_key = {"l2-payload|ipv6-ex|ipv6-tcp-ex|ipv6-udp-ex|" "l3-src-only|l3-dst-only|l4-src-only|l4-dst-only|" "l2-src-only|l2-dst-only|s-vlan|c-vlan|" -"l2tpv3|esp|ah|pfcp|pppoe " +"l2tpv3|esp|ah|pfcp|pppoe|gtpu " "<string of hex digits (variable length, NIC dependent)>", .tokens = { (void *)&cmd_config_rss_hash_key_port,
app/test-pmd/config.c +3 -1
@@ -77,7 +77,8 @@ static const struct {const struct rss_type_info rss_type_table[] = { {"all" ,ETH_RSS_ETH |ETH_RSS_VLAN |ETH_RSS_IP |ETH_RSS_TCP |ETH_RSS_UDP |ETH_RSS_SCTP |ETH_RSS_L2_PAYLOAD | -ETH_RSS_L2TPV3 |ETH_RSS_ESP |ETH_RSS_AH |ETH_RSS_PFCP }, +ETH_RSS_L2TPV3 |ETH_RSS_ESP |ETH_RSS_AH |ETH_RSS_PFCP | +ETH_RSS_GTPU }, {"none" ,0 }, {"eth" ,ETH_RSS_ETH }, {"l2-src-only" ,ETH_RSS_L2_SRC_ONLY },
@@ -119,6 +120,7 @@ const struct rss_type_info rss_type_table[] = { { "l2tpv3", ETH_RSS_L2TPV3 }, { "pfcp", ETH_RSS_PFCP }, { "pppoe", ETH_RSS_PPPOE }, + { "gtpu", ETH_RSS_GTPU }, { NULL, 0 }, };
Signature · 1 line
2.20.1
Re: [dpdk-dev] [dpdk-dev v5 0/4] enable new hash flow for pf
In reply to Jeff GuoQuoted 29 lines
-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Tuesday, July 7, 2020 1:26 PM
To: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Cc: [email protected]; Wu, Jingjing <[email protected]>; Guo, Junfeng <[email protected]>; Xing, Beilei <[email protected]>; Su, Simei <[email protected]>; Guo, Jia <[email protected]>
Subject: [dpdk-dev v5 0/4] enable new hash flow for pfPF could add or delete a RSS rule base on the PF's hash capability. Some new rss input set will be supported, the protocols as below:
eth/vlan/l2tpv3/esp/ah/pfcp/gtpu downlink/gtpu uplink.
v5->v4:
fix checkpatch issue
refine for eth/vlan hash
v4->v3:
split patch setJeff Guo (4):
net/ice: refactor for pf hash flow
net/ice: support hash for new GTPU protocols
net/ice: enable new input set for rss hash
app/testpmd: add GTPU to RSS hash commands
Quoted 7 lines
app/test-pmd/cmdline.c | 8 +- app/test-pmd/config.c | 4 +- drivers/net/ice/ice_hash.c | 773 ++++++++++++++++++++++++++----------- 3 files changed, 562 insertions(+), 223 deletions(-)--
2.20.1
Applied to dpdk-next-net-intel.
Thanks
Qi