From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0681CA04A5; Sat, 23 May 2020 22:21:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 061111D65E; Sat, 23 May 2020 22:21:31 +0200 (CEST) Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) by dpdk.org (Postfix) with ESMTP id D29991B13C for ; Sat, 23 May 2020 19:21:38 +0200 (CEST) Received: by mail-qv1-f67.google.com with SMTP id z9so6205365qvi.12 for ; Sat, 23 May 2020 10:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K+4n/X8MkOp4c0heTgzPi9JGGdK3uaNSD7jdd8dzu5g=; b=NbJSdQxJ4ArH6kKMc40tSkyoJjx++7b9jrFHS585+gTJgHrowCFqsY53oZ2KADnLnX ice8Rzi93X8SepIZjK8Jin7Hgdl54/IQWnmIK8H6UoJoQRb5zh85q4tIbOCwuE9tbAMQ 9rZQEuA6vkXKWIHikPyQQQh7XIEPZcglU/6S+UuWv50GwOAxhkxQQYj6OSxntvzNCjyD hRbSZPSpDJFMrY+JzM6m3WMl3obk/C3053lJBRyBjeaqJQE6HjwVmythC/y6jgYVmcXr 2g3aSGxGQFCdlyDrkmoGpVEER2hcN2iCCZR82nMXIftJBFbII218jm09pRQ0DBxOq66H IxRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K+4n/X8MkOp4c0heTgzPi9JGGdK3uaNSD7jdd8dzu5g=; b=pp9qSaYB/IPoLV+vTCBtWzXG5VNpAX0nVy0rQ4gmxglYXEGZyqxcq9hHgRnVf5jOV/ Th0Tbe4k/Iug9w4r0pJRf5xfPUu0MGIN4TwBnt780UMRZCv1CWz/wBM/OP/9pqymH1nj s9/CriiAT31qvIUeGRJUxDofOR7i0CFx3Ly2ettcyZAe8SGm7+b1fHWJIJUQMLe/w0rc Lov7E4QEGl2zao9YXZZ7wJv7PqK+AjyJHlkgYcj1IMBSx/1aysUdikZHW4l8Ng12QeLl oVMHgr/NEc6+puSIvH+PXVMmA//CY6scG8oaqaYWv85YEONv9ml3V/BmzpzcWqxNmEny 5d3Q== X-Gm-Message-State: AOAM533sayyuxrsKu8/opq0iELSF4/c3UZfxutidk/nsamF4hMVo/TtM Drfl9fOeqjyGr9zZ+b0BxmuNL42v X-Google-Smtp-Source: ABdhPJzLCUlMkqbJuaMxidDIufyQQc6Oh7a874CejUUd9c6e7L4hCGjirobrlupWsM9yvOlbT3j3Aw== X-Received: by 2002:a0c:b60c:: with SMTP id f12mr8972764qve.244.1590254497708; Sat, 23 May 2020 10:21:37 -0700 (PDT) Received: from localhost (modemcable249.105-163-184.mc.videotron.ca. [184.163.105.249]) by smtp.gmail.com with ESMTPSA id w14sm11049038qtt.82.2020.05.23.10.21.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 10:21:36 -0700 (PDT) From: Vivien Didelot To: dev@dpdk.org Cc: patrick.keroulas@radio-canada.ca, thomas@monjalon.net, Vivien Didelot Date: Sat, 23 May 2020 13:21:29 -0400 Message-Id: <20200523172130.2285380-1-vivien.didelot@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Sat, 23 May 2020 22:21:23 +0200 Subject: [dpdk-dev] [PATCH 1/2] net/pcap: support software Tx nanosecond timestamp X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When capturing packets into a PCAP file, DPDK currently uses microseconds for the timestamp. But libpcap supports interpreting tv_usec as nanoseconds depending on the file timestamp precision. To support this, use PCAP_TSTAMP_PRECISION_NANO when creating the empty PCAP file as specified by PCAP_OPEN_DEAD(3PCAP) and implement nanosecond timeval addition. This also ensures that the precision reported by capinfos is nanoseconds (9). Signed-off-by: Vivien Didelot --- drivers/net/pcap/rte_eth_pcap.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index b4c79d174..68588c3d7 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -287,6 +287,8 @@ eth_null_rx(void *queue __rte_unused, return 0; } +#define NSEC_PER_SEC 1e9 + static inline void calculate_timestamp(struct timeval *ts) { uint64_t cycles; @@ -294,8 +296,14 @@ calculate_timestamp(struct timeval *ts) { cycles = rte_get_timer_cycles() - start_cycles; cur_time.tv_sec = cycles / hz; - cur_time.tv_usec = (cycles % hz) * 1e6 / hz; - timeradd(&start_time, &cur_time, ts); + cur_time.tv_usec = (cycles % hz) * NSEC_PER_SEC / hz; + + ts->tv_sec = start_time.tv_sec + cur_time.tv_sec; + ts->tv_usec = start_time.tv_usec + cur_time.tv_usec; + if (ts->tv_usec > NSEC_PER_SEC) { + ts->tv_usec -= NSEC_PER_SEC; + ts->tv_sec += 1; + } } /* @@ -475,7 +483,8 @@ open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper) * with pcap_dump_open(). We create big enough an Ethernet * pcap holder. */ - tx_pcap = pcap_open_dead(DLT_EN10MB, RTE_ETH_PCAP_SNAPSHOT_LEN); + tx_pcap = pcap_open_dead_with_tstamp_precision(DLT_EN10MB, + RTE_ETH_PCAP_SNAPSHOT_LEN, PCAP_TSTAMP_PRECISION_NANO); if (tx_pcap == NULL) { PMD_LOG(ERR, "Couldn't create dead pcap"); return -1; -- 2.26.2