From patchwork Thu Jul 30 19:49:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy McDaniel X-Patchwork-Id: 75053 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3EEDAA052B; Thu, 30 Jul 2020 21:53:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 019E51C00E; Thu, 30 Jul 2020 21:53:07 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 50AEAA69 for ; Thu, 30 Jul 2020 21:53:05 +0200 (CEST) IronPort-SDR: hbsSpRqMXUqeWDcgoP/fdAOgSdzb6svzF8sDJwm5l0YJFZ0lnaQm4szVs0MJRL4nKhWuUK3bwG p5QCyRTyEz4Q== X-IronPort-AV: E=McAfee;i="6000,8403,9698"; a="139672283" X-IronPort-AV: E=Sophos;i="5.75,415,1589266800"; d="scan'208";a="139672283" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2020 12:53:04 -0700 IronPort-SDR: m1DcDnJ+Mk+xx02yn6m4MTh0hL43uzuCoNcmx1QL3H9fUbKFBlO0KUfmLv4/eWbAZxvAbPfpBS Qe1TsQCApm1g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,415,1589266800"; d="scan'208";a="465378066" Received: from txasoft-yocto.an.intel.com ([10.123.72.192]) by orsmga005.jf.intel.com with ESMTP; 30 Jul 2020 12:53:03 -0700 From: "McDaniel, Timothy" To: jerinj@marvell.com Cc: mattias.ronnblom@ericsson.com, dev@dpdk.org, gage.eads@intel.com, harry.van.haaren@intel.com, "McDaniel, Timothy" Date: Thu, 30 Jul 2020 14:49:49 -0500 Message-Id: <1596138614-17409-3-git-send-email-timothy.mcdaniel@intel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1596138614-17409-1-git-send-email-timothy.mcdaniel@intel.com> References: <1593232671-5690-0-git-send-email-timothy.mcdaniel@intel.com> <1596138614-17409-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 db2f9b7..550de73 100644 --- a/lib/librte_eventdev/rte_eventdev.c +++ b/lib/librte_eventdev/rte_eventdev.c @@ -816,6 +816,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; @@ -1425,10 +1426,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(