From: wenglianfa <wenglianfa@huawei.com> Define rdma_tracepoint() in the common trace.h to remove duplicate definition in drivers. Signed-off-by: wenglianfa <wenglianfa@huawei.com> Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com> --- libibverbs/CMakeLists.txt | 1 + libibverbs/trace.h | 22 ++++++++++++++++++++++ providers/efa/efa_trace.h | 4 ---- providers/efa/verbs.c | 1 + providers/hns/hns_roce_u_hw_v2.c | 1 + providers/hns/hns_roce_u_trace.h | 4 ---- providers/mlx5/mlx5_trace.h | 4 ---- providers/mlx5/qp.c | 1 + providers/rxe/rxe.c | 1 + providers/rxe/rxe_trace.h | 4 ---- 10 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 libibverbs/trace.h diff --git a/libibverbs/CMakeLists.txt b/libibverbs/CMakeLists.txt index 3c486b9ae..2b7be5e13 100644 --- a/libibverbs/CMakeLists.txt +++ b/libibverbs/CMakeLists.txt @@ -14,6 +14,7 @@ publish_internal_headers(infiniband driver.h kern-abi.h marshall.h + trace.h ) configure_file("libibverbs.map.in" diff --git a/libibverbs/trace.h b/libibverbs/trace.h new file mode 100644 index 000000000..db10661fd --- /dev/null +++ b/libibverbs/trace.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */ +/* + * Copyright (c) 2025 Hisilicon Limited. + */ + +#ifndef _TRACE_H +#define _TRACE_H + +#if defined(LTTNG_ENABLED) + +#include <lttng/tracepoint.h> + +#define rdma_tracepoint(arg...) lttng_ust_tracepoint(arg) + +#else + +#define rdma_tracepoint(arg...) + +#endif /* defined(LTTNG_ENABLED) */ + +#endif /* _TRACE_H */ + diff --git a/providers/efa/efa_trace.h b/providers/efa/efa_trace.h index 061848c64..0dc89c82a 100644 --- a/providers/efa/efa_trace.h +++ b/providers/efa/efa_trace.h @@ -103,8 +103,6 @@ LTTNG_UST_TRACEPOINT_EVENT( ) ) -#define rdma_tracepoint(arg...) lttng_ust_tracepoint(arg) - #endif /* __EFA_TRACE_H__*/ #include <lttng/tracepoint-event.h> @@ -114,8 +112,6 @@ LTTNG_UST_TRACEPOINT_EVENT( #ifndef __EFA_TRACE_H__ #define __EFA_TRACE_H__ -#define rdma_tracepoint(arg...) - #endif /* __EFA_TRACE_H__*/ #endif /* defined(LTTNG_ENABLED) */ diff --git a/providers/efa/verbs.c b/providers/efa/verbs.c index ea1096e91..d7605c8ad 100644 --- a/providers/efa/verbs.c +++ b/providers/efa/verbs.c @@ -26,6 +26,7 @@ #define LTTNG_UST_TRACEPOINT_DEFINE #define LTTNG_UST_TRACEPOINT_PROBE_DYNAMIC_LINKAGE #include "efa_trace.h" +#include <infiniband/trace.h> #define EFA_DEV_CAP(ctx, cap) \ ((ctx)->device_caps & EFA_QUERY_DEVICE_CAPS_##cap) diff --git a/providers/hns/hns_roce_u_hw_v2.c b/providers/hns/hns_roce_u_hw_v2.c index 9a12183d8..da8451534 100644 --- a/providers/hns/hns_roce_u_hw_v2.c +++ b/providers/hns/hns_roce_u_hw_v2.c @@ -42,6 +42,7 @@ #define LTTNG_UST_TRACEPOINT_DEFINE #define LTTNG_UST_TRACEPOINT_PROBE_DYNAMIC_LINKAGE #include "hns_roce_u_trace.h" +#include <infiniband/trace.h> #define HR_IBV_OPC_MAP(ib_key, hr_key) \ [IBV_WR_ ## ib_key] = HNS_ROCE_WQE_OP_ ## hr_key diff --git a/providers/hns/hns_roce_u_trace.h b/providers/hns/hns_roce_u_trace.h index 465498548..cd961f1cb 100644 --- a/providers/hns/hns_roce_u_trace.h +++ b/providers/hns/hns_roce_u_trace.h @@ -115,8 +115,6 @@ LTTNG_UST_TRACEPOINT_EVENT( ) ) -#define rdma_tracepoint(arg...) lttng_ust_tracepoint(arg) - #endif /* __HNS_TRACE_H__*/ #include <lttng/tracepoint-event.h> @@ -126,8 +124,6 @@ LTTNG_UST_TRACEPOINT_EVENT( #ifndef __HNS_TRACE_H__ #define __HNS_TRACE_H__ -#define rdma_tracepoint(arg...) - #endif /* __HNS_TRACE_H__*/ #endif /* defined(LTTNG_ENABLED) */ diff --git a/providers/mlx5/mlx5_trace.h b/providers/mlx5/mlx5_trace.h index 1397f2b21..e0899a62e 100644 --- a/providers/mlx5/mlx5_trace.h +++ b/providers/mlx5/mlx5_trace.h @@ -41,8 +41,6 @@ LTTNG_UST_TRACEPOINT_EVENT( ) ) -#define rdma_tracepoint(arg...) lttng_ust_tracepoint(arg) - #endif /* __MLX5_TRACE_H__*/ #include <lttng/tracepoint-event.h> @@ -52,8 +50,6 @@ LTTNG_UST_TRACEPOINT_EVENT( #ifndef __MLX5_TRACE_H__ #define __MLX5_TRACE_H__ -#define rdma_tracepoint(arg...) - #endif /* __MLX5_TRACE_H__*/ #endif /* defined(LTTNG_ENABLED) */ diff --git a/providers/mlx5/qp.c b/providers/mlx5/qp.c index c38e6f26d..aac9c867c 100644 --- a/providers/mlx5/qp.c +++ b/providers/mlx5/qp.c @@ -46,6 +46,7 @@ #define LTTNG_UST_TRACEPOINT_DEFINE #define LTTNG_UST_TRACEPOINT_PROBE_DYNAMIC_LINKAGE #include "mlx5_trace.h" +#include <infiniband/trace.h> #include "wqe.h" #define MLX5_ATOMIC_SIZE 8 diff --git a/providers/rxe/rxe.c b/providers/rxe/rxe.c index e2b825085..a0e97c7e8 100644 --- a/providers/rxe/rxe.c +++ b/providers/rxe/rxe.c @@ -59,6 +59,7 @@ #define LTTNG_UST_TRACEPOINT_DEFINE #define LTTNG_UST_TRACEPOINT_PROBE_DYNAMIC_LINKAGE #include "rxe_trace.h" +#include <infiniband/trace.h> static void rxe_free_context(struct ibv_context *ibctx); diff --git a/providers/rxe/rxe_trace.h b/providers/rxe/rxe_trace.h index 7568c1561..61d3be437 100644 --- a/providers/rxe/rxe_trace.h +++ b/providers/rxe/rxe_trace.h @@ -41,8 +41,6 @@ LTTNG_UST_TRACEPOINT_EVENT( ) ) -#define rdma_tracepoint(arg...) lttng_ust_tracepoint(arg) - #endif /* __RXE_TRACE_H__*/ #include <lttng/tracepoint-event.h> @@ -52,8 +50,6 @@ LTTNG_UST_TRACEPOINT_EVENT( #ifndef __RXE_TRACE_H__ #define __RXE_TRACE_H__ -#define rdma_tracepoint(arg...) - #endif /* __RXE_TRACE_H__*/ #endif /* defined(LTTNG_ENABLED) */ -- 2.33.0