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 83AEAA0520; Sat, 27 Jun 2020 06:40:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EDBC21BEA6; Sat, 27 Jun 2020 06:40:01 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id A96E31BE8E for ; Sat, 27 Jun 2020 06:39:57 +0200 (CEST) IronPort-SDR: LOtG9xY1t3TgkXHFJOt6GNRHRwBl5PIaT47lgSve75LYvCmU1fGBHK8oyMW0Q5RMjREJhq6xu3 tHswp8H+H0Ng== X-IronPort-AV: E=McAfee;i="6000,8403,9664"; a="125752948" X-IronPort-AV: E=Sophos;i="5.75,286,1589266800"; d="scan'208";a="125752948" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2020 21:39:56 -0700 IronPort-SDR: NNCPk2HI/qXeE6S/jHZ1ljECOkEzqGrw7XagESu8U4yf1Pjh0fgWrRhV4BSwMLf6xME8KL7nAy La100OpW7VwA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,286,1589266800"; d="scan'208";a="480022890" Received: from txasoft-yocto.an.intel.com ([10.123.72.192]) by fmsmga006.fm.intel.com with ESMTP; 26 Jun 2020 21:39:56 -0700 From: Tim McDaniel To: jerinj@marvell.com Cc: mattias.ronnblom@ericsson.com, dev@dpdk.org, gage.eads@intel.com, harry.van.haaren@intel.com, "McDaniel, Timothy" Date: Fri, 26 Jun 2020 23:37:26 -0500 Message-Id: <1593232671-5690-3-git-send-email-timothy.mcdaniel@intel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1593232671-5690-1-git-send-email-timothy.mcdaniel@intel.com> References: <1593232671-5690-1-git-send-email-timothy.mcdaniel@intel.com> Subject: [dpdk-dev] [PATCH 02/27] eventdev: do not pass disable_implicit_release bit to trace macro 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: "McDaniel, Timothy" Previous implementation traced u8 disable_impl_release, which is now a bit field contained in the new u32 event_port_cfg field. Signed-off-by: McDaniel, Timothy --- lib/librte_eventdev/rte_event_crypto_adapter.c | 2 +- lib/librte_eventdev/rte_event_eth_tx_adapter.c | 5 +++-- lib/librte_eventdev/rte_eventdev.c | 3 +-- lib/librte_eventdev/rte_eventdev_trace.h | 9 +++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/librte_eventdev/rte_event_crypto_adapter.c index 8f25933..2717857 100644 --- a/lib/librte_eventdev/rte_event_crypto_adapter.c +++ b/lib/librte_eventdev/rte_event_crypto_adapter.c @@ -269,7 +269,7 @@ struct crypto_queue_pair_info { event_crypto_adapter[id] = adapter; rte_eventdev_trace_crypto_adapter_create(id, dev_id, adapter, conf_arg, - mode); + mode); return 0; } diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/librte_eventdev/rte_event_eth_tx_adapter.c index 8a72256..a8a010e 100644 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c @@ -943,8 +943,9 @@ static int txa_service_queue_del(uint8_t id, txa_dev_id_array[id] = TXA_INVALID_DEV_ID; return ret; } + rte_eventdev_trace_eth_tx_adapter_create(id, dev_id, NULL, port_conf, - ret); + ret); txa_dev_id_array[id] = dev_id; return 0; } @@ -987,7 +988,7 @@ static int txa_service_queue_del(uint8_t id, } rte_eventdev_trace_eth_tx_adapter_create(id, dev_id, conf_cb, conf_arg, - ret); + ret); txa_dev_id_array[id] = dev_id; return 0; } diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c index e8d7c0d..8437d13 100644 --- a/lib/librte_eventdev/rte_eventdev.c +++ b/lib/librte_eventdev/rte_eventdev.c @@ -937,6 +937,7 @@ diag = rte_event_port_unlink(dev_id, port_id, NULL, 0); rte_eventdev_trace_port_setup(dev_id, port_id, port_conf, diag); + if (diag < 0) return diag; @@ -1550,10 +1551,8 @@ struct rte_eventdev * eventdev->data = eventdev_data; if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - strlcpy(eventdev->data->name, name, RTE_EVENTDEV_NAME_MAX_LEN); - eventdev->data->dev_id = dev_id; eventdev->data->socket_id = socket_id; eventdev->data->dev_started = 0; diff --git a/lib/librte_eventdev/rte_eventdev_trace.h b/lib/librte_eventdev/rte_eventdev_trace.h index 4de6341..5dd72d9 100644 --- a/lib/librte_eventdev/rte_eventdev_trace.h +++ b/lib/librte_eventdev/rte_eventdev_trace.h @@ -53,13 +53,14 @@ RTE_TRACE_POINT( rte_eventdev_trace_port_setup, RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint8_t port_id, - const struct rte_event_port_conf *port_conf, int rc), + const struct rte_event_port_conf *port_conf, + int rc), rte_trace_point_emit_u8(dev_id); rte_trace_point_emit_u8(port_id); rte_trace_point_emit_i32(port_conf->new_event_threshold); rte_trace_point_emit_u16(port_conf->dequeue_depth); rte_trace_point_emit_u16(port_conf->enqueue_depth); - rte_trace_point_emit_u8(port_conf->disable_implicit_release); + rte_trace_point_emit_u32(port_conf->event_port_cfg); rte_trace_point_emit_int(rc); ) @@ -165,7 +166,7 @@ rte_trace_point_emit_i32(port_conf->new_event_threshold); rte_trace_point_emit_u16(port_conf->dequeue_depth); rte_trace_point_emit_u16(port_conf->enqueue_depth); - rte_trace_point_emit_u8(port_conf->disable_implicit_release); + rte_trace_point_emit_u32(port_conf->event_port_cfg); rte_trace_point_emit_ptr(conf_cb); rte_trace_point_emit_int(rc); ) @@ -257,7 +258,7 @@ rte_trace_point_emit_i32(port_conf->new_event_threshold); rte_trace_point_emit_u16(port_conf->dequeue_depth); rte_trace_point_emit_u16(port_conf->enqueue_depth); - rte_trace_point_emit_u8(port_conf->disable_implicit_release); + rte_trace_point_emit_u32(port_conf->event_port_cfg); ) RTE_TRACE_POINT( -- 1.7.10