IB/rdmavt: Fix trace hierarchy

Split rdmavt traces into separate files to preserve the original hierarchy since only one trace sub system may now be defined per header file. Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
author: Dennis Dalessandro <dennis.dalessandro@intel.com> 2016-12-07 22:32:47 -0500
committer: Doug Ledford <dledford@redhat.com> 2016-12-11 15:25:13 -0500
commit: cf4c2f8c9d0483f7585883d3f6733ebf09ea837c (patch)
tree: c1d5c575c2670a5606757760dce814769ccaa3b2
parent: e730139b3464cc740c33131c872f7d173744ef11 (diff)
4 files changed, 312 insertions, 137 deletions
diff --git a/drivers/infiniband/sw/rdmavt/trace.h b/drivers/infiniband/sw/rdmavt/trace.h
index 6c0457db5499..11a2afbc8e76 100644
--- a/drivers/infiniband/sw/rdmavt/trace.h
+++ b/drivers/infiniband/sw/rdmavt/trace.h
@@ -45,143 +45,9 @@
 *
 */
-#undef TRACE_SYSTEM_VAR
-#define TRACE_SYSTEM_VAR rdmavt
-#if !defined(__RDMAVT_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
-#define __RDMAVT_TRACE_H
-#include <linux/tracepoint.h>
-#include <linux/trace_seq.h>
-#include <rdma/ib_verbs.h>
-#include <rdma/rdma_vt.h>
 #define RDI_DEV_ENTRY(rdi)   __string(dev, rdi->driver_f.get_card_name(rdi))
 #define RDI_DEV_ASSIGN(rdi)  __assign_str(dev, rdi->driver_f.get_card_name(rdi))
-#undef TRACE_SYSTEM
+#include "trace_rvt.h"
-#define TRACE_SYSTEM rdmavt
+#include "trace_qp.h"
+#include "trace_tx.h"
-TRACE_EVENT(rvt_dbg,
-        TP_PROTO(struct rvt_dev_info *rdi,
-                 const char *msg),
-        TP_ARGS(rdi, msg),
-        TP_STRUCT__entry(
-                RDI_DEV_ENTRY(rdi)
-                __string(msg, msg)
-        ),
-        TP_fast_assign(
-                RDI_DEV_ASSIGN(rdi);
-                __assign_str(msg, msg);
-        ),
-        TP_printk("[%s]: %s", __get_str(dev), __get_str(msg))
-);
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM rvt_qphash
-DECLARE_EVENT_CLASS(rvt_qphash_template,
-        TP_PROTO(struct rvt_qp *qp, u32 bucket),
-        TP_ARGS(qp, bucket),
-        TP_STRUCT__entry(
-                RDI_DEV_ENTRY(ib_to_rvt(qp->ibqp.device))
-                __field(u32, qpn)
-                __field(u32, bucket)
-        ),
-        TP_fast_assign(
-                RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device))
-                __entry->qpn = qp->ibqp.qp_num;
-                __entry->bucket = bucket;
-        ),
-        TP_printk(
-                "[%s] qpn 0x%x bucket %u",
-                __get_str(dev),
-                __entry->qpn,
-                __entry->bucket
-        )
-);
-DEFINE_EVENT(rvt_qphash_template, rvt_qpinsert,
-        TP_PROTO(struct rvt_qp *qp, u32 bucket),
-        TP_ARGS(qp, bucket));
-DEFINE_EVENT(rvt_qphash_template, rvt_qpremove,
-        TP_PROTO(struct rvt_qp *qp, u32 bucket),
-        TP_ARGS(qp, bucket));
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM rvt_tx
-#define wr_opcode_name(opcode) { IB_WR_##opcode, #opcode  }
-#define show_wr_opcode(opcode)                             \
-__print_symbolic(opcode,                                   \
-        wr_opcode_name(RDMA_WRITE),                        \
-        wr_opcode_name(RDMA_WRITE_WITH_IMM),               \
-        wr_opcode_name(SEND),                              \
-        wr_opcode_name(SEND_WITH_IMM),                     \
-        wr_opcode_name(RDMA_READ),                         \
-        wr_opcode_name(ATOMIC_CMP_AND_SWP),                \
-        wr_opcode_name(ATOMIC_FETCH_AND_ADD),              \
-        wr_opcode_name(LSO),                               \
-        wr_opcode_name(SEND_WITH_INV),                     \
-        wr_opcode_name(RDMA_READ_WITH_INV),                \
-        wr_opcode_name(LOCAL_INV),                         \
-        wr_opcode_name(MASKED_ATOMIC_CMP_AND_SWP),         \
-        wr_opcode_name(MASKED_ATOMIC_FETCH_AND_ADD))
-#define POS_PRN \
-"[%s] wr_id %llx qpn %x psn 0x%x lpsn 0x%x length %u opcode 0x%.2x,%s size %u avail %u head %u last %u"
-TRACE_EVENT(
-        rvt_post_one_wr,
-        TP_PROTO(struct rvt_qp *qp, struct rvt_swqe *wqe),
-        TP_ARGS(qp, wqe),
-        TP_STRUCT__entry(
-                RDI_DEV_ENTRY(ib_to_rvt(qp->ibqp.device))
-                __field(u64, wr_id)
-                __field(u32, qpn)
-                __field(u32, psn)
-                __field(u32, lpsn)
-                __field(u32, length)
-                __field(u32, opcode)
-                __field(u32, size)
-                __field(u32, avail)
-                __field(u32, head)
-                __field(u32, last)
-        ),
-        TP_fast_assign(
-                RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device))
-                __entry->wr_id = wqe->wr.wr_id;
-                __entry->qpn = qp->ibqp.qp_num;
-                __entry->psn = wqe->psn;
-                __entry->lpsn = wqe->lpsn;
-                __entry->length = wqe->length;
-                __entry->opcode = wqe->wr.opcode;
-                __entry->size = qp->s_size;
-                __entry->avail = qp->s_avail;
-                __entry->head = qp->s_head;
-                __entry->last = qp->s_last;
-        ),
-        TP_printk(
-                POS_PRN,
-                __get_str(dev),
-                __entry->wr_id,
-                __entry->qpn,
-                __entry->psn,
-                __entry->lpsn,
-                __entry->length,
-                __entry->opcode, show_wr_opcode(__entry->opcode),
-                __entry->size,
-                __entry->avail,
-                __entry->head,
-                __entry->last
-        )
-);
-#endif /* __RDMAVT_TRACE_H */
-#undef TRACE_INCLUDE_PATH
-#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_PATH .
-#define TRACE_INCLUDE_FILE trace
-#include <trace/define_trace.h>
diff --git a/drivers/infiniband/sw/rdmavt/trace_qp.h b/drivers/infiniband/sw/rdmavt/trace_qp.h
new file mode 100644
index 000000000000..4c77a3119bda
--- /dev/null
+++ b/drivers/infiniband/sw/rdmavt/trace_qp.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright(c) 2016 Intel Corporation.
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * BSD LICENSE
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  - Neither the name of Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#if !defined(__RVT_TRACE_QP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define __RVT_TRACE_QP_H
+#include <linux/tracepoint.h>
+#include <linux/trace_seq.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/rdma_vt.h>
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM rvt_qp
+DECLARE_EVENT_CLASS(rvt_qphash_template,
+        TP_PROTO(struct rvt_qp *qp, u32 bucket),
+        TP_ARGS(qp, bucket),
+        TP_STRUCT__entry(
+                RDI_DEV_ENTRY(ib_to_rvt(qp->ibqp.device))
+                __field(u32, qpn)
+                __field(u32, bucket)
+        ),
+        TP_fast_assign(
+                RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device))
+                __entry->qpn = qp->ibqp.qp_num;
+                __entry->bucket = bucket;
+        ),
+        TP_printk(
+                "[%s] qpn 0x%x bucket %u",
+                __get_str(dev),
+                __entry->qpn,
+                __entry->bucket
+        )
+);
+DEFINE_EVENT(rvt_qphash_template, rvt_qpinsert,
+        TP_PROTO(struct rvt_qp *qp, u32 bucket),
+        TP_ARGS(qp, bucket));
+DEFINE_EVENT(rvt_qphash_template, rvt_qpremove,
+        TP_PROTO(struct rvt_qp *qp, u32 bucket),
+        TP_ARGS(qp, bucket));
+#endif /* __RVT_TRACE_QP_H */
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE trace_qp
+#include <trace/define_trace.h>
diff --git a/drivers/infiniband/sw/rdmavt/trace_rvt.h b/drivers/infiniband/sw/rdmavt/trace_rvt.h
new file mode 100644
index 000000000000..746f33461d9a
--- /dev/null
+++ b/drivers/infiniband/sw/rdmavt/trace_rvt.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright(c) 2016 Intel Corporation.
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * BSD LICENSE
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  - Neither the name of Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#if !defined(__RVT_TRACE_RVT_H) || defined(TRACE_HEADER_MULTI_READ)
+#define __RVT_TRACE_RVT_H
+#include <linux/tracepoint.h>
+#include <linux/trace_seq.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/rdma_vt.h>
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM rvt
+TRACE_EVENT(rvt_dbg,
+        TP_PROTO(struct rvt_dev_info *rdi,
+                 const char *msg),
+        TP_ARGS(rdi, msg),
+        TP_STRUCT__entry(
+                RDI_DEV_ENTRY(rdi)
+                __string(msg, msg)
+        ),
+        TP_fast_assign(
+                RDI_DEV_ASSIGN(rdi);
+                __assign_str(msg, msg);
+        ),
+        TP_printk("[%s]: %s", __get_str(dev), __get_str(msg))
+);
+#endif /* __RVT_TRACE_MISC_H */
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE trace_rvt
+#include <trace/define_trace.h>
diff --git a/drivers/infiniband/sw/rdmavt/trace_tx.h b/drivers/infiniband/sw/rdmavt/trace_tx.h
new file mode 100644
index 000000000000..0e03173662d8
--- /dev/null
+++ b/drivers/infiniband/sw/rdmavt/trace_tx.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright(c) 2016 Intel Corporation.
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * BSD LICENSE
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  - Neither the name of Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#if !defined(__RVT_TRACE_TX_H) || defined(TRACE_HEADER_MULTI_READ)
+#define __RVT_TRACE_TX_H
+#include <linux/tracepoint.h>
+#include <linux/trace_seq.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/rdma_vt.h>
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM rvt_tx
+#define wr_opcode_name(opcode) { IB_WR_##opcode, #opcode  }
+#define show_wr_opcode(opcode)                             \
+__print_symbolic(opcode,                                   \
+        wr_opcode_name(RDMA_WRITE),                        \
+        wr_opcode_name(RDMA_WRITE_WITH_IMM),               \
+        wr_opcode_name(SEND),                              \
+        wr_opcode_name(SEND_WITH_IMM),                     \
+        wr_opcode_name(RDMA_READ),                         \
+        wr_opcode_name(ATOMIC_CMP_AND_SWP),                \
+        wr_opcode_name(ATOMIC_FETCH_AND_ADD),              \
+        wr_opcode_name(LSO),                               \
+        wr_opcode_name(SEND_WITH_INV),                     \
+        wr_opcode_name(RDMA_READ_WITH_INV),                \
+        wr_opcode_name(LOCAL_INV),                         \
+        wr_opcode_name(MASKED_ATOMIC_CMP_AND_SWP),         \
+        wr_opcode_name(MASKED_ATOMIC_FETCH_AND_ADD))
+#define POS_PRN \
+"[%s] wr_id %llx qpn %x psn 0x%x lpsn 0x%x length %u opcode 0x%.2x,%s size %u avail %u head %u last %u"
+TRACE_EVENT(
+        rvt_post_one_wr,
+        TP_PROTO(struct rvt_qp *qp, struct rvt_swqe *wqe),
+        TP_ARGS(qp, wqe),
+        TP_STRUCT__entry(
+                RDI_DEV_ENTRY(ib_to_rvt(qp->ibqp.device))
+                __field(u64, wr_id)
+                __field(u32, qpn)
+                __field(u32, psn)
+                __field(u32, lpsn)
+                __field(u32, length)
+                __field(u32, opcode)
+                __field(u32, size)
+                __field(u32, avail)
+                __field(u32, head)
+                __field(u32, last)
+        ),
+        TP_fast_assign(
+                RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device))
+                __entry->wr_id = wqe->wr.wr_id;
+                __entry->qpn = qp->ibqp.qp_num;
+                __entry->psn = wqe->psn;
+                __entry->lpsn = wqe->lpsn;
+                __entry->length = wqe->length;
+                __entry->opcode = wqe->wr.opcode;
+                __entry->size = qp->s_size;
+                __entry->avail = qp->s_avail;
+                __entry->head = qp->s_head;
+                __entry->last = qp->s_last;
+        ),
+        TP_printk(
+                POS_PRN,
+                __get_str(dev),
+                __entry->wr_id,
+                __entry->qpn,
+                __entry->psn,
+                __entry->lpsn,
+                __entry->length,
+                __entry->opcode, show_wr_opcode(__entry->opcode),
+                __entry->size,
+                __entry->avail,
+                __entry->head,
+                __entry->last
+        )
+);
+#endif /* __RVT_TRACE_TX_H */
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE trace_tx
+#include <trace/define_trace.h>
author	Dennis Dalessandro <dennis.dalessandro@intel.com>	2016-12-07 22:32:47 -0500
committer	Doug Ledford <dledford@redhat.com>	2016-12-11 15:25:13 -0500
commit	cf4c2f8c9d0483f7585883d3f6733ebf09ea837c (patch)
tree	c1d5c575c2670a5606757760dce814769ccaa3b2
parent	e730139b3464cc740c33131c872f7d173744ef11 (diff)

diff --git a/drivers/infiniband/sw/rdmavt/trace.h b/drivers/infiniband/sw/rdmavt/trace.h index 6c0457db5499..11a2afbc8e76 100644 --- a/drivers/infiniband/sw/rdmavt/trace.h +++ b/drivers/infiniband/sw/rdmavt/trace.h
@@ -45,143 +45,9 @@
45	*	45	*
46	*/	46	*/
47		47
48	#undef TRACE_SYSTEM_VAR
49	#define TRACE_SYSTEM_VAR rdmavt
50
51	#if !defined(__RDMAVT_TRACE_H) \|\| defined(TRACE_HEADER_MULTI_READ)
52	#define __RDMAVT_TRACE_H
53
54	#include <linux/tracepoint.h>
55	#include <linux/trace_seq.h>
56
57	#include <rdma/ib_verbs.h>
58	#include <rdma/rdma_vt.h>
59
60	#define RDI_DEV_ENTRY(rdi) __string(dev, rdi->driver_f.get_card_name(rdi))	48	#define RDI_DEV_ENTRY(rdi) __string(dev, rdi->driver_f.get_card_name(rdi))
61	#define RDI_DEV_ASSIGN(rdi) __assign_str(dev, rdi->driver_f.get_card_name(rdi))	49	#define RDI_DEV_ASSIGN(rdi) __assign_str(dev, rdi->driver_f.get_card_name(rdi))
62		50
63	#undef TRACE_SYSTEM	51	#include "trace_rvt.h"
64	#define TRACE_SYSTEM rdmavt	52	#include "trace_qp.h"
65		53	#include "trace_tx.h"
66	TRACE_EVENT(rvt_dbg,
67	TP_PROTO(struct rvt_dev_info *rdi,
68	const char *msg),
69	TP_ARGS(rdi, msg),
70	TP_STRUCT__entry(
71	RDI_DEV_ENTRY(rdi)
72	__string(msg, msg)
73	),
74	TP_fast_assign(
75	RDI_DEV_ASSIGN(rdi);
76	__assign_str(msg, msg);
77	),
78	TP_printk("[%s]: %s", __get_str(dev), __get_str(msg))
79	);
80
81	#undef TRACE_SYSTEM
82	#define TRACE_SYSTEM rvt_qphash
83	DECLARE_EVENT_CLASS(rvt_qphash_template,
84	TP_PROTO(struct rvt_qp *qp, u32 bucket),
85	TP_ARGS(qp, bucket),
86	TP_STRUCT__entry(
87	RDI_DEV_ENTRY(ib_to_rvt(qp->ibqp.device))
88	__field(u32, qpn)
89	__field(u32, bucket)
90	),
91	TP_fast_assign(
92	RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device))
93	__entry->qpn = qp->ibqp.qp_num;
94	__entry->bucket = bucket;
95	),
96	TP_printk(
97	"[%s] qpn 0x%x bucket %u",
98	__get_str(dev),
99	__entry->qpn,
100	__entry->bucket
101	)
102	);
103
104	DEFINE_EVENT(rvt_qphash_template, rvt_qpinsert,
105	TP_PROTO(struct rvt_qp *qp, u32 bucket),
106	TP_ARGS(qp, bucket));
107
108	DEFINE_EVENT(rvt_qphash_template, rvt_qpremove,
109	TP_PROTO(struct rvt_qp *qp, u32 bucket),
110	TP_ARGS(qp, bucket));
111
112	#undef TRACE_SYSTEM
113	#define TRACE_SYSTEM rvt_tx
114
115	#define wr_opcode_name(opcode) { IB_WR_##opcode, #opcode }
116	#define show_wr_opcode(opcode) \
117	__print_symbolic(opcode, \
118	wr_opcode_name(RDMA_WRITE), \
119	wr_opcode_name(RDMA_WRITE_WITH_IMM), \
120	wr_opcode_name(SEND), \
121	wr_opcode_name(SEND_WITH_IMM), \
122	wr_opcode_name(RDMA_READ), \
123	wr_opcode_name(ATOMIC_CMP_AND_SWP), \
124	wr_opcode_name(ATOMIC_FETCH_AND_ADD), \
125	wr_opcode_name(LSO), \
126	wr_opcode_name(SEND_WITH_INV), \
127	wr_opcode_name(RDMA_READ_WITH_INV), \
128	wr_opcode_name(LOCAL_INV), \
129	wr_opcode_name(MASKED_ATOMIC_CMP_AND_SWP), \
130	wr_opcode_name(MASKED_ATOMIC_FETCH_AND_ADD))
131
132	#define POS_PRN \
133	"[%s] wr_id %llx qpn %x psn 0x%x lpsn 0x%x length %u opcode 0x%.2x,%s size %u avail %u head %u last %u"
134
135	TRACE_EVENT(
136	rvt_post_one_wr,
137	TP_PROTO(struct rvt_qp qp, struct rvt_swqe wqe),
138	TP_ARGS(qp, wqe),
139	TP_STRUCT__entry(
140	RDI_DEV_ENTRY(ib_to_rvt(qp->ibqp.device))
141	__field(u64, wr_id)
142	__field(u32, qpn)
143	__field(u32, psn)
144	__field(u32, lpsn)
145	__field(u32, length)
146	__field(u32, opcode)
147	__field(u32, size)
148	__field(u32, avail)
149	__field(u32, head)
150	__field(u32, last)
151	),
152	TP_fast_assign(
153	RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device))
154	__entry->wr_id = wqe->wr.wr_id;
155	__entry->qpn = qp->ibqp.qp_num;
156	__entry->psn = wqe->psn;
157	__entry->lpsn = wqe->lpsn;
158	__entry->length = wqe->length;
159	__entry->opcode = wqe->wr.opcode;
160	__entry->size = qp->s_size;
161	__entry->avail = qp->s_avail;
162	__entry->head = qp->s_head;
163	__entry->last = qp->s_last;
164	),
165	TP_printk(
166	POS_PRN,
167	__get_str(dev),
168	__entry->wr_id,
169	__entry->qpn,
170	__entry->psn,
171	__entry->lpsn,
172	__entry->length,
173	__entry->opcode, show_wr_opcode(__entry->opcode),
174	__entry->size,
175	__entry->avail,
176	__entry->head,
177	__entry->last
178	)
179	);
180
181	#endif /* __RDMAVT_TRACE_H */
182
183	#undef TRACE_INCLUDE_PATH
184	#undef TRACE_INCLUDE_FILE
185	#define TRACE_INCLUDE_PATH .
186	#define TRACE_INCLUDE_FILE trace
187	#include <trace/define_trace.h>


diff --git a/drivers/infiniband/sw/rdmavt/trace_qp.h b/drivers/infiniband/sw/rdmavt/trace_qp.h new file mode 100644 index 000000000000..4c77a3119bda --- /dev/null +++ b/drivers/infiniband/sw/rdmavt/trace_qp.h
@@ -0,0 +1,96 @@
		1	/*
		2	* Copyright(c) 2016 Intel Corporation.
		3	*
		4	* This file is provided under a dual BSD/GPLv2 license. When using or
		5	* redistributing this file, you may do so under either license.
		6	*
		7	* GPL LICENSE SUMMARY
		8	*
		9	* This program is free software; you can redistribute it and/or modify
		10	* it under the terms of version 2 of the GNU General Public License as
		11	* published by the Free Software Foundation.
		12	*
		13	* This program is distributed in the hope that it will be useful, but
		14	* WITHOUT ANY WARRANTY; without even the implied warranty of
		15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		16	* General Public License for more details.
		17	*
		18	* BSD LICENSE
		19	*
		20	* Redistribution and use in source and binary forms, with or without
		21	* modification, are permitted provided that the following conditions
		22	* are met:
		23	*
		24	* - Redistributions of source code must retain the above copyright
		25	* notice, this list of conditions and the following disclaimer.
		26	* - Redistributions in binary form must reproduce the above copyright
		27	* notice, this list of conditions and the following disclaimer in
		28	* the documentation and/or other materials provided with the
		29	* distribution.
		30	* - Neither the name of Intel Corporation nor the names of its
		31	* contributors may be used to endorse or promote products derived
		32	* from this software without specific prior written permission.
		33	*
		34	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		35	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		36	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		37	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		38	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		39	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		40	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		41	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		42	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		43	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		44	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		45	*
		46	*/
		47	#if !defined(__RVT_TRACE_QP_H) \|\| defined(TRACE_HEADER_MULTI_READ)
		48	#define __RVT_TRACE_QP_H
		49
		50	#include <linux/tracepoint.h>
		51	#include <linux/trace_seq.h>
		52
		53	#include <rdma/ib_verbs.h>
		54	#include <rdma/rdma_vt.h>
		55
		56	#undef TRACE_SYSTEM
		57	#define TRACE_SYSTEM rvt_qp
		58
		59	DECLARE_EVENT_CLASS(rvt_qphash_template,
		60	TP_PROTO(struct rvt_qp *qp, u32 bucket),
		61	TP_ARGS(qp, bucket),
		62	TP_STRUCT__entry(
		63	RDI_DEV_ENTRY(ib_to_rvt(qp->ibqp.device))
		64	__field(u32, qpn)
		65	__field(u32, bucket)
		66	),
		67	TP_fast_assign(
		68	RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device))
		69	__entry->qpn = qp->ibqp.qp_num;
		70	__entry->bucket = bucket;
		71	),
		72	TP_printk(
		73	"[%s] qpn 0x%x bucket %u",
		74	__get_str(dev),
		75	__entry->qpn,
		76	__entry->bucket
		77	)
		78	);
		79
		80	DEFINE_EVENT(rvt_qphash_template, rvt_qpinsert,
		81	TP_PROTO(struct rvt_qp *qp, u32 bucket),
		82	TP_ARGS(qp, bucket));
		83
		84	DEFINE_EVENT(rvt_qphash_template, rvt_qpremove,
		85	TP_PROTO(struct rvt_qp *qp, u32 bucket),
		86	TP_ARGS(qp, bucket));
		87
		88
		89	#endif /* __RVT_TRACE_QP_H */
		90
		91	#undef TRACE_INCLUDE_PATH
		92	#undef TRACE_INCLUDE_FILE
		93	#define TRACE_INCLUDE_PATH .
		94	#define TRACE_INCLUDE_FILE trace_qp
		95	#include <trace/define_trace.h>
		96


