IB/hfi1: Separate tracepoints into specific headers (462b6b21) · Commits · 戴 / test

drivers/infiniband/hw/hfi1/hfi.h

+51 −0

Original line number	Diff line number	Diff line
		@@ -1947,4 +1947,55 @@ static inline u32 qsfp_resource(struct hfi1_devdata *dd)

		int hfi1_tempsense_rd(struct hfi1_devdata dd, struct hfi1_temp temp);

		#define DD_DEV_ENTRY(dd) __string(dev, dev_name(&(dd)->pcidev->dev))
		#define DD_DEV_ASSIGN(dd) __assign_str(dev, dev_name(&(dd)->pcidev->dev))

		#define packettype_name(etype) { RHF_RCV_TYPE_##etype, #etype }
		#define show_packettype(etype) \
		__print_symbolic(etype, \
		packettype_name(EXPECTED), \
		packettype_name(EAGER), \
		packettype_name(IB), \
		packettype_name(ERROR), \
		packettype_name(BYPASS))

		#define ib_opcode_name(opcode) { IB_OPCODE_##opcode, #opcode }
		#define show_ib_opcode(opcode) \
		__print_symbolic(opcode, \
		ib_opcode_name(RC_SEND_FIRST), \
		ib_opcode_name(RC_SEND_MIDDLE), \
		ib_opcode_name(RC_SEND_LAST), \
		ib_opcode_name(RC_SEND_LAST_WITH_IMMEDIATE), \
		ib_opcode_name(RC_SEND_ONLY), \
		ib_opcode_name(RC_SEND_ONLY_WITH_IMMEDIATE), \
		ib_opcode_name(RC_RDMA_WRITE_FIRST), \
		ib_opcode_name(RC_RDMA_WRITE_MIDDLE), \
		ib_opcode_name(RC_RDMA_WRITE_LAST), \
		ib_opcode_name(RC_RDMA_WRITE_LAST_WITH_IMMEDIATE), \
		ib_opcode_name(RC_RDMA_WRITE_ONLY), \
		ib_opcode_name(RC_RDMA_WRITE_ONLY_WITH_IMMEDIATE), \
		ib_opcode_name(RC_RDMA_READ_REQUEST), \
		ib_opcode_name(RC_RDMA_READ_RESPONSE_FIRST), \
		ib_opcode_name(RC_RDMA_READ_RESPONSE_MIDDLE), \
		ib_opcode_name(RC_RDMA_READ_RESPONSE_LAST), \
		ib_opcode_name(RC_RDMA_READ_RESPONSE_ONLY), \
		ib_opcode_name(RC_ACKNOWLEDGE), \
		ib_opcode_name(RC_ATOMIC_ACKNOWLEDGE), \
		ib_opcode_name(RC_COMPARE_SWAP), \
		ib_opcode_name(RC_FETCH_ADD), \
		ib_opcode_name(UC_SEND_FIRST), \
		ib_opcode_name(UC_SEND_MIDDLE), \
		ib_opcode_name(UC_SEND_LAST), \
		ib_opcode_name(UC_SEND_LAST_WITH_IMMEDIATE), \
		ib_opcode_name(UC_SEND_ONLY), \
		ib_opcode_name(UC_SEND_ONLY_WITH_IMMEDIATE), \
		ib_opcode_name(UC_RDMA_WRITE_FIRST), \
		ib_opcode_name(UC_RDMA_WRITE_MIDDLE), \
		ib_opcode_name(UC_RDMA_WRITE_LAST), \
		ib_opcode_name(UC_RDMA_WRITE_LAST_WITH_IMMEDIATE), \
		ib_opcode_name(UC_RDMA_WRITE_ONLY), \
		ib_opcode_name(UC_RDMA_WRITE_ONLY_WITH_IMMEDIATE), \
		ib_opcode_name(UD_SEND_ONLY), \
		ib_opcode_name(UD_SEND_ONLY_WITH_IMMEDIATE), \
		ib_opcode_name(CNP))
		#endif /* _HFI1_KERNEL_H */

