net/ice: enable Rx timestamp on Flex Descriptor
PATCH 1/1 net/ice: enable Rx timestamp on Flex Descriptor
Use the dynamic mbuf to register timestamp field and flag. The ice has the feature to dump Rx timestamp value into dynamic mbuf field by flex descriptor. This feature is turned on by dev config "enable-rx-timestamp". Currently, it's only supported under scalar path.
--- doc/guides/rel_notes/release_21_11.rst | 1 + drivers/net/ice/ice_ethdev.c | 6 +- drivers/net/ice/ice_rxtx.c | 107 +++++++++++++++++++++++++++++++++ drivers/net/ice/ice_rxtx.h | 6 ++ drivers/net/ice/ice_rxtx_vec_common.h | 3 + 5 files changed, 122 insertions(+), 1 deletion(-)
doc/guides/rel_notes/release_21_11.rst +1 -0
@@ -70,6 +70,7 @@ New Features * **Updated Intel ice driver.** Added 1PPS out support by a devargs. + * Added Rx timstamp support by dynamic mbuf on Flex Descriptor. Removed Items
drivers/net/ice/ice_ethdev.c +5 -1
@@ -31,6 +31,9 @@#define ICE_HW_DEBUG_MASK_ARG "hw_debug_mask"#define ICE_ONE_PPS_OUT_ARG "pps_out" +uint64_t ice_timestamp_dynflag; +int ice_timestamp_dynfield_offset =-1 ; +static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG ,ICE_PIPELINE_MODE_SUPPORT_ARG ,
@@ -3672,7 +3675,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)DEV_RX_OFFLOAD_QINQ_STRIP |DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |DEV_RX_OFFLOAD_VLAN_EXTEND | -DEV_RX_OFFLOAD_RSS_HASH ; +DEV_RX_OFFLOAD_RSS_HASH | +DEV_RX_OFFLOAD_TIMESTAMP ; dev_info->tx_offload_capa |=DEV_TX_OFFLOAD_QINQ_INSERT | DEV_TX_OFFLOAD_IPV4_CKSUM |
drivers/net/ice/ice_rxtx.c +107 -0
161 lines not on this page · raw message
drivers/net/ice/ice_rxtx.h +6 -0
@@ -40,6 +40,9 @@#define ICE_RXDID_COMMS_OVS 22 +extern uint64_t ice_timestamp_dynflag; +extern int ice_timestamp_dynfield_offset; +typedef void (*ice_rx_release_mbufs_t )(struct ice_rx_queue *rxq);typedef void (*ice_tx_release_mbufs_t )(struct ice_tx_queue *txq); typedef void (*ice_rxd_to_pkt_fields_t)(struct ice_rx_queue *rxq,
@@ -89,6 +92,7 @@ struct ice_rx_queue {ice_rxd_to_pkt_fields_t rxd_to_pkt_fields;/* handle FlexiMD by RXDID */ ice_rx_release_mbufs_t rx_rel_mbufs;uint64_t offloads; +uint32_t time_high; };struct ice_tx_entry {
@@ -281,6 +285,8 @@ uint16_t ice_xmit_pkts_vec_avx512_offload(void *tx_queue,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);int ice_get_monitor_addr (void *rx_queue,struct rte_power_monitor_cond *pmc); +uint64_t ice_read_time (struct ice_hw *hw); +uint64_t ice_tstamp_convert_32b_64b (uint64_t time,uint64_t timestamp);#define FDIR_PARSING_ENABLE_PER_QUEUE (ad, on) do { \ int i; \
drivers/net/ice/ice_rxtx_vec_common.h +3 -0
@@ -287,6 +287,9 @@ ice_rx_vec_queue_default(struct ice_rx_queue *rxq)if (rxq->proto_xtr !=PROTO_XTR_NONE )return -1 ; +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) +return -1 ; +if (rxq->offloads &ICE_RX_VECTOR_OFFLOAD )return ICE_VECTOR_OFFLOAD_PATH ;
Signature · 1 line
2.9.5
Quoted 31 lines
-----Original Message-----
From: Su, Simei <[email protected]>
Sent: Saturday, September 18, 2021 2:57 PM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]; Wang, Haiyue <[email protected]>; Su, Simei <[email protected]>
Subject: [PATCH] net/ice: enable Rx timestamp on Flex DescriptorUse the dynamic mbuf to register timestamp field and flag.
The ice has the feature to dump Rx timestamp value into dynamic mbuf field by flex descriptor. This feature is turned on by dev config "enable-rx-timestamp". Currently, it's only supported under scalar path.Signed-off-by Simei Su <[email protected]>--- doc/guides/rel_notes/release_21_11.rst | 1 + drivers/net/ice/ice_ethdev.c | 6 +- drivers/net/ice/ice_rxtx.c | 107 +++++++++++++++++++++++++++++++++ drivers/net/ice/ice_rxtx.h | 6 ++ drivers/net/ice/ice_rxtx_vec_common.h | 3 + 5 files changed, 122 insertions(+), 1 deletion(-)doc/guides/rel_notes/release_21_11.rst +0
-0
doc/guides/rel_notes/release_21_11.rst New Features · line 73
Quoted 4 lines
doc/guides/rel_notes/release_21_11.rst +1
-0@@ -70,6 +70,7 @@ New Features * **Updated Intel ice driver.** Added 1PPS out support by a devargs. + * Added Rx timstamp support by dynamic mbuf on Flex Descriptor.
How about just "added DEV_RX_OFFLOAD_TIMESTAMP support"
Quoted 93 lines
doc/guides/rel_notes/release_21_11.rst +0
-0Removed Itemsdrivers/net/ice/ice_ethdev.c index renamed from drivers/net/ice/ice_ethdev.c +0
-076dcabf..06adf43 100644
drivers/net/ice/ice_ethdev.c +5
-1@@ -31,6 +31,9 @@#define ICE_HW_DEBUG_MASK_ARG "hw_debug_mask"#define ICE_ONE_PPS_OUT_ARG "pps_out" +uint64_t ice_timestamp_dynflag; +int ice_timestamp_dynfield_offset =-1 ; +static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG ,ICE_PIPELINE_MODE_SUPPORT_ARG ,@@ -3672,7 +3675,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) DEV_RX_OFFLOAD_QINQ_STRIP | DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | DEV_RX_OFFLOAD_VLAN_EXTEND | -DEV_RX_OFFLOAD_RSS_HASH ; + DEV_RX_OFFLOAD_RSS_HASH | +DEV_RX_OFFLOAD_TIMESTAMP ; dev_info->tx_offload_capa |= DEV_TX_OFFLOAD_QINQ_INSERT |drivers/net/ice/ice_ethdev.c +0
-0DEV_TX_OFFLOAD_IPV4_CKSUM |drivers/net/ice/ice_rxtx.c index renamed from drivers/net/ice/ice_rxtx.c +0
-05d7ab4f..717d3f0 100644
drivers/net/ice/ice_rxtx.c +12
-0@@ -302,6 +302,18 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq) } } +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) { +/* Register mbuf field and flag for Rx timestamp */ + err =rte_mbuf_dyn_rx_timestamp_register ( + &ice_timestamp_dynfield_offset, + &ice_timestamp_dynflag); +if (err !=0 ) { +PMD_INIT_LOG (ERR , +"Cannot register mbuf field/flag for timestamp" ); +return -EINVAL ; + } + } +memset (&rx_ctx,0 ,sizeof (rx_ctx));drivers/net/ice/ice_rxtx.c +3
-1rx_ctx.base = rxq->rx_ring_dma / ICE_QUEUE_BASE_ADDR_UNIT; @@ -354,6 +366,9 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq) regval |= (0x03 <<QRXFLXP_CNTXT_RXDID_PRIO_S ) &QRXFLXP_CNTXT_RXDID_PRIO_M ; +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) + regval |=QRXFLXP_CNTXT_TS_M ; +ICE_WRITE_REG (hw,QRXFLXP_CNTXT (rxq->reg_idx), regval); err = ice_clear_rxq_ctx(hw, rxq->reg_idx); @@ -1530,6 +1545,45 @@
ice_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp)drivers/net/ice/ice_rxtx.c +27
-0mb->vlan_tci, mb->vlan_tci_outer); } +uint64_t +ice_read_time (struct ice_hw *hw) +{ +uint32_t hi, lo, lo2; +uint64_t time; + + lo =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); + hi =ICE_READ_REG (hw,GLTSYN_TIME_H (0 )); + lo2 =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); + +if (lo2 < lo) { + lo =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); + hi =ICE_READ_REG (hw,GLTSYN_TIME_H (0 )); + } + + time = ((uint64_t )hi <<32 ) | lo; + +return time; +} + +uint64_t +ice_tstamp_convert_32b_64b (uint64_t time,uint64_t timestamp) { +const uint64_t mask =0xFFFFFFFF ; +uint32_t delta; +uint64_t ns; + + delta = (timestamp - (uint32_t )(time & mask));
drivers/net/ice/ice_rxtx.c ice_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp) · line 1585
Quoted 10 lines
drivers/net/ice/ice_rxtx.c +10
-0+ +if (delta > (mask /2 )) { + delta = ((uint32_t )(time & mask) - timestamp); + ns = time - delta; + }else { + ns = time + delta; + } + +return ns; +}
Above two helper functions can be merged into one or be wrapped by a new function. and all functions can be defined as a static inline function in ice_rxtx.h.
Quoted 114 lines
drivers/net/ice/ice_rxtx.c +54
-0+#define ICE_LOOK_AHEAD 8#if (ICE_LOOK_AHEAD !=8 )#error "PMD ICE: ICE_LOOK_AHEAD must be 8\n"@@ -1546,6 +1600,9 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq)int32_t i, j, nb_rx =0 ;uint64_t pkt_flags =0 ;uint32_t *ptype_tbl = rxq->vsi->adapter->ptype_tbl; +struct ice_vsi *vsi = rxq->vsi; +struct ice_hw *hw =ICE_VSI_TO_HW (vsi); +uint64_t time, ts_ns; rxdp = &rxq->rx_ring[rxq->rx_tail]; rxep = &rxq->sw_ring[rxq->rx_tail];@@ -1589,6 +1646,20 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq)ice_rxd_to_vlan_tci (mb, &rxdp[j]); rxq->rxd_to_pkt_fields (rxq, mb, &rxdp[j]); +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) { + rxq->time_high = +rte_le_to_cpu_32 (rxdp[j].wb.flex_ts.ts_high); + time =ice_read_time (hw); + ts_ns =ice_tstamp_convert_32b_64b (time, + rxq->time_high); +if (ice_timestamp_dynflag >0 ) { + *RTE_MBUF_DYNFIELD (mb, + ice_timestamp_dynfield_offset, + rte_mbuf_timestamp_t *) = ts_ns; + mb->ol_flags |= ice_timestamp_dynflag; + } + } + mb->ol_flags |= pkt_flags; }@@ -1772,6 +1843,9 @@ ice_recv_scattered_pkts(void *rx_queue,uint64_t dma_addr;uint64_t pkt_flags;uint32_t *ptype_tbl = rxq->vsi->adapter->ptype_tbl; +struct ice_vsi *vsi = rxq->vsi; +struct ice_hw *hw =ICE_VSI_TO_HW (vsi); +uint64_t time, ts_ns;while (nb_rx < nb_pkts) { rxdp = &rx_ring[rx_id];@@ -1882,6 +1956,21 @@ ice_recv_scattered_pkts(void *rx_queue,ice_rxd_to_vlan_tci (first_seg, &rxd); rxq->rxd_to_pkt_fields (rxq, first_seg, &rxd); pkt_flags =ice_rxd_error_to_pkt_flags (rx_stat_err0); + +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) { + rxq->time_high = +rte_le_to_cpu_32 (rxd.wb.flex_ts.ts_high); + time =ice_read_time (hw); + ts_ns =ice_tstamp_convert_32b_64b (time, + rxq->time_high); +if (ice_timestamp_dynflag >0 ) { + *RTE_MBUF_DYNFIELD (first_seg, + ice_timestamp_dynfield_offset, + rte_mbuf_timestamp_t *) = ts_ns; + first_seg->ol_flags |= ice_timestamp_dynflag; + } + } + first_seg->ol_flags |= pkt_flags;/* Prefetch data of first segment, if configured to do so. */ rte_prefetch0(RTE_PTR_ADD(first_seg->buf_addr,@@ -2237,6 +2326,9 @@ ice_recv_pkts(void *rx_queue,uint64_t dma_addr;uint64_t pkt_flags;uint32_t *ptype_tbl = rxq->vsi->adapter->ptype_tbl; +struct ice_vsi *vsi = rxq->vsi; +struct ice_hw *hw =ICE_VSI_TO_HW (vsi); +uint64_t time, ts_ns;while (nb_rx < nb_pkts) { rxdp = &rx_ring[rx_id];@@ -2288,6 +2380,21 @@ ice_recv_pkts(void *rx_queue,ice_rxd_to_vlan_tci (rxm, &rxd); rxq->rxd_to_pkt_fields (rxq, rxm, &rxd); pkt_flags =ice_rxd_error_to_pkt_flags (rx_stat_err0); + +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) { + rxq->time_high = +rte_le_to_cpu_32 (rxd.wb.flex_ts.ts_high); + time =ice_read_time (hw); + ts_ns =ice_tstamp_convert_32b_64b (time, + rxq->time_high); +if (ice_timestamp_dynflag >0 ) { + *RTE_MBUF_DYNFIELD (rxm, + ice_timestamp_dynfield_offset, + rte_mbuf_timestamp_t *) = ts_ns; + rxm->ol_flags |= ice_timestamp_dynflag; + } + } + rxm->ol_flags |= pkt_flags;/* copy old mbuf to rx_pkts */ rx_pkts[nb_rx++] = rxm;drivers/net/ice/ice_rxtx.h index renamed from drivers/net/ice/ice_rxtx.h +0
-0b10db08..b3dc80b 100644
drivers/net/ice/ice_rxtx.h +3
-0@@ -40,6 +40,9 @@#define ICE_RXDID_COMMS_OVS 22 +extern uint64_t ice_timestamp_dynflag; +extern int ice_timestamp_dynfield_offset; + typedef void (*ice_rx_release_mbufs_t)(struct ice_rx_queue *rxq); typedefvoid (*ice_tx_release_mbufs_t)(struct
ice_tx_queue*txq); typedef void (*ice_rxd_to_pkt_fields_t)(structice_rx_queue*rxq, @@ -89,6 +92,7 @@ structice_rx_queue{
drivers/net/ice/ice_rxtx.h struct ice_rx_queue { · line 95
Quoted 4 lines
drivers/net/ice/ice_rxtx.h +1
-0ice_rxd_to_pkt_fields_t rxd_to_pkt_fields;/* handle FlexiMD by RXDID */ ice_rx_release_mbufs_t rx_rel_mbufs;uint64_t offloads; +uint32_t time_high;
Why we need this field?
I saw the only place it is referenced is to set value with rte_le_to_cpu_32(rxdp[j].wb.flex_ts.ts_high and parse it to ice_tstamp_convert_32b_64b
Quoted 1 line
Hi, Qi
Quoted 40 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Friday, September 24, 2021 1:25 PM
To: Su, Simei <[email protected]>
Cc: [email protected]; Wang, Haiyue <[email protected]>
Subject: RE: [PATCH] net/ice: enable Rx timestamp on Flex DescriptorQuoted 31 lines
-----Original Message-----
From: Su, Simei <[email protected]>
Sent: Saturday, September 18, 2021 2:57 PM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]; Wang, Haiyue <[email protected]>; Su, Simei <[email protected]>
Subject: [PATCH] net/ice: enable Rx timestamp on Flex DescriptorUse the dynamic mbuf to register timestamp field and flag. The ice has the feature to dump Rx timestamp value into dynamic mbuf field by flex descriptor. This feature is turned on by dev config "enable-rx-timestamp". Currently, it's only supported under scalar path.
Signed-off-by Simei Su <[email protected]>--- doc/guides/rel_notes/release_21_11.rst | 1 + drivers/net/ice/ice_ethdev.c | 6 +- drivers/net/ice/ice_rxtx.c | 107 +++++++++++++++++++++++++++++++++ drivers/net/ice/ice_rxtx.h | 6 ++ drivers/net/ice/ice_rxtx_vec_common.h | 3 + 5 files changed, 122 insertions(+), 1 deletion(-)doc/guides/rel_notes/release_21_11.rst +0
-0@@ -70,6 +70,7 @@ New Features * **Updated Intel ice driver.**
Quoted 5 lines
doc/guides/rel_notes/release_21_11.rst New Features · line 73
Quoted 2 lines
doc/guides/rel_notes/release_21_11.rst +1
-0Added 1PPS out support by a devargs. + * Added Rx timstamp support by dynamic mbuf on Flex Descriptor.How about just "added
DEV_RX_OFFLOAD_TIMESTAMPsupport"
OK. I will change it.
Quoted 92 lines
Quoted 9 lines
doc/guides/rel_notes/release_21_11.rst +0
-0Removed Items(quoted diff) +0
-0
b/drivers/net/ice/ice_ethdev.cindex
76dcabf..06adf43 100644drivers/net/ice/ice_ethdev.c line 38
Quoted 8 lines
drivers/net/ice/ice_ethdev.c +3
-0@@ -31,6 +31,9 @@#define ICE_HW_DEBUG_MASK_ARG "hw_debug_mask"#define ICE_ONE_PPS_OUT_ARG "pps_out" +uint64_t ice_timestamp_dynflag; +int ice_timestamp_dynfield_offset =-1 ; +static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG ,ICE_PIPELINE_MODE_SUPPORT_ARG ,@@ -3672,7
Quoted 3 lines
drivers/net/ice/ice_ethdev.c +1
-0+3675,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info*dev_info)DEV_RX_OFFLOAD_QINQ_STRIP|DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM|
DEV_RX_OFFLOAD_VLAN_EXTEND|Quoted 70 lines
drivers/net/ice/ice_ethdev.c +2
-1-DEV_RX_OFFLOAD_RSS_HASH ; +DEV_RX_OFFLOAD_RSS_HASH | +DEV_RX_OFFLOAD_TIMESTAMP ; dev_info->tx_offload_capa |=DEV_TX_OFFLOAD_QINQ_INSERT | DEV_TX_OFFLOAD_IPV4_CKSUM |drivers/net/ice/ice_rxtx.c +0
-0index
5d7ab4f..717d3f0 100644drivers/net/ice/ice_rxtx.c +9
-1@@ -302,6 +302,18 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq) } } +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) { +/* Register mbuf field and flag for Rx timestamp */ err = +rte_mbuf_dyn_rx_timestamp_register ( +&ice_timestamp_dynfield_offset, +&ice_timestamp_dynflag); +if (err !=0 ) { +PMD_INIT_LOG (ERR , +"Cannot register mbuf field/flag for timestamp" );return -EINVAL ; } } +memset (&rx_ctx,0 ,sizeof (rx_ctx)); rx_ctx.base = rxq->rx_ring_dma / ICE_QUEUE_BASE_ADDR_UNIT; @@ -354,6 +366,9 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)regval |= (
0x03<<QRXFLXP_CNTXT_RXDID_PRIO_S) &QRXFLXP_CNTXT_RXDID_PRIO_M;drivers/net/ice/ice_rxtx.c +3
-0+if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) regval |= +QRXFLXP_CNTXT_TS_M ; +ICE_WRITE_REG (hw,QRXFLXP_CNTXT (rxq->reg_idx), regval); err = ice_clear_rxq_ctx(hw, rxq->reg_idx); @@ -1530,6 +1545,45 @@ice_rxd_to_vlan_tci(struct
rte_mbuf*mb, volatile unionice_rx_flex_desc
*rxdp)mb->vlan_tci, mb->vlan_tci_outer); }drivers/net/ice/ice_rxtx.c +27
-0+uint64_t +ice_read_time (struct ice_hw *hw) +{ +uint32_t hi, lo, lo2; +uint64_t time; + +lo =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); hi =ICE_READ_REG (hw, +GLTSYN_TIME_H (0 )); +lo2 =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); + +if (lo2 < lo) { +lo =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); hi =ICE_READ_REG (hw, +GLTSYN_TIME_H (0 )); } + +time = ((uint64_t )hi <<32 ) | lo; + +return time; +} + +uint64_t +ice_tstamp_convert_32b_64b (uint64_t time,uint64_t timestamp) {const +uint64_t mask =0xFFFFFFFF ;uint32_t delta;uint64_t ns; + +delta = (timestamp - (uint32_t )(time & mask)); + +if (delta > (mask /2 )) { +delta = ((uint32_t )(time & mask) - timestamp); ns = time - delta; }
Quoted 9 lines
drivers/net/ice/ice_rxtx.c ice_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp) · line 1585
Quoted 4 lines
drivers/net/ice/ice_rxtx.c +4
-0+else { ns = time + delta; } + +return ns; +}Above two helper functions can be merged into one or be wrapped by a new function.
and all functions can be defined as a static inline function inice_rxtx.h.
Yes, above two functions can be merged into one, but I don't define it as a static function
because subsequent timesync support patch also need to use this function in ice_ethdev.c.
Quoted 98 lines
Quoted 98 lines
drivers/net/ice/ice_rxtx.c +1
-0+#define ICE_LOOK_AHEAD 8#if (ICE_LOOK_AHEAD !=8 )#error "PMD ICE: ICE_LOOK_AHEAD must be 8\n"@@ -1546,6 +1600,9 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq)
int32_ti, j,nb_rx= 0;uint64_tpkt_flags= 0;uint32_t*ptype_tbl=rxq->vsi->adapter->ptype_tbl;drivers/net/ice/ice_rxtx.c +16
-0+struct ice_vsi *vsi = rxq->vsi; +struct ice_hw *hw =ICE_VSI_TO_HW (vsi);uint64_t time, ts_ns; rxdp = &rxq->rx_ring[rxq->rx_tail]; rxep = &rxq->sw_ring[rxq->rx_tail];@@ -1589,6 +1646,20 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq)ice_rxd_to_vlan_tci (mb, &rxdp[j]); rxq->rxd_to_pkt_fields (rxq, mb, &rxdp[j]); +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) { +rxq->time_high = +rte_le_to_cpu_32 (rxdp[j].wb.flex_ts.ts_high); +time =ice_read_time (hw); +ts_ns =ice_tstamp_convert_32b_64b (time, +rxq->time_high); +if (ice_timestamp_dynflag >0 ) { +*RTE_MBUF_DYNFIELD (mb, +ice_timestamp_dynfield_offset, +rte_mbuf_timestamp_t *) = ts_ns; +mb->ol_flags |= ice_timestamp_dynflag; +} +} + mb->ol_flags |= pkt_flags; }@@ -1772,6 +1843,9 @@ ice_recv_scattered_pkts(void *rx_queue,
uint64_tdma_addr;uint64_tpkt_flags;uint32_t*ptype_tbl=rxq->vsi->adapter->ptype_tbl;drivers/net/ice/ice_rxtx.c +2
-0+struct ice_vsi *vsi = rxq->vsi; +struct ice_hw *hw =ICE_VSI_TO_HW (vsi);uint64_t time, ts_ns;while (nb_rx < nb_pkts) { rxdp = &rx_ring[rx_id];@@ -1882,6 +1956,21 @@ ice_recv_scattered_pkts(void *rx_queue, ice_rxd_to_vlan_tci(first_seg, &rxd); rxq->rxd_to_pkt_fields(rxq,
first_seg, &rxd);pkt_flags=ice_rxd_error_to_pkt_flags(rx_stat_err0);drivers/net/ice/ice_rxtx.c +13
-0+ +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) { +rxq->time_high = +rte_le_to_cpu_32 (rxd.wb.flex_ts.ts_high); +time =ice_read_time (hw); +ts_ns =ice_tstamp_convert_32b_64b (time, +rxq->time_high); +if (ice_timestamp_dynflag >0 ) { +*RTE_MBUF_DYNFIELD (first_seg, +ice_timestamp_dynfield_offset, +rte_mbuf_timestamp_t *) = ts_ns; +first_seg->ol_flags |= ice_timestamp_dynflag; } } + first_seg->ol_flags |= pkt_flags;/* Prefetch data of first segment, if configured to do so. */ rte_prefetch0(RTE_PTR_ADD(first_seg->buf_addr,
drivers/net/ice/ice_rxtx.c +0
-0@@ -2237,6 +2326,9 @@ ice_recv_pkts(void *rx_queue, uint64_t
dma_addr;uint64_tpkt_flags;uint32_t*ptype_tbl=rxq->vsi->adapter->ptype_tbl;drivers/net/ice/ice_rxtx.c +17
-0+struct ice_vsi *vsi = rxq->vsi; +struct ice_hw *hw =ICE_VSI_TO_HW (vsi);uint64_t time, ts_ns;while (nb_rx < nb_pkts) { rxdp = &rx_ring[rx_id];@@ -2288,6 +2380,21 @@ ice_recv_pkts(void *rx_queue,ice_rxd_to_vlan_tci (rxm, &rxd); rxq->rxd_to_pkt_fields (rxq, rxm, &rxd); pkt_flags =ice_rxd_error_to_pkt_flags (rx_stat_err0); + +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) { +rxq->time_high = +rte_le_to_cpu_32 (rxd.wb.flex_ts.ts_high); +time =ice_read_time (hw); +ts_ns =ice_tstamp_convert_32b_64b (time, +rxq->time_high); +if (ice_timestamp_dynflag >0 ) { +*RTE_MBUF_DYNFIELD (rxm, +ice_timestamp_dynfield_offset, +rte_mbuf_timestamp_t *) = ts_ns; +rxm->ol_flags |= ice_timestamp_dynflag; +} +} + rxm->ol_flags |= pkt_flags;/* copy old mbuf to rx_pkts */ rx_pkts[nb_rx++] = rxm;drivers/net/ice/ice_rxtx.h +0
-0@@ -40,6 +40,9 @@#define ICE_RXDID_COMMS_OVS22
Quoted 18 lines
Quoted 10 lines
drivers/net/ice/ice_rxtx.h +3
-0+extern uint64_t ice_timestamp_dynflag;extern int +ice_timestamp_dynfield_offset; +typedef void (*ice_rx_release_mbufs_t )(struct ice_rx_queue *rxq);typedef void (*ice_tx_release_mbufs_t )(struct ice_tx_queue *txq);typedef void (*ice_rxd_to_pkt_fields_t)(struct
ice_rx_queue*rxq, @@ -89,6 +92,7 @@ structice_rx_queue{ice_rxd_to_pkt_fields_trxd_to_pkt_fields; /* handle FlexiMD by RXDID */ice_rx_release_mbufs_trx_rel_mbufs;uint64_toffloads; +uint32_ttime_high;Why we need this field?
I saw the only place it is referenced is to set value with rte_le_to_cpu_32(rxdp[j].wb.flex_ts.ts_high and parse it toice_tstamp_convert_32b_64bQuoted 1 line
Yes, timesync patch can also reuse this field, so I add this field, but you are right, I will remove this field can add it in the following timesync patch.
PATCH v2 1/1 net/ice: enable Rx timestamp on Flex Descriptor
In reply to Simei SuUse the dynamic mbuf to register timestamp field and flag. The ice has the feature to dump Rx timestamp value into dynamic mbuf field by flex descriptor. This feature is turned on by dev config "enable-rx-timestamp". Currently, it's only supported under scalar path.
---
v2:
* Refine release notes.
* Merge two helper functions into one.
* Remove one field in ice_rx_queue structure.
doc/guides/rel_notes/release_21_11.rst | 3 +- drivers/net/ice/ice_ethdev.c | 6 ++- drivers/net/ice/ice_rxtx.c | 88 ++++++++++++++++++++++++++++++++++ drivers/net/ice/ice_rxtx.h | 4 ++ drivers/net/ice/ice_rxtx_vec_common.h | 3 ++ 5 files changed, 102 insertions(+), 2 deletions(-)
doc/guides/rel_notes/release_21_11.rst +2 -1
@@ -75,7 +75,8 @@ New Features * **Updated Intel ice driver.** - Added 1PPS out support by a devargs. + * Added 1PPS out support by a devargs. + * Added DEV_RX_OFFLOAD_TIMESTAMP support. * **Updated Marvell cnxk ethdev driver.**
drivers/net/ice/ice_ethdev.c +5 -1
@@ -31,6 +31,9 @@#define ICE_HW_DEBUG_MASK_ARG "hw_debug_mask"#define ICE_ONE_PPS_OUT_ARG "pps_out" +uint64_t ice_timestamp_dynflag; +int ice_timestamp_dynfield_offset =-1 ; +static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG ,ICE_PIPELINE_MODE_SUPPORT_ARG ,
@@ -3652,7 +3655,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)DEV_RX_OFFLOAD_QINQ_STRIP |DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |DEV_RX_OFFLOAD_VLAN_EXTEND | -DEV_RX_OFFLOAD_RSS_HASH ; +DEV_RX_OFFLOAD_RSS_HASH | +DEV_RX_OFFLOAD_TIMESTAMP ; dev_info->tx_offload_capa |=DEV_TX_OFFLOAD_QINQ_INSERT | DEV_TX_OFFLOAD_IPV4_CKSUM |
drivers/net/ice/ice_rxtx.c +88 -0
142 lines not on this page · raw message
drivers/net/ice/ice_rxtx.h +4 -0
@@ -40,6 +40,9 @@#define ICE_RXDID_COMMS_OVS 22 +extern uint64_t ice_timestamp_dynflag; +extern int ice_timestamp_dynfield_offset; +typedef void (*ice_rx_release_mbufs_t )(struct ice_rx_queue *rxq);typedef void (*ice_tx_release_mbufs_t )(struct ice_tx_queue *txq); typedef void (*ice_rxd_to_pkt_fields_t)(struct ice_rx_queue *rxq,
@@ -281,6 +284,7 @@ uint16_t ice_xmit_pkts_vec_avx512_offload(void *tx_queue,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);int ice_get_monitor_addr (void *rx_queue,struct rte_power_monitor_cond *pmc); +uint64_t ice_tstamp_convert_32b_64b (struct ice_hw *hw,uint32_t in_timestamp);#define FDIR_PARSING_ENABLE_PER_QUEUE (ad, on) do { \ int i; \
drivers/net/ice/ice_rxtx_vec_common.h +3 -0
@@ -287,6 +287,9 @@ ice_rx_vec_queue_default(struct ice_rx_queue *rxq)if (rxq->proto_xtr !=PROTO_XTR_NONE )return -1 ; +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) +return -1 ; +if (rxq->offloads &ICE_RX_VECTOR_OFFLOAD )return ICE_VECTOR_OFFLOAD_PATH ;
Signature · 1 line
2.9.5
PATCH v3 1/1 net/ice: enable Rx timestamp on Flex Descriptor
Use the dynamic mbuf to register timestamp field and flag. The ice has the feature to dump Rx timestamp value into dynamic mbuf field by flex descriptor. This feature is turned on by dev config "enable-rx-timestamp". Currently, it's only supported under scalar path.
---
v3:
* Define ice_tstamp_convert_32b_64b() as a static inline function in ice_rxtx.h.
v2:
* Refine release notes.
* Merge two helper functions into one.
* Remove one field in ice_rx_queue structure.
doc/guides/rel_notes/release_21_11.rst | 3 +- drivers/net/ice/ice_ethdev.c | 6 +++- drivers/net/ice/ice_rxtx.c | 59 ++++++++++++++++++++++++++++++++++ drivers/net/ice/ice_rxtx.h | 33 +++++++++++++++++++ drivers/net/ice/ice_rxtx_vec_common.h | 3 ++ 5 files changed, 102 insertions(+), 2 deletions(-)
doc/guides/rel_notes/release_21_11.rst +2 -1
@@ -75,7 +75,8 @@ New Features * **Updated Intel ice driver.** - Added 1PPS out support by a devargs. + * Added 1PPS out support by a devargs. + * Added DEV_RX_OFFLOAD_TIMESTAMP support. * **Updated Marvell cnxk ethdev driver.**
drivers/net/ice/ice_ethdev.c +5 -1
@@ -31,6 +31,9 @@#define ICE_HW_DEBUG_MASK_ARG "hw_debug_mask"#define ICE_ONE_PPS_OUT_ARG "pps_out" +uint64_t ice_timestamp_dynflag; +int ice_timestamp_dynfield_offset =-1 ; +static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG ,ICE_PIPELINE_MODE_SUPPORT_ARG ,
@@ -3652,7 +3655,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)DEV_RX_OFFLOAD_QINQ_STRIP |DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |DEV_RX_OFFLOAD_VLAN_EXTEND | -DEV_RX_OFFLOAD_RSS_HASH ; +DEV_RX_OFFLOAD_RSS_HASH | +DEV_RX_OFFLOAD_TIMESTAMP ; dev_info->tx_offload_capa |=DEV_TX_OFFLOAD_QINQ_INSERT | DEV_TX_OFFLOAD_IPV4_CKSUM |
drivers/net/ice/ice_rxtx.c +59 -0
107 lines not on this page · raw message
drivers/net/ice/ice_rxtx.h +33 -0
@@ -40,6 +40,9 @@#define ICE_RXDID_COMMS_OVS 22 +extern uint64_t ice_timestamp_dynflag; +extern int ice_timestamp_dynfield_offset; +typedef void (*ice_rx_release_mbufs_t )(struct ice_rx_queue *rxq);typedef void (*ice_tx_release_mbufs_t )(struct ice_tx_queue *txq); typedef void (*ice_rxd_to_pkt_fields_t)(struct ice_rx_queue *rxq,
@@ -311,4 +314,34 @@ void ice_fdir_rx_parsing_enable(struct ice_adapter *ad, bool on) } } +/* Helper function to convert a 32b nanoseconds timestamp to 64b. */ +static inline +uint64_t ice_tstamp_convert_32b_64b (struct ice_hw *hw,uint32_t in_timestamp) +{ +const uint64_t mask =0xFFFFFFFF ; +uint32_t hi, lo, lo2, delta; +uint64_t time, ns; + + lo =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); + hi =ICE_READ_REG (hw,GLTSYN_TIME_H (0 )); + lo2 =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); + +if (lo2 < lo) { + lo =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); + hi =ICE_READ_REG (hw,GLTSYN_TIME_H (0 )); + } + + time = ((uint64_t )hi <<32 ) | lo; + + delta = (in_timestamp - (uint32_t )(time & mask)); +if (delta > (mask /2 )) { + delta = ((uint32_t )(time & mask) - in_timestamp); + ns = time - delta; + }else { + ns = time + delta; + } + +return ns; +} +#endif /* _ICE_RXTX_H_ */
drivers/net/ice/ice_rxtx_vec_common.h +3 -0
@@ -287,6 +287,9 @@ ice_rx_vec_queue_default(struct ice_rx_queue *rxq)if (rxq->proto_xtr !=PROTO_XTR_NONE )return -1 ; +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) +return -1 ; +if (rxq->offloads &ICE_RX_VECTOR_OFFLOAD )return ICE_VECTOR_OFFLOAD_PATH ;
Signature · 1 line
2.9.5
PATCH v4 1/1 net/ice: enable Rx timestamp on Flex Descriptor
Use the dynamic mbuf to register timestamp field and flag. The ice has the feature to dump Rx timestamp value into dynamic mbuf field by flex descriptor. This feature is turned on by dev config "enable-rx-timestamp". Currently, it's only supported under scalar path.
---
v4:
* Rebase code.
v3:
* Define ice_tstamp_convert_32b_64b() as a static inline function in ice_rxtx.h.
v2:
* Refine release notes.
* Merge two helper functions into one.
* Remove one field in ice_rx_queue structure.
doc/guides/rel_notes/release_21_11.rst | 1 + drivers/net/ice/ice_ethdev.c | 6 +++- drivers/net/ice/ice_rxtx.c | 59 ++++++++++++++++++++++++++++++++++ drivers/net/ice/ice_rxtx.h | 33 +++++++++++++++++++ drivers/net/ice/ice_rxtx_vec_common.h | 3 ++ 5 files changed, 101 insertions(+), 1 deletion(-)
doc/guides/rel_notes/release_21_11.rst +1 -0
@@ -81,6 +81,7 @@ New Features * Added 1PPS out support by a devargs. * Added IPv4 and L4(TCP/UDP/SCTP) checksum hash support in RSS flow. + * Added DEV_RX_OFFLOAD_TIMESTAMP support. * **Updated Marvell cnxk ethdev driver.**
drivers/net/ice/ice_ethdev.c +5 -1
@@ -32,6 +32,9 @@#define ICE_ONE_PPS_OUT_ARG "pps_out"#define ICE_RX_LOW_LATENCY_ARG "rx_low_latency" +uint64_t ice_timestamp_dynflag; +int ice_timestamp_dynfield_offset =-1 ; +static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG ,ICE_PIPELINE_MODE_SUPPORT_ARG ,
@@ -3671,7 +3674,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)DEV_RX_OFFLOAD_QINQ_STRIP |DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |DEV_RX_OFFLOAD_VLAN_EXTEND | -DEV_RX_OFFLOAD_RSS_HASH ; +DEV_RX_OFFLOAD_RSS_HASH | +DEV_RX_OFFLOAD_TIMESTAMP ; dev_info->tx_offload_capa |=DEV_TX_OFFLOAD_QINQ_INSERT | DEV_TX_OFFLOAD_IPV4_CKSUM |
drivers/net/ice/ice_rxtx.c +59 -0
107 lines not on this page · raw message
drivers/net/ice/ice_rxtx.h +33 -0
@@ -40,6 +40,9 @@#define ICE_RXDID_COMMS_OVS 22 +extern uint64_t ice_timestamp_dynflag; +extern int ice_timestamp_dynfield_offset; +typedef void (*ice_rx_release_mbufs_t )(struct ice_rx_queue *rxq);typedef void (*ice_tx_release_mbufs_t )(struct ice_tx_queue *txq); typedef void (*ice_rxd_to_pkt_fields_t)(struct ice_rx_queue *rxq,
@@ -311,4 +314,34 @@ void ice_fdir_rx_parsing_enable(struct ice_adapter *ad, bool on) } } +/* Helper function to convert a 32b nanoseconds timestamp to 64b. */ +static inline +uint64_t ice_tstamp_convert_32b_64b (struct ice_hw *hw,uint32_t in_timestamp) +{ +const uint64_t mask =0xFFFFFFFF ; +uint32_t hi, lo, lo2, delta; +uint64_t time, ns; + + lo =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); + hi =ICE_READ_REG (hw,GLTSYN_TIME_H (0 )); + lo2 =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); + +if (lo2 < lo) { + lo =ICE_READ_REG (hw,GLTSYN_TIME_L (0 )); + hi =ICE_READ_REG (hw,GLTSYN_TIME_H (0 )); + } + + time = ((uint64_t )hi <<32 ) | lo; + + delta = (in_timestamp - (uint32_t )(time & mask)); +if (delta > (mask /2 )) { + delta = ((uint32_t )(time & mask) - in_timestamp); + ns = time - delta; + }else { + ns = time + delta; + } + +return ns; +} +#endif /* _ICE_RXTX_H_ */
drivers/net/ice/ice_rxtx_vec_common.h +3 -0
@@ -287,6 +287,9 @@ ice_rx_vec_queue_default(struct ice_rx_queue *rxq)if (rxq->proto_xtr !=PROTO_XTR_NONE )return -1 ; +if (rxq->offloads &DEV_RX_OFFLOAD_TIMESTAMP ) +return -1 ; +if (rxq->offloads &ICE_RX_VECTOR_OFFLOAD )return ICE_VECTOR_OFFLOAD_PATH ;
Signature · 1 line
2.9.5
Quoted 10 lines
-----Original Message-----
From: Su, Simei <[email protected]>
Sent: Sunday, September 26, 2021 10:05 PM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]; Wang, Haiyue <[email protected]>; Su, Simei <[email protected]>
Subject: [PATCH v4] net/ice: enable Rx timestamp on Flex Descriptor
Quoted 6 lines
Use the dynamic mbuf to register timestamp field and flag.
The ice has the feature to dump Rx timestamp value into dynamic mbuf field by flex descriptor. This feature is turned on by dev config "enable-rx-timestamp". Currently, it's only supported under scalar path.Signed-off-by Simei Su <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi
Quoted 20 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Zhang, Qi Z
Sent: Monday, September 27, 2021 3:02 PM
To: Su, Simei <[email protected]>
Cc: [email protected]; Wang, Haiyue <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v4] net/ice: enable Rx timestamp on Flex DescriptorQuoted 8 lines
-----Original Message-----
From: Su, Simei <[email protected]>
Sent: Sunday, September 26, 2021 10:05 PM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]; Wang, Haiyue <[email protected]>; Su, Simei <[email protected]>
Subject: [PATCH v4] net/ice: enable Rx timestamp on Flex Descriptor
Quoted 8 lines
Quoted 6 lines
Use the dynamic mbuf to register timestamp field and flag. The ice has the feature to dump Rx timestamp value into dynamic mbuf field by flex descriptor. This feature is turned on by dev config "enable-rx-timestamp". Currently, it's only supported under scalar path.
Signed-off-by Simei Su <[email protected]>Acked-by Qi Zhang <[email protected]>
Seems the patch need update the ice.ini for new feature enabling.
As it has not been merged into next-net, so fix the gap by adding below in ice.ini in dpdk-next-net-intel.
Timestamp offload = P
Quoted 5 lines
Applied to dpdk-next-net-intel.
Thanks
Qi