s390 cio: Rewrite trace point in s390_cio_stcrw

Tools like 'perf stat' parse the trace point format files defined
in /sys/kernel/debug/tracing/events/s390/.../format to handle
the print fmt: statement. The kernel provides a library in
directory linux/tools/lib/traceevent/* for this reason.

This library can not handle structures or unions defined in
the TRACE_EVENT/TP_STRUCT__entry macros with __field_struct macro.
There is no possibility to extract a structure member
(which might be a bit field) since there is no packing
information nor bit field offset by parsing the printf fmt line.

Therefore rewrite the TRACE_EVENT macro and add the
the __field macro for the missing members.
Keep the __fieldstruct macro to extract the complete
structure when dumps are analysed.

Note that the same information is displayed, this is no
interface change.

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Acked-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/cio/trace.h b/drivers/s390/cio/trace.h
index 5c06b680471e807edfe3c3864d442cae24b32399..baff0303533efd4bdc50a3e40a67777bb8635f76 100644 (file)
--- a/drivers/s390/cio/trace.h
+++ b/drivers/s390/cio/trace.h
@@ -349,16 +349,30 @@ TRACE_EVENT(s390_cio_stcrw,
        TP_STRUCT__entry(
                __field_struct(struct crw, crw)
                __field(int, cc)
+               __field(u8, slct)
+               __field(u8, oflw)
+               __field(u8, chn)
+               __field(u8, rsc)
+               __field(u8, anc)
+               __field(u8, erc)
+               __field(u16, rsid)
        ),
        TP_fast_assign(
                __entry->crw = *crw;
                __entry->cc = cc;
+               __entry->slct = crw->slct;
+               __entry->oflw = crw->oflw;
+               __entry->chn = crw->chn;
+               __entry->rsc = crw->rsc;
+               __entry->anc = crw->anc;
+               __entry->erc = crw->erc;
+               __entry->rsid = crw->rsid;
        ),
        TP_printk("cc=%d slct=%d oflw=%d chn=%d rsc=%d anc=%d erc=0x%x "
                  "rsid=0x%x",
-                 __entry->cc, __entry->crw.slct, __entry->crw.oflw,
-                 __entry->crw.chn, __entry->crw.rsc,  __entry->crw.anc,
-                 __entry->crw.erc, __entry->crw.rsid
+                 __entry->cc, __entry->slct, __entry->oflw,
+                 __entry->chn, __entry->rsc,  __entry->anc,
+                 __entry->erc, __entry->rsid
        )
 );