[PATCH v1 0/5] remove internal tracepoints from version map

[PATCH v1 0/5] remove internal tracepoints from version map

[Ankur Dwivedi]

The internal tracepoints of a library are not needed to be exported in
version.map file, as they will not be called from outside the library.
Only the tracepoints called from a public function need to be exported
in version.map. This patch removes the internal tracepoints from
version.map for mempool, cryptodev, eal, ethdev and eventdev library.

Ankur Dwivedi (5):
  mempool: remove internal tracepoints from version map
  cryptodev: remove internal tracepoints from version map
  eal: remove internal tracepoints from version map
  ethdev: remove internal tracepoints from version map
  eventdev: remove internal tracepoints from version map

 ...te_cryptodev_trace.h => cryptodev_trace.h} |   6 +-
 lib/cryptodev/cryptodev_trace_points.c        |   2 +-
 lib/cryptodev/meson.build                     |   2 +-
 lib/cryptodev/rte_cryptodev.c                 |   2 +-
 lib/cryptodev/version.map                     |  62 ------
 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/meson.build                   |   1 +
 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 +-
 lib/ethdev/version.map                        |   6 -
 lib/eventdev/version.map                      |  30 ---
 .../{rte_mempool_trace.h => mempool_trace.h}  |   6 +-
 lib/mempool/mempool_trace_points.c            |   2 +-
 lib/mempool/meson.build                       |   4 +-
 lib/mempool/rte_mempool.c                     |   2 +-
 lib/mempool/rte_mempool_ops.c                 |   2 +-
 lib/mempool/version.map                       |  14 --
 27 files changed, 209 insertions(+), 308 deletions(-)
 rename lib/cryptodev/{rte_cryptodev_trace.h => cryptodev_trace.h} (99%)
 create mode 100644 lib/eal/include/eal_trace_internal.h
 rename lib/mempool/{rte_mempool_trace.h => mempool_trace.h} (98%)

-- 
2.25.1

[PATCH v1 1/5] mempool: remove internal tracepoints from version map

[Ankur Dwivedi]

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 <adwivedi@marvell.com>
---
 .../{rte_mempool_trace.h => mempool_trace.h}       |  6 +++---
 lib/mempool/mempool_trace_points.c                 |  2 +-
 lib/mempool/meson.build                            |  4 +++-
 lib/mempool/rte_mempool.c                          |  2 +-
 lib/mempool/rte_mempool_ops.c                      |  2 +-
 lib/mempool/version.map                            | 14 --------------
 6 files changed, 9 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 <rte_trace_point_register.h>
 
-#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..29ae6d21e5 100644
--- a/lib/mempool/meson.build
+++ b/lib/mempool/meson.build
@@ -17,7 +17,9 @@ sources = files(
 )
 headers = files(
         'rte_mempool.h',
-        'rte_mempool_trace.h',
         'rte_mempool_trace_fp.h',
 )
+driver_sdk_headers += files(
+        'mempool_trace.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 <rte_eal_paging.h>
 #include <rte_telemetry.h>
 
+#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 <rte_errno.h>
 #include <dev_driver.h>
 
-#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 {
-- 
2.25.1

[PATCH v1 2/5] cryptodev: remove internal tracepoints from version map

[Ankur Dwivedi]

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 <adwivedi@marvell.com>
---
 ...te_cryptodev_trace.h => cryptodev_trace.h} |  6 +-
 lib/cryptodev/cryptodev_trace_points.c        |  2 +-
 lib/cryptodev/meson.build                     |  2 +-
 lib/cryptodev/rte_cryptodev.c                 |  2 +-
 lib/cryptodev/version.map                     | 62 -------------------
 5 files changed, 6 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 <rte_trace_point_register.h>
 
-#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..55ce5b3a36 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',
@@ -19,6 +18,7 @@ indirect_headers += files(
 )
 driver_sdk_headers += files(
         'cryptodev_pmd.h',
+        'cryptodev_trace.h',
 )
 
 deps += ['kvargs', 'mbuf', 'rcu', 'telemetry']
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;
-- 
2.25.1

[PATCH v1 3/5] eal: remove internal tracepoints from version map

[Ankur Dwivedi]

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 <adwivedi@marvell.com>
---
 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/meson.build              |   1 +
 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, 194 insertions(+), 183 deletions(-)
 create mode 100644 lib/eal/include/eal_trace_internal.h

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 <errno.h>
 
+#include <eal_trace_internal.h>
 #include <rte_launch.h>
-#include <rte_eal_trace.h>
 #include <rte_pause.h>
 #include <rte_lcore.h>
 
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 <string.h>
 #include <errno.h>
 
+#include <eal_trace_internal.h>
 #include <rte_log.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
@@ -15,7 +16,6 @@
 #include <rte_errno.h>
 #include <rte_string_fns.h>
 #include <rte_common.h>
-#include <rte_eal_trace.h>
 
 #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 3181515c5b..ff07f70f27 100644
--- a/lib/eal/common/eal_common_thread.c
+++ b/lib/eal/common/eal_common_thread.c
@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <rte_eal_trace.h>
+#include <eal_trace_internal.h>
 #include <rte_errno.h>
 #include <rte_lcore.h>
 #include <rte_log.h>
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 <rte_eal_trace.h>
 
+#include <eal_trace_internal.h>
+
 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 <rte_common.h>
 #include <rte_spinlock.h>
 
-#include <rte_eal_trace.h>
+#include <eal_trace_internal.h>
 
 #include <rte_malloc.h>
 #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 <time.h>
 #include <errno.h>
 
