IB/MAD: Add agent trace points

Trace agent details when agents are [un]registered.  In addition, report
agent details on send/recv.

Reviewed-by: "Ruhl, Michael J" <michael.j.ruhl@intel.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 7164db34bd4d093fe8bc8327d2b18f70a16ecf87..cc1805211a848c49e1a550b1f27c5ef5d5e64274 100644 (file)
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -467,6 +467,7 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
        }
        spin_unlock_irq(&port_priv->reg_lock);
 
+       trace_ib_mad_create_agent(mad_agent_priv);
        return &mad_agent_priv->agent;
 error6:
        spin_unlock_irq(&port_priv->reg_lock);
@@ -622,6 +623,7 @@ static void unregister_mad_agent(struct ib_mad_agent_private *mad_agent_priv)
        struct ib_mad_port_private *port_priv;
 
        /* Note that we could still be handling received MADs */
+       trace_ib_mad_unregister_agent(mad_agent_priv);
 
        /*
         * Canceling all sends results in dropping received response
@@ -2354,6 +2356,7 @@ static void ib_mad_recv_done(struct ib_cq *cq, struct ib_wc *wc)
 
        mad_agent = find_mad_agent(port_priv, (const struct ib_mad_hdr *)recv->mad);
        if (mad_agent) {
+               trace_ib_mad_recv_done_agent(mad_agent);
                ib_mad_complete_recv(mad_agent, &recv->header.recv_wc);
                /*
                 * recv is freed up in error cases in ib_mad_complete_recv
@@ -2518,6 +2521,7 @@ static void ib_mad_send_done(struct ib_cq *cq, struct ib_wc *wc)
        send_queue = mad_list->mad_queue;
        qp_info = send_queue->qp_info;
 
+       trace_ib_mad_send_done_agent(mad_send_wr->mad_agent_priv);
        trace_ib_mad_send_done_handler(mad_send_wr, wc);
 
 retry:

diff --git a/include/trace/events/ib_mad.h b/include/trace/events/ib_mad.h
index 245a916bfd5aae41fa2cc92dea35000f09ba801d..6f504c2af935ed05ca4416dd0cc765ef4ebd9772 100644 (file)
--- a/include/trace/events/ib_mad.h
+++ b/include/trace/events/ib_mad.h
@@ -248,6 +248,52 @@ TRACE_EVENT(ib_mad_recv_done_handler,
        )
 );
 
+DECLARE_EVENT_CLASS(ib_mad_agent_template,
+       TP_PROTO(struct ib_mad_agent_private *agent),
+       TP_ARGS(agent),
+
+       TP_STRUCT__entry(
+               __field(u32,            dev_index)
+               __field(u32,            hi_tid)
+               __field(u8,             port_num)
+               __field(u8,             mgmt_class)
+               __field(u8,             mgmt_class_version)
+       ),
+
+       TP_fast_assign(
+               __entry->dev_index = agent->agent.device->index;
+               __entry->port_num = agent->agent.port_num;
+               __entry->hi_tid = agent->agent.hi_tid;
+
+               if (agent->reg_req) {
+                       __entry->mgmt_class = agent->reg_req->mgmt_class;
+                       __entry->mgmt_class_version =
+                               agent->reg_req->mgmt_class_version;
+               } else {
+                       __entry->mgmt_class = 0;
+                       __entry->mgmt_class_version = 0;
+               }
+       ),
+
+       TP_printk("%d:%d mad agent : hi_tid 0x%08x class 0x%02x class_ver 0x%02x",
+               __entry->dev_index, __entry->port_num,
+               __entry->hi_tid, __entry->mgmt_class,
+               __entry->mgmt_class_version
+       )
+);
+DEFINE_EVENT(ib_mad_agent_template, ib_mad_recv_done_agent,
+       TP_PROTO(struct ib_mad_agent_private *agent),
+       TP_ARGS(agent));
+DEFINE_EVENT(ib_mad_agent_template, ib_mad_send_done_agent,
+       TP_PROTO(struct ib_mad_agent_private *agent),
+       TP_ARGS(agent));
+DEFINE_EVENT(ib_mad_agent_template, ib_mad_create_agent,
+       TP_PROTO(struct ib_mad_agent_private *agent),
+       TP_ARGS(agent));
+DEFINE_EVENT(ib_mad_agent_template, ib_mad_unregister_agent,
+       TP_PROTO(struct ib_mad_agent_private *agent),
+       TP_ARGS(agent));
+
 
 #endif /* _TRACE_IB_MAD_H */