From: Kefu Chai Date: Thu, 30 Mar 2017 04:57:58 +0000 (+0800) Subject: Revert "msg/async/rdma: Debug prints for ibv_*" X-Git-Tag: v12.0.2~259^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e0f0748ef59842e329aa845baf153e812349450;p=ceph.git Revert "msg/async/rdma: Debug prints for ibv_*" This reverts commit 7d1475f6274531988854cf62f6056f9cfd13ff29. Signed-off-by: Kefu Chai --- diff --git a/src/msg/async/rdma/Infiniband.h b/src/msg/async/rdma/Infiniband.h index 4c284583d976b..cd74d9e57fc8e 100644 --- a/src/msg/async/rdma/Infiniband.h +++ b/src/msg/async/rdma/Infiniband.h @@ -18,7 +18,6 @@ #define CEPH_INFINIBAND_H #include -#include #include #include @@ -31,12 +30,6 @@ #include "msg/async/net_handler.h" #include "common/Mutex.h" -#define RDMA_DEBUG 0 - -#if RDMA_DEBUG -#include "ib_dbg.h" -#endif - #define HUGE_PAGE_SIZE (2 * 1024 * 1024) #define ALIGN_TO_PAGE_SIZE(x) \ (((x) + HUGE_PAGE_SIZE -1) / HUGE_PAGE_SIZE * HUGE_PAGE_SIZE) diff --git a/src/msg/async/rdma/ib_dbg.h b/src/msg/async/rdma/ib_dbg.h deleted file mode 100644 index aac698d266848..0000000000000 --- a/src/msg/async/rdma/ib_dbg.h +++ /dev/null @@ -1,387 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab - -#ifndef __IB_DBG_H__ -#define __IB_DBG_H__ - -#define dout_subsys ceph_subsys_ms -#undef dout_prefix -#define dout_prefix *_dout << "ib_dbg " - -#define ibdbg_ldout \ - if (g_ceph_context && g_ceph_context->_log) \ - ldout(g_ceph_context,1) << f << ":" << l << " ib command: " << __func__ - -static inline struct ibv_srq *_ibv_create_srq(const char *f, int l, - struct ibv_pd *pd, - struct ibv_srq_init_attr *srq_init_attr) -{ - auto ret = ibv_create_srq(pd, srq_init_attr); - - ibdbg_ldout << " pd: " << pd << - " | srq: " << ret << dendl; - - return ret; -} -#define ibv_create_srq(...) _ibv_create_srq(__func__, __LINE__, __VA_ARGS__) - -static inline void _ibv_ack_cq_events(const char *f, int l, - struct ibv_cq *cq, unsigned int nevents) -{ - ibdbg_ldout << " cq: " << cq << " nevents: " << nevents << dendl; - - ibv_ack_cq_events(cq, nevents); -} -#define ibv_ack_cq_events(...) _ibv_ack_cq_events(__func__, __LINE__, __VA_ARGS__) - -static inline struct ibv_pd *_ibv_alloc_pd(const char *f, int l, - struct ibv_context *context) -{ - auto ret = ibv_alloc_pd(context); - - - ibdbg_ldout << " ctxt: " << context << - " | pd: " << ret << dendl; - - return ret; -} -#define ibv_alloc_pd(...) _ibv_alloc_pd(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_close_device(const char *f, int l, - struct ibv_context *context) -{ - auto ret = ibv_close_device(context); - - ibdbg_ldout << " ctxt: " << context << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_close_device(...) _ibv_close_device(__func__, __LINE__, __VA_ARGS__) - -static inline struct ibv_comp_channel *_ibv_create_comp_channel(const char *f, int l, - struct ibv_context *context) -{ - auto ret = ibv_create_comp_channel(context); - - ibdbg_ldout << " ctxt: " << context << - " | channel: " << ret << " fd: " << ( ret ? ret->fd : -1 ) << dendl; - - return ret; -} -#define ibv_create_comp_channel(...) _ibv_create_comp_channel(__func__, __LINE__, __VA_ARGS__) - -static inline struct ibv_cq *_ibv_create_cq(const char *f, int l, - struct ibv_context *context, int cqe, - void *cq_context, - struct ibv_comp_channel *channel, - int comp_vector) -{ - auto ret = ibv_create_cq(context, cqe, cq_context, channel, comp_vector); - - ibdbg_ldout << " context: " << context << " channel: " << channel << - " | cq: " << ret << dendl; - - return ret; -} -#define ibv_create_cq(...) _ibv_create_cq(__func__, __LINE__, __VA_ARGS__) - -static inline struct ibv_qp *_ibv_create_qp(const char *f, int l, - struct ibv_pd *pd, - struct ibv_qp_init_attr *qp_init_attr) -{ - auto ret = ibv_create_qp(pd, qp_init_attr); - - ibdbg_ldout << " pd: " << pd << - " send_cq: " << qp_init_attr->send_cq << - " recv_cq: " << qp_init_attr->recv_cq << - " srq: " << qp_init_attr->srq << - " | qp: " << ret << dendl; - - return ret; -} -#define ibv_create_qp(...) _ibv_create_qp(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_dealloc_pd(const char *f, int l, - struct ibv_pd *pd) -{ - auto ret = ibv_dealloc_pd(pd); - - ibdbg_ldout << " pd: " << pd << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_dealloc_pd(...) _ibv_dealloc_pd(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_destroy_comp_channel(const char *f, int l, - struct ibv_comp_channel *channel) -{ - auto ret = ibv_destroy_comp_channel(channel); - - ibdbg_ldout << " channel: " << channel << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_destroy_comp_channel(...) _ibv_destroy_comp_channel(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_destroy_cq(const char *f, int l, - struct ibv_cq *cq) -{ - auto ret = ibv_destroy_cq(cq); - - if (ret) { - ibdbg_ldout << " cq: " << cq << - " | ret: " << cpp_strerror(ret) << dendl; - } else { - ibdbg_ldout << " cq: " << cq << - " | ret: " << ret << dendl; - } - - return ret; -} -#define ibv_destroy_cq(...) _ibv_destroy_cq(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_destroy_qp(const char *f, int l, - struct ibv_qp *qp) -{ - auto ret = ibv_destroy_qp(qp); - - ibdbg_ldout << " qp: " << qp << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_destroy_qp(...) _ibv_destroy_qp(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_destroy_srq(const char *f, int l, - struct ibv_srq *srq) -{ - auto ret = ibv_destroy_srq(srq); - - ibdbg_ldout << " srq: " << srq << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_destroy_srq(...) _ibv_destroy_srq(__func__, __LINE__, __VA_ARGS__) - -//#define ibv_exp_query_gid_attr(...) _ibv_exp_query_gid_attr(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_fork_init(const char *f, int l) -{ - auto ret = ibv_fork_init(); - - ibdbg_ldout << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_fork_init() _ibv_fork_init(__func__, __LINE__) - -static inline void _ibv_free_device_list(const char *f, int l, - struct ibv_device **list) -{ - ibdbg_ldout << " list: " << list << dendl; - - ibv_free_device_list(list); -} -#define ibv_free_device_list(...) _ibv_free_device_list(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_get_cq_event(const char *f, int l, - struct ibv_comp_channel *channel, - struct ibv_cq **cq, void **cq_context) -{ - auto ret = ibv_get_cq_event(channel, cq, cq_context); - - ibdbg_ldout << " channel: " << channel << " cq: " << cq << " cq_context:" << cq_context << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_get_cq_event(...) _ibv_get_cq_event(__func__, __LINE__, __VA_ARGS__) - -static inline struct ibv_device **_ibv_get_device_list(const char *f, int l, - int *num_devices) -{ - auto ret = ibv_get_device_list(num_devices); - - ibdbg_ldout << - " | num: " << *num_devices << " list: " << ret << dendl; - - return ret; -} -#define ibv_get_device_list(...) _ibv_get_device_list(__func__, __LINE__, __VA_ARGS__) - -static inline const char *_ibv_get_device_name(const char *f, int l, - struct ibv_device *device) -{ - auto ret = ibv_get_device_name(device); - - ibdbg_ldout << " device: " << device << - " | name: " << ret << dendl; - - return ret; -} -#define ibv_get_device_name(...) _ibv_get_device_name(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_modify_qp(const char *f, int l, - struct ibv_qp *qp, struct ibv_qp_attr *attr, - int attr_mask) -{ - auto ret = ibv_modify_qp(qp, attr, attr_mask); - - ibdbg_ldout << " qp: " << qp << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_modify_qp(...) _ibv_modify_qp(__func__, __LINE__, __VA_ARGS__) - -static inline struct ibv_context *_ibv_open_device(const char *f, int l, - struct ibv_device *device) -{ - auto ret = ibv_open_device(device); - - ibdbg_ldout << " device: " << device << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_open_device(...) _ibv_open_device(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_poll_cq(const char *f, int l, - struct ibv_cq *cq, int num_entries, struct ibv_wc *wc) -{ - auto ret = ibv_poll_cq(cq, num_entries, wc); - static utime_t last_print = ceph_clock_now(); - static int suppressed_counter = 0; - - if ((ceph_clock_now() - last_print).to_msec() < 100) { - suppressed_counter++; - return ret; - } - - if (suppressed_counter > 0) { - ibdbg_ldout << " cq: " << cq << " num_entries: " << num_entries << - " | ret: " << ret << - " {suppressed " << suppressed_counter << " prints}" << dendl; - suppressed_counter = 0; - } else { - ibdbg_ldout << " cq: " << cq << " num_entries: " << num_entries << - " | ret: " << ret << dendl; - } - - last_print = ceph_clock_now(); - - return ret; -} -#define ibv_poll_cq(...) _ibv_poll_cq(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_post_send(const char *f, int l, - struct ibv_qp *qp, struct ibv_send_wr *wr, - struct ibv_send_wr **bad_wr) -{ - auto ret = ibv_post_send(qp, wr, bad_wr); - - ibdbg_ldout << " qp: " << qp << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_post_send(...) _ibv_post_send(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_post_srq_recv(const char *f, int l, - struct ibv_srq *srq, - struct ibv_recv_wr *recv_wr, - struct ibv_recv_wr **bad_recv_wr) -{ - auto ret = ibv_post_srq_recv(srq, recv_wr, bad_recv_wr); - - static struct ibv_srq *last_srq = nullptr; - if (last_srq != srq) { - ibdbg_ldout << " srq: " << srq << - " | ret: " << ret << dendl; - last_srq = srq; - } - - return ret; -} -#define ibv_post_srq_recv(...) _ibv_post_srq_recv(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_query_device(const char *f, int l, - struct ibv_context *context, - struct ibv_device_attr *device_attr) -{ - auto ret = ibv_query_device(context, device_attr); - - ibdbg_ldout << " context: " << context << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_query_device(...) _ibv_query_device(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_query_gid(const char *f, int l, - struct ibv_context *context, int port_num, - int index, union ibv_gid *gid) -{ - auto ret = ibv_query_gid(context, port_num, index, gid); - - ibdbg_ldout << " context: " << context << " port_num: " << port_num << " index: " << index << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_query_gid(...) _ibv_query_gid(__func__, __LINE__, __VA_ARGS__) - -static inline int ____ibv_query_port(const char *f, int l, - struct ibv_context *context, - int port_num, - struct ibv_port_attr *port_attr) -{ - auto ret = ___ibv_query_port(context, port_num, port_attr); - - ibdbg_ldout << " context: " << context << " port_num: " << port_num << - " | ret: " << ret << dendl; - - return ret; -} -#define ___ibv_query_port(...) ____ibv_query_port(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_req_notify_cq(const char *f, int l, - struct ibv_cq *cq, int solicited_only) -{ - auto ret = ibv_req_notify_cq(cq, solicited_only); - - ibdbg_ldout << " cq: " << cq << " solicited_only: " << solicited_only << - " | ret: " << ret << dendl; - - return ret; -} -#define ibv_req_notify_cq(...) _ibv_req_notify_cq(__func__, __LINE__, __VA_ARGS__) - -static inline int _ibv_get_async_event(const char *f, int l, - struct ibv_context *context, - struct ibv_async_event *event) -{ - auto ret = ibv_get_async_event(context, event); - - ibdbg_ldout << " context: " << context << - " | event: " << event << " ret: " << ret << dendl; - - return ret; -} -#define ibv_get_async_event(...) _ibv_get_async_event(__func__, __LINE__, __VA_ARGS__) - -static inline void _ibv_ack_async_event(const char *f, int l, - struct ibv_async_event *event) -{ - ibdbg_ldout << " event: " << event << dendl; - - ibv_ack_async_event(event); -} -#define ibv_ack_async_event(...) _ibv_ack_async_event(__func__, __LINE__, __VA_ARGS__) - -#endif // __IB_DBG_H__