+#include <eal_trace_internal.h>
 #include <rte_alarm.h>
 #include <rte_cycles.h>
 #include <rte_common.h>
 #include <rte_errno.h>
 #include <rte_interrupts.h>
 #include <rte_spinlock.h>
-#include <rte_eal_trace.h>
 
 #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 <sys/queue.h>
 #include <unistd.h>
 
+#include <eal_trace_internal.h>
 #include <rte_errno.h>
 #include <rte_lcore.h>
 #include <rte_spinlock.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
-#include <rte_eal_trace.h>
 
 #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 <rte_alarm.h>
+#include <rte_interrupts.h>
+#include <rte_trace_point.h>
+
+#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/meson.build b/lib/eal/include/meson.build
index cfcd40aaed..b515cfd0f3 100644
--- a/lib/eal/include/meson.build
+++ b/lib/eal/include/meson.build
@@ -58,6 +58,7 @@ headers += files(
 driver_sdk_headers = files(
         'bus_driver.h',
         'dev_driver.h',
+        'eal_trace_internal.h',
 )
 
 # special case install the generic headers, since they go in a subdir
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 <rte_alarm.h>
-#include <rte_interrupts.h>
 #include <rte_trace_point.h>
 
-#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 <sys/time.h>
 #include <sys/timerfd.h>
 
+#include <eal_trace_internal.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_common.h>
 #include <rte_errno.h>
 #include <rte_spinlock.h>
-#include <rte_eal_trace.h>
 
 #include <eal_private.h>
 
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 <assert.h>
 #include <stdbool.h>
 
+#include <eal_trace_internal.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
 #include <rte_per_lcore.h>
@@ -27,7 +28,6 @@
 #include <rte_spinlock.h>
 #include <rte_pause.h>
 #include <rte_vfio.h>
-#include <rte_eal_trace.h>
 
 #include "eal_private.h"
 
diff --git a/lib/eal/version.map b/lib/eal/version.map
index 21aa1b8ce3..d0a0da7332 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 <rte_alarm.h>
 #include <rte_spinlock.h>
 
-#include <rte_eal_trace.h>
-
+#include <eal_trace_internal.h>
 #include "eal_windows.h"
 
 enum alarm_state {
-- 
2.25.1

[PATCH v1 4/5] ethdev: remove internal tracepoints from version map

[Ankur Dwivedi]

The internal trcepoints are removed from the version.map file.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
---
 lib/ethdev/version.map | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map
index 17201fbe0f..d8e9941356 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;
-- 
2.25.1

[PATCH v1 5/5] eventdev: remove internal tracepoints from version map

[Ankur Dwivedi]

The internal tracepoints are removed from the version.map file.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
---
 lib/eventdev/version.map | 30 ------------------------------
 1 file changed, 30 deletions(-)

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;
-- 
2.25.1

Re: [PATCH v1 4/5] ethdev: remove internal tracepoints from version map

[Ferruh Yigit]

On 2/9/2023 1:30 PM, Ankur Dwivedi wrote:
> The internal trcepoints are removed from the version.map file.
> 
> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
> ---
>  lib/ethdev/version.map | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map
> index 17201fbe0f..d8e9941356 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;

Thanks for the cleanup.

Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>

Re: [PATCH v1 1/5] mempool: remove internal tracepoints from version map

[David Marchand]

On Thu, Feb 9, 2023 at 2:30 PM Ankur Dwivedi <adwivedi@marvell.com> wrote:
>
> 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

This patch also exports this new internal header which looks wrong to me.
See below.


> experimental section in version.map file.
>
> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>

> diff --git a/lib/mempool/meson.build b/lib/mempool/meson.build
> index b8aaa00694..29ae6d21e5 100644
> --- a/lib/mempool/meson.build
> +++ b/lib/mempool/meson.build
> @@ -17,7 +17,9 @@ sources = files(
>  )
>  headers = files(
>          'rte_mempool.h',
> -        'rte_mempool_trace.h',
>          'rte_mempool_trace_fp.h',
>  )
> +driver_sdk_headers += files(
> +        'mempool_trace.h',
> +)

driver_sdk_headers is for exporting driver headers.
I am not sure why you added this, can you elaborate?


Checking with who includes this header in the whole tree:
$ git grep include..mempool_trace
lib/mempool/mempool_trace_points.c:#include "mempool_trace.h"
lib/mempool/rte_mempool.c:#include "mempool_trace.h"
lib/mempool/rte_mempool_ops.c:#include "mempool_trace.h"

I see no external (from the mempool library pov) user of this header
=> no export needed.

I did not check the rest of the series, but the same argument is
likely to apply.


Thanks.

-- 
David Marchand

RE: [EXT] Re: [PATCH v1 1/5] mempool: remove internal tracepoints from version map

[Ankur Dwivedi]

>On Thu, Feb 9, 2023 at 2:30 PM Ankur Dwivedi <adwivedi@marvell.com>
>wrote:
>>
>> 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
>
>This patch also exports this new internal header which looks wrong to me.
>See below.
>
>
>> experimental section in version.map file.
>>
>> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
>
>> diff --git a/lib/mempool/meson.build b/lib/mempool/meson.build index
>> b8aaa00694..29ae6d21e5 100644
>> --- a/lib/mempool/meson.build
>> +++ b/lib/mempool/meson.build
>> @@ -17,7 +17,9 @@ sources = files(
>>  )
>>  headers = files(
>>          'rte_mempool.h',
>> -        'rte_mempool_trace.h',
>>          'rte_mempool_trace_fp.h',
>>  )
>> +driver_sdk_headers += files(
>> +        'mempool_trace.h',
>> +)
>
>driver_sdk_headers is for exporting driver headers.
Ok.

>I am not sure why you added this, can you elaborate?

I saw the changes done in lib/eventdev for eventdev_trace.h. Made similar changes for 
mempool and other library. 
>
>Checking with who includes this header in the whole tree:
>$ git grep include..mempool_trace
>lib/mempool/mempool_trace_points.c:#include "mempool_trace.h"
>lib/mempool/rte_mempool.c:#include "mempool_trace.h"
>lib/mempool/rte_mempool_ops.c:#include "mempool_trace.h"
>
>I see no external (from the mempool library pov) user of this header => no
>export needed.

Ok, will remove it. 
>
>I did not check the rest of the series, but the same argument is likely to apply.
>
>
>Thanks.
>
>--
>David Marchand

Re: [PATCH v1 1/5] mempool: remove internal tracepoints from version map

[Jerin Jacob]

On Thu, Feb 9, 2023 at 7:00 PM Ankur Dwivedi <adwivedi@marvell.com> wrote:
>
> 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 <adwivedi@marvell.com>

> @@ -47,22 +47,8 @@ EXPERIMENTAL {
>         __rte_mempool_trace_generic_get;
>         __rte_mempool_trace_get_bulk;
>         __rte_mempool_trace_get_contig_blocks;

I think, FP ones also can be removed.

Also, in one of the patch(may be eal). Update the doc
https://doc.dpdk.org/guides/prog_guide/trace_lib.html

The following note can be removed:

The RTE_TRACE_POINT_REGISTER defines the placeholder for the
rte_trace_point_t tracepoint object. The user must export a
__<trace_function_name> 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 above
example.



> -       __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 {
> --
> 2.25.1
>

RE: [EXT] Re: [PATCH v1 1/5] mempool: remove internal tracepoints from version map

[Ankur Dwivedi]

>On Thu, Feb 9, 2023 at 7:00 PM Ankur Dwivedi <adwivedi@marvell.com>
>wrote:
>>
>> 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 <adwivedi@marvell.com>
>
>> @@ -47,22 +47,8 @@ EXPERIMENTAL {
>>         __rte_mempool_trace_generic_get;
>>         __rte_mempool_trace_get_bulk;
>>         __rte_mempool_trace_get_contig_blocks;
>
>I think, FP ones also can be removed.

The FP symbols are used in header file rte_mempool.h. Removing the symbols will cause build
failure in shared build. 
>
>Also, in one of the patch(may be eal). Update the doc
>https://urldefense.proofpoint.com/v2/url?u=https-
>3A__doc.dpdk.org_guides_prog-5Fguide_trace-
>5Flib.html&d=DwIBaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=ILjiNF3GF25y6QdHZU
>xMl6JrStU0MIuCtO5dMzn3Ybk&m=wr975-
>STqC3Y1eiGa9KZMdPdNKingEIEfZXvMkri8VO0p31eWWzr8kAoQC2TEIxV&s=g_
>M3SEGmHvisHLnOLO8ilDQbVQ85MFRR2YCmCfYZ3SE&e=
>
>The following note can be removed:
>
>The RTE_TRACE_POINT_REGISTER defines the placeholder for the
>rte_trace_point_t tracepoint object. The user must export a
>__<trace_function_name> 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 above example.
>
>
>
>> -       __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 {
>> --
>> 2.25.1
>>

Re: [EXT] Re: [PATCH v1 1/5] mempool: remove internal tracepoints from version map

[Jerin Jacob]

On Fri, Feb 10, 2023 at 12:30 PM Ankur Dwivedi <adwivedi@marvell.com> wrote:
>
> >On Thu, Feb 9, 2023 at 7:00 PM Ankur Dwivedi <adwivedi@marvell.com>
> >wrote:
> >>
> >> 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 <adwivedi@marvell.com>
> >
> >> @@ -47,22 +47,8 @@ EXPERIMENTAL {
> >>         __rte_mempool_trace_generic_get;
> >>         __rte_mempool_trace_get_bulk;
> >>         __rte_mempool_trace_get_contig_blocks;
> >
> >I think, FP ones also can be removed.
>
> The FP symbols are used in header file rte_mempool.h. Removing the symbols will cause build
> failure in shared build.

OK. Please update the below note documentation only for FP symbols then.

> >
> >Also, in one of the patch(may be eal). Update the doc
> >https://urldefense.proofpoint.com/v2/url?u=https-
> >3A__doc.dpdk.org_guides_prog-5Fguide_trace-
> >5Flib.html&d=DwIBaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=ILjiNF3GF25y6QdHZU
> >xMl6JrStU0MIuCtO5dMzn3Ybk&m=wr975-
> >STqC3Y1eiGa9KZMdPdNKingEIEfZXvMkri8VO0p31eWWzr8kAoQC2TEIxV&s=g_
> >M3SEGmHvisHLnOLO8ilDQbVQ85MFRR2YCmCfYZ3SE&e=
> >
> >The following note can be removed:
> >
> >The RTE_TRACE_POINT_REGISTER defines the placeholder for the
> >rte_trace_point_t tracepoint object. The user must export a
> >__<trace_function_name> 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 above example.
> >
> >
> >
> >> -       __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 {
> >> --
> >> 2.25.1
> >>

[PATCH v2 0/5] remove internal tracepoints from version map

[Ankur Dwivedi]

The internal tracepoints of a library are not needed to be exported in
version.map file, as they will not be called from outside the library.
The fast path tracepoints which are called from outside the library needs
to be exported in version.map.
This patch removes the internal tracepoints from version.map for mempool,
cryptodev, eal, ethdev and eventdev library.

v2:
 - Removed the internal tracepoint header files from meson.build.
 - Updated the trace document in
   "eal: remove internal tracepoints from version map"
 - Added acked by from Ferruh for
   "ethdev: remove internal tracepoints from version map"

Ankur Dwivedi (5):
  mempool: remove internal tracepoints from version map
  cryptodev: remove internal tracepoints from version map
  eal: remove internal tracepoints from version map
  ethdev: remove internal tracepoints from version map
  eventdev: remove internal tracepoints from version map

 doc/guides/prog_guide/trace_lib.rst           |  18 +-
 ...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 ------
 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 +-
 lib/ethdev/version.map                        |   6 -
 lib/eventdev/version.map                      |  30 ---
 .../{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 --
 27 files changed, 213 insertions(+), 317 deletions(-)
 rename lib/cryptodev/{rte_cryptodev_trace.h => cryptodev_trace.h} (99%)
 create mode 100644 lib/eal/include/eal_trace_internal.h
 rename lib/mempool/{rte_mempool_trace.h => mempool_trace.h} (98%)

-- 
2.25.1

[PATCH v2 1/5] mempool: remove internal tracepoints from version map

[Ankur Dwivedi]

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 <adwivedi@marvell.com>
---
 .../{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 <rte_trace_point_register.h>
 
-#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 <rte_eal_paging.h>
 #include <rte_telemetry.h>
 
+#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 <rte_errno.h>
 #include <dev_driver.h>
 
-#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 {
-- 
2.25.1

[PATCH v2 2/5] cryptodev: remove internal tracepoints from version map

[Ankur Dwivedi]

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 <adwivedi@marvell.com>
---
 ...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 <rte_trace_point_register.h>
 
-#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;
-- 
2.25.1

[PATCH v2 3/5] eal: remove internal tracepoints from version map

[Ankur Dwivedi]

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 <adwivedi@marvell.com>
---
 doc/guides/prog_guide/trace_lib.rst      |  18 +--
 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, 202 insertions(+), 192 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..cc4de29774 100644
--- a/doc/guides/prog_guide/trace_lib.rst
+++ b/doc/guides/prog_guide/trace_lib.rst
@@ -118,15 +118,6 @@ convention.
    The ``rte_trace_point_register.h`` header must be included before any
    inclusion of the ``rte_trace_point.h`` header.
 
-.. note::
-
-   The ``RTE_TRACE_POINT_REGISTER`` defines the placeholder for the
-   ``rte_trace_point_t`` tracepoint object. The user must export a
-   ``__<trace_function_name>`` 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
-   above example.
-
 Fast path tracepoint
 --------------------
 
@@ -137,6 +128,15 @@ the user must use ``RTE_TRACE_POINT_FP`` instead of ``RTE_TRACE_POINT``.
 ``RTE_TRACE_POINT_FP`` is compiled out by default and it can be enabled using
 the ``enable_trace_fp`` option for meson build.
 
+.. note::
+
+   The ``RTE_TRACE_POINT_REGISTER`` defines the placeholder for the
+   ``rte_trace_point_t`` tracepoint object. For fast path tracepoint, the user
+   must export a ``__<trace_function_name>`` 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
+   above example.
+
 Event record mode
 -----------------
 
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 <errno.h>
 
+#include <eal_trace_internal.h>
 #include <rte_launch.h>
-#include <rte_eal_trace.h>
 #include <rte_pause.h>
 #include <rte_lcore.h>
 
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 <string.h>
 #include <errno.h>
 
+#include <eal_trace_internal.h>
 #include <rte_log.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
@@ -15,7 +16,6 @@
 #include <rte_errno.h>
 #include <rte_string_fns.h>
 #include <rte_common.h>
-#include <rte_eal_trace.h>
 
 #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 3181515c5b..ff07f70f27 100644
--- a/lib/eal/common/eal_common_thread.c
+++ b/lib/eal/common/eal_common_thread.c
@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <rte_eal_trace.h>
+#include <eal_trace_internal.h>
 #include <rte_errno.h>
 #include <rte_lcore.h>
 #include <rte_log.h>
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 <rte_eal_trace.h>
 
+#include <eal_trace_internal.h>
+
 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 <rte_common.h>
 #include <rte_spinlock.h>
 
-#include <rte_eal_trace.h>
+#include <eal_trace_internal.h>
 
 #include <rte_malloc.h>
 #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 <time.h>
 #include <errno.h>
 
+#include <eal_trace_internal.h>
 #include <rte_alarm.h>
 #include <rte_cycles.h>
 #include <rte_common.h>
 #include <rte_errno.h>
 #include <rte_interrupts.h>
 #include <rte_spinlock.h>
-#include <rte_eal_trace.h>
 
 #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 <sys/queue.h>
 #include <unistd.h>
 
+#include <eal_trace_internal.h>
 #include <rte_errno.h>
 #include <rte_lcore.h>
 #include <rte_spinlock.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
-#include <rte_eal_trace.h>
 
 #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 <rte_alarm.h>
+#include <rte_interrupts.h>
+#include <rte_trace_point.h>
+
+#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 <rte_alarm.h>
-#include <rte_interrupts.h>
 #include <rte_trace_point.h>
 
-#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 <sys/time.h>
 #include <sys/timerfd.h>
 
+#include <eal_trace_internal.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_common.h>
 #include <rte_errno.h>
 #include <rte_spinlock.h>
-#include <rte_eal_trace.h>
 
 #include <eal_private.h>
 
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 <assert.h>
 #include <stdbool.h>
 
+#include <eal_trace_internal.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
 #include <rte_per_lcore.h>
@@ -27,7 +28,6 @@
 #include <rte_spinlock.h>
 #include <rte_pause.h>
 #include <rte_vfio.h>
-#include <rte_eal_trace.h>
 
 #include "eal_private.h"
 
diff --git a/lib/eal/version.map b/lib/eal/version.map
index 21aa1b8ce3..d0a0da7332 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 <rte_alarm.h>
 #include <rte_spinlock.h>
 
-#include <rte_eal_trace.h>
-
+#include <eal_trace_internal.h>
 #include "eal_windows.h"
 
 enum alarm_state {
-- 
2.25.1

[PATCH v2 4/5] ethdev: remove internal tracepoints from version map

[Ankur Dwivedi]

The internal tracepoints are removed from the version.map file.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 lib/ethdev/version.map | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map
index 17201fbe0f..d8e9941356 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;
-- 
2.25.1

[PATCH v2 5/5] eventdev: remove internal tracepoints from version map

[Ankur Dwivedi]

The internal tracepoints are removed from the version.map file.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
---
 lib/eventdev/version.map | 30 ------------------------------
 1 file changed, 30 deletions(-)

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;
-- 
2.25.1

Re: [PATCH v2 5/5] eventdev: remove internal tracepoints from version map

[Jerin Jacob]

On Fri, Feb 10, 2023 at 4:05 PM Ankur Dwivedi <adwivedi@marvell.com> wrote:
>
> The internal tracepoints are removed from the version.map file.
>
> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>

From Trace change PoV,

Series-Acked-by: Jerin Jacob <jerinj@marvell.com>

> ---
>  lib/eventdev/version.map | 30 ------------------------------
>  1 file changed, 30 deletions(-)
>
> 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;
> --
> 2.25.1
>

Re: [PATCH v2 4/5] ethdev: remove internal tracepoints from version map

[David Marchand]

On Fri, Feb 10, 2023 at 11:35 AM Ankur Dwivedi <adwivedi@marvell.com> wrote:
>
> The internal tracepoints are removed from the version.map file.
>
> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
> Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>

rte_ethdev_trace.h does not need to be exported.

I suggest the following addition:

diff --git a/lib/ethdev/rte_ethdev_trace.h b/lib/ethdev/ethdev_trace.h
similarity index 96%
rename from lib/ethdev/rte_ethdev_trace.h
rename to lib/ethdev/ethdev_trace.h
index 1491c815c3..3f419fbfa0 100644
--- a/lib/ethdev/rte_ethdev_trace.h
+++ b/lib/ethdev/ethdev_trace.h
@@ -2,8 +2,8 @@
  * Copyright(C) 2020 Marvell International Ltd.
  */

-#ifndef _RTE_ETHDEV_TRACE_H_
-#define _RTE_ETHDEV_TRACE_H_
+#ifndef _ETHDEV_TRACE_H_
+#define _ETHDEV_TRACE_H_

 /**
  * @file
@@ -92,4 +92,4 @@ RTE_TRACE_POINT(
 }
 #endif

-#endif /* _RTE_ETHDEV_TRACE_H_ */
+#endif /* _ETHDEV_TRACE_H_ */
diff --git a/lib/ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c
index 2919409a15..5f08d2dfb6 100644
--- a/lib/ethdev/ethdev_trace_points.c
+++ b/lib/ethdev/ethdev_trace_points.c
@@ -4,7 +4,7 @@

 #include <rte_trace_point_register.h>

-#include <rte_ethdev_trace.h>
+#include <ethdev_trace.h>

 RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_configure,
        lib.ethdev.configure)
diff --git a/lib/ethdev/meson.build b/lib/ethdev/meson.build
index 39250b5da1..9e97f05983 100644
--- a/lib/ethdev/meson.build
+++ b/lib/ethdev/meson.build
@@ -22,7 +22,6 @@ sources = files(
 headers = files(
         'rte_cman.h',
         'rte_ethdev.h',
-        'rte_ethdev_trace.h',
         'rte_ethdev_trace_fp.h',
         'rte_dev_info.h',
         'rte_flow.h',
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index d25db35f7f..a2d289b7a4 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -27,7 +27,7 @@
 #include <rte_ether.h>
 #include <rte_telemetry.h>

-#include "rte_ethdev_trace.h"
+#include "ethdev_trace.h"
 #include "rte_ethdev.h"
 #include "ethdev_driver.h"
 #include "ethdev_profile.h"


-- 
David Marchand

Re: [EXT] Re: [PATCH v1 1/5] mempool: remove internal tracepoints from version map

[David Marchand]

On Fri, Feb 10, 2023 at 8:06 AM Jerin Jacob <jerinjacobk@gmail.com> wrote:
>
> On Fri, Feb 10, 2023 at 12:30 PM Ankur Dwivedi <adwivedi@marvell.com> wrote:
> >
> > >On Thu, Feb 9, 2023 at 7:00 PM Ankur Dwivedi <adwivedi@marvell.com>
> > >wrote:
> > >>
> > >> 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 <adwivedi@marvell.com>
> > >
> > >> @@ -47,22 +47,8 @@ EXPERIMENTAL {
> > >>         __rte_mempool_trace_generic_get;
> > >>         __rte_mempool_trace_get_bulk;
> > >>         __rte_mempool_trace_get_contig_blocks;
> > >
> > >I think, FP ones also can be removed.
> >
> > The FP symbols are used in header file rte_mempool.h. Removing the symbols will cause build
> > failure in shared build.
>
> OK. Please update the below note documentation only for FP symbols then.

I disagree.

We may enhance this note, but it is not a matter of being FP / non-FP.
A simple example is the "generic" non-FP tracepoints provided by EAL.


-- 
David Marchand

Re: [EXT] Re: [PATCH v1 1/5] mempool: remove internal tracepoints from version map

[Jerin Jacob]

On Fri, Feb 10, 2023 at 7:54 PM David Marchand
<david.marchand@redhat.com> wrote:
>
> On Fri, Feb 10, 2023 at 8:06 AM Jerin Jacob <jerinjacobk@gmail.com> wrote:
> >
> > On Fri, Feb 10, 2023 at 12:30 PM Ankur Dwivedi <adwivedi@marvell.com> wrote:
> > >
> > > >On Thu, Feb 9, 2023 at 7:00 PM Ankur Dwivedi <adwivedi@marvell.com>
> > > >wrote:
> > > >>
> > > >> 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 <adwivedi@marvell.com>
> > > >
> > > >> @@ -47,22 +47,8 @@ EXPERIMENTAL {
> > > >>         __rte_mempool_trace_generic_get;
> > > >>         __rte_mempool_trace_get_bulk;
> > > >>         __rte_mempool_trace_get_contig_blocks;
> > > >
> > > >I think, FP ones also can be removed.
> > >
> > > The FP symbols are used in header file rte_mempool.h. Removing the symbols will cause build
> > > failure in shared build.
> >
> > OK. Please update the below note documentation only for FP symbols then.
>
> I disagree.
>
> We may enhance this note, but it is not a matter of being FP / non-FP.
> A simple example is the "generic" non-FP tracepoints provided by EAL.

OK. Then what's your recommendation for the document update ?
Generic datatype exposed by EAL trace library or FP trace point
object. or something else?
I am trying to see what needs to be added/changed in documentation?



>
>
> --
> David Marchand
>

RE: [EXT] Re: [PATCH v2 4/5] ethdev: remove internal tracepoints from version map

[Ankur Dwivedi]

>-----Original Message-----
>From: David Marchand <david.marchand@redhat.com>
>Sent: Friday, February 10, 2023 7:50 PM
>To: Ankur Dwivedi <adwivedi@marvell.com>
>Cc: dev@dpdk.org; thomas@monjalon.net; ferruh.yigit@amd.com; Jerin
>Jacob Kollanukkaran <jerinj@marvell.com>
>Subject: [EXT] Re: [PATCH v2 4/5] ethdev: remove internal tracepoints from
>version map
>
>External Email
>
>----------------------------------------------------------------------
>On Fri, Feb 10, 2023 at 11:35 AM Ankur Dwivedi <adwivedi@marvell.com>
>wrote:
>>
>> The internal tracepoints are removed from the version.map file.
>>
>> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
>> Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
>
>rte_ethdev_trace.h does not need to be exported.
>
>I suggest the following addition:
>
>diff --git a/lib/ethdev/rte_ethdev_trace.h b/lib/ethdev/ethdev_trace.h
>similarity index 96% rename from lib/ethdev/rte_ethdev_trace.h rename to
>lib/ethdev/ethdev_trace.h index 1491c815c3..3f419fbfa0 100644
>--- a/lib/ethdev/rte_ethdev_trace.h
>+++ b/lib/ethdev/ethdev_trace.h
>@@ -2,8 +2,8 @@
>  * Copyright(C) 2020 Marvell International Ltd.
>  */
>
>-#ifndef _RTE_ETHDEV_TRACE_H_
>-#define _RTE_ETHDEV_TRACE_H_
>+#ifndef _ETHDEV_TRACE_H_
>+#define _ETHDEV_TRACE_H_
>
> /**
>  * @file
>@@ -92,4 +92,4 @@ RTE_TRACE_POINT(
> }
> #endif
>
>-#endif /* _RTE_ETHDEV_TRACE_H_ */
>+#endif /* _ETHDEV_TRACE_H_ */
>diff --git a/lib/ethdev/ethdev_trace_points.c
>b/lib/ethdev/ethdev_trace_points.c
>index 2919409a15..5f08d2dfb6 100644
>--- a/lib/ethdev/ethdev_trace_points.c
>+++ b/lib/ethdev/ethdev_trace_points.c
>@@ -4,7 +4,7 @@
>
> #include <rte_trace_point_register.h>
>
>-#include <rte_ethdev_trace.h>
>+#include <ethdev_trace.h>
>
> RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_configure,
>        lib.ethdev.configure)
>diff --git a/lib/ethdev/meson.build b/lib/ethdev/meson.build index
>39250b5da1..9e97f05983 100644
>--- a/lib/ethdev/meson.build
>+++ b/lib/ethdev/meson.build
>@@ -22,7 +22,6 @@ sources = files(
> headers = files(
>         'rte_cman.h',
>         'rte_ethdev.h',
>-        'rte_ethdev_trace.h',
>         'rte_ethdev_trace_fp.h',
>         'rte_dev_info.h',
>         'rte_flow.h',
>diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index
>d25db35f7f..a2d289b7a4 100644
>--- a/lib/ethdev/rte_ethdev.c
>+++ b/lib/ethdev/rte_ethdev.c
>@@ -27,7 +27,7 @@
> #include <rte_ether.h>
> #include <rte_telemetry.h>
>
>-#include "rte_ethdev_trace.h"
>+#include "ethdev_trace.h"
> #include "rte_ethdev.h"
> #include "ethdev_driver.h"
> #include "ethdev_profile.h"
>
>
>--
>David Marchand

I will include the changes in next version. Some of these changes is needed for eventdev lib also. Will include that in eventdev patch (5/5) of this series.

RE: [EXT] Re: [PATCH v1 1/5] mempool: remove internal tracepoints from version map

[Ankur Dwivedi]

>Subject: Re: [EXT] Re: [PATCH v1 1/5] mempool: remove internal tracepoints
>from version map
>
>On Fri, Feb 10, 2023 at 7:54 PM David Marchand
><david.marchand@redhat.com> wrote:
>>
>> On Fri, Feb 10, 2023 at 8:06 AM Jerin Jacob <jerinjacobk@gmail.com> wrote:
>> >
>> > On Fri, Feb 10, 2023 at 12:30 PM Ankur Dwivedi <adwivedi@marvell.com>
>wrote:
>> > >
>> > > >On Thu, Feb 9, 2023 at 7:00 PM Ankur Dwivedi
>> > > ><adwivedi@marvell.com>
>> > > >wrote:
>> > > >>
>> > > >> 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 <adwivedi@marvell.com>
>> > > >
>> > > >> @@ -47,22 +47,8 @@ EXPERIMENTAL {
>> > > >>         __rte_mempool_trace_generic_get;
>> > > >>         __rte_mempool_trace_get_bulk;
>> > > >>         __rte_mempool_trace_get_contig_blocks;
>> > > >
>> > > >I think, FP ones also can be removed.
>> > >
>> > > The FP symbols are used in header file rte_mempool.h. Removing the
>> > > symbols will cause build failure in shared build.
>> >
>> > OK. Please update the below note documentation only for FP symbols
>then.
>>
>> I disagree.
>>
>> We may enhance this note, but it is not a matter of being FP / non-FP.
>> A simple example is the "generic" non-FP tracepoints provided by EAL.
>
>OK. Then what's your recommendation for the document update ?
>Generic datatype exposed by EAL trace library or FP trace point object. or
>something else?
>I am trying to see what needs to be added/changed in documentation?

Will the following line in document cover the different cases:

For generic tracepoint or for tracepoint used in public header files, the user must export a ``__<trace_function_name>`` symbol in the library ``.map`` file, for this tracepoint to be used out of the library in shared builds.
>
>
>
>>
>>
>> --
>> David Marchand
>>

[PATCH v3 0/5] remove internal tracepoints from version map

[Ankur Dwivedi]

The internal tracepoints of a library are not needed to be exported in
version.map file, as they will not be called from outside the library.
This patch removes the internal tracepoints from version.map for mempool,
cryptodev, eal, ethdev and eventdev library.

v3:
 - Updated the trace document in patch (3/5).
 - Removed internal trace file from meson.build in ethdev and eventdev
   library, in patches (4/5) and (5/5).
 - Added acked by from Jerin for series.

v2:
 - Removed the internal tracepoint header files from meson.build.
 - Updated the trace document in
   "eal: remove internal tracepoints from version map"
 - Added acked by from Ferruh for
   "ethdev: remove internal tracepoints from version map"

Ankur Dwivedi (5):
  mempool: remove internal tracepoints from version map
  cryptodev: remove internal tracepoints from version map
  eal: remove internal tracepoints from version map
  ethdev: remove internal tracepoints from version map
  eventdev: remove internal tracepoints from version map

 doc/guides/prog_guide/trace_lib.rst           |   3 +-
 ...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 ------
 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 +-
 lib/ethdev/ethdev_trace.h                     |   6 +-
 lib/ethdev/meson.build                        |   1 -
 lib/ethdev/version.map                        |   6 -
 lib/eventdev/eventdev_trace.h                 |   6 +-
 lib/eventdev/meson.build                      |   1 -
 lib/eventdev/version.map                      |  30 ---
 .../{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 --
 31 files changed, 212 insertions(+), 317 deletions(-)
 rename lib/cryptodev/{rte_cryptodev_trace.h => cryptodev_trace.h} (99%)
 create mode 100644 lib/eal/include/eal_trace_internal.h
 rename lib/mempool/{rte_mempool_trace.h => mempool_trace.h} (98%)

-- 
2.25.1

[PATCH v3 1/5] mempool: remove internal tracepoints from version map

[Ankur Dwivedi]

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 <adwivedi@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 .../{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 <rte_trace_point_register.h>
 
-#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 <rte_eal_paging.h>
 #include <rte_telemetry.h>
 
+#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 <rte_errno.h>
 #include <dev_driver.h>
 
-#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 {
-- 
2.25.1

[PATCH v3 2/5] cryptodev: remove internal tracepoints from version map

[Ankur Dwivedi]

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 <adwivedi@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 ...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 <rte_trace_point_register.h>
 
-#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;
-- 
2.25.1

[PATCH v3 3/5] eal: remove internal tracepoints from version map

[Ankur Dwivedi]

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 <adwivedi@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 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
    ``__<trace_function_name>`` 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 <errno.h>
 
+#include <eal_trace_internal.h>
 #include <rte_launch.h>
-#include <rte_eal_trace.h>
 #include <rte_pause.h>
 #include <rte_lcore.h>
 
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 <string.h>
 #include <errno.h>
 
+#include <eal_trace_internal.h>
 #include <rte_log.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
@@ -15,7 +16,6 @@
 #include <rte_errno.h>
 #include <rte_string_fns.h>
 #include <rte_common.h>
-#include <rte_eal_trace.h>
 
 #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 <assert.h>
 #include <string.h>
 
-#include <rte_eal_trace.h>
+#include <eal_trace_internal.h>
 #include <rte_errno.h>
 #include <rte_lcore.h>
 #include <rte_log.h>
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 <rte_eal_trace.h>
 
+#include <eal_trace_internal.h>
+
 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 <rte_common.h>
 #include <rte_spinlock.h>
 
-#include <rte_eal_trace.h>
+#include <eal_trace_internal.h>
 
 #include <rte_malloc.h>
 #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 <time.h>
 #include <errno.h>
 
+#include <eal_trace_internal.h>
 #include <rte_alarm.h>
 #include <rte_cycles.h>
 #include <rte_common.h>
 #include <rte_errno.h>
 #include <rte_interrupts.h>
 #include <rte_spinlock.h>
-#include <rte_eal_trace.h>
 
 #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 <sys/queue.h>
 #include <unistd.h>
 
+#include <eal_trace_internal.h>
 #include <rte_errno.h>
 #include <rte_lcore.h>
 #include <rte_spinlock.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
-#include <rte_eal_trace.h>
 
 #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 <rte_alarm.h>
+#include <rte_interrupts.h>
+#include <rte_trace_point.h>
+
+#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 <rte_alarm.h>
-#include <rte_interrupts.h>
 #include <rte_trace_point.h>
 
-#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 <sys/time.h>
 #include <sys/timerfd.h>
 
+#include <eal_trace_internal.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_common.h>
 #include <rte_errno.h>
 #include <rte_spinlock.h>
-#include <rte_eal_trace.h>
 
 #include <eal_private.h>
 
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 <assert.h>
 #include <stdbool.h>
 
+#include <eal_trace_internal.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
 #include <rte_per_lcore.h>
@@ -27,7 +28,6 @@
 #include <rte_spinlock.h>
 #include <rte_pause.h>
 #include <rte_vfio.h>
-#include <rte_eal_trace.h>
 
 #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 <rte_alarm.h>
 #include <rte_spinlock.h>
 
-#include <rte_eal_trace.h>
-
+#include <eal_trace_internal.h>
 #include "eal_windows.h"
 
 enum alarm_state {
-- 
2.25.1

[PATCH v3 4/5] ethdev: remove internal tracepoints from version map

[Ankur Dwivedi]

The internal tracepoints are removed from the version.map file.
Also, removed ethdev_trace.h from meson.build.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 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;
-- 
2.25.1

[PATCH v3 5/5] eventdev: remove internal tracepoints from version map

[Ankur Dwivedi]

The internal tracepoints are removed from the version.map file.
Also, removed eventdev_trace.h from meson.build.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 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;
-- 
2.25.1

Re: [EXT] Re: [PATCH v1 1/5] mempool: remove internal tracepoints from version map

[David Marchand]

On Tue, Feb 14, 2023 at 12:37 PM Ankur Dwivedi <adwivedi@marvell.com> wrote:
>
> >Subject: Re: [EXT] Re: [PATCH v1 1/5] mempool: remove internal tracepoints
> >from version map
> >
> >On Fri, Feb 10, 2023 at 7:54 PM David Marchand
> ><david.marchand@redhat.com> wrote:
> >>
> >> On Fri, Feb 10, 2023 at 8:06 AM Jerin Jacob <jerinjacobk@gmail.com> wrote:
> >> >
> >> > On Fri, Feb 10, 2023 at 12:30 PM Ankur Dwivedi <adwivedi@marvell.com>
> >wrote:
> >> > >
> >> > > >On Thu, Feb 9, 2023 at 7:00 PM Ankur Dwivedi
> >> > > ><adwivedi@marvell.com>
> >> > > >wrote:
> >> > > >>
> >> > > >> 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 <adwivedi@marvell.com>
> >> > > >
> >> > > >> @@ -47,22 +47,8 @@ EXPERIMENTAL {
> >> > > >>         __rte_mempool_trace_generic_get;
> >> > > >>         __rte_mempool_trace_get_bulk;
> >> > > >>         __rte_mempool_trace_get_contig_blocks;
> >> > > >
> >> > > >I think, FP ones also can be removed.
> >> > >
> >> > > The FP symbols are used in header file rte_mempool.h. Removing the
> >> > > symbols will cause build failure in shared build.
> >> >
> >> > OK. Please update the below note documentation only for FP symbols
> >then.
> >>
> >> I disagree.
> >>
> >> We may enhance this note, but it is not a matter of being FP / non-FP.
> >> A simple example is the "generic" non-FP tracepoints provided by EAL.
> >
> >OK. Then what's your recommendation for the document update ?
> >Generic datatype exposed by EAL trace library or FP trace point object. or
> >something else?
> >I am trying to see what needs to be added/changed in documentation?
>
> Will the following line in document cover the different cases:
>
> For generic tracepoint or for tracepoint used in public header files, the user must export a ``__<trace_function_name>`` symbol in the library ``.map`` file, for this tracepoint to be used out of the library in shared builds.

Yes, this sounds ok to me.
Thanks for updating in v3.



-- 
David Marchand

Re: [PATCH v3 0/5] remove internal tracepoints from version map

[Thomas Monjalon]

> Ankur Dwivedi (5):
>   mempool: remove internal tracepoints from version map
>   cryptodev: remove internal tracepoints from version map
>   eal: remove internal tracepoints from version map
>   ethdev: remove internal tracepoints from version map
>   eventdev: remove internal tracepoints from version map

Applied, thanks.