redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

IB/UMAD: Add umad trace points 

Trace MADs going to/from user space.

Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
hifive-unleashed-5.2
Ira Weiny 2019-03-19 14:11:47 -07:00 committed by Jason Gunthorpe
parent 0e65bae205
commit 056533192a
3 changed files with 139 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -7654,6 +7654,7 @@ F: include/uapi/linux/if_infiniband.h
F: include/uapi/rdma/
F: include/rdma/
F: include/trace/events/ib_mad.h
F: include/trace/events/ib_umad.h
INGENIC JZ4780 DMA Driver
M: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>

12
drivers/infiniband/core/user_mad.c
View File

@ -129,6 +129,9 @@ struct ib_umad_packet {
struct ib_user_mad mad;
};
#define CREATE_TRACE_POINTS
#include <trace/events/ib_umad.h>
static const dev_t base_umad_dev = MKDEV(IB_UMAD_MAJOR, IB_UMAD_MINOR_BASE);
static const dev_t base_issm_dev = MKDEV(IB_UMAD_MAJOR, IB_UMAD_MINOR_BASE) +
IB_UMAD_NUM_FIXED_MINOR;
@ -334,6 +337,9 @@ static ssize_t copy_recv_mad(struct ib_umad_file *file, char __user *buf,
return -EFAULT;
}
}
trace_ib_umad_read_recv(file, &packet->mad.hdr, &recv_buf->mad->mad_hdr);
return hdr_size(file) + packet->length;
}
@ -353,6 +359,9 @@ static ssize_t copy_send_mad(struct ib_umad_file *file, char __user *buf,
if (copy_to_user(buf, packet->mad.data, packet->length))
return -EFAULT;
trace_ib_umad_read_send(file, &packet->mad.hdr,
(struct ib_mad_hdr *)&packet->mad.data);
return size;
}
@ -508,6 +517,9 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
mutex_lock(&file->mutex);
trace_ib_umad_write(file, &packet->mad.hdr,
(struct ib_mad_hdr *)&packet->mad.data);
agent = __get_agent(file, packet->mad.hdr.id);
if (!agent) {
ret = -EINVAL;

126
include/trace/events/ib_umad.h 100644
View File

@ -0,0 +1,126 @@
/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */
/*
* Copyright (c) 2018 Intel Corporation. All rights reserved.
*
*/
#undef TRACE_SYSTEM
#define TRACE_SYSTEM ib_umad
#if !defined(_TRACE_IB_UMAD_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_IB_UMAD_H
#include <linux/tracepoint.h>
DECLARE_EVENT_CLASS(ib_umad_template,
TP_PROTO(struct ib_umad_file *file, struct ib_user_mad_hdr *umad_hdr,
struct ib_mad_hdr *mad_hdr),
TP_ARGS(file, umad_hdr, mad_hdr),
TP_STRUCT__entry(
__field(u8, port_num)
__field(u8, sl)
__field(u8, path_bits)
__field(u8, grh_present)
__field(u32, id)
__field(u32, status)
__field(u32, timeout_ms)
__field(u32, retires)
__field(u32, length)
__field(u32, qpn)
__field(u32, qkey)
__field(u8, gid_index)
__field(u8, hop_limit)
__field(u16, lid)
__field(u16, attr_id)
__field(u16, pkey_index)
__field(u8, base_version)
__field(u8, mgmt_class)
__field(u8, class_version)
__field(u8, method)
__field(u32, flow_label)
__field(u16, mad_status)
__field(u16, class_specific)
__field(u32, attr_mod)
__field(u64, tid)
__array(u8, gid, 16)
__field(u32, dev_index)
__field(u8, traffic_class)
),
TP_fast_assign(
__entry->dev_index = file->port->ib_dev->index;
__entry->port_num = file->port->port_num;
__entry->id = umad_hdr->id;
__entry->status = umad_hdr->status;
__entry->timeout_ms = umad_hdr->timeout_ms;
__entry->retires = umad_hdr->retries;
__entry->length = umad_hdr->length;
__entry->qpn = umad_hdr->qpn;
__entry->qkey = umad_hdr->qkey;
__entry->lid = umad_hdr->lid;
__entry->sl = umad_hdr->sl;
__entry->path_bits = umad_hdr->path_bits;
__entry->grh_present = umad_hdr->grh_present;
__entry->gid_index = umad_hdr->gid_index;
__entry->hop_limit = umad_hdr->hop_limit;
__entry->traffic_class = umad_hdr->traffic_class;
memcpy(__entry->gid, umad_hdr->gid, sizeof(umad_hdr->gid));
__entry->flow_label = umad_hdr->flow_label;
__entry->pkey_index = umad_hdr->pkey_index;
__entry->base_version = mad_hdr->base_version;
__entry->mgmt_class = mad_hdr->mgmt_class;
__entry->class_version = mad_hdr->class_version;
__entry->method = mad_hdr->method;
__entry->mad_status = mad_hdr->status;
__entry->class_specific = mad_hdr->class_specific;
__entry->tid = mad_hdr->tid;
__entry->attr_id = mad_hdr->attr_id;
__entry->attr_mod = mad_hdr->attr_mod;
),
TP_printk("%d:%d umad_hdr: id 0x%08x status 0x%08x ms %u ret %u " \
"len %u QP%u qkey 0x%08x lid 0x%04x sl %u path_bits 0x%x " \
"grh 0x%x gidi %u hop_lim %u traf_cl %u gid %pI6c " \
"flow 0x%08x pkeyi %u MAD: base_ver 0x%x class 0x%x " \
"class_ver 0x%x method 0x%x status 0x%04x " \
"class_specific 0x%04x tid 0x%016llx attr_id 0x%04x " \
"attr_mod 0x%08x ",
__entry->dev_index, __entry->port_num,
__entry->id, __entry->status, __entry->timeout_ms,
__entry->retires, __entry->length, be32_to_cpu(__entry->qpn),
be32_to_cpu(__entry->qkey), be16_to_cpu(__entry->lid),
__entry->sl, __entry->path_bits, __entry->grh_present,
__entry->gid_index, __entry->hop_limit,
__entry->traffic_class, &__entry->gid,
be32_to_cpu(__entry->flow_label), __entry->pkey_index,
__entry->base_version, __entry->mgmt_class,
__entry->class_version, __entry->method,
be16_to_cpu(__entry->mad_status),
be16_to_cpu(__entry->class_specific),
be64_to_cpu(__entry->tid), be16_to_cpu(__entry->attr_id),
be32_to_cpu(__entry->attr_mod)
)
);
DEFINE_EVENT(ib_umad_template, ib_umad_write,
TP_PROTO(struct ib_umad_file *file, struct ib_user_mad_hdr *umad_hdr,
struct ib_mad_hdr *mad_hdr),
TP_ARGS(file, umad_hdr, mad_hdr));
DEFINE_EVENT(ib_umad_template, ib_umad_read_recv,
TP_PROTO(struct ib_umad_file *file, struct ib_user_mad_hdr *umad_hdr,
struct ib_mad_hdr *mad_hdr),
TP_ARGS(file, umad_hdr, mad_hdr));
DEFINE_EVENT(ib_umad_template, ib_umad_read_send,
TP_PROTO(struct ib_umad_file *file, struct ib_user_mad_hdr *umad_hdr,
struct ib_mad_hdr *mad_hdr),
TP_ARGS(file, umad_hdr, mad_hdr));
#endif /* _TRACE_IB_UMAD_H */
#include <trace/define_trace.h>