support RXDID22 and FDID22
cover support RXDID22 and FDID22
Support flexible descriptor RXDID22 and FDID offload in vPMD. Remove devargs flow-mark-support.
Guinan Sun (4):
net/ice: remove devargs flow-mark-support net/ice: add flow director enabled switch value net/ice: support Flex Rx desc and flow mark in AVX path net/ice: support Flex Rx desc and flow mark in SSE path
Junyu Jiang (3):
net/ice: change RSS hash parsing in AVX path
net/ice: change RSS hash parsing in SSE path
net/ice: support flexible descriptor RxDID #22
doc/guides/nics/ice.rst | 12 -- drivers/net/ice/ice_ethdev.c | 10 +- drivers/net/ice/ice_ethdev.h | 3 +- drivers/net/ice/ice_fdir_filter.c | 9 +- drivers/net/ice/ice_rxtx.c | 16 +-- drivers/net/ice/ice_rxtx.h | 72 ++++++++++++ drivers/net/ice/ice_rxtx_vec_avx2.c | 162 +++++++++++++++++++++++++- drivers/net/ice/ice_rxtx_vec_common.h | 6 - drivers/net/ice/ice_rxtx_vec_sse.c | 138 +++++++++++++++++++--- 9 files changed, 371 insertions(+), 57 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/7 net/ice: change RSS hash parsing in AVX path
From: Junyu Jiang <[email protected]>
Change RSS hash parsing from Flex Rx descriptor in AVX data path.
--- drivers/net/ice/ice_rxtx_vec_avx2.c | 98 +++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 4 deletions(-)
drivers/net/ice/ice_rxtx_vec_avx2.c +94 -4
@@ -191,8 +191,8 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts,const __m256i shuf_msk = _mm256_set_epi8 (/* first descriptor */ - 15, 14, - 13, 12, /* octet 12~15, 32 bits rss */ + 0xFF, 0xFF, + 0xFF, 0xFF, /* rss hash parsed separately */ 11, 10, /* octet 10~11, 16 bits vlan_macip */ 5, 4, /* octet 4~5, 16 bits data_len */ 0xFF, 0xFF, /* skip hi 16 bits pkt_len, zero out */
@@ -200,8 +200,8 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts,0xFF ,0xFF ,/* pkt_type set as unknown */ 0xFF ,0xFF ,/*pkt_type set as unknown */ /* second descriptor */ -15 ,14 , -13 ,12 ,/* octet 12~15, 32 bits rss */ +0xFF ,0xFF , +0xFF ,0xFF ,/* rss hash parsed separately */ 11 ,10 ,/* octet 10~11, 16 bits vlan_macip */ 5 ,4 ,/* octet 4~5, 16 bits data_len */ 0xFF, 0xFF, /* skip hi 16 bits pkt_len, zero out */
@@ -461,6 +461,96 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts,/* merge flags */ const __m256i mbuf_flags =_mm256_or_si256 (l3_l4_flags, rss_vlan_flags); + +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC +/** +* needs to load 2nd 16B of each desc for RSS hash parsing, +* will cause performance drop to get into this context. +*/ +if (rxq->vsi->adapter->eth_dev->data->dev_conf.rxmode.offloads & +DEV_RX_OFFLOAD_RSS_HASH ) { +/* load bottom half of every 32B desc */ +const __m128i raw_desc_bh7 = +_mm_load_si128 + ((void *)(&rxdp[7 ].wb.status_error1)); +rte_compiler_barrier (); +const __m128i raw_desc_bh6 = +_mm_load_si128 + ((void *)(&rxdp[6 ].wb.status_error1)); +rte_compiler_barrier (); +const __m128i raw_desc_bh5 = +_mm_load_si128 + ((void *)(&rxdp[5 ].wb.status_error1)); +rte_compiler_barrier (); +const __m128i raw_desc_bh4 = +_mm_load_si128 + ((void *)(&rxdp[4 ].wb.status_error1)); +rte_compiler_barrier (); +const __m128i raw_desc_bh3 = +_mm_load_si128 + ((void *)(&rxdp[3 ].wb.status_error1)); +rte_compiler_barrier (); +const __m128i raw_desc_bh2 = +_mm_load_si128 + ((void *)(&rxdp[2 ].wb.status_error1)); +rte_compiler_barrier (); +const __m128i raw_desc_bh1 = +_mm_load_si128 + ((void *)(&rxdp[1 ].wb.status_error1)); +rte_compiler_barrier (); +const __m128i raw_desc_bh0 = +_mm_load_si128 + ((void *)(&rxdp[0 ].wb.status_error1)); + +__m256i raw_desc_bh6_7 = +_mm256_inserti128_si256 + (_mm256_castsi128_si256 (raw_desc_bh6), + raw_desc_bh7,1 ); +__m256i raw_desc_bh4_5 = +_mm256_inserti128_si256 + (_mm256_castsi128_si256 (raw_desc_bh4), + raw_desc_bh5,1 ); +__m256i raw_desc_bh2_3 = +_mm256_inserti128_si256 + (_mm256_castsi128_si256 (raw_desc_bh2), + raw_desc_bh3,1 ); +__m256i raw_desc_bh0_1 = +_mm256_inserti128_si256 + (_mm256_castsi128_si256 (raw_desc_bh0), + raw_desc_bh1,1 ); + +/** +* to shift the 32b RSS hash value to the +* highest 32b of each 128b before mask +*/ +__m256i rss_hash6_7 = +_mm256_slli_epi64 (raw_desc_bh6_7,32 ); +__m256i rss_hash4_5 = +_mm256_slli_epi64 (raw_desc_bh4_5,32 ); +__m256i rss_hash2_3 = +_mm256_slli_epi64 (raw_desc_bh2_3,32 ); +__m256i rss_hash0_1 = +_mm256_slli_epi64 (raw_desc_bh0_1,32 ); + +__m256i rss_hash_msk = +_mm256_set_epi32 (0xFFFFFFFF ,0 ,0 ,0 , +0xFFFFFFFF ,0 ,0 ,0 ); + + rss_hash6_7 =_mm256_and_si256 + (rss_hash6_7, rss_hash_msk); + rss_hash4_5 =_mm256_and_si256 + (rss_hash4_5, rss_hash_msk); + rss_hash2_3 =_mm256_and_si256 + (rss_hash2_3, rss_hash_msk); + rss_hash0_1 =_mm256_and_si256 + (rss_hash0_1, rss_hash_msk); + + mb6_7 =_mm256_or_si256 (mb6_7, rss_hash6_7); + mb4_5 =_mm256_or_si256 (mb4_5, rss_hash4_5); + mb2_3 =_mm256_or_si256 (mb2_3, rss_hash2_3); + mb0_1 =_mm256_or_si256 (mb0_1, rss_hash0_1); + }/* if() on RSS hash parsing */ +#endif /** * At this point, we have the 8 sets of flags in the low 16-bits * of each 32-bit value in vlan0.
Signature · 1 line
2.17.1
PATCH 2/7 net/ice: change RSS hash parsing in SSE path
In reply to Guinan SunFrom: Junyu Jiang <[email protected]>
Change RSS hash parsing from Flex Rx descriptor in SSE data path.
--- drivers/net/ice/ice_rxtx_vec_sse.c | 89 ++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 16 deletions(-)
drivers/net/ice/ice_rxtx_vec_sse.c +73 -16
@@ -230,7 +230,8 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts,const __m128i zero =_mm_setzero_si128 ();/* mask to shuffle from desc. to mbuf */ const __m128i shuf_msk = _mm_set_epi8 - (15, 14, 13, 12, /* octet 12~15, 32 bits rss */ + (0xFF, 0xFF, + 0xFF, 0xFF, /* rss hash parsed separately */ 11, 10, /* octet 10~11, 16 bits vlan_macip */ 5, 4, /* octet 4~5, 16 bits data_len */ 0xFF, 0xFF, /* skip high 16 bits pkt_len, zero out */
@@ -321,7 +322,7 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, pos += ICE_DESCS_PER_LOOP, rxdp += ICE_DESCS_PER_LOOP) {__m128i descs[ICE_DESCS_PER_LOOP ]; -__m128i pkt_mb1, pkt_mb2, pkt_mb3, pkt_mb4; +__m128i pkt_mb0, pkt_mb1, pkt_mb2, pkt_mb3;__m128i staterr, sterr_tmp1, sterr_tmp2;/* 2 64 bit or 4 32 bit mbuf pointers in one XMM reg. */ __m128i mbp1;
@@ -367,8 +368,12 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts,rte_compiler_barrier ();/* D.1 pkt 3,4 convert format from desc to pktmbuf */ - pkt_mb4 =_mm_shuffle_epi8 (descs[3 ], shuf_msk); - pkt_mb3 =_mm_shuffle_epi8 (descs[2 ], shuf_msk); + pkt_mb3 =_mm_shuffle_epi8 (descs[3 ], shuf_msk); + pkt_mb2 =_mm_shuffle_epi8 (descs[2 ], shuf_msk); + +/* D.1 pkt 1,2 convert format from desc to pktmbuf */ + pkt_mb1 =_mm_shuffle_epi8 (descs[1 ], shuf_msk); + pkt_mb0 =_mm_shuffle_epi8 (descs[0 ], shuf_msk);/* C.1 4=>2 filter staterr info only */ sterr_tmp2 =_mm_unpackhi_epi32 (descs[3 ], descs[2 ]);
@@ -378,12 +383,68 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts,ice_rx_desc_to_olflags_v (rxq, descs, &rx_pkts[pos]);/* D.2 pkt 3,4 set in_port/nb_seg and remove crc */ - pkt_mb4 =_mm_add_epi16 (pkt_mb4, crc_adjust); pkt_mb3 =_mm_add_epi16 (pkt_mb3, crc_adjust); + pkt_mb2 =_mm_add_epi16 (pkt_mb2, crc_adjust); -/* D.1 pkt 1,2 convert format from desc to pktmbuf */ - pkt_mb2 =_mm_shuffle_epi8 (descs[1 ], shuf_msk); - pkt_mb1 =_mm_shuffle_epi8 (descs[0 ], shuf_msk); +/* D.2 pkt 1,2 set in_port/nb_seg and remove crc */ + pkt_mb1 =_mm_add_epi16 (pkt_mb1, crc_adjust); + pkt_mb0 =_mm_add_epi16 (pkt_mb0, crc_adjust); + +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC +/** +* needs to load 2nd 16B of each desc for RSS hash parsing, +* will cause performance drop to get into this context. +*/ +if (rxq->vsi->adapter->eth_dev->data->dev_conf.rxmode.offloads & +DEV_RX_OFFLOAD_RSS_HASH ) { +/* load bottom half of every 32B desc */ +const __m128i raw_desc_bh3 = +_mm_load_si128 + ((void *)(&rxdp[3 ].wb.status_error1)); +rte_compiler_barrier (); +const __m128i raw_desc_bh2 = +_mm_load_si128 + ((void *)(&rxdp[2 ].wb.status_error1)); +rte_compiler_barrier (); +const __m128i raw_desc_bh1 = +_mm_load_si128 + ((void *)(&rxdp[1 ].wb.status_error1)); +rte_compiler_barrier (); +const __m128i raw_desc_bh0 = +_mm_load_si128 + ((void *)(&rxdp[0 ].wb.status_error1)); + +/** +* to shift the 32b RSS hash value to the +* highest 32b of each 128b before mask +*/ +__m128i rss_hash3 = +_mm_slli_epi64 (raw_desc_bh3,32 ); +__m128i rss_hash2 = +_mm_slli_epi64 (raw_desc_bh2,32 ); +__m128i rss_hash1 = +_mm_slli_epi64 (raw_desc_bh1,32 ); +__m128i rss_hash0 = +_mm_slli_epi64 (raw_desc_bh0,32 ); + +__m128i rss_hash_msk = +_mm_set_epi32 (0xFFFFFFFF ,0 ,0 ,0 ); + + rss_hash3 =_mm_and_si128 + (rss_hash3, rss_hash_msk); + rss_hash2 =_mm_and_si128 + (rss_hash2, rss_hash_msk); + rss_hash1 =_mm_and_si128 + (rss_hash1, rss_hash_msk); + rss_hash0 =_mm_and_si128 + (rss_hash0, rss_hash_msk); + + pkt_mb3 =_mm_or_si128 (pkt_mb3, rss_hash3); + pkt_mb2 =_mm_or_si128 (pkt_mb2, rss_hash2); + pkt_mb1 =_mm_or_si128 (pkt_mb1, rss_hash1); + pkt_mb0 =_mm_or_si128 (pkt_mb0, rss_hash0); + }/* if() on RSS hash parsing */ +#endif /* C.2 get 4 pkts staterr value */ staterr =_mm_unpacklo_epi32 (sterr_tmp1, sterr_tmp2);
@@ -391,14 +452,10 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts,/* D.3 copy final 3,4 data to rx_pkts */ _mm_storeu_si128 ((void *)&rx_pkts[pos +3 ]->rx_descriptor_fields1, - pkt_mb4); + pkt_mb3);_mm_storeu_si128 ((void *)&rx_pkts[pos +2 ]->rx_descriptor_fields1, - pkt_mb3); - -/* D.2 pkt 1,2 set in_port/nb_seg and remove crc */ - pkt_mb2 =_mm_add_epi16 (pkt_mb2, crc_adjust); - pkt_mb1 =_mm_add_epi16 (pkt_mb1, crc_adjust); + pkt_mb2);/* C* extract and record EOP bit */ if (split_packet) {
@@ -422,9 +479,9 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts,/* D.3 copy final 1,2 data to rx_pkts */ _mm_storeu_si128 ((void *)&rx_pkts[pos +1 ]->rx_descriptor_fields1, - pkt_mb2); + pkt_mb1);_mm_storeu_si128 ((void *)&rx_pkts[pos]->rx_descriptor_fields1, - pkt_mb1); + pkt_mb0);ice_rx_desc_to_ptype_v (descs, &rx_pkts[pos], ptype_tbl);/* C.4 calc avaialbe number of desc */ var =__builtin_popcountll (_mm_cvtsi128_si64 (staterr));
Signature · 1 line
2.17.1
PATCH 3/7 net/ice: support flexible descriptor RxDID #22
In reply to Guinan SunFrom: Junyu Jiang <[email protected]>
Add structure and macro definition for flex Rx descriptor RxDID #22, and support flex Rx descriptor RxDID #22 format in normal path.
--- drivers/net/ice/ice_rxtx.c | 16 ++++++++------- drivers/net/ice/ice_rxtx.h | 42 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 7 deletions(-)
drivers/net/ice/ice_rxtx.c +9 -7
@@ -50,7 +50,7 @@ static inline uint8_t ice_proto_xtr_type_to_rxdid(uint8_t xtr_type) {static uint8_t rxdid_map[] = { - [PROTO_XTR_NONE ] =ICE_RXDID_COMMS_GENERIC , + [PROTO_XTR_NONE ] =ICE_RXDID_COMMS_OVS , [PROTO_XTR_VLAN ] =ICE_RXDID_COMMS_AUX_VLAN , [PROTO_XTR_IPV4 ] =ICE_RXDID_COMMS_AUX_IPV4 , [PROTO_XTR_IPV6 ] =ICE_RXDID_COMMS_AUX_IPV6 ,
@@ -59,7 +59,7 @@ ice_proto_xtr_type_to_rxdid(uint8_t xtr_type) };return xtr_type <RTE_DIM (rxdid_map) ? - rxdid_map[xtr_type] :ICE_RXDID_COMMS_GENERIC ; + rxdid_map[xtr_type] :ICE_RXDID_COMMS_OVS ; } static enum ice_status
@@ -72,7 +72,7 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)enum ice_status err;uint16_t buf_size, len;struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; -uint32_t rxdid =ICE_RXDID_COMMS_GENERIC ; +uint32_t rxdid =ICE_RXDID_COMMS_OVS ;uint32_t regval;/* Set buffer size as the head split is disabled. */
@@ -1309,7 +1309,7 @@ ice_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp)static void ice_rxd_to_proto_xtr (struct rte_mbuf *mb, -volatile struct ice_32b_rx_flex_desc_comms *desc) +volatile struct ice_32b_rx_flex_desc_comms_ovs *desc) {uint16_t stat_err =rte_le_to_cpu_16 (desc->status_error1);uint32_t metadata;
@@ -1338,8 +1338,9 @@ static inline void ice_rxd_to_pkt_fields(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp) { - volatile struct ice_32b_rx_flex_desc_comms *desc = - (volatile struct ice_32b_rx_flex_desc_comms *)rxdp; + volatile struct ice_32b_rx_flex_desc_comms_ovs *desc = + (volatile struct ice_32b_rx_flex_desc_comms_ovs *)rxdp; +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC uint16_t stat_err; stat_err =rte_le_to_cpu_16 (desc->status_error0);
@@ -1347,13 +1348,14 @@ ice_rxd_to_pkt_fields(struct rte_mbuf *mb, mb->ol_flags |=PKT_RX_RSS_HASH ; mb->hash.rss = rte_le_to_cpu_32(desc->rss_hash); } +#endif -#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC if (desc->flow_id !=0xFFFFFFFF ) { mb->ol_flags |=PKT_RX_FDIR |PKT_RX_FDIR_ID ; mb->hash.fdir.hi =rte_le_to_cpu_32 (desc->flow_id); } +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC if (unlikely (rte_net_ice_dynf_proto_xtr_metadata_avail ()))ice_rxd_to_proto_xtr (mb, desc);#endif
drivers/net/ice/ice_rxtx.h +42 -0
54 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 4/7 net/ice: remove devargs flow-mark-support
In reply to Guinan SunRemove devargs "flow-mark-support".
--- doc/guides/nics/ice.rst | 12 ------------ drivers/net/ice/ice_ethdev.c | 10 +--------- drivers/net/ice/ice_ethdev.h | 1 - drivers/net/ice/ice_rxtx_vec_common.h | 6 ------ 4 files changed, 1 insertion(+), 28 deletions(-)
doc/guides/nics/ice.rst +0 -12
@@ -75,18 +75,6 @@ Runtime Config Options -w 80:00.0,pipeline-mode-support=1 -- ``Flow Mark Support`` (default ``0``) - - This is a hint to the driver to select the data path that supports flow mark extraction - by default. - NOTE: This is an experimental devarg, it will be removed when any of below conditions - is ready. - 1) all data paths support flow mark (currently vPMD does not) - 2) a new offload like RTE_DEV_RX_OFFLOAD_FLOW_MARK be introduced as a standard way to hint. - Example:: - - -w 80:00.0,flow-mark-support=1 - - ``Protocol extraction for per queue`` Configure the RX queues to do protocol extraction into mbuf for protocol
drivers/net/ice/ice_ethdev.c +1 -9
@@ -23,13 +23,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support" -#define ICE_FLOW_MARK_SUPPORT_ARG "flow-mark-support"#define ICE_PROTO_XTR_ARG "proto_xtr"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG ,ICE_PIPELINE_MODE_SUPPORT_ARG , -ICE_FLOW_MARK_SUPPORT_ARG ,ICE_PROTO_XTR_ARG ,NULL };
@@ -1985,11 +1983,6 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)if (ret) goto bail; - ret =rte_kvargs_process (kvlist,ICE_FLOW_MARK_SUPPORT_ARG , - &parse_bool, &ad->devargs.flow_mark_support); -if (ret) - goto bail; - bail:rte_kvargs_free (kvlist);return ret;
@@ -5131,8 +5124,7 @@ RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci");RTE_PMD_REGISTER_PARAM_STRING (net_ice,ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp>" ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" -ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" -ICE_FLOW_MARK_SUPPORT_ARG "=<0|1>" ); +ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" );RTE_LOG_REGISTER (ice_logtype_init, pmd.net.ice.init,NOTICE );RTE_LOG_REGISTER (ice_logtype_driver, pmd.net.ice.driver,NOTICE );
drivers/net/ice/ice_ethdev.h +0 -1
@@ -443,7 +443,6 @@ struct ice_devargs {int safe_mode_support;uint8_t proto_xtr_dflt;int pipe_mode_support; -int flow_mark_support;uint8_t proto_xtr[ICE_MAX_QUEUE_NUM ]; };
drivers/net/ice/ice_rxtx_vec_common.h +0 -6
@@ -270,12 +270,6 @@ ice_rx_vec_dev_check_default(struct rte_eth_dev *dev) {int i;struct ice_rx_queue *rxq; -struct ice_adapter *ad = -ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); - -/* vPMD does not support flow mark. */ -if (ad->devargs.flow_mark_support) -return -1 ;for (i =0 ; i < dev->data->nb_rx_queues; i++) { rxq = dev->data->rx_queues[i];
Signature · 1 line
2.17.1
PATCH 5/7 net/ice: add flow director enabled switch value
In reply to Guinan SunThe commit adds fdir_enabled flag into ice_adapter structure to identify if fdir id is active. Rx data path can be benefit if fdir id parsing is not needed, especially in vector path.
--- drivers/net/ice/ice_ethdev.h | 2 ++ drivers/net/ice/ice_fdir_filter.c | 9 ++++++++- drivers/net/ice/ice_rxtx.h | 30 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-)
drivers/net/ice/ice_ethdev.h +2 -0
@@ -285,6 +285,7 @@ struct ice_fdir_filter_conf {struct rte_flow_action_count act_count;uint64_t input_set; +uint32_t mark_flag; };#define ICE_MAX_FDIR_FILTER_NUM (1024 * 16)
@@ -463,6 +464,7 @@ struct ice_adapter {bool is_safe_mode;struct ice_devargs devargs;enum ice_pkg_type active_pkg_type;/* loaded ddp package type */ +uint16_t fdir_ref_cnt; };struct ice_vsi_vlan_pvid_info {
drivers/net/ice/ice_fdir_filter.c +8 -1
@@ -1329,6 +1329,9 @@ ice_fdir_create_filter(struct ice_adapter *ad, goto free_counter; } +if (filter->mark_flag ==1 ) +ice_fdir_rx_proc_enable (ad,1 ); +rte_memcpy (entry, filter,sizeof (*entry)); ret =ice_fdir_entry_insert (pf, entry, &key);if (ret) {
@@ -1401,6 +1404,10 @@ ice_fdir_destroy_filter(struct ice_adapter *ad, }ice_fdir_cnt_update (pf, filter->input.flow_type, is_tun, false); + +if (filter->mark_flag ==1 ) +ice_fdir_rx_proc_enable (ad,0 ); + flow->rule =NULL ;rte_free (filter);
@@ -1573,7 +1580,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,break ;case RTE_FLOW_ACTION_TYPE_MARK : mark_num++; - + filter->mark_flag =1 ; mark_spec = actions->conf; filter->input.fltr_id = mark_spec->id; filter->input.fdid_prio =ICE_FXD_FLTR_QW1_FDID_PRI_ONE ;
drivers/net/ice/ice_rxtx.h +30 -0
@@ -70,6 +70,7 @@ struct ice_rx_queue {uint8_t port_id;/* device port ID */ uint8_t crc_len;/* 0 if CRC stripped, 4 otherwise */ +uint8_t fdir_enabled;/* 0 if FDIR disabled, 1 when enabled */ uint16_t queue_id;/* RX queue index */ uint16_t reg_idx;/* RX queue register index */ uint8_t drop_en;/* if not 0, set register bit */
@@ -245,4 +246,33 @@ uint16_t ice_xmit_pkts_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,int ice_fdir_programming (struct ice_pf *pf,struct ice_fltr_desc *fdir_desc);int ice_tx_done_cleanup (void *txq,uint32_t free_cnt); +#define FDIR_PROC_ENABLE_PER_QUEUE (ad, on) do { \ + int i; \ + for (i = 0; i < (ad)->eth_dev->data->nb_rx_queues; i++) { \ + struct ice_rx_queue *rxq = (ad)->eth_dev->data->rx_queues[i]; \ + if (!rxq) \ + continue; \ + rxq->fdir_enabled = on; \ + } \ + PMD_DRV_LOG(DEBUG, "FDIR processing on RX set to %d", on); \ +} while (0) + +/* Enable/disable flow director Rx processing in data path. */ +static inline +void ice_fdir_rx_proc_enable (struct ice_adapter *ad,bool on) +{ +if (on) { +/* enable flow director processing */ +FDIR_PROC_ENABLE_PER_QUEUE (ad, on); + ad->fdir_ref_cnt++; + }else { +if (ad->fdir_ref_cnt >=1 ) { + ad->fdir_ref_cnt--; + +if (ad->fdir_ref_cnt ==0 ) +FDIR_PROC_ENABLE_PER_QUEUE (ad, on); + } + } +} +#endif /* _ICE_RXTX_H_ */
Signature · 1 line
2.17.1
PATCH 6/7 net/ice: support Flex Rx desc and flow mark in AVX path
In reply to Guinan SunSupport Flow Director mark ID parsing from Flex
Rx descriptor in AVX path.
--- drivers/net/ice/ice_rxtx_vec_avx2.c | 64 ++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-)
drivers/net/ice/ice_rxtx_vec_avx2.c +63 -1
@@ -132,6 +132,25 @@ ice_rxq_rearm(struct ice_rx_queue *rxq)ICE_PCI_REG_WRITE (rxq->qrx_tail, rx_id); } +static inline __m256i +ice_flex_rxd_to_fdir_flags_vec_avx2 (const __m256i fdir_id0_7) +{ +#define FDID_MIS_MAGIC 0xFFFFFFFF +RTE_BUILD_BUG_ON (PKT_RX_FDIR != (1 <<2 )); +RTE_BUILD_BUG_ON (PKT_RX_FDIR_ID != (1 <<13 )); +const __m256i pkt_fdir_bit =_mm256_set1_epi32 (PKT_RX_FDIR | +PKT_RX_FDIR_ID ); +/* desc->flow_id field == 0xFFFFFFFF means fdir mismatch */ +const __m256i fdir_mis_mask =_mm256_set1_epi32 (FDID_MIS_MAGIC ); +__m256i fdir_mask =_mm256_cmpeq_epi32 (fdir_id0_7, + fdir_mis_mask); +/* this XOR op results to bit-reverse the fdir_mask */ + fdir_mask =_mm256_xor_si256 (fdir_mask, fdir_mis_mask); +const __m256i fdir_flags =_mm256_and_si256 (fdir_mask, pkt_fdir_bit); + +return fdir_flags; +} +static inline uint16_t _ice_recv_raw_pkts_vec_avx2 (struct ice_rx_queue *rxq,struct rte_mbuf **rx_pkts,uint16_t nb_pkts,uint8_t *split_packet)
@@ -459,9 +478,51 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, rss_vlan_flag_bits);/* merge flags */ -const __m256i mbuf_flags =_mm256_or_si256 (l3_l4_flags, +__m256i mbuf_flags =_mm256_or_si256 (l3_l4_flags, rss_vlan_flags); +if (rxq->fdir_enabled) { +const __m256i fdir_id4_7 = +_mm256_unpackhi_epi32 (raw_desc6_7, raw_desc4_5); + +const __m256i fdir_id0_3 = +_mm256_unpackhi_epi32 (raw_desc2_3, raw_desc0_1); + +const __m256i fdir_id0_7 = +_mm256_unpackhi_epi64 (fdir_id4_7, fdir_id0_3); + +const __m256i fdir_flags = +ice_flex_rxd_to_fdir_flags_vec_avx2 (fdir_id0_7); + +/* merge with fdir_flags */ + mbuf_flags =_mm256_or_si256 (mbuf_flags, fdir_flags); + +/* write to mbuf: have to use scalar store here */ + rx_pkts[i +0 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,3 ); + + rx_pkts[i +1 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,7 ); + + rx_pkts[i +2 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,2 ); + + rx_pkts[i +3 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,6 ); + + rx_pkts[i +4 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,1 ); + + rx_pkts[i +5 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,5 ); + + rx_pkts[i +6 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,0 ); + + rx_pkts[i +7 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,4 ); + }/* if() on fdir_enabled */ +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC /** * needs to load 2nd 16B of each desc for RSS hash parsing,
@@ -551,6 +612,7 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, mb0_1 = _mm256_or_si256(mb0_1, rss_hash0_1); }/* if() on RSS hash parsing */ #endif +/** * At this point, we have the 8 sets of flags in the low 16-bits * of each 32-bit value in vlan0.
Signature · 1 line
2.17.1
PATCH 7/7 net/ice: support Flex Rx desc and flow mark in SSE path
In reply to Guinan SunSupport Flow Director mark ID parsing from Flex
Rx descriptor in SSE path.
--- drivers/net/ice/ice_rxtx_vec_sse.c | 49 ++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
drivers/net/ice/ice_rxtx_vec_sse.c +49 -0
@@ -10,6 +10,25 @@#pragma GCC diagnostic ignored "-Wcast-qual"#endif +static inline __m128i +ice_flex_rxd_to_fdir_flags_vec (const __m128i fdir_id0_3) +{ +#define FDID_MIS_MAGIC 0xFFFFFFFF +RTE_BUILD_BUG_ON (PKT_RX_FDIR != (1 <<2 )); +RTE_BUILD_BUG_ON (PKT_RX_FDIR_ID != (1 <<13 )); +const __m128i pkt_fdir_bit =_mm_set1_epi32 (PKT_RX_FDIR | +PKT_RX_FDIR_ID ); +/* desc->flow_id field == 0xFFFFFFFF means fdir mismatch */ +const __m128i fdir_mis_mask =_mm_set1_epi32 (FDID_MIS_MAGIC ); +__m128i fdir_mask =_mm_cmpeq_epi32 (fdir_id0_3, + fdir_mis_mask); +/* this XOR op results to bit-reverse the fdir_mask */ + fdir_mask =_mm_xor_si128 (fdir_mask, fdir_mis_mask); +const __m128i fdir_flags =_mm_and_si128 (fdir_mask, pkt_fdir_bit); + +return fdir_flags; +} +static inline void ice_rxq_rearm (struct ice_rx_queue *rxq) {
@@ -159,6 +178,36 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq, __m128i descs[4],/* merge the flags */ flags =_mm_or_si128 (flags, rss_vlan); +if (rxq->fdir_enabled) { +const __m128i fdir_id0_1 = +_mm_unpackhi_epi32 (descs[0 ], descs[1 ]); + +const __m128i fdir_id2_3 = +_mm_unpackhi_epi32 (descs[2 ], descs[3 ]); + +const __m128i fdir_id0_3 = +_mm_unpackhi_epi64 (fdir_id0_1, fdir_id2_3); + +const __m128i fdir_flags = +ice_flex_rxd_to_fdir_flags_vec (fdir_id0_3); + +/* merge with fdir_flags */ + flags =_mm_or_si128 (flags, fdir_flags); + +/* write fdir_id to mbuf */ + rx_pkts[0 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,0 ); + + rx_pkts[1 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,1 ); + + rx_pkts[2 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,2 ); + + rx_pkts[3 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,3 ); + }/* if() on fdir_enabled */ +/** * At this point, we have the 4 sets of flags in the low 16-bits * of each 32-bit value in flags.
Signature · 1 line
2.17.1
Quoted 21 lines
-----Original Message-----
From: Sun, GuinanX <[email protected]>
Sent: Wednesday, August 26, 2020 3:55 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>
Subject: [PATCH 0/7] support RXDID22 and FDID22Support flexible descriptor RXDID22 and FDID offload in vPMD. Remove devargs flow-mark-support.
Guinan Sun (4):
net/ice: remove devargs flow-mark-support net/ice: add flow director enabled switch value net/ice: support Flex Rx desc and flow mark in AVX path net/ice: support Flex Rx desc and flow mark in SSE path
Quoted 4 lines
Junyu Jiang (3):
net/ice: change RSS hash parsing in AVX path
net/ice: change RSS hash parsing in SSE path
net/ice: support flexible descriptor RxDID #22
Can you combine above 3 patches into 1 and reorder other 4 patches as below?
net/ice: add flow director enabled switch value net/ice: support Flex Rx desc and flow mark in AVX path net/ice: support Flex Rx desc and flow mark in SSE path net/ice: remove devargs flow-mark-support
so it will not break regression test.
Quoted 14 lines
doc/guides/nics/ice.rst | 12 -- drivers/net/ice/ice_ethdev.c | 10 +- drivers/net/ice/ice_ethdev.h | 3 +- drivers/net/ice/ice_fdir_filter.c | 9 +- drivers/net/ice/ice_rxtx.c | 16 +-- drivers/net/ice/ice_rxtx.h | 72 ++++++++++++ drivers/net/ice/ice_rxtx_vec_avx2.c | 162 +++++++++++++++++++++++++- drivers/net/ice/ice_rxtx_vec_common.h | 6 - drivers/net/ice/ice_rxtx_vec_sse.c | 138 +++++++++++++++++++--- 9 files changed, 371 insertions(+), 57 deletions(-)--
2.17.1
Quoted 31 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Monday, September 7, 2020 1:44 PM
To: Sun, GuinanX <[email protected]>; Jiang, JunyuX <[email protected]>; [email protected]
Cc: Yang, Qiming <[email protected]>
Subject: RE: [PATCH 0/7] support RXDID22 and FDID22Quoted 17 lines
-----Original Message-----
From: Sun, GuinanX <[email protected]>
Sent: Wednesday, August 26, 2020 3:55 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>
Subject: [PATCH 0/7] support RXDID22 and FDID22Support flexible descriptor RXDID22 and FDID offload in vPMD. Remove devargs flow-mark-support.
Guinan Sun (4):
net/ice: remove devargs flow-mark-support net/ice: add flow director enabled switch value net/ice: support Flex Rx desc and flow mark in AVX path net/ice: support Flex Rx desc and flow mark in SSE path
Quoted 8 lines
Quoted 4 lines
Junyu Jiang (3):
net/ice: change RSS hash parsing in AVX path
net/ice: change RSS hash parsing in SSE path
net/ice: support flexible descriptor RxDID #22Can you combine above 3 patches into 1 and reorder other 4 patches as below?
OK.
Quoted 21 lines
net/ice: add flow director enabled switch value net/ice: support Flex Rx desc and flow mark in AVX path net/ice: support Flex Rx desc and flow mark in SSE path net/ice: remove devargs flow-mark-support
so it will not break regression test.
Quoted 8 lines
doc/guides/nics/ice.rst | 12 -- drivers/net/ice/ice_ethdev.c | 10 +- drivers/net/ice/ice_ethdev.h | 3 +- drivers/net/ice/ice_fdir_filter.c | 9 +- drivers/net/ice/ice_rxtx.c | 16 +-- drivers/net/ice/ice_rxtx.h | 72 ++++++++++++ drivers/net/ice/ice_rxtx_vec_avx2.c | 162+++++++++++++++++++++++++-
Quoted 6 lines
drivers/net/ice/ice_rxtx_vec_common.h | 6 - drivers/net/ice/ice_rxtx_vec_sse.c | 138 +++++++++++++++++++--- 9 files changed, 371 insertions(+), 57 deletions(-)--
2.17.1
v2 cover supports RxDID #22 and FDID
In reply to Guinan SunThis patchset supports flex Rx descriptor RxDID #22 and FDID offload in vPMD.Remove devargs "flow-mark-support".
v2:
-Reorder patches.
Guinan Sun (4):
net/ice: add flow director enabled switch value
net/ice: support flow mark in AVX path
net/ice: support flow mark in SSE path
net/ice: remove devargs flow-mark-support
Junyu Jiang (1):
net/ice: support flex Rx descriptor RxDID #22
doc/guides/nics/ice.rst | 12 -- drivers/net/ice/ice_ethdev.c | 10 +- drivers/net/ice/ice_ethdev.h | 3 +- drivers/net/ice/ice_fdir_filter.c | 9 +- drivers/net/ice/ice_rxtx.c | 16 +-- drivers/net/ice/ice_rxtx.h | 72 ++++++++++++ drivers/net/ice/ice_rxtx_vec_avx2.c | 162 +++++++++++++++++++++++++- drivers/net/ice/ice_rxtx_vec_common.h | 6 - drivers/net/ice/ice_rxtx_vec_sse.c | 138 +++++++++++++++++++--- 9 files changed, 371 insertions(+), 57 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/5 net/ice: support flex Rx descriptor RxDID #22
This patch supports RxDID #22 by the following changes:
-add structure and macro definition for RxDID #22, -support RxDID #22 format in normal path,
-change RSS hash parsing from RxDID #22 in AVX/SSE data path.
--- drivers/net/ice/ice_rxtx.c | 16 ++--- drivers/net/ice/ice_rxtx.h | 42 +++++++++++++ drivers/net/ice/ice_rxtx_vec_avx2.c | 98 +++++++++++++++++++++++++++-- drivers/net/ice/ice_rxtx_vec_sse.c | 89 +++++++++++++++++++++----- 4 files changed, 218 insertions(+), 27 deletions(-)
drivers/net/ice/ice_rxtx.c +9 -7
@@ -50,7 +50,7 @@ static inline uint8_t ice_proto_xtr_type_to_rxdid(uint8_t xtr_type) {static uint8_t rxdid_map[] = { - [PROTO_XTR_NONE ] =ICE_RXDID_COMMS_GENERIC , + [PROTO_XTR_NONE ] =ICE_RXDID_COMMS_OVS , [PROTO_XTR_VLAN ] =ICE_RXDID_COMMS_AUX_VLAN , [PROTO_XTR_IPV4 ] =ICE_RXDID_COMMS_AUX_IPV4 , [PROTO_XTR_IPV6 ] =ICE_RXDID_COMMS_AUX_IPV6 ,
@@ -59,7 +59,7 @@ ice_proto_xtr_type_to_rxdid(uint8_t xtr_type) };return xtr_type <RTE_DIM (rxdid_map) ? - rxdid_map[xtr_type] :ICE_RXDID_COMMS_GENERIC ; + rxdid_map[xtr_type] :ICE_RXDID_COMMS_OVS ; } static enum ice_status
@@ -72,7 +72,7 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)enum ice_status err;uint16_t buf_size, len;struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; -uint32_t rxdid =ICE_RXDID_COMMS_GENERIC ; +uint32_t rxdid =ICE_RXDID_COMMS_OVS ;uint32_t regval;/* Set buffer size as the head split is disabled. */
@@ -1309,7 +1309,7 @@ ice_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp)static void ice_rxd_to_proto_xtr (struct rte_mbuf *mb, -volatile struct ice_32b_rx_flex_desc_comms *desc) +volatile struct ice_32b_rx_flex_desc_comms_ovs *desc) {uint16_t stat_err =rte_le_to_cpu_16 (desc->status_error1);uint32_t metadata;
@@ -1338,8 +1338,9 @@ static inline void ice_rxd_to_pkt_fields(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp) { - volatile struct ice_32b_rx_flex_desc_comms *desc = - (volatile struct ice_32b_rx_flex_desc_comms *)rxdp; + volatile struct ice_32b_rx_flex_desc_comms_ovs *desc = + (volatile struct ice_32b_rx_flex_desc_comms_ovs *)rxdp; +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC uint16_t stat_err; stat_err =rte_le_to_cpu_16 (desc->status_error0);
@@ -1347,13 +1348,14 @@ ice_rxd_to_pkt_fields(struct rte_mbuf *mb, mb->ol_flags |=PKT_RX_RSS_HASH ; mb->hash.rss = rte_le_to_cpu_32(desc->rss_hash); } +#endif -#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC if (desc->flow_id !=0xFFFFFFFF ) { mb->ol_flags |=PKT_RX_FDIR |PKT_RX_FDIR_ID ; mb->hash.fdir.hi =rte_le_to_cpu_32 (desc->flow_id); } +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC if (unlikely (rte_net_ice_dynf_proto_xtr_metadata_avail ()))ice_rxd_to_proto_xtr (mb, desc);#endif
drivers/net/ice/ice_rxtx.h +42 -0
54 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_avx2.c +94 -4
116 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_sse.c +73 -16
130 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 2/5 net/ice: add flow director enabled switch value
In reply to Junyu JiangFrom: Guinan Sun <[email protected]>
The commit adds fdir_enabled flag into ice_adapter structure to identify if fdir id is active. Rx data path can be benefit if fdir id parsing is not needed, especially in vector path.
--- drivers/net/ice/ice_ethdev.h | 2 ++ drivers/net/ice/ice_fdir_filter.c | 9 ++++++++- drivers/net/ice/ice_rxtx.h | 30 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-)
drivers/net/ice/ice_ethdev.h +2 -0
@@ -285,6 +285,7 @@ struct ice_fdir_filter_conf {struct rte_flow_action_count act_count;uint64_t input_set; +uint32_t mark_flag; };#define ICE_MAX_FDIR_FILTER_NUM (1024 * 16)
@@ -464,6 +465,7 @@ struct ice_adapter {bool is_safe_mode;struct ice_devargs devargs;enum ice_pkg_type active_pkg_type;/* loaded ddp package type */ +uint16_t fdir_ref_cnt; };struct ice_vsi_vlan_pvid_info {
drivers/net/ice/ice_fdir_filter.c +8 -1
@@ -1329,6 +1329,9 @@ ice_fdir_create_filter(struct ice_adapter *ad, goto free_counter; } +if (filter->mark_flag ==1 ) +ice_fdir_rx_proc_enable (ad,1 ); +rte_memcpy (entry, filter,sizeof (*entry)); ret =ice_fdir_entry_insert (pf, entry, &key);if (ret) {
@@ -1401,6 +1404,10 @@ ice_fdir_destroy_filter(struct ice_adapter *ad, }ice_fdir_cnt_update (pf, filter->input.flow_type, is_tun, false); + +if (filter->mark_flag ==1 ) +ice_fdir_rx_proc_enable (ad,0 ); + flow->rule =NULL ;rte_free (filter);
@@ -1573,7 +1580,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,break ;case RTE_FLOW_ACTION_TYPE_MARK : mark_num++; - + filter->mark_flag =1 ; mark_spec = actions->conf; filter->input.fltr_id = mark_spec->id; filter->input.fdid_prio =ICE_FXD_FLTR_QW1_FDID_PRI_ONE ;
drivers/net/ice/ice_rxtx.h +30 -0
@@ -70,6 +70,7 @@ struct ice_rx_queue {uint8_t port_id;/* device port ID */ uint8_t crc_len;/* 0 if CRC stripped, 4 otherwise */ +uint8_t fdir_enabled;/* 0 if FDIR disabled, 1 when enabled */ uint16_t queue_id;/* RX queue index */ uint16_t reg_idx;/* RX queue register index */ uint8_t drop_en;/* if not 0, set register bit */
@@ -245,4 +246,33 @@ uint16_t ice_xmit_pkts_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,int ice_fdir_programming (struct ice_pf *pf,struct ice_fltr_desc *fdir_desc);int ice_tx_done_cleanup (void *txq,uint32_t free_cnt); +#define FDIR_PROC_ENABLE_PER_QUEUE (ad, on) do { \ + int i; \ + for (i = 0; i < (ad)->eth_dev->data->nb_rx_queues; i++) { \ + struct ice_rx_queue *rxq = (ad)->eth_dev->data->rx_queues[i]; \ + if (!rxq) \ + continue; \ + rxq->fdir_enabled = on; \ + } \ + PMD_DRV_LOG(DEBUG, "FDIR processing on RX set to %d", on); \ +} while (0) + +/* Enable/disable flow director Rx processing in data path. */ +static inline +void ice_fdir_rx_proc_enable (struct ice_adapter *ad,bool on) +{ +if (on) { +/* enable flow director processing */ +FDIR_PROC_ENABLE_PER_QUEUE (ad, on); + ad->fdir_ref_cnt++; + }else { +if (ad->fdir_ref_cnt >=1 ) { + ad->fdir_ref_cnt--; + +if (ad->fdir_ref_cnt ==0 ) +FDIR_PROC_ENABLE_PER_QUEUE (ad, on); + } + } +} +#endif /* _ICE_RXTX_H_ */
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v2 2/5] net/ice: add flow director enabled switch value
Quoted 10 lines
-----Original Message-----
From: Jiang, JunyuX <[email protected]>
Sent: Monday, September 7, 2020 17:17
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>
Subject: [PATCH v2 2/5] net/ice: add flow director enabled switch value
Quoted 4 lines
From: Guinan Sun <[email protected]>
The commit adds
fdir_enabledflag intoice_adapterstructure to identify if fdir id is active. Rx data path can be benefit if fdir id parsing is not needed,
Don't use abbreviation and check your grammar.
Quoted 90 lines
especially in vector path.
Signed-off-by Guinan Sun <[email protected]>--- drivers/net/ice/ice_ethdev.h | 2 ++ drivers/net/ice/ice_fdir_filter.c | 9 ++++++++- drivers/net/ice/ice_rxtx.h | 30 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-)drivers/net/ice/ice_ethdev.h +2
-0@@ -285,6 +285,7 @@ struct ice_fdir_filter_conf {struct rte_flow_action_count act_count;uint64_t input_set; +uint32_t mark_flag; };#define ICE_MAX_FDIR_FILTER_NUM (1024 * 16)@@ -464,6 +465,7 @@ struct ice_adapter {bool is_safe_mode;struct ice_devargs devargs;enum ice_pkg_type active_pkg_type;/* loaded ddp package type */ +uint16_t fdir_ref_cnt; };struct ice_vsi_vlan_pvid_info {drivers/net/ice/ice_fdir_filter.c +8
-1@@ -1329,6 +1329,9 @@ ice_fdir_create_filter(struct ice_adapter *ad, goto free_counter; } +if (filter->mark_flag ==1 ) +ice_fdir_rx_proc_enable (ad,1 ); +rte_memcpy (entry, filter,sizeof (*entry)); ret =ice_fdir_entry_insert (pf, entry, &key);if (ret) {@@ -1401,6 +1404,10 @@ ice_fdir_destroy_filter(struct ice_adapter *ad, }ice_fdir_cnt_update (pf, filter->input.flow_type, is_tun, false); + +if (filter->mark_flag ==1 ) +ice_fdir_rx_proc_enable (ad,0 ); + flow->rule =NULL ;rte_free (filter);@@ -1573,7 +1580,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,break ;case RTE_FLOW_ACTION_TYPE_MARK : mark_num++; - + filter->mark_flag =1 ; mark_spec = actions->conf; filter->input.fltr_id = mark_spec->id; filter->input.fdid_prio =
ICE_FXD_FLTR_QW1_FDID_PRI_ONE; diff --gita/drivers/net/ice/ice_rxtx.hb/drivers/net/ice/ice_rxtx.hindexe21ba152d..69d6e0b8b100644drivers/net/ice/ice_rxtx.h +1
-0@@ -70,6 +70,7 @@ struct ice_rx_queue {uint8_t port_id;/* device port ID */ uint8_t crc_len;/* 0 if CRC stripped, 4 otherwise */ +uint8_t fdir_enabled;/* 0 if FDIR disabled, 1 when enabled */ uint16_t queue_id;/* RX queue index */ uint16_t reg_idx;/* RX queue register index */ uint8_t drop_en; /* if not 0, set register bit */ @@ -245,4 +246,33@@
uint16_tice_xmit_pkts_vec_avx2(void*tx_queue, structrte_mbuf**tx_pkts, intice_fdir_programming(struct ice_pf *pf, struct ice_fltr_desc *fdir_desc); intice_tx_done_cleanup(void *txq, uint32_t free_cnt);drivers/net/ice/ice_rxtx.h +4
-0+#define FDIR_PROC_ENABLE_PER_QUEUE (ad, on) do { \ + int i; \ + for (i = 0; i < (ad)->eth_dev->data->nb_rx_queues; i++) { \ + struct ice_rx_queue *rxq = (ad)->eth_dev->data-Quoted 1 line
rx_queues[i]; \
drivers/net/ice/ice_rxtx.h +5
-0+if (!rxq) \ +continue ; \ + rxq->fdir_enabled = on; \ + } \ + PMD_DRV_LOG(DEBUG, "FDIR processing on RX set to %d", on); \ }while
drivers/net/ice/ice_rxtx.h
Quoted 3 lines
drivers/net/ice/ice_rxtx.h +3
-0+(0 ) + +/* Enable/disable flow director Rx processing in data path. */ static
Wha't do you mean ' flow director Rx processing '?
Quoted 18 lines
drivers/net/ice/ice_rxtx.h +15
-1+inline void ice_fdir_rx_proc_enable (struct ice_adapter *ad,bool on) { +if (on) { +/* enable flow director processing */ +FDIR_PROC_ENABLE_PER_QUEUE (ad, on); + ad->fdir_ref_cnt++; + }else { +if (ad->fdir_ref_cnt >=1 ) { + ad->fdir_ref_cnt--; + +if (ad->fdir_ref_cnt ==0 ) +FDIR_PROC_ENABLE_PER_QUEUE (ad, on); + } + } +} +#endif /* _ICE_RXTX_H_ */ --2.17.1
PATCH v2 3/5 net/ice: support flow mark in AVX path
In reply to Junyu JiangFrom: Guinan Sun <[email protected]>
Support Flow Director mark ID parsing from Flex
Rx descriptor in AVX path.
--- drivers/net/ice/ice_rxtx_vec_avx2.c | 64 ++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-)
drivers/net/ice/ice_rxtx_vec_avx2.c +63 -1
@@ -132,6 +132,25 @@ ice_rxq_rearm(struct ice_rx_queue *rxq)ICE_PCI_REG_WRITE (rxq->qrx_tail, rx_id); } +static inline __m256i +ice_flex_rxd_to_fdir_flags_vec_avx2 (const __m256i fdir_id0_7) +{ +#define FDID_MIS_MAGIC 0xFFFFFFFF +RTE_BUILD_BUG_ON (PKT_RX_FDIR != (1 <<2 )); +RTE_BUILD_BUG_ON (PKT_RX_FDIR_ID != (1 <<13 )); +const __m256i pkt_fdir_bit =_mm256_set1_epi32 (PKT_RX_FDIR | +PKT_RX_FDIR_ID ); +/* desc->flow_id field == 0xFFFFFFFF means fdir mismatch */ +const __m256i fdir_mis_mask =_mm256_set1_epi32 (FDID_MIS_MAGIC ); +__m256i fdir_mask =_mm256_cmpeq_epi32 (fdir_id0_7, + fdir_mis_mask); +/* this XOR op results to bit-reverse the fdir_mask */ + fdir_mask =_mm256_xor_si256 (fdir_mask, fdir_mis_mask); +const __m256i fdir_flags =_mm256_and_si256 (fdir_mask, pkt_fdir_bit); + +return fdir_flags; +} +static inline uint16_t _ice_recv_raw_pkts_vec_avx2 (struct ice_rx_queue *rxq,struct rte_mbuf **rx_pkts,uint16_t nb_pkts,uint8_t *split_packet)
@@ -459,9 +478,51 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, rss_vlan_flag_bits);/* merge flags */ -const __m256i mbuf_flags =_mm256_or_si256 (l3_l4_flags, +__m256i mbuf_flags =_mm256_or_si256 (l3_l4_flags, rss_vlan_flags); +if (rxq->fdir_enabled) { +const __m256i fdir_id4_7 = +_mm256_unpackhi_epi32 (raw_desc6_7, raw_desc4_5); + +const __m256i fdir_id0_3 = +_mm256_unpackhi_epi32 (raw_desc2_3, raw_desc0_1); + +const __m256i fdir_id0_7 = +_mm256_unpackhi_epi64 (fdir_id4_7, fdir_id0_3); + +const __m256i fdir_flags = +ice_flex_rxd_to_fdir_flags_vec_avx2 (fdir_id0_7); + +/* merge with fdir_flags */ + mbuf_flags =_mm256_or_si256 (mbuf_flags, fdir_flags); + +/* write to mbuf: have to use scalar store here */ + rx_pkts[i +0 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,3 ); + + rx_pkts[i +1 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,7 ); + + rx_pkts[i +2 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,2 ); + + rx_pkts[i +3 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,6 ); + + rx_pkts[i +4 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,1 ); + + rx_pkts[i +5 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,5 ); + + rx_pkts[i +6 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,0 ); + + rx_pkts[i +7 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,4 ); + }/* if() on fdir_enabled */ +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC /** * needs to load 2nd 16B of each desc for RSS hash parsing,
@@ -551,6 +612,7 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, mb0_1 = _mm256_or_si256(mb0_1, rss_hash0_1); }/* if() on RSS hash parsing */ #endif +/** * At this point, we have the 8 sets of flags in the low 16-bits * of each 32-bit value in vlan0.
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v2 3/5] net/ice: support flow mark in AVX path
Quoted 10 lines
-----Original Message-----
From: Jiang, JunyuX <[email protected]>
Sent: Monday, September 7, 2020 17:17
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>
Subject: [PATCH v2 3/5] net/ice: support flow mark in AVX path
Quoted 3 lines
From: Guinan Sun <[email protected]>
Support Flow Director mark ID parsing from Flex Rx descriptor in AVX path.
Same comments.
Quoted 109 lines
Signed-off-by Guinan Sun <[email protected]>--- drivers/net/ice/ice_rxtx_vec_avx2.c | 64 ++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-)drivers/net/ice/ice_rxtx_vec_avx2.c +18
-0@@ -132,6 +132,25 @@ ice_rxq_rearm(struct ice_rx_queue *rxq)ICE_PCI_REG_WRITE (rxq->qrx_tail, rx_id); } +static inline __m256i +ice_flex_rxd_to_fdir_flags_vec_avx2 (const __m256i fdir_id0_7) {#define +FDID_MIS_MAGIC 0xFFFFFFFF +RTE_BUILD_BUG_ON (PKT_RX_FDIR != (1 <<2 )); +RTE_BUILD_BUG_ON (PKT_RX_FDIR_ID != (1 <<13 )); +const __m256i pkt_fdir_bit =_mm256_set1_epi32 (PKT_RX_FDIR | +PKT_RX_FDIR_ID ); +/* desc->flow_id field == 0xFFFFFFFF means fdir mismatch */ +const __m256i fdir_mis_mask =_mm256_set1_epi32 (FDID_MIS_MAGIC ); +__m256i fdir_mask =_mm256_cmpeq_epi32 (fdir_id0_7, + fdir_mis_mask); +/* this XOR op results to bit-reverse the fdir_mask */ + fdir_mask =_mm256_xor_si256 (fdir_mask, fdir_mis_mask); +const __m256i fdir_flags =_mm256_and_si256 (fdir_mask, pkt_fdir_bit); + +return fdir_flags; +} +static inline uint16_t _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf**rx_pkts,
uint16_tnb_pkts,uint8_t*split_packet) @@ -459,9
+478,51 @@ _ice_recv_raw_pkts_vec_avx2(structice_rx_queue*rxq, structrte_mbuf**rx_pkts,drivers/net/ice/ice_rxtx_vec_avx2.c +4
-1rss_vlan_flag_bits);/* merge flags */ -const __m256i mbuf_flags =_mm256_or_si256 (l3_l4_flags, +__m256i mbuf_flags =_mm256_or_si256 (l3_l4_flags, rss_vlan_flags); +if (rxq->fdir_enabled) { +const __m256i fdir_id4_7 = + _mm256_unpackhi_epi32(raw_desc6_7,
raw_desc4_5);drivers/net/ice/ice_rxtx_vec_avx2.c +3
-0+ +const __m256i fdir_id0_3 = + _mm256_unpackhi_epi32(raw_desc2_3,
raw_desc0_1);drivers/net/ice/ice_rxtx_vec_avx2.c +3
-0+ +const __m256i fdir_id0_7 = + _mm256_unpackhi_epi64(fdir_id4_7,
fdir_id0_3);drivers/net/ice/ice_rxtx_vec_avx2.c +3
-0+ + const __m256i fdir_flags = +ice_flex_rxd_to_fdir_flags_vec_avx2(fdir_id0_7);drivers/net/ice/ice_rxtx_vec_avx2.c +3
-0+ +/* merge with fdir_flags */ + mbuf_flags = _mm256_or_si256(mbuf_flags,
fdir_flags);drivers/net/ice/ice_rxtx_vec_avx2.c +28
-0+ +/* write to mbuf: have to use scalar store here */ + rx_pkts[i +0 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,3 ); + + rx_pkts[i +1 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,7 ); + + rx_pkts[i +2 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,2 ); + + rx_pkts[i +3 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,6 ); + + rx_pkts[i +4 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,1 ); + + rx_pkts[i +5 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,5 ); + + rx_pkts[i +6 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,0 ); + + rx_pkts[i +7 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,4 ); + }/* if() on fdir_enabled */ +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC /** * needs to load 2nd 16B of each desc for RSS hash parsing, @@ -551,6 +612,7 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, mb0_1 = _mm256_or_si256(mb0_1, rss_hash0_1); }/* if() on RSS hash parsing */ #endif +/** * At this point, we have the 8 sets of flags in the low 16-bits * of each 32-bit value in vlan0.
--
2.17.1
PATCH v2 4/5 net/ice: support flow mark in SSE path
In reply to Junyu JiangFrom: Guinan Sun <[email protected]>
Support Flow Director mark ID parsing from Flex
Rx descriptor in SSE path.
--- drivers/net/ice/ice_rxtx_vec_sse.c | 49 ++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
drivers/net/ice/ice_rxtx_vec_sse.c +49 -0
@@ -10,6 +10,25 @@#pragma GCC diagnostic ignored "-Wcast-qual"#endif +static inline __m128i +ice_flex_rxd_to_fdir_flags_vec (const __m128i fdir_id0_3) +{ +#define FDID_MIS_MAGIC 0xFFFFFFFF +RTE_BUILD_BUG_ON (PKT_RX_FDIR != (1 <<2 )); +RTE_BUILD_BUG_ON (PKT_RX_FDIR_ID != (1 <<13 )); +const __m128i pkt_fdir_bit =_mm_set1_epi32 (PKT_RX_FDIR | +PKT_RX_FDIR_ID ); +/* desc->flow_id field == 0xFFFFFFFF means fdir mismatch */ +const __m128i fdir_mis_mask =_mm_set1_epi32 (FDID_MIS_MAGIC ); +__m128i fdir_mask =_mm_cmpeq_epi32 (fdir_id0_3, + fdir_mis_mask); +/* this XOR op results to bit-reverse the fdir_mask */ + fdir_mask =_mm_xor_si128 (fdir_mask, fdir_mis_mask); +const __m128i fdir_flags =_mm_and_si128 (fdir_mask, pkt_fdir_bit); + +return fdir_flags; +} +static inline void ice_rxq_rearm (struct ice_rx_queue *rxq) {
@@ -159,6 +178,36 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq, __m128i descs[4],/* merge the flags */ flags =_mm_or_si128 (flags, rss_vlan); +if (rxq->fdir_enabled) { +const __m128i fdir_id0_1 = +_mm_unpackhi_epi32 (descs[0 ], descs[1 ]); + +const __m128i fdir_id2_3 = +_mm_unpackhi_epi32 (descs[2 ], descs[3 ]); + +const __m128i fdir_id0_3 = +_mm_unpackhi_epi64 (fdir_id0_1, fdir_id2_3); + +const __m128i fdir_flags = +ice_flex_rxd_to_fdir_flags_vec (fdir_id0_3); + +/* merge with fdir_flags */ + flags =_mm_or_si128 (flags, fdir_flags); + +/* write fdir_id to mbuf */ + rx_pkts[0 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,0 ); + + rx_pkts[1 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,1 ); + + rx_pkts[2 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,2 ); + + rx_pkts[3 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,3 ); + }/* if() on fdir_enabled */ +/** * At this point, we have the 4 sets of flags in the low 16-bits * of each 32-bit value in flags.
Signature · 1 line
2.17.1
PATCH v2 5/5 net/ice: remove devargs flow-mark-support
In reply to Junyu JiangFrom: Guinan Sun <[email protected]>
Remove devargs "flow-mark-support".
--- doc/guides/nics/ice.rst | 12 ------------ drivers/net/ice/ice_ethdev.c | 10 +--------- drivers/net/ice/ice_ethdev.h | 1 - drivers/net/ice/ice_rxtx_vec_common.h | 6 ------ 4 files changed, 1 insertion(+), 28 deletions(-)
doc/guides/nics/ice.rst +0 -12
@@ -75,18 +75,6 @@ Runtime Config Options -w 80:00.0,pipeline-mode-support=1 -- ``Flow Mark Support`` (default ``0``) - - This is a hint to the driver to select the data path that supports flow mark extraction - by default. - NOTE: This is an experimental devarg, it will be removed when any of below conditions - is ready. - 1) all data paths support flow mark (currently vPMD does not) - 2) a new offload like RTE_DEV_RX_OFFLOAD_FLOW_MARK be introduced as a standard way to hint. - Example:: - - -w 80:00.0,flow-mark-support=1 - - ``Protocol extraction for per queue`` Configure the RX queues to do protocol extraction into mbuf for protocol
drivers/net/ice/ice_ethdev.c +1 -9
@@ -23,13 +23,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support" -#define ICE_FLOW_MARK_SUPPORT_ARG "flow-mark-support"#define ICE_PROTO_XTR_ARG "proto_xtr"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG ,ICE_PIPELINE_MODE_SUPPORT_ARG , -ICE_FLOW_MARK_SUPPORT_ARG ,ICE_PROTO_XTR_ARG ,NULL };
@@ -1985,11 +1983,6 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)if (ret) goto bail; - ret =rte_kvargs_process (kvlist,ICE_FLOW_MARK_SUPPORT_ARG , - &parse_bool, &ad->devargs.flow_mark_support); -if (ret) - goto bail; - bail:rte_kvargs_free (kvlist);return ret;
@@ -5131,8 +5124,7 @@ RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci");RTE_PMD_REGISTER_PARAM_STRING (net_ice,ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp>" ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" -ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" -ICE_FLOW_MARK_SUPPORT_ARG "=<0|1>" ); +ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" );RTE_LOG_REGISTER (ice_logtype_init, pmd.net.ice.init,NOTICE );RTE_LOG_REGISTER (ice_logtype_driver, pmd.net.ice.driver,NOTICE );
drivers/net/ice/ice_ethdev.h +0 -1
@@ -444,7 +444,6 @@ struct ice_devargs {int safe_mode_support;uint8_t proto_xtr_dflt;int pipe_mode_support; -int flow_mark_support;uint8_t proto_xtr[ICE_MAX_QUEUE_NUM ]; };
drivers/net/ice/ice_rxtx_vec_common.h +0 -6
@@ -270,12 +270,6 @@ ice_rx_vec_dev_check_default(struct rte_eth_dev *dev) {int i;struct ice_rx_queue *rxq; -struct ice_adapter *ad = -ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); - -/* vPMD does not support flow mark. */ -if (ad->devargs.flow_mark_support) -return -1 ;for (i =0 ; i < dev->data->nb_rx_queues; i++) { rxq = dev->data->rx_queues[i];
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v2 5/5] net/ice: remove devargs flow-mark-support
Quoted 10 lines
-----Original Message-----
From: Jiang, JunyuX <[email protected]>
Sent: Monday, September 7, 2020 17:17
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>
Subject: [PATCH v2 5/5] net/ice: remove devargs flow-mark-support
Quoted 3 lines
From: Guinan Sun <[email protected]>
Remove devargs "flow-mark-support".
Please rework the commit log. Mention the reason why you need to delete it and what't the new way to configure flow mark?
Quoted 111 lines
Signed-off-by Guinan Sun <[email protected]>--- doc/guides/nics/ice.rst | 12 ------------ drivers/net/ice/ice_ethdev.c | 10 +--------- drivers/net/ice/ice_ethdev.h | 1 - drivers/net/ice/ice_rxtx_vec_common.h | 6 ------ 4 files changed, 1 insertion(+), 28 deletions(-)doc/guides/nics/ice.rst index renamed from doc/guides/nics/ice.rst +0
-0
9a9f4a6bb..64b1b13a6100644doc/guides/nics/ice.rst +0
-3@@ -75,18 +75,6 @@ Runtime Config Options -w 80:00.0,pipeline-mode-support=1 -- ``Flow Mark Support`` (default ``0``) - - This is a hint to the driver to select the data path that supports flow markextraction
doc/guides/nics/ice.rst +0
-2- by default. - NOTE: This is an experimental devarg, it will be removed when any ofbelow conditions
doc/guides/nics/ice.rst +0
-3- is ready. - 1) all data paths support flow mark (currently vPMD does not) - 2) a new offload like RTE_DEV_RX_OFFLOAD_FLOW_MARK be introducedas a standard way to hint.
doc/guides/nics/ice.rst +0
-4- Example:: - - -w 80:00.0,flow-mark-support=1 - - ``Protocol extraction for per queue`` Configure the RX queues to do protocol extraction into mbuf for protocoldrivers/net/ice/ice_ethdev.c +0
-7@@ -23,13 +23,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support" -#define ICE_FLOW_MARK_SUPPORT_ARG "flow-mark-support"#define ICE_PROTO_XTR_ARG "proto_xtr"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG ,ICE_PIPELINE_MODE_SUPPORT_ARG , -ICE_FLOW_MARK_SUPPORT_ARG ,ICE_PROTO_XTR_ARG ,NULL };@@ -1985,11 +1983,6 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)if (ret) goto bail; - ret =rte_kvargs_process (kvlist,ICE_FLOW_MARK_SUPPORT_ARG , - &parse_bool, &ad- >devargs.flow_mark_support); -if (ret) - goto bail; - bail:drivers/net/ice/ice_ethdev.c +0
-0rte_kvargs_free (kvlist);return ret;@@ -5131,8 +5124,7 @@ RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci");RTE_PMD_REGISTER_PARAM_STRING (net_ice, ICE_PROTO_XTR_ARG"=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp>"
drivers/net/ice/ice_ethdev.c +1
-2ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" -ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" - ICE_FLOW_MARK_SUPPORT_ARG "=<0|1>"); + ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>");RTE_LOG_REGISTER (ice_logtype_init, pmd.net.ice.init,NOTICE );
RTE_LOG_REGISTER(ice_logtype_driver, pmd.net.ice.driver, NOTICE); diff -- gita/drivers/net/ice/ice_ethdev.hb/drivers/net/ice/ice_ethdev.hindexdf0d65d8d..d441350e0100644drivers/net/ice/ice_ethdev.h +0
-1@@ -444,7 +444,6 @@ struct ice_devargs {int safe_mode_support;uint8_t proto_xtr_dflt;int pipe_mode_support; -int flow_mark_support;uint8_t proto_xtr[ICE_MAX_QUEUE_NUM ]; };drivers/net/ice/ice_rxtx_vec_common.h +0
-7@@ -270,12 +270,6 @@ ice_rx_vec_dev_check_default(struct rte_eth_dev *dev) {int i;struct ice_rx_queue *rxq; -struct ice_adapter *ad = -ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); - -/* vPMD does not support flow mark. */ -if (ad->devargs.flow_mark_support) -return -1 ;for (i =0 ; i < dev->data->nb_rx_queues; i++) { rxq = dev->data->rx_queues[i]; --2.17.1
v3 cover supports RxDID #22 and FDID
In reply to Guinan SunThis patchset supports flex Rx descriptor RxDID #22 and FDID offload in vPMD. Remove devargs "flow-mark-support".
---
v3:
* Check if package does support RXDID.
* Modify commit message.
* Rebase the patchset.
v2:
* Reorder patches.
Guinan Sun (4):
net/ice: add flow director enabled switch value
net/ice: support flow mark in AVX path
net/ice: support flow mark in SSE path
net/ice: remove devargs flow-mark-support
Junyu Jiang (1):
net/ice: support flex Rx descriptor RxDID #22
doc/guides/nics/ice.rst | 12 -- drivers/net/ice/ice_ethdev.c | 30 +++-- drivers/net/ice/ice_ethdev.h | 7 +- drivers/net/ice/ice_fdir_filter.c | 9 +- drivers/net/ice/ice_rxtx.c | 23 ++-- drivers/net/ice/ice_rxtx.h | 72 ++++++++++++ drivers/net/ice/ice_rxtx_vec_avx2.c | 162 +++++++++++++++++++++++++- drivers/net/ice/ice_rxtx_vec_common.h | 6 - drivers/net/ice/ice_rxtx_vec_sse.c | 138 +++++++++++++++++++--- 9 files changed, 402 insertions(+), 57 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/5 net/ice: support flex Rx descriptor RxDID #22
This patch supports RxDID #22 by the following changes:
-add structure and macro definition for RxDID #22. -support RxDID #22 format in normal path.
-change RSS hash parsing from RxDID #22 in AVX/SSE data path.
--- drivers/net/ice/ice_ethdev.c | 20 ++++++ drivers/net/ice/ice_ethdev.h | 4 ++ drivers/net/ice/ice_rxtx.c | 23 ++++--- drivers/net/ice/ice_rxtx.h | 42 +++++++++++++ drivers/net/ice/ice_rxtx_vec_avx2.c | 98 +++++++++++++++++++++++++++-- drivers/net/ice/ice_rxtx_vec_sse.c | 89 +++++++++++++++++++++----- 6 files changed, 249 insertions(+), 27 deletions(-)
drivers/net/ice/ice_ethdev.c +20 -0
@@ -2147,6 +2147,24 @@ ice_rss_ctx_init(struct ice_pf *pf)ICE_HASH_CFG_RESET (&pf->gtpu_hash_ctx.ipv6_tcp); } +static uint64_t +ice_get_supported_rxdid (struct ice_hw *hw) +{ +uint64_t supported_rxdid =0 ;/* bitmap for supported RXDID */ +uint32_t regval; +int i; + + supported_rxdid |=BIT (ICE_RXDID_LEGACY_1 ); + +for (i =ICE_RXDID_FLEX_NIC ; i <ICE_FLEX_DESC_RXDID_MAX_NUM ; i++) { + regval =ICE_READ_REG (hw,GLFLXP_RXDID_FLAGS (i,0 )); +if ((regval >>GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_S ) + &GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_M ) + supported_rxdid |=BIT (i); + } +return supported_rxdid; +} +static int ice_dev_init (struct rte_eth_dev *dev) {
@@ -2298,6 +2316,8 @@ ice_dev_init(struct rte_eth_dev *dev)return ret; } + pf->supported_rxdid =ice_get_supported_rxdid (hw); +return 0 ; err_pf_setup:
drivers/net/ice/ice_ethdev.h +4 -0
@@ -136,6 +136,9 @@#define ICE_RXTX_BYTES_HIGH (bytes) ((bytes) & ~ICE_40_BIT_MASK)#define ICE_RXTX_BYTES_LOW (bytes) ((bytes) & ICE_40_BIT_MASK) +/* Max number of flexible descriptor rxdid */ +#define ICE_FLEX_DESC_RXDID_MAX_NUM 64 +/* DDP package type */ enum ice_pkg_type {ICE_PKG_TYPE_UNKNOWN ,
@@ -435,6 +438,7 @@ struct ice_pf {bool init_link_up;uint64_t old_rx_bytes;uint64_t old_tx_bytes; +uint64_t supported_rxdid;/* bitmap for supported RXDID */ };#define ICE_MAX_QUEUE_NUM 2048
drivers/net/ice/ice_rxtx.c +16 -7
@@ -63,7 +63,7 @@ static inline uint8_t ice_proto_xtr_type_to_rxdid(uint8_t xtr_type) {static uint8_t rxdid_map[] = { - [PROTO_XTR_NONE ] =ICE_RXDID_COMMS_GENERIC , + [PROTO_XTR_NONE ] =ICE_RXDID_COMMS_OVS , [PROTO_XTR_VLAN ] =ICE_RXDID_COMMS_AUX_VLAN , [PROTO_XTR_IPV4 ] =ICE_RXDID_COMMS_AUX_IPV4 , [PROTO_XTR_IPV6 ] =ICE_RXDID_COMMS_AUX_IPV6 ,
@@ -73,7 +73,7 @@ ice_proto_xtr_type_to_rxdid(uint8_t xtr_type) };return xtr_type <RTE_DIM (rxdid_map) ? - rxdid_map[xtr_type] :ICE_RXDID_COMMS_GENERIC ; + rxdid_map[xtr_type] :ICE_RXDID_COMMS_OVS ; } static enum ice_status
@@ -81,12 +81,13 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq) {struct ice_vsi *vsi = rxq->vsi;struct ice_hw *hw =ICE_VSI_TO_HW (vsi); +struct ice_pf *pf =ICE_VSI_TO_PF (vsi);struct rte_eth_dev *dev =ICE_VSI_TO_ETH_DEV (rxq->vsi);struct ice_rlan_ctx rx_ctx;enum ice_status err;uint16_t buf_size, len;struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; -uint32_t rxdid =ICE_RXDID_COMMS_GENERIC ; +uint32_t rxdid =ICE_RXDID_COMMS_OVS ;uint32_t regval;/* Set buffer size as the head split is disabled. */
@@ -151,6 +152,12 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)PMD_DRV_LOG (DEBUG ,"Port (%u) - Rx queue (%u) is set with RXDID : %u" , rxq->port_id, rxq->queue_id, rxdid); +if (!(pf->supported_rxdid &BIT (rxdid))) { +PMD_DRV_LOG (ERR ,"currently package doesn't support RXDID (%u)" , + rxdid); +return -EINVAL ; + } +/* Enable Flexible Descriptors in the queue context which * allows this driver to select a specific receive descriptor format */
@@ -1338,7 +1345,7 @@ ice_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp)static void ice_rxd_to_proto_xtr (struct rte_mbuf *mb, -volatile struct ice_32b_rx_flex_desc_comms *desc) +volatile struct ice_32b_rx_flex_desc_comms_ovs *desc) {uint16_t stat_err =rte_le_to_cpu_16 (desc->status_error1);uint32_t metadata =0 ;
@@ -1376,8 +1383,9 @@ static inline void ice_rxd_to_pkt_fields(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp) { - volatile struct ice_32b_rx_flex_desc_comms *desc = - (volatile struct ice_32b_rx_flex_desc_comms *)rxdp; + volatile struct ice_32b_rx_flex_desc_comms_ovs *desc = + (volatile struct ice_32b_rx_flex_desc_comms_ovs *)rxdp; +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC uint16_t stat_err; stat_err =rte_le_to_cpu_16 (desc->status_error0);
@@ -1385,13 +1393,14 @@ ice_rxd_to_pkt_fields(struct rte_mbuf *mb, mb->ol_flags |=PKT_RX_RSS_HASH ; mb->hash.rss = rte_le_to_cpu_32(desc->rss_hash); } +#endif -#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC if (desc->flow_id !=0xFFFFFFFF ) { mb->ol_flags |=PKT_RX_FDIR |PKT_RX_FDIR_ID ; mb->hash.fdir.hi =rte_le_to_cpu_32 (desc->flow_id); } +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC if (unlikely (rte_net_ice_dynf_proto_xtr_metadata_avail ()))ice_rxd_to_proto_xtr (mb, desc);#endif
drivers/net/ice/ice_rxtx.h +42 -0
54 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_avx2.c +94 -4
116 lines not on this page · raw message
drivers/net/ice/ice_rxtx_vec_sse.c +73 -16
130 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 2/5 net/ice: add flow director enabled switch value
In reply to Junyu JiangFrom: Guinan Sun <[email protected]>
The patch adds fdir_enabled flag to identify if parse flow director mark ID from flexible Rx descriptor.
--- drivers/net/ice/ice_ethdev.h | 2 ++ drivers/net/ice/ice_fdir_filter.c | 9 ++++++++- drivers/net/ice/ice_rxtx.h | 30 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-)
drivers/net/ice/ice_ethdev.h +2 -0
@@ -291,6 +291,7 @@ struct ice_fdir_filter_conf {uint64_t input_set;uint64_t outer_input_set;/* only for tunnel packets outer fields */ +uint32_t mark_flag; };#define ICE_MAX_FDIR_FILTER_NUM (1024 * 16)
@@ -471,6 +472,7 @@ struct ice_adapter {bool is_safe_mode;struct ice_devargs devargs;enum ice_pkg_type active_pkg_type;/* loaded ddp package type */ +uint16_t fdir_ref_cnt; };struct ice_vsi_vlan_pvid_info {
drivers/net/ice/ice_fdir_filter.c +8 -1
@@ -1318,6 +1318,9 @@ ice_fdir_create_filter(struct ice_adapter *ad, goto free_counter; } +if (filter->mark_flag ==1 ) +ice_fdir_rx_parsing_enable (ad,1 ); +rte_memcpy (entry, filter,sizeof (*entry)); ret =ice_fdir_entry_insert (pf, entry, &key);if (ret) {
@@ -1390,6 +1393,10 @@ ice_fdir_destroy_filter(struct ice_adapter *ad, }ice_fdir_cnt_update (pf, filter->input.flow_type, is_tun, false); + +if (filter->mark_flag ==1 ) +ice_fdir_rx_parsing_enable (ad,0 ); + flow->rule =NULL ;rte_free (filter);
@@ -1562,7 +1569,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,break ;case RTE_FLOW_ACTION_TYPE_MARK : mark_num++; - + filter->mark_flag =1 ; mark_spec = actions->conf; filter->input.fltr_id = mark_spec->id; filter->input.fdid_prio =ICE_FXD_FLTR_QW1_FDID_PRI_ONE ;
drivers/net/ice/ice_rxtx.h +30 -0
@@ -70,6 +70,7 @@ struct ice_rx_queue {uint8_t port_id;/* device port ID */ uint8_t crc_len;/* 0 if CRC stripped, 4 otherwise */ +uint8_t fdir_enabled;/* 0 if FDIR disabled, 1 when enabled */ uint16_t queue_id;/* RX queue index */ uint16_t reg_idx;/* RX queue register index */ uint8_t drop_en;/* if not 0, set register bit */
@@ -245,4 +246,33 @@ uint16_t ice_xmit_pkts_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,int ice_fdir_programming (struct ice_pf *pf,struct ice_fltr_desc *fdir_desc);int ice_tx_done_cleanup (void *txq,uint32_t free_cnt); +#define FDIR_PARSING_ENABLE_PER_QUEUE (ad, on) do { \ + int i; \ + for (i = 0; i < (ad)->eth_dev->data->nb_rx_queues; i++) { \ + struct ice_rx_queue *rxq = (ad)->eth_dev->data->rx_queues[i]; \ + if (!rxq) \ + continue; \ + rxq->fdir_enabled = on; \ + } \ + PMD_DRV_LOG(DEBUG, "FDIR processing on RX set to %d", on); \ +} while (0) + +/* Enable/disable flow director parsing from Rx descriptor in data path. */ +static inline +void ice_fdir_rx_parsing_enable (struct ice_adapter *ad,bool on) +{ +if (on) { +/* Enable flow director parsing from Rx descriptor */ +FDIR_PARSING_ENABLE_PER_QUEUE (ad, on); + ad->fdir_ref_cnt++; + }else { +if (ad->fdir_ref_cnt >=1 ) { + ad->fdir_ref_cnt--; + +if (ad->fdir_ref_cnt ==0 ) +FDIR_PARSING_ENABLE_PER_QUEUE (ad, on); + } + } +} +#endif /* _ICE_RXTX_H_ */
Signature · 1 line
2.17.1
PATCH v3 3/5 net/ice: support flow mark in AVX path
In reply to Junyu JiangFrom: Guinan Sun <[email protected]>
Support flow director mark ID parsing from flexible Rx descriptor in AVX path.
--- drivers/net/ice/ice_rxtx_vec_avx2.c | 64 ++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-)
drivers/net/ice/ice_rxtx_vec_avx2.c +63 -1
@@ -132,6 +132,25 @@ ice_rxq_rearm(struct ice_rx_queue *rxq)ICE_PCI_REG_WRITE (rxq->qrx_tail, rx_id); } +static inline __m256i +ice_flex_rxd_to_fdir_flags_vec_avx2 (const __m256i fdir_id0_7) +{ +#define FDID_MIS_MAGIC 0xFFFFFFFF +RTE_BUILD_BUG_ON (PKT_RX_FDIR != (1 <<2 )); +RTE_BUILD_BUG_ON (PKT_RX_FDIR_ID != (1 <<13 )); +const __m256i pkt_fdir_bit =_mm256_set1_epi32 (PKT_RX_FDIR | +PKT_RX_FDIR_ID ); +/* desc->flow_id field == 0xFFFFFFFF means fdir mismatch */ +const __m256i fdir_mis_mask =_mm256_set1_epi32 (FDID_MIS_MAGIC ); +__m256i fdir_mask =_mm256_cmpeq_epi32 (fdir_id0_7, + fdir_mis_mask); +/* this XOR op results to bit-reverse the fdir_mask */ + fdir_mask =_mm256_xor_si256 (fdir_mask, fdir_mis_mask); +const __m256i fdir_flags =_mm256_and_si256 (fdir_mask, pkt_fdir_bit); + +return fdir_flags; +} +static inline uint16_t _ice_recv_raw_pkts_vec_avx2 (struct ice_rx_queue *rxq,struct rte_mbuf **rx_pkts,uint16_t nb_pkts,uint8_t *split_packet)
@@ -459,9 +478,51 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, rss_vlan_flag_bits);/* merge flags */ -const __m256i mbuf_flags =_mm256_or_si256 (l3_l4_flags, +__m256i mbuf_flags =_mm256_or_si256 (l3_l4_flags, rss_vlan_flags); +if (rxq->fdir_enabled) { +const __m256i fdir_id4_7 = +_mm256_unpackhi_epi32 (raw_desc6_7, raw_desc4_5); + +const __m256i fdir_id0_3 = +_mm256_unpackhi_epi32 (raw_desc2_3, raw_desc0_1); + +const __m256i fdir_id0_7 = +_mm256_unpackhi_epi64 (fdir_id4_7, fdir_id0_3); + +const __m256i fdir_flags = +ice_flex_rxd_to_fdir_flags_vec_avx2 (fdir_id0_7); + +/* merge with fdir_flags */ + mbuf_flags =_mm256_or_si256 (mbuf_flags, fdir_flags); + +/* write to mbuf: have to use scalar store here */ + rx_pkts[i +0 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,3 ); + + rx_pkts[i +1 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,7 ); + + rx_pkts[i +2 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,2 ); + + rx_pkts[i +3 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,6 ); + + rx_pkts[i +4 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,1 ); + + rx_pkts[i +5 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,5 ); + + rx_pkts[i +6 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,0 ); + + rx_pkts[i +7 ]->hash.fdir.hi = +_mm256_extract_epi32 (fdir_id0_7,4 ); + }/* if() on fdir_enabled */ +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC /** * needs to load 2nd 16B of each desc for RSS hash parsing,
@@ -551,6 +612,7 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, mb0_1 = _mm256_or_si256(mb0_1, rss_hash0_1); }/* if() on RSS hash parsing */ #endif +/** * At this point, we have the 8 sets of flags in the low 16-bits * of each 32-bit value in vlan0.
Signature · 1 line
2.17.1
PATCH v3 4/5 net/ice: support flow mark in SSE path
In reply to Junyu JiangFrom: Guinan Sun <[email protected]>
Support flow director mark ID parsing from flexible Rx descriptor in SSE path.
--- drivers/net/ice/ice_rxtx_vec_sse.c | 49 ++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
drivers/net/ice/ice_rxtx_vec_sse.c +49 -0
@@ -10,6 +10,25 @@#pragma GCC diagnostic ignored "-Wcast-qual"#endif +static inline __m128i +ice_flex_rxd_to_fdir_flags_vec (const __m128i fdir_id0_3) +{ +#define FDID_MIS_MAGIC 0xFFFFFFFF +RTE_BUILD_BUG_ON (PKT_RX_FDIR != (1 <<2 )); +RTE_BUILD_BUG_ON (PKT_RX_FDIR_ID != (1 <<13 )); +const __m128i pkt_fdir_bit =_mm_set1_epi32 (PKT_RX_FDIR | +PKT_RX_FDIR_ID ); +/* desc->flow_id field == 0xFFFFFFFF means fdir mismatch */ +const __m128i fdir_mis_mask =_mm_set1_epi32 (FDID_MIS_MAGIC ); +__m128i fdir_mask =_mm_cmpeq_epi32 (fdir_id0_3, + fdir_mis_mask); +/* this XOR op results to bit-reverse the fdir_mask */ + fdir_mask =_mm_xor_si128 (fdir_mask, fdir_mis_mask); +const __m128i fdir_flags =_mm_and_si128 (fdir_mask, pkt_fdir_bit); + +return fdir_flags; +} +static inline void ice_rxq_rearm (struct ice_rx_queue *rxq) {
@@ -159,6 +178,36 @@ ice_rx_desc_to_olflags_v(struct ice_rx_queue *rxq, __m128i descs[4],/* merge the flags */ flags =_mm_or_si128 (flags, rss_vlan); +if (rxq->fdir_enabled) { +const __m128i fdir_id0_1 = +_mm_unpackhi_epi32 (descs[0 ], descs[1 ]); + +const __m128i fdir_id2_3 = +_mm_unpackhi_epi32 (descs[2 ], descs[3 ]); + +const __m128i fdir_id0_3 = +_mm_unpackhi_epi64 (fdir_id0_1, fdir_id2_3); + +const __m128i fdir_flags = +ice_flex_rxd_to_fdir_flags_vec (fdir_id0_3); + +/* merge with fdir_flags */ + flags =_mm_or_si128 (flags, fdir_flags); + +/* write fdir_id to mbuf */ + rx_pkts[0 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,0 ); + + rx_pkts[1 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,1 ); + + rx_pkts[2 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,2 ); + + rx_pkts[3 ]->hash.fdir.hi = +_mm_extract_epi32 (fdir_id0_3,3 ); + }/* if() on fdir_enabled */ +/** * At this point, we have the 4 sets of flags in the low 16-bits * of each 32-bit value in flags.
Signature · 1 line
2.17.1
PATCH v3 5/5 net/ice: remove devargs flow-mark-support
In reply to Junyu JiangFrom: Guinan Sun <[email protected]>
Currently, all data paths already support flow mark, so remove devargs "flow-mark-support". FDIR matched ID will display in verbose when packets match the created rule.
--- doc/guides/nics/ice.rst | 12 ------------ drivers/net/ice/ice_ethdev.c | 10 +--------- drivers/net/ice/ice_ethdev.h | 1 - drivers/net/ice/ice_rxtx_vec_common.h | 6 ------ 4 files changed, 1 insertion(+), 28 deletions(-)
doc/guides/nics/ice.rst +0 -12
@@ -72,18 +72,6 @@ Runtime Config Options -w 80:00.0,pipeline-mode-support=1 -- ``Flow Mark Support`` (default ``0``) - - This is a hint to the driver to select the data path that supports flow mark extraction - by default. - NOTE: This is an experimental devarg, it will be removed when any of below conditions - is ready. - 1) all data paths support flow mark (currently vPMD does not) - 2) a new offload like RTE_DEV_RX_OFFLOAD_FLOW_MARK be introduced as a standard way to hint. - Example:: - - -w 80:00.0,flow-mark-support=1 - - ``Protocol extraction for per queue`` Configure the RX queues to do protocol extraction into mbuf for protocol
drivers/net/ice/ice_ethdev.c +1 -9
@@ -23,13 +23,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support" -#define ICE_FLOW_MARK_SUPPORT_ARG "flow-mark-support"#define ICE_PROTO_XTR_ARG "proto_xtr"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG ,ICE_PIPELINE_MODE_SUPPORT_ARG , -ICE_FLOW_MARK_SUPPORT_ARG ,ICE_PROTO_XTR_ARG ,NULL };
@@ -2006,11 +2004,6 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)if (ret) goto bail; - ret =rte_kvargs_process (kvlist,ICE_FLOW_MARK_SUPPORT_ARG , - &parse_bool, &ad->devargs.flow_mark_support); -if (ret) - goto bail; - bail:rte_kvargs_free (kvlist);return ret;
@@ -5178,8 +5171,7 @@ RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci");RTE_PMD_REGISTER_PARAM_STRING (net_ice,ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp|ip_offset>" ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" -ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" -ICE_FLOW_MARK_SUPPORT_ARG "=<0|1>" ); +ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" );RTE_LOG_REGISTER (ice_logtype_init, pmd.net.ice.init,NOTICE );RTE_LOG_REGISTER (ice_logtype_driver, pmd.net.ice.driver,NOTICE );
drivers/net/ice/ice_ethdev.h +0 -1
@@ -451,7 +451,6 @@ struct ice_devargs {int safe_mode_support;uint8_t proto_xtr_dflt;int pipe_mode_support; -int flow_mark_support;uint8_t proto_xtr[ICE_MAX_QUEUE_NUM ]; };
drivers/net/ice/ice_rxtx_vec_common.h +0 -6
@@ -270,12 +270,6 @@ ice_rx_vec_dev_check_default(struct rte_eth_dev *dev) {int i;struct ice_rx_queue *rxq; -struct ice_adapter *ad = -ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); - -/* vPMD does not support flow mark. */ -if (ad->devargs.flow_mark_support) -return -1 ;for (i =0 ; i < dev->data->nb_rx_queues; i++) { rxq = dev->data->rx_queues[i];
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v3 0/5] supports RxDID #22 and FDID
In reply to Junyu JiangQuoted 42 lines
-----Original Message-----
From: Jiang, JunyuX <[email protected]>
Sent: Wednesday, September 16, 2020 11:10 AM
To: [email protected]
Cc: Rong, Leyi <[email protected]>; Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>; Jiang, JunyuX <[email protected]>
Subject: [PATCH v3 0/5] supports RxDID #22 and FDIDThis patchset supports flex Rx descriptor RxDID #22 and FDID offload in vPMD. Remove devargs "flow-mark-support".
---
v3:
* Check if package does support RXDID.
* Modify commit message.
* Rebase the patchset.
v2:
* Reorder patches.Guinan Sun (4):
net/ice: add flow director enabled switch value
net/ice: support flow mark in AVX path
net/ice: support flow mark in SSE path
net/ice: remove devargs flow-mark-supportJunyu Jiang (1):
net/ice: support flex Rx descriptor RxDID #22doc/guides/nics/ice.rst | 12 -- drivers/net/ice/ice_ethdev.c | 30 +++-- drivers/net/ice/ice_ethdev.h | 7 +- drivers/net/ice/ice_fdir_filter.c | 9 +- drivers/net/ice/ice_rxtx.c | 23 ++-- drivers/net/ice/ice_rxtx.h | 72 ++++++++++++ drivers/net/ice/ice_rxtx_vec_avx2.c | 162 +++++++++++++++++++++++++- drivers/net/ice/ice_rxtx_vec_common.h | 6 - drivers/net/ice/ice_rxtx_vec_sse.c | 138 +++++++++++++++++++--- 9 files changed, 402 insertions(+), 57 deletions(-)
Quoted 2 lines
--
2.17.1
Zhang, Qi Z
AppliedRe: [dpdk-dev] [PATCH v3 0/5] supports RxDID #22 and FDID
Quoted 55 lines
-----Original Message-----
From: Rong, Leyi <[email protected]>
Sent: Wednesday, September 16, 2020 2:30 PM
To: Jiang, JunyuX <[email protected]>; [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>
Subject: RE: [PATCH v3 0/5] supports RxDID #22 and FDIDQuoted 11 lines
-----Original Message-----
From: Jiang, JunyuX <[email protected]>
Sent: Wednesday, September 16, 2020 11:10 AM
To: [email protected]
Cc: Rong, Leyi <[email protected]>; Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>; Jiang, JunyuX <[email protected]>
Subject: [PATCH v3 0/5] supports RxDID #22 and FDIDThis patchset supports flex Rx descriptor RxDID #22 and FDID offload in
vPMD.
Quoted 20 lines
Remove devargs "flow-mark-support".
---
v3:
* Check if package does support RXDID.
* Modify commit message.
* Rebase the patchset.
v2:
* Reorder patches.Guinan Sun (4):
net/ice: add flow director enabled switch value
net/ice: support flow mark in AVX path
net/ice: support flow mark in SSE path
net/ice: remove devargs flow-mark-supportJunyu Jiang (1):
net/ice: support flex Rx descriptor RxDID #22Quoted 7 lines
doc/guides/nics/ice.rst | 12 -- drivers/net/ice/ice_ethdev.c | 30 +++-- drivers/net/ice/ice_ethdev.h | 7 +- drivers/net/ice/ice_fdir_filter.c | 9 +- drivers/net/ice/ice_rxtx.c | 23 ++-- drivers/net/ice/ice_rxtx.h | 72 ++++++++++++ drivers/net/ice/ice_rxtx_vec_avx2.c | 162+++++++++++++++++++++++++-
Quoted 4 lines
drivers/net/ice/ice_rxtx_vec_common.h | 6 - drivers/net/ice/ice_rxtx_vec_sse.c | 138 +++++++++++++++++++--- 9 files changed, 402 insertions(+), 57 deletions(-)
Quoted 5 lines
Quoted 2 lines
--
2.17.1Acked-by Leyi Rong <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi