From patchwork Tue Jun 27 13:16:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ilia.kurakin@intel.com X-Patchwork-Id: 25784 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 49C252C08; Tue, 27 Jun 2017 15:16:26 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 44987374 for ; Tue, 27 Jun 2017 15:16:23 +0200 (CEST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP; 27 Jun 2017 06:16:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,399,1493708400"; d="scan'208";a="279126392" Received: from nntvtune144.inn.intel.com ([10.125.21.144]) by fmsmga004.fm.intel.com with ESMTP; 27 Jun 2017 06:16:20 -0700 From: ilia.kurakin@intel.com To: dev@dpdk.org Cc: konstantin.ananyev@intel.com, keith.wiles@intel.com, dmitry.galanov@intel.com, Ilia Kurakin Date: Tue, 27 Jun 2017 16:16:01 +0300 Message-Id: <1498569361-5011-1-git-send-email-ilia.kurakin@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497892689-27494-1-git-send-email-ilia.kurakin@intel.com> References: <1497892689-27494-1-git-send-email-ilia.kurakin@intel.com> Subject: [dpdk-dev] [PATCH] ether: add support for vtune task tracing 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" From: Ilia Kurakin The patch adds tracing of loop iterations that yielded no packets in a DPDK application. It is using ITT task API: https://software.intel.com/en-us/node/544206 We suppose the flow of using this tracing would assume the user has ITT lib and header on machine and re-build DPDK with additional make parameters: make EXTRA_CFLAGS=-I EXTRA_LDLIBS="-L -littnotify" Signed-off-by: Ilia Kurakin --- config/common_base | 1 + lib/librte_ether/Makefile | 1 + lib/librte_ether/rte_eth_itt.h | 102 +++++++++++++++++++++++++++++++++++++++++ lib/librte_ether/rte_ethdev.c | 5 ++ lib/librte_ether/rte_ethdev.h | 23 ++++++++++ 5 files changed, 132 insertions(+) create mode 100644 lib/librte_ether/rte_eth_itt.h diff --git a/config/common_base b/config/common_base index f6aafd1..60d8b63 100644 --- a/config/common_base +++ b/config/common_base @@ -135,6 +135,7 @@ CONFIG_RTE_MAX_QUEUES_PER_PORT=1024 CONFIG_RTE_LIBRTE_IEEE1588=n CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16 CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y +CONFIG_RTE_ETHDEV_TRACE_WASTED_RX_ITERATIONS=n # # Turn off Tx preparation stage diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile index 93fdde1..c10153a 100644 --- a/lib/librte_ether/Makefile +++ b/lib/librte_ether/Makefile @@ -56,5 +56,6 @@ SYMLINK-y-include += rte_eth_ctrl.h SYMLINK-y-include += rte_dev_info.h SYMLINK-y-include += rte_flow.h SYMLINK-y-include += rte_flow_driver.h +SYMLINK-${CONFIG_RTE_ETHDEV_TRACE_WASTED_RX_ITERATIONS}-include += rte_eth_itt.h include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ether/rte_eth_itt.h b/lib/librte_ether/rte_eth_itt.h new file mode 100644 index 0000000..e661782 --- /dev/null +++ b/lib/librte_ether/rte_eth_itt.h @@ -0,0 +1,102 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _RTE_ETH_ITT_H_ +#define _RTE_ETH_ITT_H_ + +#include +#include + +#define ITT_MAX_NAME_LEN (100) + +/** + * Auxiliary ITT structure belonging to port and using to: + * - track queue state to determine whether it is wasting loop iterations + * - begin or end ITT task using task domain and name + */ +struct rte_eth_itt_aux_data { + /** + * ITT domains for each queue. + */ + __itt_domain *wasted_iter_domains[RTE_MAX_QUEUES_PER_PORT]; + /** + * ITT task names for each queue. + */ + __itt_string_handle *wasted_iter_handles[RTE_MAX_QUEUES_PER_PORT]; + /** + * Flags indicating the queues state. Possible values: + * 1 - queue is wasting iterations, 0 - otherwise. + */ + uint8_t queue_is_wasting_iters[RTE_MAX_QUEUES_PER_PORT]; +}; + +/** + * The pool of *rte_eth_itt_aux_data* structures. + */ +struct rte_eth_itt_aux_data itt_aux_data[RTE_MAX_ETHPORTS]; + +/** + * Initialization of rte_eth_itt_aux_data for a given port. + * This function must be invoked when ethernet device is being configured. + * Result will be stored in the global array *itt_aux_data*. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param port_name + * The name of the Ethernet device. + * @param queue_num + * The number of queues on specified port. + */ +static inline void +rte_eth_init_itt(uint8_t port_id, char *port_name, uint8_t queue_num) { + uint16_t q_id; + for (q_id = 0; q_id < queue_num; ++q_id) { + char domain_name[ITT_MAX_NAME_LEN]; + snprintf(domain_name, sizeof(domain_name), + "RXBurst.WastedIterations.Port_%s.Queue_%d", + port_name, q_id); + itt_aux_data[port_id].wasted_iter_domains[q_id] + = __itt_domain_create(domain_name); + + char task_name[ITT_MAX_NAME_LEN]; + snprintf(task_name, sizeof(task_name), + "port id: %d; queue id: %d", + port_id, q_id); + itt_aux_data[port_id].wasted_iter_handles[q_id] + = __itt_string_handle_create(task_name); + + itt_aux_data[port_id].queue_is_wasting_iters[q_id] = 0; + } +} + +#endif diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 81a45c0..ebaaf99 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -818,6 +818,11 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, return diag; } +#ifdef RTE_ETHDEV_TRACE_WASTED_RX_ITERATIONS + /* See rte_eth_itt.h to find comments on code below. */ + rte_eth_init_itt(port_id, dev->data->name, nb_rx_q); +#endif + return 0; } diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index f6e6c74..ee7cc42 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -186,6 +186,10 @@ extern "C" { #include "rte_eth_ctrl.h" #include "rte_dev_info.h" +#ifdef RTE_ETHDEV_TRACE_WASTED_RX_ITERATIONS +#include "rte_eth_itt.h" +#endif + struct rte_mbuf; /** @@ -2710,6 +2714,25 @@ rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id, int16_t nb_rx = (*dev->rx_pkt_burst)(dev->data->rx_queues[queue_id], rx_pkts, nb_pkts); +#ifdef RTE_ETHDEV_TRACE_WASTED_RX_ITERATIONS + /* See rte_eth_itt.h to find comments on code below. */ + if (unlikely(nb_rx == 0)) { + if (!itt_aux_data[port_id].queue_is_wasting_iters[queue_id]) { + __itt_task_begin( + itt_aux_data[port_id].wasted_iter_domains[queue_id], + __itt_null, __itt_null, + itt_aux_data[port_id].wasted_iter_handles[queue_id]); + itt_aux_data[port_id].queue_is_wasting_iters[queue_id] = 1; + } + } else { + if (unlikely(itt_aux_data[port_id].queue_is_wasting_iters[queue_id])) { + __itt_task_end( + itt_aux_data[port_id].wasted_iter_domains[queue_id]); + itt_aux_data[port_id].queue_is_wasting_iters[queue_id] = 0; + } + } +#endif + #ifdef RTE_ETHDEV_RXTX_CALLBACKS struct rte_eth_rxtx_callback *cb = dev->post_rx_burst_cbs[queue_id];