From patchwork Fri Apr 15 13:04:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Elo, Matias \(Nokia - FI/Espoo\)" X-Patchwork-Id: 65911 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1169254qge; Fri, 15 Apr 2016 06:06:04 -0700 (PDT) X-Received: by 10.55.79.207 with SMTP id d198mr25440763qkb.49.1460725564309; Fri, 15 Apr 2016 06:06:04 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id r5si23715060qkr.88.2016.04.15.06.06.03; Fri, 15 Apr 2016 06:06:04 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE dis=NONE) header.from=nokia.com Received: by lists.linaro.org (Postfix, from userid 109) id CADD266781; Fri, 15 Apr 2016 13:06:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 6F10F62E14; Fri, 15 Apr 2016 13:04:46 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 532FF65118; Fri, 15 Apr 2016 13:04:36 +0000 (UTC) Received: from demumfd002.nsn-inter.net (demumfd002.nsn-inter.net [93.183.12.31]) by lists.linaro.org (Postfix) with ESMTPS id 89EC362296 for ; Fri, 15 Apr 2016 13:04:33 +0000 (UTC) Received: from demuprx016.emea.nsn-intra.net ([10.150.129.55]) by demumfd002.nsn-inter.net (8.15.2/8.15.2) with ESMTPS id u3FD4Wr9023168 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 15 Apr 2016 13:04:32 GMT Received: from 10.144.19.15 ([10.144.104.112]) by demuprx016.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id u3FD4UHh019910 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO) for ; Fri, 15 Apr 2016 15:04:31 +0200 From: Matias Elo To: lng-odp@lists.linaro.org Date: Fri, 15 Apr 2016 16:04:23 +0300 Message-Id: <1460725470-4457-5-git-send-email-matias.elo@nokia.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460725470-4457-1-git-send-email-matias.elo@nokia.com> References: <1460725470-4457-1-git-send-email-matias.elo@nokia.com> X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-size: 6127 X-purgate-ID: 151667::1460725472-00002418-C8116957/0/0 X-Topics: patch Subject: [lng-odp] [API-NEXT PATCH v2 04/11] linux-generic: pktio: implement odp_pktin_ts_from_ns() X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Add default implementations for odp_pktin_ts_from_ns() using odp global time. Signed-off-by: Matias Elo --- platform/linux-generic/include/odp_packet_io_internal.h | 1 + platform/linux-generic/odp_packet_io.c | 17 +++++++++++++++++ platform/linux-generic/pktio/dpdk.c | 1 + platform/linux-generic/pktio/ipc.c | 1 + platform/linux-generic/pktio/loop.c | 1 + platform/linux-generic/pktio/netmap.c | 1 + platform/linux-generic/pktio/pcap.c | 1 + platform/linux-generic/pktio/socket.c | 1 + platform/linux-generic/pktio/socket_mmap.c | 1 + platform/linux-generic/pktio/tap.c | 1 + 10 files changed, 26 insertions(+) diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index c76ea1f..ee7fc71 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -185,6 +185,7 @@ typedef struct pktio_if_ops { int (*stats)(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats); int (*stats_reset)(pktio_entry_t *pktio_entry); uint64_t (*pktin_ts_res)(pktio_entry_t *pktio_entry); + odp_time_t (*pktin_ts_from_ns)(pktio_entry_t *pktio_entry, uint64_t ns); int (*recv)(pktio_entry_t *pktio_entry, odp_packet_t pkt_table[], unsigned len); int (*send)(pktio_entry_t *pktio_entry, odp_packet_t pkt_table[], diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 295a758..4946f78 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -938,6 +938,23 @@ uint64_t odp_pktin_ts_res(odp_pktio_t id) return odp_time_global_res(); } +odp_time_t odp_pktin_ts_from_ns(odp_pktio_t id, uint64_t ns) +{ + pktio_entry_t *entry; + + entry = get_pktio_entry(id); + + if (entry == NULL) { + ODP_DBG("pktio entry %d does not exist\n", id); + return ODP_TIME_NULL; + } + + if (entry->s.ops->pktin_ts_from_ns) + return entry->s.ops->pktin_ts_from_ns(entry, ns); + + return odp_time_global_from_ns(ns); +} + void odp_pktio_print(odp_pktio_t id) { pktio_entry_t *entry; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index d67fb01..ea7b925 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -928,6 +928,7 @@ const pktio_if_ops_t dpdk_pktio_ops = { .mac_get = dpdk_mac_addr_get, .capability = dpdk_capability, .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, .input_queues_config = dpdk_input_queues_config, .output_queues_config = dpdk_output_queues_config }; diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index ca8eaa5..cd7e32f 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -727,4 +727,5 @@ const pktio_if_ops_t ipc_pktio_ops = { .promisc_mode_get = NULL, .mac_get = ipc_mac_addr_get, .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, }; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 1a7a572..396b769 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -185,6 +185,7 @@ const pktio_if_ops_t loopback_pktio_ops = { .link_status = loopback_link_status, .capability = NULL, .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, .input_queues_config = NULL, .output_queues_config = NULL, .recv_queue = NULL, diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index cf116fe..c2a6b34 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -862,6 +862,7 @@ const pktio_if_ops_t netmap_pktio_ops = { .mac_get = netmap_mac_addr_get, .capability = netmap_capability, .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, .input_queues_config = netmap_input_queues_config, .output_queues_config = netmap_output_queues_config, .recv_queue = netmap_recv_queue, diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index d33f04f..c8769f5 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -408,6 +408,7 @@ const pktio_if_ops_t pcap_pktio_ops = { .mac_get = pcapif_mac_addr_get, .capability = NULL, .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, .input_queues_config = NULL, .output_queues_config = NULL, .recv_queue = NULL, diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 7416a8c..c5cbc2d 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -857,6 +857,7 @@ const pktio_if_ops_t sock_mmsg_pktio_ops = { .link_status = sock_link_status, .capability = NULL, .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, .input_queues_config = NULL, .output_queues_config = NULL, .recv_queue = NULL, diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index d36668a..6d211ec 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -626,6 +626,7 @@ const pktio_if_ops_t sock_mmap_pktio_ops = { .link_status = sock_mmap_link_status, .capability = NULL, .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, .input_queues_config = NULL, .output_queues_config = NULL, .recv_queue = NULL, diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index d075bbb..abc49fa 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -325,4 +325,5 @@ const pktio_if_ops_t tap_pktio_ops = { .promisc_mode_get = tap_promisc_mode_get, .mac_get = tap_mac_addr_get, .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, };