From patchwork Wed Feb 15 09:42:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Dwivedi X-Patchwork-Id: 123937 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4A33E41CA4; Wed, 15 Feb 2023 10:42:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 37F5742FE6; Wed, 15 Feb 2023 10:42:52 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 6230342FDA for ; Wed, 15 Feb 2023 10:42:51 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31F9FxTd007391; Wed, 15 Feb 2023 01:42:48 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=0i6W33OXMUWWctaHXzFZXgb/HOChmcAyEUJ9QGEvn10=; b=PBkiQ+4nOban8sOyYTRAlNVoTjQw9RH1KFk4IP/q0pFH+kdyWJv8kvJ7SfyvMUvOF5Gj KPOxtjzRfv+54ACSc+q393Imru0zU03wDwOnJNzUp5Bp5GJeB4uc8KObcILt+XD7DmzG NjlMvBOBbTZYycf1B75fn3IvHepYgW4Dzu4b4Gt0dAnUGMcYBIftowNwwrcg+NKe7svJ t6XbyLHUalUrGCpP5a69tiheEpOBW712ywc33As/Z5ZnD2V9LFI0P5Hqa4o305/CYTYg 9kryNWXhvXHJFX/Pc1t9DjhnpRHn6IywUQbFfEXUtYRqTjXcEzY3Lh25ZZADAb/VDU7c AQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nrumggc0d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 15 Feb 2023 01:42:48 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 15 Feb 2023 01:42:46 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 15 Feb 2023 01:42:46 -0800 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id CA1D63F7040; Wed, 15 Feb 2023 01:42:44 -0800 (PST) From: Ankur Dwivedi To: CC: , , , , Ankur Dwivedi Subject: [PATCH v3 1/5] mempool: remove internal tracepoints from version map Date: Wed, 15 Feb 2023 15:12:24 +0530 Message-ID: <20230215094228.1452656-2-adwivedi@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230215094228.1452656-1-adwivedi@marvell.com> References: <20230210103446.1126999-1-adwivedi@marvell.com> <20230215094228.1452656-1-adwivedi@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: LY8AIzkzh_Lu2lzQOM-4GBfMDFfdIG1S X-Proofpoint-ORIG-GUID: LY8AIzkzh_Lu2lzQOM-4GBfMDFfdIG1S X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-15_06,2023-02-14_01,2023-02-09_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The file rte_mempool_trace.h contains tracepoints which are internal to the mempool library. This file is renamed to mempool_trace.h, and is made an internal header. The tracepoints in this file are removed from the experimental section in version.map file. Signed-off-by: Ankur Dwivedi Acked-by: Jerin Jacob --- .../{rte_mempool_trace.h => mempool_trace.h} | 6 +++--- lib/mempool/mempool_trace_points.c | 2 +- lib/mempool/meson.build | 1 - lib/mempool/rte_mempool.c | 2 +- lib/mempool/rte_mempool_ops.c | 2 +- lib/mempool/version.map | 14 -------------- 6 files changed, 6 insertions(+), 21 deletions(-) rename lib/mempool/{rte_mempool_trace.h => mempool_trace.h} (98%) diff --git a/lib/mempool/rte_mempool_trace.h b/lib/mempool/mempool_trace.h similarity index 98% rename from lib/mempool/rte_mempool_trace.h rename to lib/mempool/mempool_trace.h index 087c913c8c..3e663c72e4 100644 --- a/lib/mempool/rte_mempool_trace.h +++ b/lib/mempool/mempool_trace.h @@ -2,8 +2,8 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#ifndef _RTE_MEMPOOL_TRACE_H_ -#define _RTE_MEMPOOL_TRACE_H_ +#ifndef _MEMPOOL_TRACE_H_ +#define _MEMPOOL_TRACE_H_ /** * @file @@ -172,4 +172,4 @@ RTE_TRACE_POINT( } #endif -#endif /* _RTE_MEMPOOL_TRACE_H_ */ +#endif /* _MEMPOOL_TRACE_H_ */ diff --git a/lib/mempool/mempool_trace_points.c b/lib/mempool/mempool_trace_points.c index 4ad76deb34..307018094d 100644 --- a/lib/mempool/mempool_trace_points.c +++ b/lib/mempool/mempool_trace_points.c @@ -4,7 +4,7 @@ #include -#include "rte_mempool_trace.h" +#include "mempool_trace.h" RTE_TRACE_POINT_REGISTER(rte_mempool_trace_ops_dequeue_bulk, lib.mempool.ops.deq.bulk) diff --git a/lib/mempool/meson.build b/lib/mempool/meson.build index b8aaa00694..8099a56466 100644 --- a/lib/mempool/meson.build +++ b/lib/mempool/meson.build @@ -17,7 +17,6 @@ sources = files( ) headers = files( 'rte_mempool.h', - 'rte_mempool_trace.h', 'rte_mempool_trace_fp.h', ) deps += ['ring', 'telemetry'] diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c index 45b5df6199..cf5dea2304 100644 --- a/lib/mempool/rte_mempool.c +++ b/lib/mempool/rte_mempool.c @@ -28,8 +28,8 @@ #include #include +#include "mempool_trace.h" #include "rte_mempool.h" -#include "rte_mempool_trace.h" TAILQ_HEAD(rte_mempool_list, rte_tailq_entry); diff --git a/lib/mempool/rte_mempool_ops.c b/lib/mempool/rte_mempool_ops.c index 3b43edc548..ae1d288f27 100644 --- a/lib/mempool/rte_mempool_ops.c +++ b/lib/mempool/rte_mempool_ops.c @@ -11,7 +11,7 @@ #include #include -#include "rte_mempool_trace.h" +#include "mempool_trace.h" /* indirect jump table to support external memory pools. */ struct rte_mempool_ops_table rte_mempool_ops_table = { diff --git a/lib/mempool/version.map b/lib/mempool/version.map index b67d7aace7..dff2d1cb55 100644 --- a/lib/mempool/version.map +++ b/lib/mempool/version.map @@ -47,22 +47,8 @@ EXPERIMENTAL { __rte_mempool_trace_generic_get; __rte_mempool_trace_get_bulk; __rte_mempool_trace_get_contig_blocks; - __rte_mempool_trace_create; - __rte_mempool_trace_create_empty; - __rte_mempool_trace_free; - __rte_mempool_trace_populate_iova; - __rte_mempool_trace_populate_virt; - __rte_mempool_trace_populate_default; - __rte_mempool_trace_populate_anon; - __rte_mempool_trace_cache_create; - __rte_mempool_trace_cache_free; __rte_mempool_trace_default_cache; - __rte_mempool_trace_get_page_size; __rte_mempool_trace_cache_flush; - __rte_mempool_trace_ops_populate; - __rte_mempool_trace_ops_alloc; - __rte_mempool_trace_ops_free; - __rte_mempool_trace_set_ops_byname; }; INTERNAL { From patchwork Wed Feb 15 09:42:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Dwivedi X-Patchwork-Id: 123938 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B07B841CA4; Wed, 15 Feb 2023 10:42:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D64442FD6; Wed, 15 Feb 2023 10:42:58 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 4D5F942FDA for ; Wed, 15 Feb 2023 10:42:57 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31F9FqlV007244; Wed, 15 Feb 2023 01:42:55 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=VZbN6id4WboUB7gxTfla1rak2elQMeZBVDW0YvulqNk=; b=YSIFghkMZfWVmDIOlRsP9I8UZGURyhURKpGWW/KiP6hloaOudspIMdrQSWcvNqrAV+eI NSrJ/ZWCiqhgynRa6xFS/QE6KHgv5plQ4eXL1H4dnJ8ASq6po16Bg3xyM6jVLw49HoqP zI8fR2+jWztk+ZcjFeZ+pNAlJUW0JHZIwAL3nmq6OiFDTz24f+MqlnRNRdZ0k16osg04 InQ2ZjDIsSuQsOy+KT1LXXipnG4sVipuUOllra61fAsk4s0oiJZfSrOKQ3p+XGPMK6Za 9fguQFHlAWEMhePlvh3uEy9Ub+a5mAtjBZikvq8cjy4EVJ4zsvVSC1qrCoJwClVJfwPB ig== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nrumggc0r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 15 Feb 2023 01:42:55 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 15 Feb 2023 01:42:53 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 15 Feb 2023 01:42:53 -0800 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id F30253F7040; Wed, 15 Feb 2023 01:42:50 -0800 (PST) From: Ankur Dwivedi To: CC: , , , , Ankur Dwivedi Subject: [PATCH v3 2/5] cryptodev: remove internal tracepoints from version map Date: Wed, 15 Feb 2023 15:12:25 +0530 Message-ID: <20230215094228.1452656-3-adwivedi@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230215094228.1452656-1-adwivedi@marvell.com> References: <20230210103446.1126999-1-adwivedi@marvell.com> <20230215094228.1452656-1-adwivedi@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: lh6DYVinkI7J1LfykbxeTmRSDeyfYEsb X-Proofpoint-ORIG-GUID: lh6DYVinkI7J1LfykbxeTmRSDeyfYEsb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-15_06,2023-02-14_01,2023-02-09_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The file rte_cryptodev_trace.h contains tracepoints which are internal to the cryptodev library. This file is renamed to cryptodev_trace.h, and is made an internal header. The tracepoints in this file are removed from the experimental and internal section in version.map file. Signed-off-by: Ankur Dwivedi Acked-by: Jerin Jacob --- ...te_cryptodev_trace.h => cryptodev_trace.h} | 6 +- lib/cryptodev/cryptodev_trace_points.c | 2 +- lib/cryptodev/meson.build | 1 - lib/cryptodev/rte_cryptodev.c | 2 +- lib/cryptodev/version.map | 62 ------------------- 5 files changed, 5 insertions(+), 68 deletions(-) rename lib/cryptodev/{rte_cryptodev_trace.h => cryptodev_trace.h} (99%) diff --git a/lib/cryptodev/rte_cryptodev_trace.h b/lib/cryptodev/cryptodev_trace.h similarity index 99% rename from lib/cryptodev/rte_cryptodev_trace.h rename to lib/cryptodev/cryptodev_trace.h index 5e694379b1..637baa31b3 100644 --- a/lib/cryptodev/rte_cryptodev_trace.h +++ b/lib/cryptodev/cryptodev_trace.h @@ -2,8 +2,8 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#ifndef _RTE_CRYPTODEV_TRACE_H_ -#define _RTE_CRYPTODEV_TRACE_H_ +#ifndef _CRYPTODEV_TRACE_H_ +#define _CRYPTODEV_TRACE_H_ /** * @file @@ -530,4 +530,4 @@ RTE_TRACE_POINT( } #endif -#endif /* _RTE_CRYPTODEV_TRACE_H_ */ +#endif /* _CRYPTODEV_TRACE_H_ */ diff --git a/lib/cryptodev/cryptodev_trace_points.c b/lib/cryptodev/cryptodev_trace_points.c index 4980bcc9be..e2303fdb52 100644 --- a/lib/cryptodev/cryptodev_trace_points.c +++ b/lib/cryptodev/cryptodev_trace_points.c @@ -4,7 +4,7 @@ #include -#include "rte_cryptodev_trace.h" +#include "cryptodev_trace.h" RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_configure, lib.cryptodev.configure) diff --git a/lib/cryptodev/meson.build b/lib/cryptodev/meson.build index 19de3073bb..4734acf321 100644 --- a/lib/cryptodev/meson.build +++ b/lib/cryptodev/meson.build @@ -8,7 +8,6 @@ sources = files( ) headers = files( 'rte_cryptodev.h', - 'rte_cryptodev_trace.h', 'rte_cryptodev_trace_fp.h', 'rte_crypto.h', 'rte_crypto_sym.h', diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index cf06511ae7..a96114b2da 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -29,7 +29,7 @@ #include "rte_crypto.h" #include "rte_cryptodev.h" #include "cryptodev_pmd.h" -#include "rte_cryptodev_trace.h" +#include "cryptodev_trace.h" static uint8_t nb_drivers; diff --git a/lib/cryptodev/version.map b/lib/cryptodev/version.map index 91c734dd7b..24ff90799c 100644 --- a/lib/cryptodev/version.map +++ b/lib/cryptodev/version.map @@ -64,16 +64,6 @@ EXPERIMENTAL { rte_crypto_asym_xform_strings; # added in 20.05 - __rte_cryptodev_trace_configure; - __rte_cryptodev_trace_start; - __rte_cryptodev_trace_stop; - __rte_cryptodev_trace_close; - __rte_cryptodev_trace_queue_pair_setup; - __rte_cryptodev_trace_sym_session_pool_create; - __rte_cryptodev_trace_sym_session_create; - __rte_cryptodev_trace_asym_session_create; - __rte_cryptodev_trace_sym_session_free; - __rte_cryptodev_trace_asym_session_free; __rte_cryptodev_trace_dequeue_burst; __rte_cryptodev_trace_enqueue_burst; @@ -98,59 +88,11 @@ EXPERIMENTAL { rte_cryptodev_asym_session_get_user_data; rte_cryptodev_asym_session_pool_create; rte_cryptodev_asym_session_set_user_data; - __rte_cryptodev_trace_asym_session_pool_create; #added in 22.07 rte_cryptodev_session_event_mdata_set; rte_crypto_asym_ke_strings; - #added in 22.11 - __rte_cryptodev_trace_add_deq_callback; - __rte_cryptodev_trace_add_enq_callback; - __rte_cryptodev_trace_allocate_driver; - __rte_cryptodev_trace_asym_capability_get; - __rte_cryptodev_trace_asym_get_private_session_size; - __rte_cryptodev_trace_asym_get_xform_enum; - __rte_cryptodev_trace_asym_session_get_user_data; - __rte_cryptodev_trace_asym_session_set_user_data; - __rte_cryptodev_trace_asym_xform_capability_check_modlen; - __rte_cryptodev_trace_asym_xform_capability_check_optype; - __rte_cryptodev_trace_callback_register; - __rte_cryptodev_trace_callback_unregister; - __rte_cryptodev_trace_configure_raw_dp_ctx; - __rte_cryptodev_trace_device_count_by_driver; - __rte_cryptodev_trace_devices_get; - __rte_cryptodev_trace_driver_id_get; - __rte_cryptodev_trace_driver_name_get; - __rte_cryptodev_trace_get_aead_algo_enum; - __rte_cryptodev_trace_get_auth_algo_enum; - __rte_cryptodev_trace_get_cipher_algo_enum; - __rte_cryptodev_trace_get_dev_id; - __rte_cryptodev_trace_get_feature_name; - __rte_cryptodev_trace_get_qp_status; - __rte_cryptodev_trace_get_raw_dp_ctx_size; - __rte_cryptodev_trace_get_sec_ctx; - __rte_cryptodev_trace_info_get; - __rte_cryptodev_trace_is_valid_dev; - __rte_cryptodev_trace_name_get; - __rte_cryptodev_trace_op_pool_create; - __rte_cryptodev_trace_queue_pair_count; - __rte_cryptodev_trace_remove_deq_callback; - __rte_cryptodev_trace_remove_enq_callback; - __rte_cryptodev_trace_session_event_mdata_set; - __rte_cryptodev_trace_socket_id; - __rte_cryptodev_trace_stats_get; - __rte_cryptodev_trace_stats_reset; - __rte_cryptodev_trace_sym_capability_check_aead; - __rte_cryptodev_trace_sym_capability_check_auth; - __rte_cryptodev_trace_sym_capability_check_cipher; - __rte_cryptodev_trace_sym_capability_get; - __rte_cryptodev_trace_sym_cpu_crypto_process; - __rte_cryptodev_trace_sym_get_private_session_size; - __rte_cryptodev_trace_sym_session_get_user_data; - __rte_cryptodev_trace_sym_session_set_user_data; - __rte_cryptodev_trace_count; - # added 23.03 rte_cryptodev_asym_get_xform_string; rte_cryptodev_get_aead_algo_string; @@ -162,10 +104,6 @@ EXPERIMENTAL { INTERNAL { global: - __rte_cryptodev_trace_asym_get_xform_string; - __rte_cryptodev_trace_get_aead_algo_string; - __rte_cryptodev_trace_get_auth_algo_string; - __rte_cryptodev_trace_get_cipher_algo_string; cryptodev_fp_ops_reset; cryptodev_fp_ops_set; rte_cryptodev_allocate_driver; From patchwork Wed Feb 15 09:42:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Dwivedi X-Patchwork-Id: 123939 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8A51441CA4; Wed, 15 Feb 2023 10:43:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 275B442FFE; Wed, 15 Feb 2023 10:43:06 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 1681843006 for ; Wed, 15 Feb 2023 10:43:03 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31F7GTFC009828; Wed, 15 Feb 2023 01:43:02 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=0gnSWfKIwbl70hsDIj06ODdRiuLg6A1ZgAnQbS++Pyo=; b=coER/KF7mdu1G4xrzmm5ne6EF/V5ZKWF1hCK012jufI0HTe5AO7A7C9hoRVUxw5qYXMA JRTleCZ90OgRUDT0pZNGPay2d2xeWncwTKc3Nr5vk9QKyukj7BuU6c0vr5nuNwIIZ2f7 yir6I3k55ZG4cwx95IS8zsUxRPm8H1AUIZQxCAeA6Zz3O9aWGYB8ZtyOO46EFxwQ59tj R0NpmY3xwBT8ReQqHWhsQY5Aro+m7YRnvFXkbVTId5dPQ94eYEXFwD+olpKytqSE2Lo+ EcTie5/lddxYKVSzfNaCZHUtTQkZesoIJ4Nlq0l2d/3lUFo/mrlEhpj6/OF4BkoNnC1J aQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3nr7f5uuj6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 15 Feb 2023 01:43:01 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 15 Feb 2023 01:43:00 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 15 Feb 2023 01:43:00 -0800 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id 2E8CE3F7040; Wed, 15 Feb 2023 01:42:57 -0800 (PST) From: Ankur Dwivedi To: CC: , , , , Ankur Dwivedi Subject: [PATCH v3 3/5] eal: remove internal tracepoints from version map Date: Wed, 15 Feb 2023 15:12:26 +0530 Message-ID: <20230215094228.1452656-4-adwivedi@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230215094228.1452656-1-adwivedi@marvell.com> References: <20230210103446.1126999-1-adwivedi@marvell.com> <20230215094228.1452656-1-adwivedi@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: a9aWHpL9xTKaL1-WMIbAurENP47ohVyQ X-Proofpoint-ORIG-GUID: a9aWHpL9xTKaL1-WMIbAurENP47ohVyQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-15_06,2023-02-14_01,2023-02-09_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The file rte_eal_trace.h contains some tracepoints which are internal to the eal library. Those tracepoints are moved to a new file eal_trace_internal.h. The internal tracepoints are removed from the version.map file. Signed-off-by: Ankur Dwivedi Acked-by: Jerin Jacob --- doc/guides/prog_guide/trace_lib.rst | 3 +- lib/eal/common/eal_common_launch.c | 2 +- lib/eal/common/eal_common_memzone.c | 2 +- lib/eal/common/eal_common_thread.c | 2 +- lib/eal/common/eal_common_trace_points.c | 2 + lib/eal/common/rte_malloc.c | 2 +- lib/eal/freebsd/eal_alarm.c | 2 +- lib/eal/freebsd/eal_interrupts.c | 2 +- lib/eal/include/eal_trace_internal.h | 182 +++++++++++++++++++++++ lib/eal/include/rte_eal_trace.h | 158 -------------------- lib/eal/linux/eal_alarm.c | 2 +- lib/eal/linux/eal_interrupts.c | 2 +- lib/eal/version.map | 15 -- lib/eal/windows/eal_alarm.c | 3 +- 14 files changed, 195 insertions(+), 184 deletions(-) create mode 100644 lib/eal/include/eal_trace_internal.h diff --git a/doc/guides/prog_guide/trace_lib.rst b/doc/guides/prog_guide/trace_lib.rst index 3e0ea5835c..6f19efb3f9 100644 --- a/doc/guides/prog_guide/trace_lib.rst +++ b/doc/guides/prog_guide/trace_lib.rst @@ -121,7 +121,8 @@ convention. .. note:: The ``RTE_TRACE_POINT_REGISTER`` defines the placeholder for the - ``rte_trace_point_t`` tracepoint object. The user must export a + ``rte_trace_point_t`` tracepoint object. For generic tracepoint or for + tracepoint used in public header files, the user must export a ``__`` symbol in the library ``.map`` file for this tracepoint to be used out of the library, in shared builds. For example, ``__app_trace_string`` will be the exported symbol in the diff --git a/lib/eal/common/eal_common_launch.c b/lib/eal/common/eal_common_launch.c index 487e58c124..050459857a 100644 --- a/lib/eal/common/eal_common_launch.c +++ b/lib/eal/common/eal_common_launch.c @@ -4,8 +4,8 @@ #include +#include #include -#include #include #include diff --git a/lib/eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c index 860fb5fb64..a9cd91ffea 100644 --- a/lib/eal/common/eal_common_memzone.c +++ b/lib/eal/common/eal_common_memzone.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include -#include #include "malloc_heap.h" #include "malloc_elem.h" diff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c index 7d60eaf1df..edb9d4ead2 100644 --- a/lib/eal/common/eal_common_thread.c +++ b/lib/eal/common/eal_common_thread.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/eal/common/eal_common_trace_points.c b/lib/eal/common/eal_common_trace_points.c index 051f89809c..3f5bf5c55c 100644 --- a/lib/eal/common/eal_common_trace_points.c +++ b/lib/eal/common/eal_common_trace_points.c @@ -6,6 +6,8 @@ #include +#include + RTE_TRACE_POINT_REGISTER(rte_eal_trace_generic_void, lib.eal.generic.void) RTE_TRACE_POINT_REGISTER(rte_eal_trace_generic_u64, diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c index 48db264449..d39870bf3c 100644 --- a/lib/eal/common/rte_malloc.c +++ b/lib/eal/common/rte_malloc.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "malloc_elem.h" diff --git a/lib/eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c index 1023c32937..177897fbc4 100644 --- a/lib/eal/freebsd/eal_alarm.c +++ b/lib/eal/freebsd/eal_alarm.c @@ -11,13 +11,13 @@ #include #include +#include #include #include #include #include #include #include -#include #include "eal_private.h" #include "eal_alarm_private.h" diff --git a/lib/eal/freebsd/eal_interrupts.c b/lib/eal/freebsd/eal_interrupts.c index 9f720bdc8f..ffcf97ad4c 100644 --- a/lib/eal/freebsd/eal_interrupts.c +++ b/lib/eal/freebsd/eal_interrupts.c @@ -8,12 +8,12 @@ #include #include +#include #include #include #include #include #include -#include #include "eal_private.h" #include "eal_alarm_private.h" diff --git a/lib/eal/include/eal_trace_internal.h b/lib/eal/include/eal_trace_internal.h new file mode 100644 index 0000000000..9d678b3f76 --- /dev/null +++ b/lib/eal/include/eal_trace_internal.h @@ -0,0 +1,182 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2023 Marvell International Ltd. + */ + +#ifndef _EAL_TRACE_INTERNAL_H_ +#define _EAL_TRACE_INTERNAL_H_ + +/** + * @file + * + * API for EAL trace support + */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include + +#include "eal_interrupts.h" + +/* Alarm */ +RTE_TRACE_POINT( + rte_eal_trace_alarm_set, + RTE_TRACE_POINT_ARGS(uint64_t us, rte_eal_alarm_callback cb_fn, + void *cb_arg, int rc), + rte_trace_point_emit_u64(us); + rte_trace_point_emit_ptr(cb_fn); + rte_trace_point_emit_ptr(cb_arg); + rte_trace_point_emit_int(rc); +) + +RTE_TRACE_POINT( + rte_eal_trace_alarm_cancel, + RTE_TRACE_POINT_ARGS(rte_eal_alarm_callback cb_fn, void *cb_arg, + int count), + rte_trace_point_emit_ptr(cb_fn); + rte_trace_point_emit_ptr(cb_arg); + rte_trace_point_emit_int(count); +) + +/* Interrupt */ +RTE_TRACE_POINT( + rte_eal_trace_intr_callback_register, + RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, + rte_intr_callback_fn cb, void *cb_arg, int rc), + rte_trace_point_emit_int(rc); + rte_trace_point_emit_int(handle->dev_fd); + rte_trace_point_emit_int(handle->fd); + rte_trace_point_emit_int(handle->type); + rte_trace_point_emit_u32(handle->max_intr); + rte_trace_point_emit_u32(handle->nb_efd); + rte_trace_point_emit_ptr(cb); + rte_trace_point_emit_ptr(cb_arg); +) +RTE_TRACE_POINT( + rte_eal_trace_intr_callback_unregister, + RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, + rte_intr_callback_fn cb, void *cb_arg, int rc), + rte_trace_point_emit_int(rc); + rte_trace_point_emit_int(handle->dev_fd); + rte_trace_point_emit_int(handle->fd); + rte_trace_point_emit_int(handle->type); + rte_trace_point_emit_u32(handle->max_intr); + rte_trace_point_emit_u32(handle->nb_efd); + rte_trace_point_emit_ptr(cb); + rte_trace_point_emit_ptr(cb_arg); +) +RTE_TRACE_POINT( + rte_eal_trace_intr_enable, + RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc), + rte_trace_point_emit_int(rc); + rte_trace_point_emit_int(handle->dev_fd); + rte_trace_point_emit_int(handle->fd); + rte_trace_point_emit_int(handle->type); + rte_trace_point_emit_u32(handle->max_intr); + rte_trace_point_emit_u32(handle->nb_efd); +) +RTE_TRACE_POINT( + rte_eal_trace_intr_disable, + RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc), + rte_trace_point_emit_int(rc); + rte_trace_point_emit_int(handle->dev_fd); + rte_trace_point_emit_int(handle->fd); + rte_trace_point_emit_int(handle->type); + rte_trace_point_emit_u32(handle->max_intr); + rte_trace_point_emit_u32(handle->nb_efd); +) + +/* Memory */ +RTE_TRACE_POINT( + rte_eal_trace_mem_zmalloc, + RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align, + int socket, void *ptr), + rte_trace_point_emit_string(type); + rte_trace_point_emit_size_t(size); + rte_trace_point_emit_u32(align); + rte_trace_point_emit_int(socket); + rte_trace_point_emit_ptr(ptr); +) + +RTE_TRACE_POINT( + rte_eal_trace_mem_malloc, + RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align, + int socket, void *ptr), + rte_trace_point_emit_string(type); + rte_trace_point_emit_size_t(size); + rte_trace_point_emit_u32(align); + rte_trace_point_emit_int(socket); + rte_trace_point_emit_ptr(ptr); +) + +RTE_TRACE_POINT( + rte_eal_trace_mem_realloc, + RTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int socket, + void *ptr), + rte_trace_point_emit_size_t(size); + rte_trace_point_emit_u32(align); + rte_trace_point_emit_int(socket); + rte_trace_point_emit_ptr(ptr); +) + +RTE_TRACE_POINT( + rte_eal_trace_mem_free, + RTE_TRACE_POINT_ARGS(void *ptr), + rte_trace_point_emit_ptr(ptr); +) + +/* Memzone */ +RTE_TRACE_POINT( + rte_eal_trace_memzone_reserve, + RTE_TRACE_POINT_ARGS(const char *name, size_t len, int socket_id, + unsigned int flags, unsigned int align, unsigned int bound, + const void *mz), + rte_trace_point_emit_string(name); + rte_trace_point_emit_size_t(len); + rte_trace_point_emit_int(socket_id); + rte_trace_point_emit_u32(flags); + rte_trace_point_emit_u32(align); + rte_trace_point_emit_u32(bound); + rte_trace_point_emit_ptr(mz); +) + +RTE_TRACE_POINT( + rte_eal_trace_memzone_lookup, + RTE_TRACE_POINT_ARGS(const char *name, const void *memzone), + rte_trace_point_emit_string(name); + rte_trace_point_emit_ptr(memzone); +) + +RTE_TRACE_POINT( + rte_eal_trace_memzone_free, + RTE_TRACE_POINT_ARGS(const char *name, void *addr, int rc), + rte_trace_point_emit_string(name); + rte_trace_point_emit_ptr(addr); + rte_trace_point_emit_int(rc); +) + +/* Thread */ +RTE_TRACE_POINT( + rte_eal_trace_thread_remote_launch, + RTE_TRACE_POINT_ARGS(int (*f)(void *), void *arg, + unsigned int worker_id, int rc), + rte_trace_point_emit_ptr(f); + rte_trace_point_emit_ptr(arg); + rte_trace_point_emit_u32(worker_id); + rte_trace_point_emit_int(rc); +) +RTE_TRACE_POINT( + rte_eal_trace_thread_lcore_ready, + RTE_TRACE_POINT_ARGS(unsigned int lcore_id, const char *cpuset), + rte_trace_point_emit_u32(lcore_id); + rte_trace_point_emit_string(cpuset); +) + +#ifdef __cplusplus +} +#endif + +#endif /* _EAL_TRACE_INTERNAL_H_ */ diff --git a/lib/eal/include/rte_eal_trace.h b/lib/eal/include/rte_eal_trace.h index 6f5c022558..c3d15bbe5e 100644 --- a/lib/eal/include/rte_eal_trace.h +++ b/lib/eal/include/rte_eal_trace.h @@ -15,32 +15,8 @@ extern "C" { #endif -#include -#include #include -#include "eal_interrupts.h" - -/* Alarm */ -RTE_TRACE_POINT( - rte_eal_trace_alarm_set, - RTE_TRACE_POINT_ARGS(uint64_t us, rte_eal_alarm_callback cb_fn, - void *cb_arg, int rc), - rte_trace_point_emit_u64(us); - rte_trace_point_emit_ptr(cb_fn); - rte_trace_point_emit_ptr(cb_arg); - rte_trace_point_emit_int(rc); -) - -RTE_TRACE_POINT( - rte_eal_trace_alarm_cancel, - RTE_TRACE_POINT_ARGS(rte_eal_alarm_callback cb_fn, void *cb_arg, - int count), - rte_trace_point_emit_ptr(cb_fn); - rte_trace_point_emit_ptr(cb_arg); - rte_trace_point_emit_int(count); -) - /* Generic */ RTE_TRACE_POINT( rte_eal_trace_generic_void, @@ -151,140 +127,6 @@ RTE_TRACE_POINT( #define RTE_EAL_TRACE_GENERIC_FUNC rte_eal_trace_generic_func(__func__) -/* Interrupt */ -RTE_TRACE_POINT( - rte_eal_trace_intr_callback_register, - RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, - rte_intr_callback_fn cb, void *cb_arg, int rc), - rte_trace_point_emit_int(rc); - rte_trace_point_emit_int(handle->dev_fd); - rte_trace_point_emit_int(handle->fd); - rte_trace_point_emit_int(handle->type); - rte_trace_point_emit_u32(handle->max_intr); - rte_trace_point_emit_u32(handle->nb_efd); - rte_trace_point_emit_ptr(cb); - rte_trace_point_emit_ptr(cb_arg); -) -RTE_TRACE_POINT( - rte_eal_trace_intr_callback_unregister, - RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, - rte_intr_callback_fn cb, void *cb_arg, int rc), - rte_trace_point_emit_int(rc); - rte_trace_point_emit_int(handle->dev_fd); - rte_trace_point_emit_int(handle->fd); - rte_trace_point_emit_int(handle->type); - rte_trace_point_emit_u32(handle->max_intr); - rte_trace_point_emit_u32(handle->nb_efd); - rte_trace_point_emit_ptr(cb); - rte_trace_point_emit_ptr(cb_arg); -) -RTE_TRACE_POINT( - rte_eal_trace_intr_enable, - RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc), - rte_trace_point_emit_int(rc); - rte_trace_point_emit_int(handle->dev_fd); - rte_trace_point_emit_int(handle->fd); - rte_trace_point_emit_int(handle->type); - rte_trace_point_emit_u32(handle->max_intr); - rte_trace_point_emit_u32(handle->nb_efd); -) -RTE_TRACE_POINT( - rte_eal_trace_intr_disable, - RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc), - rte_trace_point_emit_int(rc); - rte_trace_point_emit_int(handle->dev_fd); - rte_trace_point_emit_int(handle->fd); - rte_trace_point_emit_int(handle->type); - rte_trace_point_emit_u32(handle->max_intr); - rte_trace_point_emit_u32(handle->nb_efd); -) - -/* Memory */ -RTE_TRACE_POINT( - rte_eal_trace_mem_zmalloc, - RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align, - int socket, void *ptr), - rte_trace_point_emit_string(type); - rte_trace_point_emit_size_t(size); - rte_trace_point_emit_u32(align); - rte_trace_point_emit_int(socket); - rte_trace_point_emit_ptr(ptr); -) - -RTE_TRACE_POINT( - rte_eal_trace_mem_malloc, - RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align, - int socket, void *ptr), - rte_trace_point_emit_string(type); - rte_trace_point_emit_size_t(size); - rte_trace_point_emit_u32(align); - rte_trace_point_emit_int(socket); - rte_trace_point_emit_ptr(ptr); -) - -RTE_TRACE_POINT( - rte_eal_trace_mem_realloc, - RTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int socket, - void *ptr), - rte_trace_point_emit_size_t(size); - rte_trace_point_emit_u32(align); - rte_trace_point_emit_int(socket); - rte_trace_point_emit_ptr(ptr); -) - -RTE_TRACE_POINT( - rte_eal_trace_mem_free, - RTE_TRACE_POINT_ARGS(void *ptr), - rte_trace_point_emit_ptr(ptr); -) - -/* Memzone */ -RTE_TRACE_POINT( - rte_eal_trace_memzone_reserve, - RTE_TRACE_POINT_ARGS(const char *name, size_t len, int socket_id, - unsigned int flags, unsigned int align, unsigned int bound, - const void *mz), - rte_trace_point_emit_string(name); - rte_trace_point_emit_size_t(len); - rte_trace_point_emit_int(socket_id); - rte_trace_point_emit_u32(flags); - rte_trace_point_emit_u32(align); - rte_trace_point_emit_u32(bound); - rte_trace_point_emit_ptr(mz); -) - -RTE_TRACE_POINT( - rte_eal_trace_memzone_lookup, - RTE_TRACE_POINT_ARGS(const char *name, const void *memzone), - rte_trace_point_emit_string(name); - rte_trace_point_emit_ptr(memzone); -) - -RTE_TRACE_POINT( - rte_eal_trace_memzone_free, - RTE_TRACE_POINT_ARGS(const char *name, void *addr, int rc), - rte_trace_point_emit_string(name); - rte_trace_point_emit_ptr(addr); - rte_trace_point_emit_int(rc); -) - -/* Thread */ -RTE_TRACE_POINT( - rte_eal_trace_thread_remote_launch, - RTE_TRACE_POINT_ARGS(int (*f)(void *), void *arg, - unsigned int worker_id, int rc), - rte_trace_point_emit_ptr(f); - rte_trace_point_emit_ptr(arg); - rte_trace_point_emit_u32(worker_id); - rte_trace_point_emit_int(rc); -) -RTE_TRACE_POINT( - rte_eal_trace_thread_lcore_ready, - RTE_TRACE_POINT_ARGS(unsigned int lcore_id, const char *cpuset), - rte_trace_point_emit_u32(lcore_id); - rte_trace_point_emit_string(cpuset); -) - #ifdef __cplusplus } #endif diff --git a/lib/eal/linux/eal_alarm.c b/lib/eal/linux/eal_alarm.c index 9a68e4ce68..397f25d7d5 100644 --- a/lib/eal/linux/eal_alarm.c +++ b/lib/eal/linux/eal_alarm.c @@ -9,12 +9,12 @@ #include #include +#include #include #include #include #include #include -#include #include diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c index d52ec8eb4c..c9881143be 100644 --- a/lib/eal/linux/eal_interrupts.c +++ b/lib/eal/linux/eal_interrupts.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -27,7 +28,6 @@ #include #include #include -#include #include "eal_private.h" diff --git a/lib/eal/version.map b/lib/eal/version.map index 2ae57ee78a..6d6978f108 100644 --- a/lib/eal/version.map +++ b/lib/eal/version.map @@ -333,8 +333,6 @@ EXPERIMENTAL { rte_dev_dma_unmap; # added in 20.05 - __rte_eal_trace_alarm_cancel; - __rte_eal_trace_alarm_set; __rte_eal_trace_generic_double; __rte_eal_trace_generic_float; __rte_eal_trace_generic_func; @@ -351,19 +349,6 @@ EXPERIMENTAL { __rte_eal_trace_generic_u64; __rte_eal_trace_generic_u8; __rte_eal_trace_generic_void; - __rte_eal_trace_intr_callback_register; - __rte_eal_trace_intr_callback_unregister; - __rte_eal_trace_intr_enable; - __rte_eal_trace_intr_disable; - __rte_eal_trace_mem_free; - __rte_eal_trace_mem_malloc; - __rte_eal_trace_mem_realloc; - __rte_eal_trace_mem_zmalloc; - __rte_eal_trace_memzone_free; - __rte_eal_trace_memzone_lookup; - __rte_eal_trace_memzone_reserve; - __rte_eal_trace_thread_lcore_ready; - __rte_eal_trace_thread_remote_launch; __rte_trace_mem_per_thread_alloc; __rte_trace_point_emit_field; __rte_trace_point_register; diff --git a/lib/eal/windows/eal_alarm.c b/lib/eal/windows/eal_alarm.c index 51fe752c16..48203a2870 100644 --- a/lib/eal/windows/eal_alarm.c +++ b/lib/eal/windows/eal_alarm.c @@ -9,8 +9,7 @@ #include #include -#include - +#include #include "eal_windows.h" enum alarm_state { From patchwork Wed Feb 15 09:42:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Dwivedi X-Patchwork-Id: 123940 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 670B841CA4; Wed, 15 Feb 2023 10:43:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 967A74301C; Wed, 15 Feb 2023 10:43:11 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 7522543011 for ; Wed, 15 Feb 2023 10:43:10 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31F9Fxae007402; Wed, 15 Feb 2023 01:43:08 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=/1XkzHnDw/zwjMwWKzgqGZUePlLg2A1u8/vK2CKA7xc=; b=Jmv6huUk8AmFU4tHnzb/GYKIpWWxWPRignxNc9XVk93oT/QtSlVL4yiOUkUyfgPvv4IN ZjgZ1bTgRvy0xACx5gG51KO+1lp47TABw2kHmTANPEJ2+lZHrR1+FNMnExmAhoGQ90TZ 9JO/rQokRfTx7rOu3cXAFcVVLhILfPbrx1O6ZYzP2dqlCKi5zM3ONRVWa3prjb1BsnRR B2ehca0g0iGSKooOzmOHjhzPIPfD5AlYh9ToTHkZQhfXmK17mcpGTR3fFFwxIbb2FnvM OysyInkylww0+eswnZbNqTu+l21EBR9Obl0HqOQwcY9w87eInH3kHeODlZlbyiZRhPsG Rw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nrumggc2g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 15 Feb 2023 01:43:08 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 15 Feb 2023 01:43:06 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 15 Feb 2023 01:43:06 -0800 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id 3CDFA3F7054; Wed, 15 Feb 2023 01:43:04 -0800 (PST) From: Ankur Dwivedi To: CC: , , , , Ankur Dwivedi Subject: [PATCH v3 4/5] ethdev: remove internal tracepoints from version map Date: Wed, 15 Feb 2023 15:12:27 +0530 Message-ID: <20230215094228.1452656-5-adwivedi@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230215094228.1452656-1-adwivedi@marvell.com> References: <20230210103446.1126999-1-adwivedi@marvell.com> <20230215094228.1452656-1-adwivedi@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: IgsIajGUFa0CJy0hvOFS7CD8bp4Y_DZb X-Proofpoint-ORIG-GUID: IgsIajGUFa0CJy0hvOFS7CD8bp4Y_DZb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-15_06,2023-02-14_01,2023-02-09_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The internal tracepoints are removed from the version.map file. Also, removed ethdev_trace.h from meson.build. Signed-off-by: Ankur Dwivedi Acked-by: Ferruh Yigit Acked-by: Jerin Jacob --- lib/ethdev/ethdev_trace.h | 6 +++--- lib/ethdev/meson.build | 1 - lib/ethdev/version.map | 6 ------ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/ethdev/ethdev_trace.h b/lib/ethdev/ethdev_trace.h index 9fae22c490..54d9106a65 100644 --- a/lib/ethdev/ethdev_trace.h +++ b/lib/ethdev/ethdev_trace.h @@ -2,8 +2,8 @@ * Copyright(C) 2023 Marvell International Ltd. */ -#ifndef _RTE_ETHDEV_TRACE_H_ -#define _RTE_ETHDEV_TRACE_H_ +#ifndef _ETHDEV_TRACE_H_ +#define _ETHDEV_TRACE_H_ /** * @file @@ -2522,4 +2522,4 @@ RTE_TRACE_POINT_FP( } #endif -#endif /* _RTE_ETHDEV_TRACE_H_ */ +#endif /* _ETHDEV_TRACE_H_ */ diff --git a/lib/ethdev/meson.build b/lib/ethdev/meson.build index 7835c96601..9e97f05983 100644 --- a/lib/ethdev/meson.build +++ b/lib/ethdev/meson.build @@ -40,7 +40,6 @@ indirect_headers += files( driver_sdk_headers += files( 'ethdev_driver.h', 'ethdev_pci.h', - 'ethdev_trace.h', 'ethdev_vdev.h', ) diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index dbc2bffe64..b5260a8349 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -177,12 +177,6 @@ EXPERIMENTAL { rte_flow_dev_dump; # added in 20.05 - __rte_ethdev_trace_configure; - __rte_ethdev_trace_rxq_setup; - __rte_ethdev_trace_txq_setup; - __rte_ethdev_trace_start; - __rte_ethdev_trace_stop; - __rte_ethdev_trace_close; __rte_ethdev_trace_rx_burst; __rte_ethdev_trace_tx_burst; rte_flow_get_aged_flows; From patchwork Wed Feb 15 09:42:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Dwivedi X-Patchwork-Id: 123941 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 537E541CA4; Wed, 15 Feb 2023 10:43:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3ED1D42BB1; Wed, 15 Feb 2023 10:43:21 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 3FC584301A for ; Wed, 15 Feb 2023 10:43:19 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31F9FvQi007323; Wed, 15 Feb 2023 01:43:16 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=QDTuZ59Yf6o7gU0NIbxGIom2VzvainttMgdyNcC9pvE=; b=KtXsBDfooiTEay13eFHyYb0zwcAY09++GHz+6JEivq/HhDjSfVGnKA93kHFwCGHwZYEs AVGvwnuSmYgdHPBLrO9/lp8og507Zv5KsD/F1/0PMFdK5Adr2SnwkxGOk+QUJiG8pIqe NwKJTeaBnQt97Fj0a+WQ0MouL7XIs95PhNutA85dziqR8k+9bavwODXxFgjmK8LGSAPx xhfN9g9aohDfQZrZvYzTH356i4FhNMo9g98dElQqtiIm7k7HH609OATet0QH5VbI3Z/C Eqiy/tPvFrO4OXQYnpHcH7dUkJZC/dV2ICZ3MEqPaWssdFrZoyHHUXDD+znt/TLGU5d0 uw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nrumggc3j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 15 Feb 2023 01:43:14 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 15 Feb 2023 01:43:12 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 15 Feb 2023 01:43:12 -0800 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id 2D00A3F7069; Wed, 15 Feb 2023 01:43:09 -0800 (PST) From: Ankur Dwivedi To: CC: , , , , Ankur Dwivedi Subject: [PATCH v3 5/5] eventdev: remove internal tracepoints from version map Date: Wed, 15 Feb 2023 15:12:28 +0530 Message-ID: <20230215094228.1452656-6-adwivedi@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230215094228.1452656-1-adwivedi@marvell.com> References: <20230210103446.1126999-1-adwivedi@marvell.com> <20230215094228.1452656-1-adwivedi@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: Dh_1EW4Vo9MAMKZ2TqrP-ESC2OPexL1g X-Proofpoint-ORIG-GUID: Dh_1EW4Vo9MAMKZ2TqrP-ESC2OPexL1g X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-15_06,2023-02-14_01,2023-02-09_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The internal tracepoints are removed from the version.map file. Also, removed eventdev_trace.h from meson.build. Signed-off-by: Ankur Dwivedi Acked-by: Jerin Jacob --- lib/eventdev/eventdev_trace.h | 6 +++--- lib/eventdev/meson.build | 1 - lib/eventdev/version.map | 30 ------------------------------ 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/lib/eventdev/eventdev_trace.h b/lib/eventdev/eventdev_trace.h index e1f7b45940..8340ea6dde 100644 --- a/lib/eventdev/eventdev_trace.h +++ b/lib/eventdev/eventdev_trace.h @@ -2,8 +2,8 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#ifndef _RTE_EVENTDEV_TRACE_H_ -#define _RTE_EVENTDEV_TRACE_H_ +#ifndef _EVENTDEV_TRACE_H_ +#define _EVENTDEV_TRACE_H_ /** * @file @@ -786,4 +786,4 @@ RTE_TRACE_POINT( } #endif -#endif /* _RTE_EVENTDEV_TRACE_H_ */ +#endif /* _EVENTDEV_TRACE_H_ */ diff --git a/lib/eventdev/meson.build b/lib/eventdev/meson.build index 6b2c381811..6edf98dfa5 100644 --- a/lib/eventdev/meson.build +++ b/lib/eventdev/meson.build @@ -39,7 +39,6 @@ driver_sdk_headers += files( 'eventdev_pmd.h', 'eventdev_pmd_pci.h', 'eventdev_pmd_vdev.h', - 'eventdev_trace.h', 'event_timer_adapter_pmd.h', ) diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map index 3add5e3088..9153c09b42 100644 --- a/lib/eventdev/version.map +++ b/lib/eventdev/version.map @@ -127,36 +127,6 @@ EXPERIMENTAL { INTERNAL { global: - __rte_eventdev_trace_close; - __rte_eventdev_trace_configure; - __rte_eventdev_trace_crypto_adapter_create; - __rte_eventdev_trace_crypto_adapter_free; - __rte_eventdev_trace_crypto_adapter_queue_pair_add; - __rte_eventdev_trace_crypto_adapter_queue_pair_del; - __rte_eventdev_trace_crypto_adapter_start; - __rte_eventdev_trace_crypto_adapter_stop; - __rte_eventdev_trace_eth_rx_adapter_create; - __rte_eventdev_trace_eth_rx_adapter_free; - __rte_eventdev_trace_eth_rx_adapter_queue_add; - __rte_eventdev_trace_eth_rx_adapter_queue_del; - __rte_eventdev_trace_eth_rx_adapter_start; - __rte_eventdev_trace_eth_rx_adapter_stop; - __rte_eventdev_trace_eth_tx_adapter_create; - __rte_eventdev_trace_eth_tx_adapter_free; - __rte_eventdev_trace_eth_tx_adapter_queue_add; - __rte_eventdev_trace_eth_tx_adapter_queue_del; - __rte_eventdev_trace_eth_tx_adapter_start; - __rte_eventdev_trace_eth_tx_adapter_stop; - __rte_eventdev_trace_port_link; - __rte_eventdev_trace_port_setup; - __rte_eventdev_trace_port_unlink; - __rte_eventdev_trace_queue_setup; - __rte_eventdev_trace_start; - __rte_eventdev_trace_stop; - __rte_eventdev_trace_timer_adapter_create; - __rte_eventdev_trace_timer_adapter_free; - __rte_eventdev_trace_timer_adapter_start; - __rte_eventdev_trace_timer_adapter_stop; event_dev_fp_ops_reset; event_dev_fp_ops_set; event_dev_probing_finish;