diff --git a/drivers/infiniband/sw/rdmavt/trace_rvt.h b/drivers/infiniband/sw/rdmavt/trace_rvt.h new file mode 100644 index 000000000000..746f33461d9a --- /dev/null +++ b/drivers/infiniband/sw/rdmavt/trace_rvt.h
@@ -0,0 +1,81 @@
		1	/*
		2	* Copyright(c) 2016 Intel Corporation.
		3	*
		4	* This file is provided under a dual BSD/GPLv2 license. When using or
		5	* redistributing this file, you may do so under either license.
		6	*
		7	* GPL LICENSE SUMMARY
		8	*
		9	* This program is free software; you can redistribute it and/or modify
		10	* it under the terms of version 2 of the GNU General Public License as
		11	* published by the Free Software Foundation.
		12	*
		13	* This program is distributed in the hope that it will be useful, but
		14	* WITHOUT ANY WARRANTY; without even the implied warranty of
		15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		16	* General Public License for more details.
		17	*
		18	* BSD LICENSE
		19	*
		20	* Redistribution and use in source and binary forms, with or without
		21	* modification, are permitted provided that the following conditions
		22	* are met:
		23	*
		24	* - Redistributions of source code must retain the above copyright
		25	* notice, this list of conditions and the following disclaimer.
		26	* - Redistributions in binary form must reproduce the above copyright
		27	* notice, this list of conditions and the following disclaimer in
		28	* the documentation and/or other materials provided with the
		29	* distribution.
		30	* - Neither the name of Intel Corporation nor the names of its
		31	* contributors may be used to endorse or promote products derived
		32	* from this software without specific prior written permission.
		33	*
		34	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		35	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		36	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		37	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		38	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		39	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		40	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		41	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		42	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		43	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		44	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		45	*
		46	*/
		47	#if !defined(__RVT_TRACE_RVT_H) \|\| defined(TRACE_HEADER_MULTI_READ)
		48	#define __RVT_TRACE_RVT_H
		49
		50	#include <linux/tracepoint.h>
		51	#include <linux/trace_seq.h>
		52
		53	#include <rdma/ib_verbs.h>
		54	#include <rdma/rdma_vt.h>
		55
		56	#undef TRACE_SYSTEM
		57	#define TRACE_SYSTEM rvt
		58
		59	TRACE_EVENT(rvt_dbg,
		60	TP_PROTO(struct rvt_dev_info *rdi,
		61	const char *msg),
		62	TP_ARGS(rdi, msg),
		63	TP_STRUCT__entry(
		64	RDI_DEV_ENTRY(rdi)
		65	__string(msg, msg)
		66	),
		67	TP_fast_assign(
		68	RDI_DEV_ASSIGN(rdi);
		69	__assign_str(msg, msg);
		70	),
		71	TP_printk("[%s]: %s", __get_str(dev), __get_str(msg))
		72	);
		73
		74	#endif /* __RVT_TRACE_MISC_H */
		75
		76	#undef TRACE_INCLUDE_PATH
		77	#undef TRACE_INCLUDE_FILE
		78	#define TRACE_INCLUDE_PATH .
		79	#define TRACE_INCLUDE_FILE trace_rvt
		80	#include <trace/define_trace.h>
		81


