Consistently support nanosecond timestamps across all the variations of pcap PMD receive.
Signed-off-by: Stephen Hemminger <[email protected]> --- doc/guides/nics/features/pcap.ini | 1 + drivers/net/pcap/pcap_ethdev.c | 136 +++++++++++++++++++++++------- 2 files changed, 107 insertions(+), 30 deletions(-) diff --git a/doc/guides/nics/features/pcap.ini b/doc/guides/nics/features/pcap.ini index 7a1420a2eb..24161cb33f 100644 --- a/doc/guides/nics/features/pcap.ini +++ b/doc/guides/nics/features/pcap.ini @@ -11,6 +11,7 @@ Rx Timestamp = Y Basic stats = Y Stats per queue = Y VLAN offload = Y +Timestamp offload = Y Multiprocess aware = Y FreeBSD = Y Linux = Y diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c index 19d4ed94e1..7e2a69f137 100644 --- a/drivers/net/pcap/pcap_ethdev.c +++ b/drivers/net/pcap/pcap_ethdev.c @@ -19,13 +19,13 @@ #include <rte_mbuf_dyn.h> #include <bus_vdev_driver.h> #include <rte_os_shim.h> +#include <rte_time.h> +#include <rte_reciprocal.h> #include "pcap_osdep.h" #define RTE_ETH_PCAP_SNAPSHOT_LEN 65535 #define RTE_ETH_PCAP_SNAPLEN (RTE_ETHER_MAX_JUMBO_FRAME_LEN - RTE_ETHER_CRC_LEN) -#define RTE_ETH_PCAP_PROMISC 1 -#define RTE_ETH_PCAP_TIMEOUT -1 #define ETH_PCAP_RX_PCAP_ARG "rx_pcap" #define ETH_PCAP_TX_PCAP_ARG "tx_pcap" @@ -44,6 +44,7 @@ static char errbuf[PCAP_ERRBUF_SIZE]; static struct timespec start_time; static uint64_t start_cycles; static uint64_t hz; +static struct rte_reciprocal_u64 hz_inv; static uint8_t iface_idx; static uint64_t timestamp_rx_dynflag; @@ -69,6 +70,7 @@ struct pcap_rx_queue { uint16_t port_id; uint16_t queue_id; bool vlan_strip; + bool timestamp_offloading; struct rte_mempool *mb_pool; struct queue_stat rx_stat; struct queue_missed_stat missed_stat; @@ -97,6 +99,7 @@ struct pmd_internals { bool phy_mac; bool infinite_rx; bool vlan_strip; + bool timestamp_offloading; }; struct pmd_process_private { @@ -331,10 +334,19 @@ eth_pcap_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (pcap_q->vlan_strip) rte_vlan_strip(mbuf); - uint64_t us = (uint64_t)header->ts.tv_sec * US_PER_S + header->ts.tv_usec; + if (pcap_q->timestamp_offloading) { + /* + * Although time stamp in struct pcap_pkthdr is defined as struct timeval, + * it really is a timespec with nanosecond resolution. + */ + const struct timespec *ts = (struct timespec *)&header->ts; + + *RTE_MBUF_DYNFIELD(mbuf, timestamp_dynfield_offset, + rte_mbuf_timestamp_t *) = rte_timespec_to_ns(ts); + + mbuf->ol_flags |= timestamp_rx_dynflag; + } - *RTE_MBUF_DYNFIELD(mbuf, timestamp_dynfield_offset, rte_mbuf_timestamp_t *) = us; - mbuf->ol_flags |= timestamp_rx_dynflag; mbuf->port = pcap_q->port_id; bufs[num_rx] = mbuf; num_rx++; @@ -354,20 +366,21 @@ eth_null_rx(void *queue __rte_unused, return 0; } -#define NSEC_PER_SEC 1000000000L - /* * This function stores nanoseconds in `tv_usec` field of `struct timeval`, * because `ts` goes directly to nanosecond-precision dump. */ static inline void -calculate_timestamp(struct timeval *ts) { +calculate_timestamp(struct timeval *ts) +{ uint64_t cycles; struct timespec cur_time; cycles = rte_get_timer_cycles() - start_cycles; - cur_time.tv_sec = cycles / hz; - cur_time.tv_nsec = (cycles % hz) * NSEC_PER_SEC / hz; + cur_time.tv_sec = rte_reciprocal_divide_u64(cycles, &hz_inv); + /* compute remainder */ + cycles -= cur_time.tv_sec * hz; + cur_time.tv_nsec = rte_reciprocal_divide_u64(cycles * NS_PER_S, &hz_inv); ts->tv_sec = start_time.tv_sec + cur_time.tv_sec; ts->tv_usec = start_time.tv_nsec + cur_time.tv_nsec; @@ -413,6 +426,9 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (unlikely(dumper == NULL || nb_pkts == 0)) return 0; + /* all packets in burst have same timestamp */ + calculate_timestamp(&header.ts); + /* writes the nb_pkts packets to the previously opened pcap file dumper */ for (i = 0; i < nb_pkts; i++) { struct rte_mbuf *mbuf = bufs[i]; @@ -427,7 +443,6 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } } - calculate_timestamp(&header.ts); header.len = len; header.caplen = len; @@ -539,22 +554,60 @@ eth_pcap_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) * pcap_open_live wrapper function */ static inline int -open_iface_live(const char *iface, pcap_t **pcap) { - *pcap = pcap_open_live(iface, RTE_ETH_PCAP_SNAPLEN, - RTE_ETH_PCAP_PROMISC, RTE_ETH_PCAP_TIMEOUT, errbuf); +open_iface_live(const char *iface, pcap_t **pcap) +{ + pcap_t *pc; + int status; - if (*pcap == NULL) { - PMD_LOG(ERR, "Couldn't open %s: %s", iface, errbuf); - return -1; + pc = pcap_create(iface, errbuf); + if (pc == NULL) { + PMD_LOG(ERR, "Couldn't create %s: %s", iface, errbuf); + goto error; + } + + status = pcap_set_tstamp_precision(pc, PCAP_TSTAMP_PRECISION_NANO); + if (status != 0) + PMD_LOG(WARNING, "%s: Could not set to ns precision: %s", + iface, pcap_statustostr(status)); + + status = pcap_set_immediate_mode(pc, 1); + if (status != 0) + PMD_LOG(WARNING, "%s: Could not set to immediate mode: %s", + iface, pcap_statustostr(status)); + + status = pcap_set_promisc(pc, 1); + if (status != 0) + PMD_LOG(WARNING, "%s: Could not set to promiscuous: %s", + iface, pcap_statustostr(status)); + + status = pcap_set_snaplen(pc, RTE_ETH_PCAP_SNAPSHOT_LEN); + if (status != 0) + PMD_LOG(WARNING, "%s: Could not set snapshot length: %s", + iface, pcap_statustostr(status)); + + status = pcap_activate(pc); + if (status < 0) { + char *cp = pcap_geterr(pc); + + if (status == PCAP_ERROR) + PMD_LOG(ERR, "%s: could not activate: %s", iface, cp); + else + PMD_LOG(ERR, "%s: %s (%s)", iface, pcap_statustostr(status), cp); + goto error; } - if (pcap_setnonblock(*pcap, 1, errbuf)) { + if (pcap_setnonblock(pc, 1, errbuf)) { PMD_LOG(ERR, "Couldn't set non-blocking on %s: %s", iface, errbuf); - pcap_close(*pcap); - return -1; + goto error; } + *pcap = pc; return 0; + +error: + if (pc != NULL) + pcap_close(pc); + return -1; } static int @@ -601,7 +654,8 @@ open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper) static int open_single_rx_pcap(const char *pcap_filename, pcap_t **pcap) { - *pcap = pcap_open_offline(pcap_filename, errbuf); + *pcap = pcap_open_offline_with_tstamp_precision(pcap_filename, + PCAP_TSTAMP_PRECISION_NANO, errbuf); if (*pcap == NULL) { PMD_LOG(ERR, "Couldn't open %s: %s", pcap_filename, errbuf); @@ -638,6 +692,15 @@ eth_dev_start(struct rte_eth_dev *dev) struct pcap_tx_queue *tx; struct pcap_rx_queue *rx; + if (internals->timestamp_offloading) { + int ret = rte_mbuf_dyn_rx_timestamp_register(×tamp_dynfield_offset, + ×tamp_rx_dynflag); + if (ret != 0) { + PMD_LOG(ERR, "Failed to register Rx timestamp field/flag"); + return ret; + } + } + /* Special iface case. Single pcap is open and shared between tx/rx. */ if (internals->single_iface) { tx = &internals->tx_queue[0]; @@ -760,6 +823,7 @@ eth_dev_configure(struct rte_eth_dev *dev) const struct rte_eth_rxmode *rxmode = &dev_conf->rxmode; internals->vlan_strip = !!(rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP); + internals->timestamp_offloading = !!(rxmode->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP); return 0; } @@ -779,7 +843,8 @@ eth_dev_info(struct rte_eth_dev *dev, dev_info->max_mtu = RTE_ETH_PCAP_SNAPLEN; dev_info->tx_offload_capa = RTE_ETH_TX_OFFLOAD_MULTI_SEGS | RTE_ETH_TX_OFFLOAD_VLAN_INSERT; - dev_info->rx_offload_capa = RTE_ETH_RX_OFFLOAD_VLAN_STRIP; + dev_info->rx_offload_capa = RTE_ETH_RX_OFFLOAD_VLAN_STRIP | + RTE_ETH_RX_OFFLOAD_TIMESTAMP; return 0; } @@ -928,6 +993,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, pcap_q->queue_id = rx_queue_id; pcap_q->vlan_strip = internals->vlan_strip; dev->data->rx_queues[rx_queue_id] = pcap_q; + pcap_q->timestamp_offloading = internals->timestamp_offloading; if (internals->infinite_rx) { struct pmd_process_private *pp; @@ -1049,6 +1115,17 @@ eth_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) return 0; } +/* Timestamp values in receive packets from libpcap are in UTC */ +static int +eth_rx_clock(struct rte_eth_dev *dev __rte_unused, uint64_t *timestamp) +{ + struct timespec cur_time; + + timespec_get(&cur_time, TIME_UTC); + *timestamp = rte_timespec_to_ns(&cur_time); + return 0; +} + static const struct eth_dev_ops ops = { .dev_start = eth_dev_start, .dev_stop = eth_dev_stop, @@ -1065,6 +1142,7 @@ static const struct eth_dev_ops ops = { .mtu_set = eth_mtu_set, .stats_get = eth_stats_get, .stats_reset = eth_stats_reset, + .read_clock = eth_rx_clock, }; static int @@ -1465,15 +1543,13 @@ pmd_pcap_probe(struct rte_vdev_device *dev) name = rte_vdev_device_name(dev); PMD_LOG(INFO, "Initializing pmd_pcap for %s", name); - timespec_get(&start_time, TIME_UTC); - start_cycles = rte_get_timer_cycles(); - hz = rte_get_timer_hz(); + /* Record info for timestamps on first probe */ + if (hz == 0) { + timespec_get(&start_time, TIME_UTC); + start_cycles = rte_get_timer_cycles(); - ret = rte_mbuf_dyn_rx_timestamp_register(×tamp_dynfield_offset, - ×tamp_rx_dynflag); - if (ret != 0) { - PMD_LOG(ERR, "Failed to register Rx timestamp field/flag"); - return -1; + hz = rte_get_timer_hz(); + hz_inv = rte_reciprocal_value_u64(hz); } if (rte_eal_process_type() == RTE_PROC_SECONDARY) { -- 2.51.0
