[PATCH v3 rdma-core 1/2] libhns: Add initial support for HNS LTTng tracing
From: wenglianfa <wenglianfa@huawei.com> Add initial support for HNS LTTng tracing. Signed-off-by: wenglianfa <wenglianfa@huawei.com> Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com> --- providers/hns/CMakeLists.txt | 10 +++++++++ providers/hns/hns_roce_u_trace.c | 9 ++++++++ providers/hns/hns_roce_u_trace.h | 35 ++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 providers/hns/hns_roce_u_trace.c create mode 100644 providers/hns/hns_roce_u_trace.h diff --git a/providers/hns/CMakeLists.txt b/providers/hns/CMakeLists.txt index 58139ae2b..36ebfacfb 100644 --- a/providers/hns/CMakeLists.txt +++ b/providers/hns/CMakeLists.txt @@ -1,5 +1,10 @@ +if (ENABLE_LTTNG AND LTTNGUST_FOUND) + set(TRACE_FILE hns_roce_u_trace.c) +endif() + rdma_shared_provider(hns libhns.map 1 1.0.${PACKAGE_VERSION} + ${TRACE_FILE} hns_roce_u.c hns_roce_u_buf.c hns_roce_u_db.c @@ -12,3 +17,8 @@ publish_headers(infiniband ) rdma_pkg_config("hns" "libibverbs" "${CMAKE_THREAD_LIBS_INIT}") + +if (ENABLE_LTTNG AND LTTNGUST_FOUND) + target_include_directories(hns PUBLIC ".") + target_link_libraries(hns LINK_PRIVATE LTTng::UST) +endif() diff --git a/providers/hns/hns_roce_u_trace.c b/providers/hns/hns_roce_u_trace.c new file mode 100644 index 000000000..812f54cfe --- /dev/null +++ b/providers/hns/hns_roce_u_trace.c @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +/* + * Copyright (c) 2025 Hisilicon Limited. + */ + +#define LTTNG_UST_TRACEPOINT_CREATE_PROBES +#define LTTNG_UST_TRACEPOINT_DEFINE + +#include "hns_roce_u_trace.h" diff --git a/providers/hns/hns_roce_u_trace.h b/providers/hns/hns_roce_u_trace.h new file mode 100644 index 000000000..9b9485c59 --- /dev/null +++ b/providers/hns/hns_roce_u_trace.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */ +/* + * Copyright (c) 2025 Hisilicon Limited. + */ + +#if defined(LTTNG_ENABLED) + +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER rdma_core_hns + +#undef LTTNG_UST_TRACEPOINT_INCLUDE +#define LTTNG_UST_TRACEPOINT_INCLUDE "hns_roce_u_trace.h" + +#if !defined(__HNS_TRACE_H__) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) +#define __HNS_TRACE_H__ + +#include <lttng/tracepoint.h> +#include <infiniband/verbs.h> + +#define rdma_tracepoint(arg...) lttng_ust_tracepoint(arg) + +#endif /* __HNS_TRACE_H__*/ + +#include <lttng/tracepoint-event.h> + +#else + +#ifndef __HNS_TRACE_H__ +#define __HNS_TRACE_H__ + +#define rdma_tracepoint(arg...) + +#endif /* __HNS_TRACE_H__*/ + +#endif /* defined(LTTNG_ENABLED) */ -- 2.33.0
From: wenglianfa <wenglianfa@huawei.com> Add tracepoint for HNS RoCE I/O, including post_send, post_recv and poll_cq. Signed-off-by: wenglianfa <wenglianfa@huawei.com> Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com> --- providers/hns/hns_roce_u_hw_v2.c | 153 +++++++++++++++++++++++++++++++ providers/hns/hns_roce_u_trace.h | 98 ++++++++++++++++++++ 2 files changed, 251 insertions(+) diff --git a/providers/hns/hns_roce_u_hw_v2.c b/providers/hns/hns_roce_u_hw_v2.c index b4b335fba..fce503322 100644 --- a/providers/hns/hns_roce_u_hw_v2.c +++ b/providers/hns/hns_roce_u_hw_v2.c @@ -41,6 +41,7 @@ #define LTTNG_UST_TRACEPOINT_DEFINE #define LTTNG_UST_TRACEPOINT_PROBE_DYNAMIC_LINKAGE +#include "hns_roce_u_trace.h" #define HR_IBV_OPC_MAP(ib_key, hr_key) \ [IBV_WR_ ## ib_key] = HNS_ROCE_WQE_OP_ ## hr_key @@ -683,6 +684,80 @@ static int parse_cqe_for_cq(struct hns_roce_context *ctx, struct hns_roce_cq *cq return 0; } +#ifdef LTTNG_ENABLED +static uint8_t read_wc_sl(struct hns_roce_qp *hr_qp, + struct hns_roce_v2_cqe *cqe, + struct ibv_wc *wc) +{ + return hr_qp->verbs_qp.qp.qp_type == IBV_QPT_UD && + hr_reg_read(cqe, CQE_S_R) == CQE_FOR_RQ ? + wc->sl : UINT8_MAX; +} + +static uint32_t read_wc_rqpn(struct hns_roce_qp *hr_qp, + struct hns_roce_v2_cqe *cqe, + struct ibv_wc *wc) +{ + return hr_qp->verbs_qp.qp.qp_type == IBV_QPT_UD && + hr_reg_read(cqe, CQE_S_R) == CQE_FOR_RQ ? + wc->src_qp : UINT32_MAX; +} + +static uint32_t read_wc_byte_len(struct hns_roce_v2_cqe *cqe, + struct ibv_wc *wc) +{ + if (hr_reg_read(cqe, CQE_S_R) == CQE_FOR_RQ) + return wc->byte_len; + + switch (hr_reg_read(cqe, CQE_OPCODE)) { + case HNS_ROCE_SQ_OP_RDMA_READ: + case HNS_ROCE_SQ_OP_ATOMIC_COMP_AND_SWAP: + case HNS_ROCE_SQ_OP_ATOMIC_FETCH_AND_ADD: + case HNS_ROCE_SQ_OP_ATOMIC_MASK_COMP_AND_SWAP: + case HNS_ROCE_SQ_OP_ATOMIC_MASK_FETCH_AND_ADD: + return wc->byte_len; + default: + return UINT32_MAX; + } +} + +static uint8_t trace_wc_read_sl(struct ibv_cq_ex *cq_ex) +{ + return cq_ex->read_sl ? cq_ex->read_sl(cq_ex) : UINT8_MAX; +} + +static uint32_t trace_wc_read_qp_num(struct ibv_cq_ex *cq_ex) +{ + return cq_ex->read_qp_num ? + cq_ex->read_qp_num(cq_ex) : UINT32_MAX; +} + +static uint32_t trace_wc_read_src_qp(struct ibv_cq_ex *cq_ex) +{ + return cq_ex->read_src_qp ? + cq_ex->read_src_qp(cq_ex) : UINT32_MAX; +} + +static uint32_t trace_wc_read_byte_len(struct ibv_cq_ex *cq_ex) +{ + return cq_ex->read_byte_len ? + cq_ex->read_byte_len(cq_ex) : UINT32_MAX; +} + +static uint32_t get_send_wr_rqpn(struct ibv_send_wr *wr, + uint8_t qp_type) +{ + return qp_type == IBV_QPT_UD ? wr->wr.ud.remote_qpn : UINT32_MAX; +} + +static uint8_t get_send_wr_tclass(struct ibv_send_wr *wr, + uint8_t qp_type) +{ + return qp_type == IBV_QPT_UD ? + to_hr_ah(wr->wr.ud.ah)->av.tclass : UINT8_MAX; +} +#endif + static int hns_roce_poll_one(struct hns_roce_context *ctx, struct hns_roce_qp **cur_qp, struct hns_roce_cq *cq, struct ibv_wc *wc) @@ -719,8 +794,27 @@ static int hns_roce_poll_one(struct hns_roce_context *ctx, wc->status = wc_status; wc->vendor_err = hr_reg_read(cqe, CQE_SUB_STATUS); wc->qp_num = qpn; + + rdma_tracepoint(rdma_core_hns, poll_cq, + cq->verbs_cq.cq.context->device->name, + wc->wr_id, wc_status, wc->opcode, + wc->wc_flags, wc->vendor_err, + read_wc_sl(*cur_qp, cqe, wc), + wc->qp_num, read_wc_rqpn(*cur_qp, cqe, wc), + read_wc_byte_len(cqe, wc)); } else { cq->verbs_cq.cq_ex.status = wc_status; + + rdma_tracepoint(rdma_core_hns, poll_cq, + cq->verbs_cq.cq.context->device->name, + cq->verbs_cq.cq_ex.wr_id, wc_status, + ibv_wc_read_opcode(&cq->verbs_cq.cq_ex), + ibv_wc_read_wc_flags(&cq->verbs_cq.cq_ex), + ibv_wc_read_vendor_err(&cq->verbs_cq.cq_ex), + trace_wc_read_sl(&cq->verbs_cq.cq_ex), + trace_wc_read_qp_num(&cq->verbs_cq.cq_ex), + trace_wc_read_src_qp(&cq->verbs_cq.cq_ex), + trace_wc_read_byte_len(&cq->verbs_cq.cq_ex)); } if (status == HNS_ROCE_V2_CQE_SUCCESS || @@ -1331,6 +1425,14 @@ int hns_roce_u_v2_post_send(struct ibv_qp *ibvqp, struct ibv_send_wr *wr, *bad_wr = wr; goto out; } + + rdma_tracepoint(rdma_core_hns, post_send, + ibvqp->context->device->name, wr->wr_id, + sge_info.valid_num, ibvqp->qp_num, + get_send_wr_rqpn(wr, ibvqp->qp_type), + wr->send_flags, sge_info.total_len, + wr->opcode, qp->sl, + get_send_wr_tclass(wr, ibvqp->qp_type)); } out: @@ -1460,6 +1562,10 @@ static int hns_roce_u_v2_post_recv(struct ibv_qp *ibvqp, struct ibv_recv_wr *wr, wqe_idx = (qp->rq.head + nreq) & (qp->rq.wqe_cnt - 1); fill_rq_wqe(qp, wr, wqe_idx, max_sge); qp->rq.wrid[wqe_idx] = wr->wr_id; + + rdma_tracepoint(rdma_core_hns, post_recv, + ibvqp->context->device->name, wr->wr_id, + wr->num_sge, ibvqp->qp_num, 0); } out: @@ -1797,6 +1903,10 @@ static int hns_roce_u_v2_post_srq_recv(struct ibv_srq *ib_srq, fill_wqe_idx(srq, wqe_idx); srq->wrid[wqe_idx] = wr->wr_id; + + rdma_tracepoint(rdma_core_hns, post_recv, + ib_srq->context->device->name, wr->wr_id, + wr->num_sge, srq->srqn, 1); } if (nreq) { @@ -2065,6 +2175,12 @@ static void wr_set_sge_rc(struct ibv_qp_ex *ibv_qp, uint32_t lkey, wqe->msg_len = htole32(length); hr_reg_write(wqe, RCWQE_LEN0, length); hr_reg_write(wqe, RCWQE_SGE_NUM, !!length); + + rdma_tracepoint(rdma_core_hns, post_send, + ibv_qp->qp_base.context->device->name, ibv_qp->wr_id, + !!length, ibv_qp->qp_base.qp_num, UINT32_MAX, + ibv_qp->wr_flags, length, + hr_reg_read(wqe, RCWQE_OPCODE), qp->sl, UINT8_MAX); } static void set_sgl_rc(struct hns_roce_v2_wqe_data_seg *dseg, @@ -2129,6 +2245,12 @@ static void wr_set_sge_list_rc(struct ibv_qp_ex *ibv_qp, size_t num_sge, wqe->msg_len = htole32(qp->sge_info.total_len); hr_reg_write(wqe, RCWQE_SGE_NUM, qp->sge_info.valid_num); + + rdma_tracepoint(rdma_core_hns, post_send, + ibv_qp->qp_base.context->device->name, ibv_qp->wr_id, + qp->sge_info.valid_num, ibv_qp->qp_base.qp_num, + UINT32_MAX, ibv_qp->wr_flags, qp->sge_info.total_len, + opcode, qp->sl, UINT8_MAX); } static void wr_send_rc(struct ibv_qp_ex *ibv_qp) @@ -2303,6 +2425,14 @@ static void set_inline_data_list_rc(struct hns_roce_qp *qp, hr_reg_write(wqe, RCWQE_SGE_NUM, qp->sge_info.valid_num); } + + rdma_tracepoint(rdma_core_hns, post_send, + qp->verbs_qp.qp.context->device->name, + qp->verbs_qp.qp_ex.wr_id, + hr_reg_read(wqe, RCWQE_SGE_NUM), + qp->verbs_qp.qp.qp_num, UINT32_MAX, + qp->verbs_qp.qp_ex.wr_flags, msg_len, + hr_reg_read(wqe, RCWQE_OPCODE), qp->sl, UINT8_MAX); } static void wr_set_inline_data_rc(struct ibv_qp_ex *ibv_qp, void *addr, @@ -2435,6 +2565,13 @@ static void wr_set_sge_ud(struct ibv_qp_ex *ibv_qp, uint32_t lkey, dseg->len = htole32(length); qp->sge_info.start_idx++; + + rdma_tracepoint(rdma_core_hns, post_send, + ibv_qp->qp_base.context->device->name, ibv_qp->wr_id, + 1, ibv_qp->qp_base.qp_num, + hr_reg_read(wqe, UDWQE_DQPN), ibv_qp->wr_flags, + length, hr_reg_read(wqe, UDWQE_OPCODE), + qp->sl, hr_reg_read(wqe, UDWQE_TCLASS)); } static void wr_set_sge_list_ud(struct ibv_qp_ex *ibv_qp, size_t num_sge, @@ -2473,6 +2610,13 @@ static void wr_set_sge_list_ud(struct ibv_qp_ex *ibv_qp, size_t num_sge, hr_reg_write(wqe, UDWQE_SGE_NUM, cnt); qp->sge_info.start_idx += cnt; + + rdma_tracepoint(rdma_core_hns, post_send, + ibv_qp->qp_base.context->device->name, ibv_qp->wr_id, + cnt, ibv_qp->qp_base.qp_num, + hr_reg_read(wqe, UDWQE_DQPN), ibv_qp->wr_flags, + msg_len, hr_reg_read(wqe, UDWQE_OPCODE), + qp->sl, hr_reg_read(wqe, UDWQE_TCLASS)); } static void set_inline_data_list_ud(struct hns_roce_qp *qp, @@ -2521,6 +2665,15 @@ static void set_inline_data_list_ud(struct hns_roce_qp *qp, hr_reg_write(wqe, UDWQE_SGE_NUM, qp->sge_info.valid_num); } + + rdma_tracepoint(rdma_core_hns, post_send, + qp->verbs_qp.qp.context->device->name, + qp->verbs_qp.qp_ex.wr_id, + hr_reg_read(wqe, UDWQE_SGE_NUM), + qp->verbs_qp.qp.qp_num, hr_reg_read(wqe, UDWQE_DQPN), + qp->verbs_qp.qp_ex.wr_flags, msg_len, + hr_reg_read(wqe, UDWQE_OPCODE), qp->sl, + hr_reg_read(wqe, UDWQE_TCLASS)); } static void wr_set_inline_data_ud(struct ibv_qp_ex *ibv_qp, void *addr, diff --git a/providers/hns/hns_roce_u_trace.h b/providers/hns/hns_roce_u_trace.h index 74d33344d..49a9671c0 100644 --- a/providers/hns/hns_roce_u_trace.h +++ b/providers/hns/hns_roce_u_trace.h @@ -45,6 +45,104 @@ #include <lttng/tracepoint.h> #include <infiniband/verbs.h> +LTTNG_UST_TRACEPOINT_EVENT( + /* Tracepoint provider name */ + rdma_core_hns, + + /* Tracepoint name */ + post_send, + + /* Input arguments */ + LTTNG_UST_TP_ARGS( + char *, dev_name, + uint64_t, wr_id, + int32_t, num_sge, + uint32_t, lqpn, + uint32_t, rqpn, + uint32_t, send_flags, + uint32_t, msg_len, + uint8_t, opcode, + uint8_t, sl, + uint8_t, t_class + ), + + /* Output event fields */ + LTTNG_UST_TP_FIELDS( + lttng_ust_field_string(dev_name, dev_name) + lttng_ust_field_integer_hex(uint64_t, wr_id, wr_id) + lttng_ust_field_integer_hex(int32_t, num_sge, num_sge) + lttng_ust_field_integer_hex(uint32_t, lqpn, lqpn) + lttng_ust_field_integer_hex(uint32_t, rqpn, rqpn) + lttng_ust_field_integer_hex(uint32_t, send_flags, send_flags) + lttng_ust_field_integer_hex(uint32_t, msg_len, msg_len) + lttng_ust_field_integer_hex(uint8_t, opcode, opcode) + lttng_ust_field_integer_hex(uint8_t, sl, sl) + lttng_ust_field_integer_hex(uint8_t, t_class, t_class) + ) +) + +LTTNG_UST_TRACEPOINT_EVENT( + /* Tracepoint provider name */ + rdma_core_hns, + + /* Tracepoint name */ + post_recv, + + /* Input arguments */ + LTTNG_UST_TP_ARGS( + char *, dev_name, + uint64_t, wr_id, + int32_t, num_sge, + uint32_t, rqn, + uint8_t, is_srq + ), + + /* Output event fields */ + LTTNG_UST_TP_FIELDS( + lttng_ust_field_string(dev_name, dev_name) + lttng_ust_field_integer_hex(uint64_t, wr_id, wr_id) + lttng_ust_field_integer_hex(int32_t, num_sge, num_sge) + lttng_ust_field_integer_hex(uint32_t, rqn, rqn) + lttng_ust_field_integer_hex(uint8_t, is_srq, is_srq) + ) +) + +LTTNG_UST_TRACEPOINT_EVENT( + /* Tracepoint provider name */ + rdma_core_hns, + + /* Tracepoint name */ + poll_cq, + + /* Input arguments */ + LTTNG_UST_TP_ARGS( + char *, dev_name, + uint64_t, wr_id, + uint8_t, status, + uint8_t, opcode, + uint8_t, wc_flags, + uint8_t, vendor_err, + uint8_t, pktype, + uint32_t, lqpn, + uint32_t, rqpn, + uint32_t, byte_len + ), + + /* Output event fields */ + LTTNG_UST_TP_FIELDS( + lttng_ust_field_string(dev_name, dev_name) + lttng_ust_field_integer_hex(uint64_t, wr_id, wr_id) + lttng_ust_field_integer_hex(uint8_t, status, status) + lttng_ust_field_integer_hex(uint8_t, opcode, opcode) + lttng_ust_field_integer_hex(uint8_t, wc_flags, wc_flags) + lttng_ust_field_integer_hex(uint8_t, vendor_err, vendor_err) + lttng_ust_field_integer_hex(uint8_t, pktype, pktype) + lttng_ust_field_integer_hex(uint32_t, lqpn, lqpn) + lttng_ust_field_integer_hex(uint32_t, rqpn, rqpn) + lttng_ust_field_integer_hex(uint32_t, byte_len, byte_len) + ) +) + #define rdma_tracepoint(arg...) lttng_ust_tracepoint(arg) #endif /* __HNS_TRACE_H__*/ -- 2.33.0
participants (1)
-
Junxian Huang