From: Marek Kasiewicz <[email protected]> Add rte_pcapng_copy_ts() which accepts an optional timestamp parameter in nanoseconds. When the timestamp is non-zero, it is used directly instead of reading the TSC. This allows applications to provide hardware PTP timestamps from the NIC, enabling accurate packet capture with PTP-domain timing rather than host-local TSC values.
The existing rte_pcapng_copy() function is preserved as a static inline wrapper that passes zero for backward compatibility. The TSC-to-epoch conversion in the write path is removed since callers providing hardware timestamps have already performed the conversion. Signed-off-by: Marek Kasiewicz <[email protected]> Signed-off-by: Dawid Wesierski <[email protected]> --- lib/pcapng/rte_pcapng.c | 19 ++++--------------- lib/pcapng/rte_pcapng.h | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c index b5d1026891..96b3aafeb6 100644 --- a/lib/pcapng/rte_pcapng.c +++ b/lib/pcapng/rte_pcapng.c @@ -546,14 +546,14 @@ pcapng_vlan_insert(struct rte_mbuf *m, uint16_t ether_type, uint16_t tci) */ /* Make a copy of original mbuf with pcapng header and options */ -RTE_EXPORT_SYMBOL(rte_pcapng_copy) +RTE_EXPORT_SYMBOL(rte_pcapng_copy_ts) struct rte_mbuf * -rte_pcapng_copy(uint16_t port_id, uint32_t queue, +rte_pcapng_copy_ts(uint16_t port_id, uint32_t queue, const struct rte_mbuf *md, struct rte_mempool *mp, uint32_t length, enum rte_pcapng_direction direction, - const char *comment) + const char *comment, uint64_t ts) { struct pcapng_enhance_packet_block *epb; uint32_t orig_len, pkt_len, padding, flags; @@ -691,7 +691,7 @@ rte_pcapng_copy(uint16_t port_id, uint32_t queue, mc->port = port_id; /* Put timestamp in cycles here - adjust in packet write */ - timestamp = rte_get_tsc_cycles(); + timestamp = ts ? ts : rte_get_tsc_cycles(); epb->timestamp_hi = timestamp >> 32; epb->timestamp_lo = (uint32_t)timestamp; epb->capture_length = pkt_len; @@ -720,7 +720,6 @@ rte_pcapng_write_packets(rte_pcapng_t *self, for (i = 0; i < nb_pkts; i++) { struct rte_mbuf *m = pkts[i]; struct pcapng_enhance_packet_block *epb; - uint64_t cycles, timestamp; /* sanity check that is really a pcapng mbuf */ epb = rte_pktmbuf_mtod(m, struct pcapng_enhance_packet_block *); @@ -737,16 +736,6 @@ rte_pcapng_write_packets(rte_pcapng_t *self, return -1; } - /* - * When data is captured by pcapng_copy the current TSC is stored. - * Adjust the value recorded in file to PCAP epoch units. - */ - cycles = (uint64_t)epb->timestamp_hi << 32; - cycles += epb->timestamp_lo; - timestamp = tsc_to_ns_epoch(&self->clock, cycles); - epb->timestamp_hi = timestamp >> 32; - epb->timestamp_lo = (uint32_t)timestamp; - /* * Handle case of highly fragmented and large burst size * Note: this assumes that max segments per mbuf < IOV_MAX diff --git a/lib/pcapng/rte_pcapng.h b/lib/pcapng/rte_pcapng.h index d8d328f710..3d735e4ebe 100644 --- a/lib/pcapng/rte_pcapng.h +++ b/lib/pcapng/rte_pcapng.h @@ -109,7 +109,7 @@ enum rte_pcapng_direction { }; /** - * Format an mbuf for writing to file. + * Format an mbuf with time stamp for writing to file. * * @param port_id * The Ethernet port on which packet was received @@ -129,16 +129,53 @@ enum rte_pcapng_direction { * @param comment * Optional per packet comment. * Truncated to UINT16_MAX characters. + * @param ts + * Optional timestamp in nanoseconds. If zero, the current TSC is used. * * @return * - The pointer to the new mbuf formatted for pcapng_write * - NULL on error such as invalid port or out of memory. */ struct rte_mbuf * +rte_pcapng_copy_ts(uint16_t port_id, uint32_t queue, + const struct rte_mbuf *m, struct rte_mempool *mp, + uint32_t length, + enum rte_pcapng_direction direction, const char *comment, uint64_t ts); + +/** + * Format an mbuf for writing to file. + * + * @param port_id + * The Ethernet port on which packet was received + * or is going to be transmitted. + * @param queue + * The queue on the Ethernet port where packet was received + * or is going to be transmitted. + * @param mp + * The mempool from which the "clone" mbufs are allocated. + * @param m + * The mbuf to copy + * @param length + * The upper limit on bytes to copy. Passing UINT32_MAX + * means all data (after offset). + * @param direction + * The direction of the packer: receive, transmit or unknown. + * @param comment + * Packet comment. + * + * @return + * - The pointer to the new mbuf formatted for pcapng_write + * - NULL if allocation fails. + */ +static inline struct rte_mbuf * rte_pcapng_copy(uint16_t port_id, uint32_t queue, const struct rte_mbuf *m, struct rte_mempool *mp, uint32_t length, - enum rte_pcapng_direction direction, const char *comment); + enum rte_pcapng_direction direction, const char *comment) +{ + return rte_pcapng_copy_ts(port_id, queue, m, mp, length, direction, + comment, 0); +} /** -- 2.47.3 --------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Spolka oswiadcza, ze posiada status duzego przedsiebiorcy w rozumieniu ustawy z dnia 8 marca 2013 r. o przeciwdzialaniu nadmiernym opoznieniom w transakcjach handlowych. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.
