IB/hfi1: Add static trace for iowait

This patch adds the static trace for resource wait.

Reviewed-by: Mitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Kaike Wan <kaike.wan@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/hfi1/iowait.c b/drivers/infiniband/hw/hfi1/iowait.c
index 59dc955f18803abd6003a3832d75c682f9314173..582f1ba136ff660334669288c62c6b1e4e54d44a 100644 (file)
--- a/drivers/infiniband/hw/hfi1/iowait.c
+++ b/drivers/infiniband/hw/hfi1/iowait.c
@@ -4,9 +4,11 @@
  *
  */
 #include "iowait.h"
+#include "trace_iowait.h"
 
 void iowait_set_flag(struct iowait *wait, u32 flag)
 {
+       trace_hfi1_iowait_set(wait, flag);
        set_bit(flag, &wait->flags);
 }
 
@@ -17,6 +19,7 @@ bool iowait_flag_set(struct iowait *wait, u32 flag)
 
 inline void iowait_clear_flag(struct iowait *wait, u32 flag)
 {
+       trace_hfi1_iowait_clear(wait, flag);
        clear_bit(flag, &wait->flags);
 }
 

diff --git a/drivers/infiniband/hw/hfi1/trace.h b/drivers/infiniband/hw/hfi1/trace.h
index 8540463ef3f720a680fecff1f6e323046e5bbdbd..84458f1325e1b9144c439fb889550dfddaecbb72 100644 (file)
--- a/drivers/infiniband/hw/hfi1/trace.h
+++ b/drivers/infiniband/hw/hfi1/trace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2015 - 2017 Intel Corporation.
+ * Copyright(c) 2015 - 2018 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.
@@ -62,3 +62,4 @@ __print_symbolic(etype,                         \
 #include "trace_rx.h"
 #include "trace_tx.h"
 #include "trace_mmu.h"
+#include "trace_iowait.h"

diff --git a/drivers/infiniband/hw/hfi1/trace_iowait.h b/drivers/infiniband/hw/hfi1/trace_iowait.h
new file mode 100644 (file)
index 0000000..27f4334
--- /dev/null
+++ b/drivers/infiniband/hw/hfi1/trace_iowait.h
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
+/*
+ * Copyright(c) 2018 Intel Corporation.
+ *
+ */
+#if !defined(__HFI1_TRACE_IOWAIT_H) || defined(TRACE_HEADER_MULTI_READ)
+#define __HFI1_TRACE_IOWAIT_H
+
+#include <linux/tracepoint.h>
+#include "iowait.h"
+#include "verbs.h"
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM hfi1_iowait
+
+DECLARE_EVENT_CLASS(hfi1_iowait_template,
+                   TP_PROTO(struct iowait *wait, u32 flag),
+                   TP_ARGS(wait, flag),
+                   TP_STRUCT__entry(/* entry */
+                           __field(unsigned long, addr)
+                           __field(unsigned long, flags)
+                           __field(u32, flag)
+                           __field(u32, qpn)
+                           ),
+                   TP_fast_assign(/* assign */
+                           __entry->addr = (unsigned long)wait;
+                           __entry->flags = wait->flags;
+                           __entry->flag = (1 << flag);
+                           __entry->qpn = iowait_to_qp(wait)->ibqp.qp_num;
+                           ),
+                   TP_printk(/* print */
+                           "iowait 0x%lx qp %u flags 0x%lx flag 0x%x",
+                           __entry->addr,
+                           __entry->qpn,
+                           __entry->flags,
+                           __entry->flag
+                           )
+       );
+
+DEFINE_EVENT(hfi1_iowait_template, hfi1_iowait_set,
+            TP_PROTO(struct iowait *wait, u32 flag),
+            TP_ARGS(wait, flag));
+
+DEFINE_EVENT(hfi1_iowait_template, hfi1_iowait_clear,
+            TP_PROTO(struct iowait *wait, u32 flag),
+            TP_ARGS(wait, flag));
+
+#endif /* __HFI1_TRACE_IOWAIT_H */
+
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE trace_iowait
+#include <trace/define_trace.h>