From 169734d0f5ed614e8069f94f1856995d3d7a936c Mon Sep 17 00:00:00 2001 From: Arlin Davis Date: Mon, 19 Sep 2016 16:22:57 -0700 Subject: [PATCH] mcm: remove logs from post send speed path Signed-off-by: Arlin Davis --- dapl/openib_common/dapl_ib_dto.h | 8 +++--- dapl/openib_mcm/proxy.c | 46 ++++++++++++++++---------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dapl/openib_common/dapl_ib_dto.h b/dapl/openib_common/dapl_ib_dto.h index 97341d2..11b9d08 100644 --- a/dapl/openib_common/dapl_ib_dto.h +++ b/dapl/openib_common/dapl_ib_dto.h @@ -232,10 +232,10 @@ dapls_ib_post_send ( wr.send_flags |= (DAT_COMPLETION_SOLICITED_WAIT_FLAG & completion_flags) ? IBV_SEND_SOLICITED : 0; - dapl_log(DAPL_DBG_TYPE_EP, - " post_snd: %s ep %p op %x flgs %x sgl %p,%d ln %d wr_id %Lx\n", - PROVIDER_NAME, ep_ptr, wr.opcode, wr.send_flags, wr.sg_list, - wr.num_sge, total_len, wr.wr_id); + dapl_dbg_log(DAPL_DBG_TYPE_EP, + " post_snd: %s ep %p op %x flgs %x sgl %p,%d ln %d wr_id %Lx\n", + PROVIDER_NAME, ep_ptr, wr.opcode, wr.send_flags, wr.sg_list, + wr.num_sge, total_len, wr.wr_id); #ifdef _OPENIB_MCM_ if (ep_ptr->qp_handle->tp->scif_ep) ret = dapli_mix_post_send(ep_ptr->qp_handle, total_len, &wr, &bad_wr); diff --git a/dapl/openib_mcm/proxy.c b/dapl/openib_mcm/proxy.c index 4e05ecc..ee127f9 100644 --- a/dapl/openib_mcm/proxy.c +++ b/dapl/openib_mcm/proxy.c @@ -55,12 +55,12 @@ int mcm_send_pi(struct dcm_ib_qp *m_qp, uint64_t l_addr; struct mcm_wr_rx *wr_rx_ptr; - dapl_log(DAPL_DBG_TYPE_EP, - " mcm_send_pi: ep %p qpn %x ln %d sge %d sg %d" - " WR: tl %d hd %d end %d wr_id %Lx\n", - m_qp->ep, m_qp->qp2->qp_num, len, wr->num_sge, - m_qp->seg_sz, m_qp->wr_tl, m_qp->wr_hd, - m_qp->wrc_rem.wr_end, wr->wr_id); + dapl_dbg_log(DAPL_DBG_TYPE_EP, + " mcm_send_pi: ep %p qpn %x ln %d sge %d sg %d" + " WR: tl %d hd %d end %d wr_id %Lx\n", + m_qp->ep, m_qp->qp2->qp_num, len, wr->num_sge, + m_qp->seg_sz, m_qp->wr_tl, m_qp->wr_hd, + m_qp->wrc_rem.wr_end, wr->wr_id); if (wr->num_sge > DAT_MIX_SGE_MAX) { ret = EINVAL; @@ -133,9 +133,9 @@ retry_wr: memcpy(wr_rx_ptr->inline_data, (void *)(l_addr + l_off), seg_len); } - dapl_log(DAPL_DBG_TYPE_EP, - " mcm_send_pi[%d]: seg_ln %d wr_idx %d, tl %d hd %d\n", - i, seg_len, wr_idx, m_qp->wr_tl, m_qp->wr_hd); + dapl_dbg_log(DAPL_DBG_TYPE_EP, + " mcm_send_pi[%d]: seg_ln %d wr_idx %d, tl %d hd %d\n", + i, seg_len, wr_idx, m_qp->wr_tl, m_qp->wr_hd); /* build local m_wr_rx for remote PI */ memset((void*)wr_rx_ptr, 0, MCM_WR_RX_NO_DATA); @@ -183,20 +183,20 @@ retry_wr: (uint64_t)(uintptr_t) ((struct mcm_wr_rx *) (m_qp->wrc_rem.wr_addr + (m_qp->wrc_rem.wr_sz * wr_idx))); - dapl_log(DAPL_DBG_TYPE_EP, - " mcm_send_pi[%d]: WR_RX wr_id %Lx qn %x op %d flgs 0x%x" - " imm %x laddr %p raddr %p rkey %x wr_ln %d ln %d\n", - i, wr_imm.wr_id, m_qp->qp2->qp_num, wr_imm.opcode, - wr_flags, ntohl(wr_imm.imm_data), - l_addr + l_off, wr_imm.wr.rdma.remote_addr, - wr_imm.wr.rdma.rkey, sge.length, l_len); - dapl_log(DAPL_DBG_TYPE_EP, - " mcm_send_pi[%d]: WR wr_id %Lx qn %x op %d flgs %x" - " imm %x raddr %p rkey %x sg_ln %d tl %d me %d hd %d\n", - i, wr->wr_id, m_qp->qp2->qp_num, wr->opcode, - wr->send_flags, wr->imm_data, - wr->wr.rdma.remote_addr + r_off, - wr->wr.rdma.rkey, seg_len, m_qp->wr_tl, wr_idx, m_qp->wr_hd); + dapl_dbg_log(DAPL_DBG_TYPE_EP, + " mcm_send_pi[%d]: WR_RX wr_id %Lx qn %x op %d flgs 0x%x" + " imm %x laddr %p raddr %p rkey %x wr_ln %d ln %d\n", + i, wr_imm.wr_id, m_qp->qp2->qp_num, wr_imm.opcode, + wr_flags, ntohl(wr_imm.imm_data), + l_addr + l_off, wr_imm.wr.rdma.remote_addr, + wr_imm.wr.rdma.rkey, sge.length, l_len); + dapl_dbg_log(DAPL_DBG_TYPE_EP, + " mcm_send_pi[%d]: WR wr_id %Lx qn %x op %d flgs %x" + " imm %x raddr %p rkey %x sg_ln %d tl %d me %d hd %d\n", + i, wr->wr_id, m_qp->qp2->qp_num, wr->opcode, + wr->send_flags, wr->imm_data, + wr->wr.rdma.remote_addr + r_off, + wr->wr.rdma.rkey, seg_len, m_qp->wr_tl, wr_idx, m_qp->wr_hd); ret = ibv_post_send(m_qp->qp2, &wr_imm, bad_wr); /* QP2: QPtx - QPrx PI */ if (ret) { -- 2.46.0