diff --git a/drivers/infiniband/sw/rdmavt/trace_tx.h b/drivers/infiniband/sw/rdmavt/trace_tx.h new file mode 100644 index 000000000000..0e03173662d8 --- /dev/null +++ b/drivers/infiniband/sw/rdmavt/trace_tx.h
@@ -0,0 +1,132 @@
		1	/*
		2	* Copyright(c) 2016 Intel Corporation.
		3	*
		4	* This file is provided under a dual BSD/GPLv2 license. When using or
		5	* redistributing this file, you may do so under either license.
		6	*
		7	* GPL LICENSE SUMMARY
		8	*
		9	* This program is free software; you can redistribute it and/or modify
		10	* it under the terms of version 2 of the GNU General Public License as
		11	* published by the Free Software Foundation.
		12	*
		13	* This program is distributed in the hope that it will be useful, but
		14	* WITHOUT ANY WARRANTY; without even the implied warranty of
		15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		16	* General Public License for more details.
		17	*
		18	* BSD LICENSE
		19	*
		20	* Redistribution and use in source and binary forms, with or without
		21	* modification, are permitted provided that the following conditions
		22	* are met:
		23	*
		24	* - Redistributions of source code must retain the above copyright
		25	* notice, this list of conditions and the following disclaimer.
		26	* - Redistributions in binary form must reproduce the above copyright
		27	* notice, this list of conditions and the following disclaimer in
		28	* the documentation and/or other materials provided with the
		29	* distribution.
		30	* - Neither the name of Intel Corporation nor the names of its
		31	* contributors may be used to endorse or promote products derived
		32	* from this software without specific prior written permission.
		33	*
		34	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		35	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		36	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		37	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		38	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		39	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		40	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		41	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		42	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		43	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		44	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		45	*
		46	*/
		47	#if !defined(__RVT_TRACE_TX_H) \|\| defined(TRACE_HEADER_MULTI_READ)
		48	#define __RVT_TRACE_TX_H
		49
		50	#include <linux/tracepoint.h>
		51	#include <linux/trace_seq.h>
		52
		53	#include <rdma/ib_verbs.h>
		54	#include <rdma/rdma_vt.h>
		55
		56	#undef TRACE_SYSTEM
		57	#define TRACE_SYSTEM rvt_tx
		58
		59	#define wr_opcode_name(opcode) { IB_WR_##opcode, #opcode }
		60	#define show_wr_opcode(opcode) \
		61	__print_symbolic(opcode, \
		62	wr_opcode_name(RDMA_WRITE), \
		63	wr_opcode_name(RDMA_WRITE_WITH_IMM), \
		64	wr_opcode_name(SEND), \
		65	wr_opcode_name(SEND_WITH_IMM), \
		66	wr_opcode_name(RDMA_READ), \
		67	wr_opcode_name(ATOMIC_CMP_AND_SWP), \
		68	wr_opcode_name(ATOMIC_FETCH_AND_ADD), \
		69	wr_opcode_name(LSO), \
		70	wr_opcode_name(SEND_WITH_INV), \
		71	wr_opcode_name(RDMA_READ_WITH_INV), \
		72	wr_opcode_name(LOCAL_INV), \
		73	wr_opcode_name(MASKED_ATOMIC_CMP_AND_SWP), \
		74	wr_opcode_name(MASKED_ATOMIC_FETCH_AND_ADD))
		75
		76	#define POS_PRN \
		77	"[%s] wr_id %llx qpn %x psn 0x%x lpsn 0x%x length %u opcode 0x%.2x,%s size %u avail %u head %u last %u"
		78
		79	TRACE_EVENT(
		80	rvt_post_one_wr,
		81	TP_PROTO(struct rvt_qp qp, struct rvt_swqe wqe),
		82	TP_ARGS(qp, wqe),
		83	TP_STRUCT__entry(
		84	RDI_DEV_ENTRY(ib_to_rvt(qp->ibqp.device))
		85	__field(u64, wr_id)
		86	__field(u32, qpn)
		87	__field(u32, psn)
		88	__field(u32, lpsn)
		89	__field(u32, length)
		90	__field(u32, opcode)
		91	__field(u32, size)
		92	__field(u32, avail)
		93	__field(u32, head)
		94	__field(u32, last)
		95	),
		96	TP_fast_assign(
		97	RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device))
		98	__entry->wr_id = wqe->wr.wr_id;
		99	__entry->qpn = qp->ibqp.qp_num;
		100	__entry->psn = wqe->psn;
		101	__entry->lpsn = wqe->lpsn;
		102	__entry->length = wqe->length;
		103	__entry->opcode = wqe->wr.opcode;
		104	__entry->size = qp->s_size;
		105	__entry->avail = qp->s_avail;
		106	__entry->head = qp->s_head;
		107	__entry->last = qp->s_last;
		108	),
		109	TP_printk(
		110	POS_PRN,
		111	__get_str(dev),
		112	__entry->wr_id,
		113	__entry->qpn,
		114	__entry->psn,
		115	__entry->lpsn,
		116	__entry->length,
		117	__entry->opcode, show_wr_opcode(__entry->opcode),
		118	__entry->size,
		119	__entry->avail,
		120	__entry->head,
		121	__entry->last
		122	)
		123	);
		124
		125	#endif /* __RVT_TRACE_TX_H */
		126
		127	#undef TRACE_INCLUDE_PATH
		128	#undef TRACE_INCLUDE_FILE
		129	#define TRACE_INCLUDE_PATH .
		130	#define TRACE_INCLUDE_FILE trace_tx
		131	#include <trace/define_trace.h>
		132