From patchwork Thu Apr 21 00:14:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 66262 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2742012qge; Wed, 20 Apr 2016 17:16:15 -0700 (PDT) X-Received: by 10.55.153.3 with SMTP id b3mr15355947qke.102.1461197775801; Wed, 20 Apr 2016 17:16:15 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id d5si4277820qkj.206.2016.04.20.17.16.15; Wed, 20 Apr 2016 17:16:15 -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=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 69FB268A47; Thu, 21 Apr 2016 00:16:15 +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=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 2ECA568A4C; Thu, 21 Apr 2016 00:14:37 +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 256D4687AC; Thu, 21 Apr 2016 00:14:26 +0000 (UTC) Received: from mail-oi0-f43.google.com (mail-oi0-f43.google.com [209.85.218.43]) by lists.linaro.org (Postfix) with ESMTPS id 33D0262C41 for ; Thu, 21 Apr 2016 00:14:22 +0000 (UTC) Received: by mail-oi0-f43.google.com with SMTP id p188so69161577oih.2 for ; Wed, 20 Apr 2016 17:14:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jE4wP4AnT1YtOaKM6MqT8hKO0y0PE1VhcgIoDleyVP4=; b=GyJJabnlsRFN06fwfAgnHDFGLCnxkXqxZMqMpFZdUEjs+M2UK1KvC0tfWoKAGZenGR NyUlVfRQIZANmSCqMb3vr7klXX43PZnYz0jaI4EBoSxe14MT1M0Fads3DiG7UVmlAJC1 0398ewxwGuazVbA3p8w7dsI5tKmX88g/mnEdfcC1z+N+uEQBXBsdqEv2tJm1tiZRf44L Rc7zpkaGDA4gCUoI1tH8diQbsv79OJSKxOl3Hdh8AVs37gF7ztC7W0X4y1GZ9MuLPN+5 wSHQ1ZzrK/3mg1lS4jJnabJ5LvnSvdBLEXlN0bmNOst5/XS8TAKtNCPS3BM3cF6Bldfp RG0Q== X-Gm-Message-State: AOPr4FWtzTQKmbXk7mU4MuTONvz4lyjs1BIK0Pa/O4KFYvz6lskB0InvNatSKoOR/1Bpulj2WeE= X-Received: by 10.202.60.5 with SMTP id j5mr4943893oia.43.1461197661725; Wed, 20 Apr 2016 17:14:21 -0700 (PDT) Received: from Ubuntu15.localdomain (cpe-66-68-129-43.austin.res.rr.com. [66.68.129.43]) by smtp.gmail.com with ESMTPSA id a34sm335otb.1.2016.04.20.17.14.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Apr 2016 17:14:21 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Wed, 20 Apr 2016 19:14:07 -0500 Message-Id: <1461197655-23743-4-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461197655-23743-1-git-send-email-bill.fischofer@linaro.org> References: <1461197655-23743-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv4 03/11] linux-generic: pktio: implement odp_pktin_ts_res() 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" From: Matias Elo Add default implementations for odp_pktin_ts_res() using odp global time. Signed-off-by: Matias Elo Reviewed-and-tested-by: Bill Fischofer --- 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 | 3 ++- 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 | 3 ++- 10 files changed, 28 insertions(+), 2 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index aaa9387..c76ea1f 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -184,6 +184,7 @@ typedef struct pktio_if_ops { int (*stop)(pktio_entry_t *pktio_entry); 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); 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 472efc6..15a7de7 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -931,6 +931,23 @@ int odp_pktio_index(odp_pktio_t pktio) return pktio_to_id(pktio); } +uint64_t odp_pktin_ts_res(odp_pktio_t id) +{ + pktio_entry_t *entry; + + entry = get_pktio_entry(id); + + if (entry == NULL) { + ODP_DBG("pktio entry %d does not exist\n", id); + return 0; + } + + if (entry->s.ops->pktin_ts_res) + return entry->s.ops->pktin_ts_res(entry); + + return odp_time_global_res(); +} + 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 0e57d90..d67fb01 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -927,6 +927,7 @@ const pktio_if_ops_t dpdk_pktio_ops = { .promisc_mode_get = dpdk_promisc_mode_get, .mac_get = dpdk_mac_addr_get, .capability = dpdk_capability, + .pktin_ts_res = 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 18fa5c6..ca8eaa5 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -725,5 +725,6 @@ const pktio_if_ops_t ipc_pktio_ops = { .mtu_get = ipc_mtu_get, .promisc_mode_set = NULL, .promisc_mode_get = NULL, - .mac_get = ipc_mac_addr_get + .mac_get = ipc_mac_addr_get, + .pktin_ts_res = NULL, }; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 0ea6d0e..1a7a572 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -184,6 +184,7 @@ const pktio_if_ops_t loopback_pktio_ops = { .mac_get = loopback_mac_addr_get, .link_status = loopback_link_status, .capability = NULL, + .pktin_ts_res = 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 0e160c5..cf116fe 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -861,6 +861,7 @@ const pktio_if_ops_t netmap_pktio_ops = { .promisc_mode_get = netmap_promisc_mode_get, .mac_get = netmap_mac_addr_get, .capability = netmap_capability, + .pktin_ts_res = 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 d1458bf..d33f04f 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -407,6 +407,7 @@ const pktio_if_ops_t pcap_pktio_ops = { .promisc_mode_get = pcapif_promisc_mode_get, .mac_get = pcapif_mac_addr_get, .capability = NULL, + .pktin_ts_res = 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 edc36a1..7416a8c 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -856,6 +856,7 @@ const pktio_if_ops_t sock_mmsg_pktio_ops = { .mac_get = sock_mac_addr_get, .link_status = sock_link_status, .capability = NULL, + .pktin_ts_res = 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 caca708..d36668a 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -625,6 +625,7 @@ const pktio_if_ops_t sock_mmap_pktio_ops = { .mac_get = sock_mmap_mac_addr_get, .link_status = sock_mmap_link_status, .capability = NULL, + .pktin_ts_res = 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 c895878..d075bbb 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -323,5 +323,6 @@ const pktio_if_ops_t tap_pktio_ops = { .mtu_get = tap_mtu_get, .promisc_mode_set = tap_promisc_mode_set, .promisc_mode_get = tap_promisc_mode_get, - .mac_get = tap_mac_addr_get + .mac_get = tap_mac_addr_get, + .pktin_ts_res = NULL, };