drivers/infiniband/hw/hfi1/rc.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1047,7 +1047,7 @@ void hfi1_rc_timeout(unsigned long arg)
		ibp->rvp.n_rc_timeouts++;
		qp->s_flags &= ~RVT_S_TIMER;
		del_timer(&qp->s_timer);
		trace_hfi1_rc_timeout(qp, qp->s_last_psn + 1);
		trace_hfi1_timeout(qp, qp->s_last_psn + 1);
		restart_rc(qp, qp->s_last_psn + 1, 1);
		hfi1_schedule_send(qp);
		}
		@@ -1171,7 +1171,7 @@ void hfi1_rc_send_complete(struct rvt_qp qp, struct hfi1_ib_header hdr)
		* If we were waiting for sends to complete before re-sending,
		* and they are now complete, restart sending.
		*/
		trace_hfi1_rc_sendcomplete(qp, psn);
		trace_hfi1_sendcomplete(qp, psn);
		if (qp->s_flags & RVT_S_WAIT_PSN &&
		cmp_psn(qp->s_sending_psn, qp->s_sending_hpsn) > 0) {
		qp->s_flags &= ~RVT_S_WAIT_PSN;
		@@ -1567,7 +1567,7 @@ static void rc_rcv_resp(struct hfi1_ibport *ibp,

		spin_lock_irqsave(&qp->s_lock, flags);

		trace_hfi1_rc_ack(qp, psn);
		trace_hfi1_ack(qp, psn);

		/* Ignore invalid responses. */
		smp_read_barrier_depends(); /* see post_one_send */
		@@ -1782,7 +1782,7 @@ static noinline int rc_rcv_error(struct hfi1_other_headers ohdr, void data,
		u8 i, prev;
		int old_req;

		trace_hfi1_rc_rcv_error(qp, psn);
		trace_hfi1_rcv_error(qp, psn);
		if (diff > 0) {
		/*
		* Packet sequence error.

drivers/infiniband/hw/hfi1/trace.h

+7 −1326

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/hfi1/trace_ctxts.h

0 → 100644

+141 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright(c) 2015, 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(__HFI1_TRACE_CTXTS_H) \|\| defined(TRACE_HEADER_MULTI_READ)
		#define __HFI1_TRACE_CTXTS_H

		#include <linux/tracepoint.h>
		#include <linux/trace_seq.h>

		#include "hfi.h"

		#undef TRACE_SYSTEM
		#define TRACE_SYSTEM hfi1_ctxts

		#define UCTXT_FMT \
		"cred:%u, credaddr:0x%llx, piobase:0x%llx, rcvhdr_cnt:%u, " \
		"rcvbase:0x%llx, rcvegrc:%u, rcvegrb:0x%llx"
		TRACE_EVENT(hfi1_uctxtdata,
		TP_PROTO(struct hfi1_devdata dd, struct hfi1_ctxtdata uctxt),
		TP_ARGS(dd, uctxt),
		TP_STRUCT__entry(DD_DEV_ENTRY(dd)
		__field(unsigned int, ctxt)
		__field(u32, credits)
		__field(u64, hw_free)
		__field(u64, piobase)
		__field(u16, rcvhdrq_cnt)
		__field(u64, rcvhdrq_phys)
		__field(u32, eager_cnt)
		__field(u64, rcvegr_phys)
		),
		TP_fast_assign(DD_DEV_ASSIGN(dd);
		__entry->ctxt = uctxt->ctxt;
		__entry->credits = uctxt->sc->credits;
		__entry->hw_free = (u64)uctxt->sc->hw_free;
		__entry->piobase = (u64)uctxt->sc->base_addr;
		__entry->rcvhdrq_cnt = uctxt->rcvhdrq_cnt;
		__entry->rcvhdrq_phys = uctxt->rcvhdrq_phys;
		__entry->eager_cnt = uctxt->egrbufs.alloced;
		__entry->rcvegr_phys =
		uctxt->egrbufs.rcvtids[0].phys;
		),
		TP_printk("[%s] ctxt %u " UCTXT_FMT,
		__get_str(dev),
		__entry->ctxt,
		__entry->credits,
		__entry->hw_free,
		__entry->piobase,
		__entry->rcvhdrq_cnt,
		__entry->rcvhdrq_phys,
		__entry->eager_cnt,
		__entry->rcvegr_phys
		)
		);

		#define CINFO_FMT \
		"egrtids:%u, egr_size:%u, hdrq_cnt:%u, hdrq_size:%u, sdma_ring_size:%u"
		TRACE_EVENT(hfi1_ctxt_info,
		TP_PROTO(struct hfi1_devdata *dd, unsigned int ctxt,
		unsigned int subctxt,
		struct hfi1_ctxt_info cinfo),
		TP_ARGS(dd, ctxt, subctxt, cinfo),
		TP_STRUCT__entry(DD_DEV_ENTRY(dd)
		__field(unsigned int, ctxt)
		__field(unsigned int, subctxt)
		__field(u16, egrtids)
		__field(u16, rcvhdrq_cnt)
		__field(u16, rcvhdrq_size)
		__field(u16, sdma_ring_size)
		__field(u32, rcvegr_size)
		),
		TP_fast_assign(DD_DEV_ASSIGN(dd);
		__entry->ctxt = ctxt;
		__entry->subctxt = subctxt;
		__entry->egrtids = cinfo.egrtids;
		__entry->rcvhdrq_cnt = cinfo.rcvhdrq_cnt;
		__entry->rcvhdrq_size = cinfo.rcvhdrq_entsize;
		__entry->sdma_ring_size = cinfo.sdma_ring_size;
		__entry->rcvegr_size = cinfo.rcvegr_size;
		),
		TP_printk("[%s] ctxt %u:%u " CINFO_FMT,
		__get_str(dev),
		__entry->ctxt,
		__entry->subctxt,
		__entry->egrtids,
		__entry->rcvegr_size,
		__entry->rcvhdrq_cnt,
		__entry->rcvhdrq_size,
		__entry->sdma_ring_size
		)
		);

		#endif /* __HFI1_TRACE_CTXTS_H */

		#undef TRACE_INCLUDE_PATH
		#undef TRACE_INCLUDE_FILE
		#define TRACE_INCLUDE_PATH .
		#define TRACE_INCLUDE_FILE trace_ctxts
		#include <trace/define_trace.h>

drivers/infiniband/hw/hfi1/trace_dbg.h

0 → 100644

+155 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright(c) 2015, 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(__HFI1_TRACE_EXTRA_H) \|\| defined(TRACE_HEADER_MULTI_READ)
		#define __HFI1_TRACE_EXTRA_H

		#include <linux/tracepoint.h>
		#include <linux/trace_seq.h>

		#include "hfi.h"

		/*
		* Note:
		* This produces a REALLY ugly trace in the console output when the string is
		* too long.
		*/

		#undef TRACE_SYSTEM
		#define TRACE_SYSTEM hfi1_dbg

		#define MAX_MSG_LEN 512

		DECLARE_EVENT_CLASS(hfi1_trace_template,
		TP_PROTO(const char function, struct va_format vaf),
		TP_ARGS(function, vaf),
		TP_STRUCT__entry(__string(function, function)
		__dynamic_array(char, msg, MAX_MSG_LEN)
		),
		TP_fast_assign(__assign_str(function, function);
		WARN_ON_ONCE(vsnprintf
		(__get_dynamic_array(msg),
		MAX_MSG_LEN, vaf->fmt,
		*vaf->va) >=
		MAX_MSG_LEN);
		),
		TP_printk("(%s) %s",
		__get_str(function),
		__get_str(msg))
		);

		/*
		* It may be nice to macroize the __hfi1_trace but the va_* stuff requires an
		* actual function to work and can not be in a macro.
		*/
		#define __hfi1_trace_def(lvl) \
		void __hfi1_trace_##lvl(const char funct, char fmt, ...); \
		\
		DEFINE_EVENT(hfi1_trace_template, hfi1_ ##lvl, \
		TP_PROTO(const char function, struct va_format vaf), \
		TP_ARGS(function, vaf))

		#define __hfi1_trace_fn(lvl) \
		void __hfi1_trace_##lvl(const char func, char fmt, ...) \
		{ \
		struct va_format vaf = { \
		.fmt = fmt, \
		}; \
		va_list args; \
		\
		va_start(args, fmt); \
		vaf.va = &args; \
		trace_hfi1_ ##lvl(func, &vaf); \
		va_end(args); \
		return; \
		}

		/*
		* To create a new trace level simply define it below and as a __hfi1_trace_fn
		* in trace.c. This will create all the hooks for calling
		* hfi1_cdbg(LVL, fmt, ...); as well as take care of all
		* the debugfs stuff.
		*/
		__hfi1_trace_def(PKT);
		__hfi1_trace_def(PROC);
		__hfi1_trace_def(SDMA);
		__hfi1_trace_def(LINKVERB);
		__hfi1_trace_def(DEBUG);
		__hfi1_trace_def(SNOOP);
		__hfi1_trace_def(CNTR);
		__hfi1_trace_def(PIO);
		__hfi1_trace_def(DC8051);
		__hfi1_trace_def(FIRMWARE);
		__hfi1_trace_def(RCVCTRL);
		__hfi1_trace_def(TID);
		__hfi1_trace_def(MMU);
		__hfi1_trace_def(IOCTL);

		#define hfi1_cdbg(which, fmt, ...) \
		__hfi1_trace_##which(__func__, fmt, ##__VA_ARGS__)

		#define hfi1_dbg(fmt, ...) \
		hfi1_cdbg(DEBUG, fmt, ##__VA_ARGS__)

		/*
		* Define HFI1_EARLY_DBG at compile time or here to enable early trace
		* messages. Do not check in an enablement for this.
		*/

		#ifdef HFI1_EARLY_DBG
		#define hfi1_dbg_early(fmt, ...) \
		trace_printk(fmt, ##__VA_ARGS__)
		#else
		#define hfi1_dbg_early(fmt, ...)
		#endif

		#endif /* __HFI1_TRACE_EXTRA_H */

		#undef TRACE_INCLUDE_PATH
		#undef TRACE_INCLUDE_FILE
		#define TRACE_INCLUDE_PATH .
		#define TRACE_INCLUDE_FILE trace_dbg
		#include <trace/define_trace.h>

Admin message