From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 011E1A0350;
Tue, 30 Jun 2020 09:33:10 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id EB5C71BEDC;
Tue, 30 Jun 2020 09:32:33 +0200 (CEST)
Received: from mail-qv1-f68.google.com (mail-qv1-f68.google.com
[209.85.219.68]) by dpdk.org (Postfix) with ESMTP id E40763B5
for <dev@dpdk.org>; Thu, 25 Jun 2020 21:01:30 +0200 (CEST)
Received: by mail-qv1-f68.google.com with SMTP id cv17so3328881qvb.13
for <dev@dpdk.org>; Thu, 25 Jun 2020 12:01:30 -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:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=DXUG4xVVLrkw+bc3lVuxZwZqDvE6Hgl7O/IbgNAR5iA=;
b=bdg/1L5nmMliQ1exlHKgeGI1Htd1iQaPJCfK8CC5auN3MRL7me2P2frOagKEwbGvCt
7VePaOuu5HO27xyiSX4mRe5pBh/Q1y+X0+4YmkKqTQGCg2ltm9Zl5EFa9arJzSJRJiZm
Qjejh2eXzEYVenqkLQ+sIVn49QWwx5O2SSEblhsBUqyky9XXLC6MdkWoibetUSbGCWit
341N8Q/JQtv8O2xcxJtpe0WGqp9lrx6woFVaDe6en7gXlSbK2+FUOUTXBYewYd0PyWHo
i8njP3rBMScrlf5lUevADMOLrD/jLr344SC573ig62/xCiyQqOWeI/iuP94nIqUnvrZI
i8Aw==
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:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=DXUG4xVVLrkw+bc3lVuxZwZqDvE6Hgl7O/IbgNAR5iA=;
b=fcGOdKAlcXxBSFG1EXVP8Zbg2X6RKSzteiFtpwTif/19RvDAK3LdLVUiHe9WKM4pdt
7oCj43G+ti7dLsgAYF0Xe1oslSFZQ1L8pryMyWBbmbIqqBeBYnUxieWUI3KQ5YNaMlJx
txfW+CIKWtEhgUz60ccQHRfgSCyJ80220lJwTYDep+lWOKnN2xgcavTVOqJ5mMaE/FdG
8qHUl6uMuMicB7Syn9SA62XzprNxFoDWmua6cqNou1Q5arWElZiqMO52MoyFTFPfDNKZ
tvTv+gyGi0Pilnr69S/hIMjXtrjQZ7mQ2nIPPV/BoRdWzGNWd5FITuR18V06OcxCvPYC
rHWQ==
X-Gm-Message-State: AOAM533RUDPy6fnk34SgaoYjWL35FATEeMq8Ll4p8xYB6sopLXgtKra6
j/UIQRFJfjsR9fg9j7fy0OUeb3RU
X-Google-Smtp-Source: ABdhPJxWUIRxtTP1TQ4ByG7qaKF2+VWKAD+StDbtSZT3t69/A1indG539RcSJXOpZF38bbl1ad7+Qw==
X-Received: by 2002:a0c:c602:: with SMTP id v2mr27270213qvi.220.1593111689834;
Thu, 25 Jun 2020 12:01:29 -0700 (PDT)
Received: from localhost (modemcable249.105-163-184.mc.videotron.ca.
[184.163.105.249])
by smtp.gmail.com with ESMTPSA id c2sm6565123qkl.58.2020.06.25.12.01.29
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 25 Jun 2020 12:01:29 -0700 (PDT)
From: Vivien Didelot <vivien.didelot@gmail.com>
To: dev@dpdk.org
Cc: Patrick Keroulas <patrick.keroulas@radio-canada.ca>,
Olivier Matz <olivier.matz@6wind.com>,
Ferruh Yigit <ferruh.yigit@intel.com>
Date: Thu, 25 Jun 2020 15:01:18 -0400
Message-Id: <20200625190119.265739-3-vivien.didelot@gmail.com>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20200625190119.265739-1-vivien.didelot@gmail.com>
References: <20200625190119.265739-1-vivien.didelot@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Tue, 30 Jun 2020 09:32:26 +0200
Subject: [dpdk-dev] [RFC PATCH 2/3] ethdev: add API to convert raw
timestamps to nsec
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Patrick Keroulas <patrick.keroulas@radio-canada.ca>
Existing ethdev functions can read/write time from/to device but
they're all related to timesync and none of them can translate a raw
counter in real time unit which is useful in a pdump application.
A new API is required because the conversion is derived from dev
clock info.
Signed-off-by: Patrick Keroulas <patrick.keroulas@radio-canada.ca>
---
lib/librte_ethdev/rte_ethdev.c | 12 ++++++++++++
lib/librte_ethdev/rte_ethdev.h | 17 +++++++++++++++++
lib/librte_ethdev/rte_ethdev_core.h | 5 +++++
lib/librte_ethdev/rte_ethdev_version.map | 2 ++
lib/librte_mbuf/rte_mbuf_core.h | 3 ++-
lib/librte_pdump/rte_pdump.c | 14 +++++++++++++-
6 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 8e10a6fc3..822fa6d5a 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -4810,6 +4810,18 @@ rte_eth_timesync_write_time(uint16_t port_id, const struct timespec *timestamp)
timestamp));
}
+int
+rte_eth_convert_ts_to_ns(uint16_t port_id, uint64_t *timestamp)
+{
+ struct rte_eth_dev *dev;
+
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+ dev = &rte_eth_devices[port_id];
+
+ RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->convert_ts_to_ns, -ENOTSUP);
+ return eth_err(port_id, (*dev->dev_ops->convert_ts_to_ns)(dev, timestamp));
+}
+
int
rte_eth_read_clock(uint16_t port_id, uint64_t *clock)
{
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index a49242bcd..2d4d0bc7d 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -4103,6 +4103,23 @@ int rte_eth_timesync_read_time(uint16_t port_id, struct timespec *time);
*/
int rte_eth_timesync_write_time(uint16_t port_id, const struct timespec *time);
+/**
+ * Convert a raw clock counter to nanoseconds from device clock
+ *
+ * @param port_id
+ * The port identifier of the Ethernet device.
+ * @param[in&out] timestamp
+ * Pointer to the timestamp to be converted.
+ *
+ * @return
+ * - 0: Success.
+ * - -ENODEV: The port ID is invalid.
+ * - -ENOTSUP: The function is not supported by the Ethernet driver.
+ */
+__rte_experimental
+int
+rte_eth_convert_ts_to_ns(uint16_t port_id, uint64_t *timestamp);
+
/**
* @warning
* @b EXPERIMENTAL: this API may change without prior notice.
diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/librte_ethdev/rte_ethdev_core.h
index 32407dd41..255b41b67 100644
--- a/lib/librte_ethdev/rte_ethdev_core.h
+++ b/lib/librte_ethdev/rte_ethdev_core.h
@@ -464,6 +464,10 @@ typedef int (*eth_timesync_write_time)(struct rte_eth_dev *dev,
const struct timespec *timestamp);
/**< @internal Function used to get time from the device clock */
+typedef int (*eth_convert_ts_to_ns)(struct rte_eth_dev *dev,
+ uint64_t *timestamp);
+/**< @internal Function used to convert timestamp from device clock */
+
typedef int (*eth_read_clock)(struct rte_eth_dev *dev,
uint64_t *timestamp);
/**< @internal Function used to get the current value of the device clock. */
@@ -730,6 +734,7 @@ struct eth_dev_ops {
eth_timesync_read_time timesync_read_time; /** Get the device clock time. */
eth_timesync_write_time timesync_write_time; /** Set the device clock time. */
+ eth_convert_ts_to_ns convert_ts_to_ns;
eth_read_clock read_clock;
eth_xstats_get_by_id_t xstats_get_by_id;
diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map
index 715505604..754c05630 100644
--- a/lib/librte_ethdev/rte_ethdev_version.map
+++ b/lib/librte_ethdev/rte_ethdev_version.map
@@ -241,4 +241,6 @@ EXPERIMENTAL {
__rte_ethdev_trace_rx_burst;
__rte_ethdev_trace_tx_burst;
rte_flow_get_aged_flows;
+
+ rte_eth_convert_ts_to_ns;
};
diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h
index 16600f171..470616fb2 100644
--- a/lib/librte_mbuf/rte_mbuf_core.h
+++ b/lib/librte_mbuf/rte_mbuf_core.h
@@ -595,7 +595,8 @@ struct rte_mbuf {
/** Valid if PKT_RX_TIMESTAMP is set. The unit and time reference
* are not normalized but are always the same for a given port.
* Some devices allow to query rte_eth_read_clock that will return the
- * current device timestamp.
+ * current device timestamp or rte_eth_ts_to_ns that will convert raw
+ * counter to nanoseconds.
*/
uint64_t timestamp;
diff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c
index f96709f95..03d9ba484 100644
--- a/lib/librte_pdump/rte_pdump.c
+++ b/lib/librte_pdump/rte_pdump.c
@@ -100,12 +100,24 @@ pdump_copy(struct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params)
}
}
+static inline void
+pdump_ts_to_ns(uint16_t port_id, struct rte_mbuf **pkts, uint16_t nb_pkts)
+{
+ unsigned int i;
+
+ for (i = 0; i < nb_pkts; i++) {
+ if (pkts[i]->ol_flags & PKT_RX_TIMESTAMP)
+ rte_eth_convert_ts_to_ns(port_id, &pkts[i]->timestamp);
+ }
+}
+
static uint16_t
-pdump_rx(uint16_t port __rte_unused, uint16_t qidx __rte_unused,
+pdump_rx(uint16_t port_id, uint16_t qidx __rte_unused,
struct rte_mbuf **pkts, uint16_t nb_pkts,
uint16_t max_pkts __rte_unused,
void *user_params)
{
+ pdump_ts_to_ns(port_id, pkts, nb_pkts);
pdump_copy(pkts, nb_pkts, user_params);
return nb_pkts;
}
--
2.27.0