net/iavf: Enable 256 queues
cover net/iavf: Enable 256 queues
From: gordonno <[email protected]>
Enable 256 queues per VF.
Allow RSS across queue groups of up to 64 Queues(AVF). Enable advanced RSS for PPPoE(AVF).
Enable support for RSS on 5 Tuple Flows for GTPU encapsulated packets (AVF)
Jeff Guo (1):
net/iavf: fix gtpu ip udp issue
Qi Zhang (4):
common/iavf: add large queue VC ops
net/iavf: support 64 queues
common/iavf: add large vsi queue config
net/iavf: support > 256 lut table size
gordonno (3):
Support dst ip only for RSS
ICE: Enable advanced RSS for PPPoE
Update/Add support for RSS on 5 Tuple Flows for GTPU encapsulated
packets (AVF)
app/test-pmd/cmdline.c | 6 +- app/test-pmd/config.c | 1 + drivers/common/iavf/virtchnl.h | 113 ++ drivers/net/iavf/iavf.h | 4 +- drivers/net/iavf/iavf_ethdev.c | 2 +- drivers/net/iavf/iavf_generic_flow.c | 39 + drivers/net/iavf/iavf_generic_flow.h | 4 + drivers/net/iavf/iavf_hash.c | 2050 ++++++++++++++++++++------ drivers/net/iavf/iavf_vchnl.c | 41 +- drivers/net/ice/ice_hash.c | 31 +- lib/librte_ethdev/rte_ethdev.h | 2 +- 11 files changed, 1778 insertions(+), 515 deletions(-)
Signature · 1 line
2.17.1
RFC PATCH 1/8 common/iavf: add large queue VC ops
From: Qi Zhang <[email protected]>
Add VC ops to support 64 queue
VIRTCHNL_OP_ENABLE_LARGE_QUEUESVIRTCHNL_OP_DISABLE_LARGE_QUEUESVIRTCHNL_OP_CONFIG_LARGE_IRQ_MAP
--- drivers/common/iavf/virtchnl.h | 59 ++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)
drivers/common/iavf/virtchnl.h +59 -0
@@ -140,6 +140,9 @@ enum virtchnl_ops {VIRTCHNL_OP_ADD_FDIR_FILTER =47 ,VIRTCHNL_OP_DEL_FDIR_FILTER =48 ,VIRTCHNL_OP_QUERY_FDIR_FILTER =49 , +VIRTCHNL_OP_ENABLE_LARGE_QUEUES =50 , +VIRTCHNL_OP_DISABLE_LARGE_QUEUES =51 , + VIRTCHNL_OP_CONFIG_LARGE_IRQ_MAP = 52, };/* These macros are used to generate compilation errors if a structure/union
@@ -258,6 +261,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);#define VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC 0X04000000#define VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF 0X08000000#define VIRTCHNL_VF_OFFLOAD_FDIR_PF 0X10000000 +#define VIRTCHNL_VF_OFFLOAD_LARGE_VF 0X20000000/* 0X80000000 is reserved */ /* Define below the capability flags that are not offloads */
@@ -396,6 +400,18 @@ struct virtchnl_vector_map {VIRTCHNL_CHECK_STRUCT_LEN (12 , virtchnl_vector_map); +struct virtchnl_large_vector_map { +u64 rxq_map; +u64 txq_map; +u16 vsi_id; +u16 vector_id; +u16 rxitr_idx; +u16 txitr_idx; +}; + +VIRTCHNL_CHECK_STRUCT_LEN (24 , virtchnl_large_vector_map); + +struct virtchnl_irq_map_info {u16 num_vectors;struct virtchnl_vector_map vecmap[1 ];
@@ -403,6 +419,14 @@ struct virtchnl_irq_map_info {VIRTCHNL_CHECK_STRUCT_LEN (14 , virtchnl_irq_map_info); +struct virtchnl_large_irq_map_info { +u16 num_vectors; +struct virtchnl_large_vector_map vecmap[1 ]; +}; + +VIRTCHNL_CHECK_STRUCT_LEN (32 , virtchnl_large_irq_map_info); + +/* VIRTCHNL_OP_ENABLE_QUEUES * VIRTCHNL_OP_DISABLE_QUEUES * VF sends these message to enable or disable TX/RX queue pairs.
@@ -423,6 +447,16 @@ struct virtchnl_queue_select {VIRTCHNL_CHECK_STRUCT_LEN (12 , virtchnl_queue_select); +struct virtchnl_large_queue_select { +u64 rx_queues; +u64 tx_queues; +u16 vsi_id; +u16 pad; +}; + +VIRTCHNL_CHECK_STRUCT_LEN (24 , virtchnl_large_queue_select); + +/* VIRTCHNL_OP_ADD_ETH_ADDR * VF sends this message in order to add one or more unicast or multicast * address filters for the specified VSI.
@@ -771,6 +805,10 @@ enum virtchnl_vector_limits {VIRTCHNL_OP_ENABLE_CHANNELS_MAX = ((u16)(~0 ) -sizeof (struct virtchnl_tc_info )) /sizeof (struct virtchnl_channel_info ), + +VIRTCHNL_OP_CONFIG_LARGE_IRQ_MAP_MAX = + ((u16)(~0 ) -sizeof (struct virtchnl_large_irq_map_info )) / + sizeof(struct virtchnl_large_vector_map), };/* VF reset states - these are written into the RSTAT register:
@@ -1163,10 +1201,31 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info *ver, u32 v_opcode, sizeof(struct virtchnl_vector_map)); }break ; +case VIRTCHNL_OP_CONFIG_LARGE_IRQ_MAP : + valid_len =sizeof (struct virtchnl_large_irq_map_info ); +if (msglen >= valid_len) { +struct virtchnl_large_irq_map_info *vimi = + (struct virtchnl_large_irq_map_info *)msg; + +if (vimi->num_vectors ==0 || vimi->num_vectors > +VIRTCHNL_OP_CONFIG_LARGE_IRQ_MAP_MAX ) { + err_msg_format = true; +break ; + } + + valid_len += (vimi->num_vectors * +sizeof (struct virtchnl_large_vector_map )); + } +break ; +case VIRTCHNL_OP_ENABLE_QUEUES :case VIRTCHNL_OP_DISABLE_QUEUES : valid_len =sizeof (struct virtchnl_queue_select );break ; +case VIRTCHNL_OP_ENABLE_LARGE_QUEUES : +case VIRTCHNL_OP_DISABLE_LARGE_QUEUES : + valid_len =sizeof (struct virtchnl_large_queue_select ); +break ;case VIRTCHNL_OP_ADD_ETH_ADDR :case VIRTCHNL_OP_DEL_ETH_ADDR : valid_len =sizeof (struct virtchnl_ether_addr_list );
Signature · 1 line
2.17.1
RFC PATCH 2/8 net/iavf: support 64 queues
In reply to [email protected]From: Qi Zhang <[email protected]>
Enlarge max queue number from 16 to 64 by using "large" vc ops.
--- drivers/net/iavf/iavf.h | 4 ++-- drivers/net/iavf/iavf_vchnl.c | 35 ++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 19 deletions(-)
drivers/net/iavf/iavf.h +2 -2
@@ -19,7 +19,7 @@#define IAVF_FRAME_SIZE_MAX 9728#define IAVF_QUEUE_BASE_ADDR_UNIT 128 -#define IAVF_MAX_NUM_QUEUES 16 +#define IAVF_MAX_NUM_QUEUES 64#define IAVF_NUM_MACADDR_MAX 64
@@ -138,7 +138,7 @@ struct iavf_info {uint16_t nb_msix;/* number of MSI-X interrupts on Rx */ uint16_t msix_base;/* msix vector base from */ /* queue bitmask for each vector */ -uint16_t rxq_map[IAVF_MAX_MSIX_VECTORS ]; +uint64_t rxq_map[IAVF_MAX_MSIX_VECTORS ];struct iavf_flow_list flow_list;rte_spinlock_t flow_ops_lock;struct iavf_parser_list rss_parser_list;
drivers/net/iavf/iavf_vchnl.c +18 -17
@@ -383,7 +383,8 @@ iavf_get_vf_resource(struct iavf_adapter *adapter) caps =IAVF_BASIC_OFFLOAD_CAPS |VIRTCHNL_VF_CAP_ADV_LINK_SPEED |VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC |VIRTCHNL_VF_OFFLOAD_FDIR_PF | -VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF ; +VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF | +VIRTCHNL_VF_OFFLOAD_LARGE_VF ; args.in_args = (uint8_t *)∩︀ args.in_args_size =sizeof (caps);
@@ -450,7 +451,7 @@ int iavf_enable_queues(struct iavf_adapter *adapter) {struct iavf_info *vf =IAVF_DEV_PRIVATE_TO_VF (adapter); -struct virtchnl_queue_select queue_select; +struct virtchnl_large_queue_select queue_select;struct iavf_cmd_info args;int err;
@@ -460,7 +461,7 @@ iavf_enable_queues(struct iavf_adapter *adapter) queue_select.rx_queues =BIT (adapter->eth_dev->data->nb_rx_queues) -1 ; queue_select.tx_queues =BIT (adapter->eth_dev->data->nb_tx_queues) -1 ; - args.ops =VIRTCHNL_OP_ENABLE_QUEUES ; + args.ops =VIRTCHNL_OP_ENABLE_LARGE_QUEUES ; args.in_args = (u8 *)&queue_select; args.in_args_size =sizeof (queue_select); args.out_buffer = vf->aq_resp;
@@ -468,7 +469,7 @@ iavf_enable_queues(struct iavf_adapter *adapter) err =iavf_execute_vf_cmd (adapter, &args);if (err) {PMD_DRV_LOG (ERR , -"Failed to execute command of OP_ENABLE_QUEUES" ); +"Failed to execute command of OP_ENABLE_LARGE_QUEUES" );return err; }return 0 ;
@@ -478,7 +479,7 @@ int iavf_disable_queues(struct iavf_adapter *adapter) {struct iavf_info *vf =IAVF_DEV_PRIVATE_TO_VF (adapter); -struct virtchnl_queue_select queue_select; +struct virtchnl_large_queue_select queue_select;struct iavf_cmd_info args;int err;
@@ -488,7 +489,7 @@ iavf_disable_queues(struct iavf_adapter *adapter) queue_select.rx_queues =BIT (adapter->eth_dev->data->nb_rx_queues) -1 ; queue_select.tx_queues =BIT (adapter->eth_dev->data->nb_tx_queues) -1 ; - args.ops =VIRTCHNL_OP_DISABLE_QUEUES ; + args.ops =VIRTCHNL_OP_DISABLE_LARGE_QUEUES ; args.in_args = (u8 *)&queue_select; args.in_args_size =sizeof (queue_select); args.out_buffer = vf->aq_resp;
@@ -496,7 +497,7 @@ iavf_disable_queues(struct iavf_adapter *adapter) err =iavf_execute_vf_cmd (adapter, &args);if (err) {PMD_DRV_LOG (ERR , -"Failed to execute command of OP_DISABLE_QUEUES" ); +"Failed to execute command of OP_DISABLE_LARGE_QUEUES" );return err; }return 0 ;
@@ -507,7 +508,7 @@ iavf_switch_queue(struct iavf_adapter *adapter, uint16_t qid, bool rx, bool on) {struct iavf_info *vf =IAVF_DEV_PRIVATE_TO_VF (adapter); -struct virtchnl_queue_select queue_select; +struct virtchnl_large_queue_select queue_select;struct iavf_cmd_info args;int err;
@@ -519,9 +520,9 @@ iavf_switch_queue(struct iavf_adapter *adapter, uint16_t qid, queue_select.tx_queues |=1 << qid;if (on) - args.ops =VIRTCHNL_OP_ENABLE_QUEUES ; + args.ops =VIRTCHNL_OP_ENABLE_LARGE_QUEUES ;else - args.ops =VIRTCHNL_OP_DISABLE_QUEUES ; + args.ops =VIRTCHNL_OP_DISABLE_LARGE_QUEUES ; args.in_args = (u8 *)&queue_select; args.in_args_size =sizeof (queue_select); args.out_buffer = vf->aq_resp;
@@ -529,7 +530,7 @@ iavf_switch_queue(struct iavf_adapter *adapter, uint16_t qid, err =iavf_execute_vf_cmd (adapter, &args);if (err)PMD_DRV_LOG (ERR ,"Failed to execute command of %s" , - on ?"OP_ENABLE_QUEUES" :"OP_DISABLE_QUEUES" ); + on ?"OP_ENABLE_LARGE_QUEUES" :"OP_DISABLE_LARGE_QUEUES" );return err; }
@@ -686,13 +687,13 @@ int iavf_config_irq_map(struct iavf_adapter *adapter) {struct iavf_info *vf =IAVF_DEV_PRIVATE_TO_VF (adapter); -struct virtchnl_irq_map_info *map_info; -struct virtchnl_vector_map *vecmap; +struct virtchnl_large_irq_map_info *map_info; +struct virtchnl_large_vector_map *vecmap;struct iavf_cmd_info args;int len, i, err; - len =sizeof (struct virtchnl_irq_map_info ) + -sizeof (struct virtchnl_vector_map ) * vf->nb_msix; + len =sizeof (struct virtchnl_large_irq_map_info ) + +sizeof (struct virtchnl_large_vector_map ) * vf->nb_msix; map_info =rte_zmalloc ("map_info" , len,0 );if (!map_info)
@@ -708,14 +709,14 @@ iavf_config_irq_map(struct iavf_adapter *adapter) vecmap->rxq_map = vf->rxq_map[vf->msix_base + i]; } - args.ops =VIRTCHNL_OP_CONFIG_IRQ_MAP ; + args.ops =VIRTCHNL_OP_CONFIG_LARGE_IRQ_MAP ; args.in_args = (u8 *)map_info; args.in_args_size = len; args.out_buffer = vf->aq_resp; args.out_size =IAVF_AQ_BUF_SZ ; err =iavf_execute_vf_cmd (adapter, &args);if (err) -PMD_DRV_LOG (ERR ,"fail to execute command OP_CONFIG_IRQ_MAP" ); +PMD_DRV_LOG (ERR ,"fail to execute command OP_CONFIG_LARGE_IRQ_MAP" );rte_free (map_info);return err;
Signature · 1 line
2.17.1
RFC PATCH 3/8 common/iavf: add large vsi queue config
In reply to [email protected]From: Qi Zhang <[email protected]>
--- drivers/common/iavf/virtchnl.h | 54 ++++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_vchnl.c | 6 ++-- 2 files changed, 57 insertions(+), 3 deletions(-)
drivers/common/iavf/virtchnl.h +54 -0
@@ -143,6 +143,7 @@ enum virtchnl_ops {VIRTCHNL_OP_ENABLE_LARGE_QUEUES =50 ,VIRTCHNL_OP_DISABLE_LARGE_QUEUES =51 ,VIRTCHNL_OP_CONFIG_LARGE_IRQ_MAP =52 , + VIRTCHNL_OP_CONFIG_LARGE_VSI_QUEUES = 53, };/* These macros are used to generate compilation errors if a structure/union
@@ -303,6 +304,17 @@ struct virtchnl_txq_info {VIRTCHNL_CHECK_STRUCT_LEN (24 , virtchnl_txq_info); +struct virtchnl_txq_info_2 { +u16 vsi_id; +u16 queue_id; +u16 ring_len;/* number of descriptors, multiple of 8 */ +u16 reserved; +u64 dma_ring_addr; +}; + +VIRTCHNL_CHECK_STRUCT_LEN (16 , virtchnl_txq_info_2); + +/* VIRTCHNL_OP_CONFIG_RX_QUEUE * VF sends this message to set up parameters for one RX queue. * External data buffer contains one instance of virtchnl_rxq_info.
@@ -353,6 +365,15 @@ struct virtchnl_queue_pair_info {VIRTCHNL_CHECK_STRUCT_LEN (64 , virtchnl_queue_pair_info); +struct virtchnl_large_queue_pair_info { +/* NOTE: vsi_id and queue_id should be identical for both queues. */ +struct virtchnl_txq_info_2 txq; +struct virtchnl_rxq_info rxq; +}; + +VIRTCHNL_CHECK_STRUCT_LEN (56 , virtchnl_large_queue_pair_info); + +struct virtchnl_vsi_queue_config_info {u16 vsi_id;u16 num_queue_pairs;
@@ -362,6 +383,16 @@ struct virtchnl_vsi_queue_config_info {VIRTCHNL_CHECK_STRUCT_LEN (72 , virtchnl_vsi_queue_config_info); +struct virtchnl_large_vsi_queue_config_info { +u16 vsi_id; +u16 num_queue_pairs; +u32 pad; +struct virtchnl_large_queue_pair_info qpair[1 ]; +}; + +VIRTCHNL_CHECK_STRUCT_LEN (64 , virtchnl_large_vsi_queue_config_info); + +/* VIRTCHNL_OP_REQUEST_QUEUES * VF sends this message to request the PF to allocate additional queues to * this VF. Each VF gets a guaranteed number of queues on init but asking for
@@ -809,6 +840,11 @@ enum virtchnl_vector_limits {VIRTCHNL_OP_CONFIG_LARGE_IRQ_MAP_MAX = ((u16)(~0 ) -sizeof (struct virtchnl_large_irq_map_info )) /sizeof (struct virtchnl_large_vector_map ), + +VIRTCHNL_OP_CONFIG_LARGE_VSI_QUEUES_MAX = + ((u16)(~0 ) -sizeof (struct virtchnl_large_vsi_queue_config_info )) / + sizeof(struct virtchnl_large_queue_pair_info), + };/* VF reset states - these are written into the RSTAT register:
@@ -1185,6 +1221,24 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info *ver, u32 v_opcode, virtchnl_queue_pair_info)); }break ; +case VIRTCHNL_OP_CONFIG_LARGE_VSI_QUEUES : + valid_len =sizeof (struct virtchnl_large_vsi_queue_config_info ); +if (msglen >= valid_len) { +struct virtchnl_large_vsi_queue_config_info *vqc = + (struct virtchnl_large_vsi_queue_config_info *)msg; + +if (vqc->num_queue_pairs ==0 || vqc->num_queue_pairs > +VIRTCHNL_OP_CONFIG_LARGE_VSI_QUEUES_MAX ) { + err_msg_format = true; +break ; + } + + valid_len += (vqc->num_queue_pairs * +sizeof (struct +virtchnl_large_queue_pair_info )); + } +break ; +case VIRTCHNL_OP_CONFIG_IRQ_MAP : valid_len =sizeof (struct virtchnl_irq_map_info );if (msglen >= valid_len) {
drivers/net/iavf/iavf_vchnl.c +3 -3
@@ -606,8 +606,8 @@ iavf_configure_queues(struct iavf_adapter *adapter)struct iavf_tx_queue **txq = (struct iavf_tx_queue **)adapter->eth_dev->data->tx_queues;struct iavf_info *vf =IAVF_DEV_PRIVATE_TO_VF (adapter); -struct virtchnl_vsi_queue_config_info *vc_config; -struct virtchnl_queue_pair_info *vc_qp; +struct virtchnl_large_vsi_queue_config_info *vc_config; +struct virtchnl_large_queue_pair_info *vc_qp;struct iavf_cmd_info args;uint16_t i, size;int err;
@@ -668,7 +668,7 @@ iavf_configure_queues(struct iavf_adapter *adapter) }memset (&args,0 ,sizeof (args)); - args.ops =VIRTCHNL_OP_CONFIG_VSI_QUEUES ; + args.ops =VIRTCHNL_OP_CONFIG_LARGE_VSI_QUEUES ; args.in_args = (uint8_t *)vc_config; args.in_args_size = size; args.out_buffer = vf->aq_resp;
Signature · 1 line
2.17.1
RFC PATCH 4/8 net/iavf: support > 256 lut table size
In reply to [email protected]From: Qi Zhang <[email protected]>
--- drivers/net/iavf/iavf_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/iavf/iavf_ethdev.c +1 -1
@@ -169,7 +169,7 @@ iavf_init_rss(struct iavf_adapter *adapter) {struct iavf_info *vf =IAVF_DEV_PRIVATE_TO_VF (adapter);struct rte_eth_rss_conf *rss_conf; -uint8_t i, j, nb_q; +uint16_t i, j, nb_q;int ret; rss_conf = &adapter->eth_dev->data->dev_conf.rx_adv_conf.rss_conf;
Signature · 1 line
2.17.1
RFC PATCH 5/8 Support dst ip only for RSS
In reply to [email protected]From: gordonno <[email protected]>
--- drivers/net/iavf/iavf_hash.c | 476 +++++++++++++++++++++-------------- 1 file changed, 281 insertions(+), 195 deletions(-)
drivers/net/iavf/iavf_hash.c +281 -195
@@ -35,6 +35,12 @@ enum iavf_pattern_hint_type { IAVF_PATTERN_HINT_IPV6_SCTP, }; +enum iavf_gtpu_hint { +IAVF_GTPU_HINT_DOWNLINK , +IAVF_GTPU_HINT_UPLINK , +IAVF_GTPU_HINT_NONE , +}; +struct iavf_pattern_match_type {enum iavf_pattern_hint_type phint_type; };
@@ -43,6 +49,7 @@ struct iavf_hash_match_type {enum iavf_pattern_hint_type phint_type;uint64_t hash_type;struct virtchnl_proto_hdrs *proto_hdrs; +enum iavf_gtpu_hint gtpu_hint; };struct iavf_rss_meta {
@@ -147,9 +154,6 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = { {iavf_pattern_empty, IAVF_INSET_NONE, &phint_empty}, }; -#define GTP_EH_PDU_LINK_UP 1 -#define GTP_EH_PDU_LINK_DWN 0 -#define TUNNEL_LEVEL_OUTER 0#define TUNNEL_LEVEL_FIRST_INNER 1
@@ -160,103 +164,112 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {#define BUFF_NOUSED 0#define FIELD_FOR_PROTO_ONLY 0 +#define FIELD_SELECTOR (proto_hdr_field) \ + (1UL << ((proto_hdr_field) & PROTO_HDR_FIELD_MASK)) +#define proto_hint_eth_src { \ - VIRTCHNL_PROTO_HDR_ETH, VIRTCHNL_PROTO_HDR_ETH_SRC, {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_ETH, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_SRC), \ + {BUFF_NOUSED } }#define proto_hint_eth_dst { \ - VIRTCHNL_PROTO_HDR_ETH, VIRTCHNL_PROTO_HDR_ETH_DST, {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_ETH, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_DST), \ + {BUFF_NOUSED } }#define proto_hint_eth_only { \ VIRTCHNL_PROTO_HDR_ETH, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }#define proto_hint_eth { \ VIRTCHNL_PROTO_HDR_ETH, \ - VIRTCHNL_PROTO_HDR_ETH_SRC | VIRTCHNL_PROTO_HDR_ETH_DST, \ - {BUFF_NOUSED } } + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_SRC) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_DST), {BUFF_NOUSED } }#define proto_hint_svlan { \ - VIRTCHNL_PROTO_HDR_S_VLAN, VIRTCHNL_PROTO_HDR_S_VLAN_ID, \ - {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_S_VLAN, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_S_VLAN_ID), {BUFF_NOUSED } }#define proto_hint_cvlan { \ - VIRTCHNL_PROTO_HDR_C_VLAN, VIRTCHNL_PROTO_HDR_C_VLAN_ID, \ - {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_C_VLAN, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_C_VLAN_ID), {BUFF_NOUSED } }#define proto_hint_ipv4_src { \ - VIRTCHNL_PROTO_HDR_IPV4, VIRTCHNL_PROTO_HDR_IPV4_SRC, {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_IPV4, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC), \ + {BUFF_NOUSED } }#define proto_hint_ipv4_dst { \ - VIRTCHNL_PROTO_HDR_IPV4, VIRTCHNL_PROTO_HDR_IPV4_DST, {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_IPV4, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST), \ + {BUFF_NOUSED } }#define proto_hint_ipv4_only { \ VIRTCHNL_PROTO_HDR_IPV4, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }#define proto_hint_ipv4 { \ VIRTCHNL_PROTO_HDR_IPV4, \ - VIRTCHNL_PROTO_HDR_IPV4_SRC | VIRTCHNL_PROTO_HDR_IPV4_DST, \ - {BUFF_NOUSED } } + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST), {BUFF_NOUSED } }#define proto_hint_udp_src_port { \ - VIRTCHNL_PROTO_HDR_UDP, VIRTCHNL_PROTO_HDR_UDP_SRC_PORT, \ - {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_UDP, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_SRC_PORT), {BUFF_NOUSED } }#define proto_hint_udp_dst_port { \ - VIRTCHNL_PROTO_HDR_UDP, VIRTCHNL_PROTO_HDR_UDP_DST_PORT, \ - {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_UDP, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_DST_PORT), {BUFF_NOUSED } }#define proto_hint_udp_only { \ VIRTCHNL_PROTO_HDR_UDP, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }#define proto_hint_udp { \ VIRTCHNL_PROTO_HDR_UDP, \ - VIRTCHNL_PROTO_HDR_UDP_SRC_PORT | VIRTCHNL_PROTO_HDR_UDP_DST_PORT, \ - {BUFF_NOUSED } } + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_SRC_PORT) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_DST_PORT), {BUFF_NOUSED } }#define proto_hint_tcp_src_port { \ - VIRTCHNL_PROTO_HDR_TCP, VIRTCHNL_PROTO_HDR_TCP_SRC_PORT, \ - {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_TCP, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_SRC_PORT), {BUFF_NOUSED } }#define proto_hint_tcp_dst_port { \ - VIRTCHNL_PROTO_HDR_TCP, VIRTCHNL_PROTO_HDR_TCP_DST_PORT, \ - {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_TCP, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_DST_PORT), {BUFF_NOUSED } }#define proto_hint_tcp_only { \ VIRTCHNL_PROTO_HDR_TCP, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }#define proto_hint_tcp { \ VIRTCHNL_PROTO_HDR_TCP, \ - VIRTCHNL_PROTO_HDR_TCP_SRC_PORT | VIRTCHNL_PROTO_HDR_TCP_DST_PORT, \ - {BUFF_NOUSED } } + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_SRC_PORT) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_DST_PORT), {BUFF_NOUSED } }#define proto_hint_sctp_src_port { \ - VIRTCHNL_PROTO_HDR_SCTP, VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT, \ - {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_SCTP, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT), {BUFF_NOUSED } }#define proto_hint_sctp_dst_port { \ - VIRTCHNL_PROTO_HDR_SCTP, VIRTCHNL_PROTO_HDR_SCTP_DST_PORT, \ - {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_SCTP, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_DST_PORT), {BUFF_NOUSED } }#define proto_hint_sctp_only { \ VIRTCHNL_PROTO_HDR_SCTP, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }#define proto_hint_sctp { \ VIRTCHNL_PROTO_HDR_SCTP, \ - VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT | VIRTCHNL_PROTO_HDR_SCTP_DST_PORT, \ - {BUFF_NOUSED } } + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_DST_PORT), {BUFF_NOUSED } }#define proto_hint_ipv6_src { \ - VIRTCHNL_PROTO_HDR_IPV6, VIRTCHNL_PROTO_HDR_IPV6_SRC, {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_IPV6, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC), \ + {BUFF_NOUSED } }#define proto_hint_ipv6_dst { \ - VIRTCHNL_PROTO_HDR_IPV6, VIRTCHNL_PROTO_HDR_IPV6_DST, {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_IPV6, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST), \ + {BUFF_NOUSED } }#define proto_hint_ipv6_only { \ VIRTCHNL_PROTO_HDR_IPV6, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }#define proto_hint_ipv6 { \ VIRTCHNL_PROTO_HDR_IPV6, \ - VIRTCHNL_PROTO_HDR_IPV6_SRC | VIRTCHNL_PROTO_HDR_IPV6_DST, \ - {BUFF_NOUSED } } + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST), {BUFF_NOUSED } }#define proto_hint_gtpu_up_only { \ VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_UP, \
@@ -268,18 +281,19 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {#define proto_hint_esp { \ VIRTCHNL_PROTO_HDR_ESP, \ - VIRTCHNL_PROTO_HDR_ESP_SPI, {BUFF_NOUSED } } + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ESP_SPI), {BUFF_NOUSED } }#define proto_hint_ah { \ VIRTCHNL_PROTO_HDR_AH, \ - VIRTCHNL_PROTO_HDR_AH_SPI, {BUFF_NOUSED } } + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_AH_SPI), {BUFF_NOUSED } }#define proto_hint_l2tpv3 { \ VIRTCHNL_PROTO_HDR_L2TPV3, \ - VIRTCHNL_PROTO_HDR_L2TPV3_SESS_ID, {BUFF_NOUSED } } + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_L2TPV3_SESS_ID), {BUFF_NOUSED } }#define proto_hint_pfcp { \ - VIRTCHNL_PROTO_HDR_PFCP, VIRTCHNL_PROTO_HDR_PFCP_SEID, {BUFF_NOUSED } } + VIRTCHNL_PROTO_HDR_PFCP, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID), {BUFF_NOUSED } }struct virtchnl_proto_hdrs hdrs_hint_eth_src = {TUNNEL_LEVEL_OUTER ,PROTO_COUNT_ONE , {proto_hint_eth_src }
@@ -314,6 +328,16 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_up = { proto_hint_ipv4_src } }; +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_dwn = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_TWO , {proto_hint_gtpu_dwn_only, + proto_hint_ipv4_src } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_up = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_TWO , {proto_hint_gtpu_up_only, + proto_hint_ipv4_dst } +}; +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_dwn = {TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_TWO , {proto_hint_gtpu_dwn_only, proto_hint_ipv4_dst }
@@ -589,272 +613,333 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp = {* The first member is pattern hint type, * the second member is hash type, * the third member is virtchnl protocol hdrs. +* the forth member is downlink/uplink type. */ struct iavf_hash_match_type iavf_hash_type_list[] = {/* IPV4 */ - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_L2_SRC_ONLY , &hdrs_hint_eth_src}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_L2_DST_ONLY , &hdrs_hint_eth_dst}, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_L2_SRC_ONLY , &hdrs_hint_eth_src, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_L2_DST_ONLY , &hdrs_hint_eth_dst, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_ETH |ETH_RSS_L2_SRC_ONLY , - &hdrs_hint_eth_src}, + &hdrs_hint_eth_src,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_ETH |ETH_RSS_L2_DST_ONLY , - &hdrs_hint_eth_dst}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_ETH , &hdrs_hint_eth}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_S_VLAN , &hdrs_hint_svlan}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_C_VLAN , &hdrs_hint_cvlan}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv4_src}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv4_dst}, + &hdrs_hint_eth_dst,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_ETH , &hdrs_hint_eth, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_S_VLAN , &hdrs_hint_svlan, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_C_VLAN , &hdrs_hint_cvlan, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv4_src, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv4_dst, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_IPV4 |ETH_RSS_L3_SRC_ONLY , - &hdrs_hint_ipv4_src}, + &hdrs_hint_ipv4_src,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_IPV4 |ETH_RSS_L3_DST_ONLY , - &hdrs_hint_ipv4_dst}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_ESP , &hdrs_hint_ipv4_esp}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_AH , &hdrs_hint_ipv4_ah}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_L2TPV3 , &hdrs_hint_ipv4_l2tpv3}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_IPV4 , &hdrs_hint_ipv4}, + &hdrs_hint_ipv4_dst,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_ESP , &hdrs_hint_ipv4_esp, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_AH , &hdrs_hint_ipv4_ah, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_L2TPV3 , &hdrs_hint_ipv4_l2tpv3, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_IPV4 , &hdrs_hint_ipv4, +IAVF_GTPU_HINT_NONE },/* IPV4 UDP */ {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_src_udp_src_port}, + &hdrs_hint_ipv4_src_udp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_src_udp_dst_port}, + &hdrs_hint_ipv4_src_udp_dst_port,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &hdrs_hint_ipv4_src_gtpu_up,IAVF_GTPU_HINT_UPLINK }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , - &hdrs_hint_ipv4_src_gtpu_up}, + &hdrs_hint_ipv4_src_gtpu_dwn,IAVF_GTPU_HINT_DOWNLINK }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L3_SRC_ONLY , - &hdrs_hint_ipv4_src}, + &hdrs_hint_ipv4_src,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_dst_udp_src_port}, + &hdrs_hint_ipv4_dst_udp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_dst_udp_dst_port}, + &hdrs_hint_ipv4_dst_udp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , - &hdrs_hint_ipv4_dst_gtpu_dwn}, + &hdrs_hint_ipv4_dst_gtpu_up,IAVF_GTPU_HINT_UPLINK }, + {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &hdrs_hint_ipv4_dst_gtpu_dwn,IAVF_GTPU_HINT_DOWNLINK }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L3_DST_ONLY , - &hdrs_hint_ipv4_dst}, + &hdrs_hint_ipv4_dst,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_src_udp_src_port}, + &hdrs_hint_ipv4_src_udp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_src_udp_dst_port}, + &hdrs_hint_ipv4_src_udp_dst_port,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &hdrs_hint_ipv4_src_gtpu_up,IAVF_GTPU_HINT_UPLINK }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , - &hdrs_hint_ipv4_src_gtpu_up}, + &hdrs_hint_ipv4_src_gtpu_dwn,IAVF_GTPU_HINT_DOWNLINK }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | -ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv4_src}, +ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv4_src, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_dst_udp_src_port}, + &hdrs_hint_ipv4_dst_udp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_dst_udp_dst_port}, + &hdrs_hint_ipv4_dst_udp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , - &hdrs_hint_ipv4_dst_gtpu_dwn}, + &hdrs_hint_ipv4_dst_gtpu_up,IAVF_GTPU_HINT_UPLINK }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | -ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv4_dst}, +ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &hdrs_hint_ipv4_dst_gtpu_dwn,IAVF_GTPU_HINT_DOWNLINK }, + {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv4_dst, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_udp_src_port}, + &hdrs_hint_ipv4_udp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_udp_dst_port}, + &hdrs_hint_ipv4_udp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_PFCP , - &hdrs_hint_ipv4_pfcp}, + &hdrs_hint_ipv4_pfcp,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_UDP ,ETH_RSS_NONFRAG_IPV4_UDP , - &hdrs_hint_ipv4_udp}, + &hdrs_hint_ipv4_udp,IAVF_GTPU_HINT_NONE },/* IPV4 TCP */ {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_src_tcp_src_port}, + &hdrs_hint_ipv4_src_tcp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_src_tcp_dst_port}, + &hdrs_hint_ipv4_src_tcp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_L3_SRC_ONLY , - &hdrs_hint_ipv4_src}, + &hdrs_hint_ipv4_src,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_dst_tcp_src_port}, + &hdrs_hint_ipv4_dst_tcp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_dst_tcp_dst_port}, + &hdrs_hint_ipv4_dst_tcp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_L3_DST_ONLY , - &hdrs_hint_ipv4_dst}, + &hdrs_hint_ipv4_dst,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_src_tcp_src_port}, + &hdrs_hint_ipv4_src_tcp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_src_tcp_dst_port}, + &hdrs_hint_ipv4_src_tcp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | -ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv4_src}, +ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv4_src, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_dst_tcp_src_port}, + &hdrs_hint_ipv4_dst_tcp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_dst_tcp_dst_port}, + &hdrs_hint_ipv4_dst_tcp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP | -ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv4_dst}, +ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv4_dst, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_tcp_src_port}, + &hdrs_hint_ipv4_tcp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_tcp_dst_port}, + &hdrs_hint_ipv4_tcp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_TCP ,ETH_RSS_NONFRAG_IPV4_TCP , - &hdrs_hint_ipv4_tcp}, + &hdrs_hint_ipv4_tcp,IAVF_GTPU_HINT_NONE },/* IPV4 SCTP */ - {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_src_sctp_src_port}, - {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_src_sctp_dst_port}, + {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_SRC_ONLY , &hdrs_hint_ipv4_src_sctp_src_port, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_DST_ONLY , &hdrs_hint_ipv4_src_sctp_dst_port, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L3_SRC_ONLY , - &hdrs_hint_ipv4_src}, - {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_dst_sctp_src_port}, - {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_dst_sctp_dst_port}, + &hdrs_hint_ipv4_src,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY , &hdrs_hint_ipv4_dst_sctp_src_port, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_DST_ONLY , &hdrs_hint_ipv4_dst_sctp_dst_port, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L3_DST_ONLY , - &hdrs_hint_ipv4_dst}, + &hdrs_hint_ipv4_dst,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_src_sctp_src_port}, + &hdrs_hint_ipv4_src_sctp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_src_sctp_dst_port}, + &hdrs_hint_ipv4_src_sctp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP | -ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv4_src}, +ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv4_src, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_dst_sctp_src_port}, + &hdrs_hint_ipv4_dst_sctp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_dst_sctp_dst_port}, + &hdrs_hint_ipv4_dst_sctp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP | -ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv4_dst}, +ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv4_dst, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_sctp_src_port}, + &hdrs_hint_ipv4_sctp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_sctp_dst_port}, + &hdrs_hint_ipv4_sctp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV4_SCTP ,ETH_RSS_NONFRAG_IPV4_SCTP , - &hdrs_hint_ipv4_sctp}, + &hdrs_hint_ipv4_sctp,IAVF_GTPU_HINT_NONE },/* IPV6 */ - {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_L2_SRC_ONLY , &hdrs_hint_eth_src}, - {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_L2_DST_ONLY , &hdrs_hint_eth_dst}, + {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_L2_SRC_ONLY , + &hdrs_hint_eth_src,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_L2_DST_ONLY , + &hdrs_hint_eth_dst,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_IPV6 |ETH_RSS_L2_SRC_ONLY , - &hdrs_hint_eth_src}, + &hdrs_hint_eth_src,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_IPV6 |ETH_RSS_L2_DST_ONLY , - &hdrs_hint_eth_dst}, - {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_ETH , &hdrs_hint_eth}, - {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_S_VLAN , &hdrs_hint_svlan}, - {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_C_VLAN , &hdrs_hint_cvlan}, - {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv6_src}, - {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv6_dst}, + &hdrs_hint_eth_dst,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_ETH , + &hdrs_hint_eth,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_S_VLAN , + &hdrs_hint_svlan,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV4 ,ETH_RSS_C_VLAN , + &hdrs_hint_cvlan,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_L3_SRC_ONLY , + &hdrs_hint_ipv6_src,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_L3_DST_ONLY , + &hdrs_hint_ipv6_dst,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_IPV6 |ETH_RSS_L3_SRC_ONLY , - &hdrs_hint_ipv6_src}, + &hdrs_hint_ipv6_src,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_IPV6 |ETH_RSS_L3_DST_ONLY , - &hdrs_hint_ipv6_dst}, - {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_ESP , &hdrs_hint_ipv6_esp}, - {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_AH , &hdrs_hint_ipv6_ah}, - {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_L2TPV3 , &hdrs_hint_ipv6_l2tpv3}, - {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_IPV6 , &hdrs_hint_ipv6}, + &hdrs_hint_ipv6_dst,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_ESP , + &hdrs_hint_ipv6_esp,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_AH , + &hdrs_hint_ipv6_ah,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_L2TPV3 , + &hdrs_hint_ipv6_l2tpv3,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6 ,ETH_RSS_IPV6 , + &hdrs_hint_ipv6,IAVF_GTPU_HINT_NONE },/* IPV6 UDP */ - {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_src_udp_src_port}, - {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_src_udp_dst_port}, + {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_SRC_ONLY , &hdrs_hint_ipv6_src_udp_src_port, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_DST_ONLY , &hdrs_hint_ipv6_src_udp_dst_port, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L3_SRC_ONLY , - &hdrs_hint_ipv6_src}, - {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_dst_udp_src_port}, - {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_dst_udp_dst_port}, + &hdrs_hint_ipv6_src,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY , &hdrs_hint_ipv6_dst_udp_src_port, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_DST_ONLY , &hdrs_hint_ipv6_dst_udp_dst_port, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L3_DST_ONLY , - &hdrs_hint_ipv6_dst}, + &hdrs_hint_ipv6_dst,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_src_udp_src_port}, + &hdrs_hint_ipv6_src_udp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_src_udp_dst_port}, + &hdrs_hint_ipv6_src_udp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP | -ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv6_src}, +ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv6_src, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_dst_udp_src_port}, + &hdrs_hint_ipv6_dst_udp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_dst_udp_dst_port}, + &hdrs_hint_ipv6_dst_udp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP | -ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv6_dst}, +ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv6_dst, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_udp_src_port}, + &hdrs_hint_ipv6_udp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_udp_dst_port}, + &hdrs_hint_ipv6_udp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_PFCP , - &hdrs_hint_ipv6_pfcp}, + &hdrs_hint_ipv6_pfcp,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_UDP ,ETH_RSS_NONFRAG_IPV6_UDP , - &hdrs_hint_ipv6_udp}, + &hdrs_hint_ipv6_udp,IAVF_GTPU_HINT_NONE },/* IPV6 TCP */ - {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_src_tcp_src_port}, - {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_src_tcp_dst_port}, + {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_SRC_ONLY , &hdrs_hint_ipv6_src_tcp_src_port, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_DST_ONLY , &hdrs_hint_ipv6_src_tcp_dst_port, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L3_SRC_ONLY , - &hdrs_hint_ipv6_src}, - {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_dst_tcp_src_port}, - {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_dst_tcp_dst_port}, + &hdrs_hint_ipv6_src,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY , &hdrs_hint_ipv6_dst_tcp_src_port, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_DST_ONLY , &hdrs_hint_ipv6_dst_tcp_dst_port, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L3_DST_ONLY , - &hdrs_hint_ipv6_dst}, + &hdrs_hint_ipv6_dst,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_src_tcp_src_port}, + &hdrs_hint_ipv6_src_tcp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_src_tcp_dst_port}, + &hdrs_hint_ipv6_src_tcp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP | -ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv6_src}, +ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv6_src, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_dst_tcp_src_port}, + &hdrs_hint_ipv6_dst_tcp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_dst_tcp_dst_port}, + &hdrs_hint_ipv6_dst_tcp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP | -ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv6_dst}, +ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv6_dst, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_tcp_src_port}, + &hdrs_hint_ipv6_tcp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_tcp_dst_port}, + &hdrs_hint_ipv6_tcp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_TCP ,ETH_RSS_NONFRAG_IPV6_TCP , - &hdrs_hint_ipv6_tcp}, + &hdrs_hint_ipv6_tcp,IAVF_GTPU_HINT_NONE },/* IPV6 SCTP */ - {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_src_sctp_src_port}, - {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_src_sctp_dst_port}, + {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_SRC_ONLY , &hdrs_hint_ipv6_src_sctp_src_port, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L3_SRC_ONLY | +ETH_RSS_L4_DST_ONLY , &hdrs_hint_ipv6_src_sctp_dst_port, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L3_SRC_ONLY , - &hdrs_hint_ipv6_src}, - {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_dst_sctp_src_port}, - {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_dst_sctp_dst_port}, + &hdrs_hint_ipv6_src,IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_SRC_ONLY , &hdrs_hint_ipv6_dst_sctp_src_port, +IAVF_GTPU_HINT_NONE }, + {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L3_DST_ONLY | +ETH_RSS_L4_DST_ONLY , &hdrs_hint_ipv6_dst_sctp_dst_port, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L3_DST_ONLY , - &hdrs_hint_ipv6_dst}, + &hdrs_hint_ipv6_dst,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_src_sctp_src_port}, + &hdrs_hint_ipv6_src_sctp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_src_sctp_dst_port}, + &hdrs_hint_ipv6_src_sctp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP | -ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv6_src}, +ETH_RSS_L3_SRC_ONLY , &hdrs_hint_ipv6_src, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_dst_sctp_src_port}, + &hdrs_hint_ipv6_dst_sctp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_dst_sctp_dst_port}, + &hdrs_hint_ipv6_dst_sctp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP | -ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv6_dst}, +ETH_RSS_L3_DST_ONLY , &hdrs_hint_ipv6_dst, +IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv6_sctp_src_port}, + &hdrs_hint_ipv6_sctp_src_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv6_sctp_dst_port}, + &hdrs_hint_ipv6_sctp_dst_port,IAVF_GTPU_HINT_NONE }, {IAVF_PATTERN_HINT_IPV6_SCTP ,ETH_RSS_NONFRAG_IPV6_SCTP , - &hdrs_hint_ipv6_sctp}, + &hdrs_hint_ipv6_sctp,IAVF_GTPU_HINT_NONE }, };struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
@@ -969,8 +1054,9 @@ iavf_hash_check_inset(const struct rte_flow_item pattern[],return 0 ; } -static uint64_t -iavf_hash_refine_type (uint64_t rss_type,const struct rte_flow_item pattern[]) +static void +iavf_hash_refine_type (uint64_t *rss_type,const struct rte_flow_item pattern[], +enum iavf_gtpu_hint *gtpu_hint) {const struct rte_flow_item *item;
@@ -978,14 +1064,13 @@ iavf_hash_refine_type(uint64_t rss_type, const struct rte_flow_item pattern[])if (item->type ==RTE_FLOW_ITEM_TYPE_GTP_PSC ) {const struct rte_flow_item_gtp_psc *psc = item->spec; -if (psc && (psc->pdu_type ==GTP_EH_PDU_LINK_UP || - psc->pdu_type ==GTP_EH_PDU_LINK_DWN )) { - rss_type |=ETH_RSS_GTPU ; +if (psc && (psc->pdu_type ==IAVF_GTPU_HINT_UPLINK || + psc->pdu_type ==IAVF_GTPU_HINT_DOWNLINK )) { + *rss_type |=ETH_RSS_GTPU ; + *gtpu_hint = psc->pdu_type; } } } - -return rss_type; } static int
@@ -994,9 +1079,12 @@ iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,const struct rte_flow_action actions[], void **meta, struct rte_flow_error *error) { + struct iavf_pattern_match_type *mt = (struct iavf_pattern_match_type *) + (pattern_match_item->meta);struct iavf_rss_meta *rss_meta = (struct iavf_rss_meta *)*meta;uint32_t type_list_len =RTE_DIM (iavf_hash_type_list);struct iavf_hash_match_type *type_match_item; +enum iavf_gtpu_hint gtpu_hint =IAVF_GTPU_HINT_NONE ;enum rte_flow_action_type action_type;const struct rte_flow_action_rss *rss;const struct rte_flow_action *action;
@@ -1004,9 +1092,6 @@ iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,uint64_t rss_type;uint16_t i; -struct iavf_pattern_match_type *tt = (struct iavf_pattern_match_type *) - (pattern_match_item->meta); -/* Supported action is RSS. */ for (action = actions; action->type !=RTE_FLOW_ACTION_TYPE_END ; action++) {
@@ -1026,7 +1111,7 @@ iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,* Refine the hash type base on some specific item of * the pattern, such as identify the gtpu hash. */ - rss_type =iavf_hash_refine_type (rss_type, pattern); +iavf_hash_refine_type (&rss_type, pattern, >pu_hint);/* Check if pattern is empty. */ if (pattern_match_item->pattern_list !=
@@ -1079,7 +1164,8 @@ iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,struct iavf_hash_match_type *ht_map = &iavf_hash_type_list[i];if (rss_type == ht_map->hash_type && - tt->phint_type == ht_map->phint_type) { + mt->phint_type == ht_map->phint_type && + gtpu_hint == ht_map->gtpu_hint) { type_match_item->hash_type = ht_map->hash_type; type_match_item->proto_hdrs =
Signature · 1 line
2.17.1
RFC PATCH 6/8 ICE: Enable advanced RSS for PPPoE
In reply to [email protected]From: gordonno <[email protected]>
--- app/test-pmd/cmdline.c | 6 ++++-- app/test-pmd/config.c | 1 + drivers/net/ice/ice_hash.c | 31 ++++++++++++++++++++++++++++++- lib/librte_ethdev/rte_ethdev.h | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-)
app/test-pmd/cmdline.c +4 -2
@@ -2317,6 +2317,8 @@ cmd_config_rss_parsed(void *parsed_result, rss_conf.rss_hf =ETH_RSS_AH ; else if (!strcmp(res->value, "pfcp")) 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, "none")) rss_conf.rss_hf =0 ; else if (!strcmp(res->value, "default"))
@@ -2490,7 +2492,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"); + "l2tpv3#esp#ah#pfcp#pppoe");cmdline_parse_token_string_t cmd_config_rss_hash_key_value = TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, key, NULL);
@@ -2503,7 +2505,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 " +"l2tpv3|esp|ah|pfcp|pppoe " "<string of hex digits (variable length, NIC dependent)>", .tokens = { (void *)&cmd_config_rss_hash_key_port,
app/test-pmd/config.c +1 -0
@@ -118,6 +118,7 @@ const struct rss_type_info rss_type_table[] = { { "ah", ETH_RSS_AH }, { "l2tpv3", ETH_RSS_L2TPV3 }, { "pfcp", ETH_RSS_PFCP }, + { "pppoe", ETH_RSS_PPPOE }, { NULL, 0 }, };
drivers/net/ice/ice_hash.c +30 -1
@@ -108,6 +108,16 @@ 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 };/* Supported pattern for os default package. */ static struct ice_pattern_match_item ice_hash_pattern_list_os[] = {
@@ -140,6 +150,11 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { {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}, };/**
@@ -207,6 +222,9 @@ struct ice_hash_match_type ice_hash_type_list[] = { {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)}, }; static struct ice_flow_engine ice_hash_engine = {
@@ -325,6 +343,13 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,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 & ETH_RSS_IPV4) != m->eth_rss_hint) &&
@@ -334,7 +359,11 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, ((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 & ETH_RSS_NONFRAG_IPV6_SCTP) != 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");
lib/librte_ethdev/rte_ethdev.h +1 -1
@@ -521,7 +521,7 @@ struct rte_eth_rss_conf {#define ETH_RSS_AH (1ULL << 28)#define ETH_RSS_L2TPV3 (1ULL << 29)#define ETH_RSS_PFCP (1ULL << 30) - +#define ETH_RSS_PPPOE (1ULL << 31)/* * We use the following macros to combine with above ETH_RSS_* for
Signature · 1 line
2.17.1
RFC PATCH 7/8 Update/Add support for RSS on 5 Tuple Flows for GTPU encapsulated packets (AVF)
In reply to [email protected]From: gordonno <[email protected]>
--- drivers/net/iavf/iavf_generic_flow.c | 39 + drivers/net/iavf/iavf_generic_flow.h | 4 + drivers/net/iavf/iavf_hash.c | 1952 +++++++++++++++++++------- 3 files changed, 1478 insertions(+), 517 deletions(-)
drivers/net/iavf/iavf_generic_flow.c +39 -0
@@ -342,6 +342,45 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[] = { RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH ,RTE_FLOW_ITEM_TYPE_IPV4 ,
drivers/net/iavf/iavf_generic_flow.h +4 -0
@@ -185,6 +185,10 @@ extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];/* GTPU */ extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_udp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_tcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_sctp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_icmp[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp[];
drivers/net/iavf/iavf_hash.c +1435 -517
2,276 lines not on this page · raw message
Signature · 1 line
2.17.1
RFC PATCH 8/8 net/iavf: fix gtpu ip udp issue
In reply to [email protected]From: Jeff Guo <[email protected]>
--- drivers/net/iavf/iavf_hash.c | 136 ++++++++++++++++++++++++++--------- 1 file changed, 103 insertions(+), 33 deletions(-)
drivers/net/iavf/iavf_hash.c +103 -33
@@ -565,6 +565,76 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_ip = { proto_hint_ipv4 } }; +struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_only_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_only_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_only_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_only_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_src_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_src_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_src_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_src_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_dst_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_dst_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_dst_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_prot, proto_hint_udp} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_ip = { +TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_THREE , {proto_hint_gtpu_ip_only, + proto_hint_ipv4_prot, proto_hint_tcp} +}; +struct virtchnl_proto_hdrs hdrs_hint_teid_gtpu_ip = {TUNNEL_LEVEL_FIRST_INNER ,PROTO_COUNT_TWO , {proto_hint_gtpu_ip_teid} };
@@ -1309,43 +1379,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {/* IPv4 GTPU IP IPv4 UDP */ {ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_src_udp_src_gtpu_eh, + &hdrs_hint_ipv4_src_udp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_src_udp_dst_gtpu_eh, + &hdrs_hint_ipv4_src_udp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_eh, + &hdrs_hint_ipv4_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_udp_src_gtpu_eh, + &hdrs_hint_ipv4_udp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_dst_udp_src_gtpu_eh, + &hdrs_hint_ipv4_dst_udp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_udp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_udp_dst_gtpu_eh, + &hdrs_hint_ipv4_udp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_src_udp_src_gtpu_eh, + &hdrs_hint_ipv4_src_udp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_src_udp_dst_gtpu_eh, + &hdrs_hint_ipv4_src_udp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_SRC_ONLY , - &hdrs_hint_ipv4_src_gtpu_eh, + &hdrs_hint_ipv4_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,
@@ -1353,86 +1423,86 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_dst_udp_src_gtpu_eh, + &hdrs_hint_ipv4_dst_udp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_udp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L3_DST_ONLY , - &hdrs_hint_ipv4_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_udp_dst_gtpu_eh, + &hdrs_hint_ipv4_udp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP, - &hdrs_hint_ipv4_udp_gtpu_eh, + &hdrs_hint_ipv4_udp_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},/* IPv4 GTPU IP IPv4 TCP */ {ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_src_tcp_src_gtpu_eh, + &hdrs_hint_ipv4_src_tcp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh, + &hdrs_hint_ipv4_src_tcp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_eh, + &hdrs_hint_ipv4_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_tcp_src_gtpu_eh, + &hdrs_hint_ipv4_tcp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh, + &hdrs_hint_ipv4_dst_tcp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_tcp_dst_gtpu_eh, + &hdrs_hint_ipv4_tcp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_src_tcp_src_gtpu_eh, + &hdrs_hint_ipv4_src_tcp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh, + &hdrs_hint_ipv4_src_tcp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_SRC_ONLY , - &hdrs_hint_ipv4_src_gtpu_eh, + &hdrs_hint_ipv4_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_tcp_src_gtpu_eh, + &hdrs_hint_ipv4_tcp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , - &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh, + &hdrs_hint_ipv4_dst_tcp_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L3_DST_ONLY , - &hdrs_hint_ipv4_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP |ETH_RSS_L4_DST_ONLY , - &hdrs_hint_ipv4_tcp_dst_gtpu_eh, + &hdrs_hint_ipv4_tcp_dst_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP, - &hdrs_hint_ipv4_tcp_gtpu_eh, + &hdrs_hint_ipv4_tcp_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},/* GTPU EH */ /* Inner IPV4 */
Signature · 1 line
2.17.1