lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 7 Dec 2017 10:30:05 +0100 From: Uwe Kleine-König <u.kleine-koenig@...gutronix.de> To: linux-kernel@...r.kernel.org, Greg Kroah-Hartman <gregkh@...uxfoundation.org> Cc: kernel@...gutronix.de, Gavin Schenk <g.schenk@...elmann.de> Subject: [PATCH v1 2/5] siox: add support for tracing Implement tracing for SIOX. There are events for the data that is written to the bus and for data being read from it. Acked-by: Gavin Schenk <g.schenk@...elmann.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@...gutronix.de> --- drivers/siox/siox-core.c | 13 +++++++++ include/trace/events/siox.h | 66 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 include/trace/events/siox.h diff --git a/drivers/siox/siox-core.c b/drivers/siox/siox-core.c index 8578972ba18b..1a6383df9f32 100644 --- a/drivers/siox/siox-core.c +++ b/drivers/siox/siox-core.c @@ -33,6 +33,9 @@ */ #define SIOX_STATUS_TYPE 0xf0 +#define CREATE_TRACE_POINTS +#include <trace/events/siox.h> + static bool siox_is_registered; static void siox_master_lock(struct siox_master *smaster) @@ -126,6 +129,7 @@ static void siox_poll(struct siox_master *smaster) { struct siox_device *sdevice; size_t i = smaster->setbuf_len; + unsigned int devno = 0; int unsync_error = 0; smaster->last_poll = jiffies; @@ -172,9 +176,14 @@ static void siox_poll(struct siox_master *smaster) sdevice->status_written &= ~SIOX_STATUS_WDG; smaster->buf[i] = sdevice->status_written; + + trace_siox_set_data(smaster, sdevice, devno, i); + + devno++; } WARN_ON(i); + WARN_ON(devno != smaster->num_devices); smaster->pushpull(smaster, smaster->setbuf_len, smaster->buf, smaster->getbuf_len, @@ -183,6 +192,7 @@ static void siox_poll(struct siox_master *smaster) unsync_error = 0; /* interpret data pulled in from devices in buf[setbuf_len..] */ + devno = 0; i = smaster->setbuf_len; list_for_each_entry(sdevice, &smaster->devices, node) { struct siox_driver *sdriver = @@ -257,10 +267,13 @@ static void siox_poll(struct siox_master *smaster) sdevice->status_written_lastcycle = sdevice->status_written; sdevice->connected = connected; + trace_siox_get_data(smaster, sdevice, devno, status_clean, i); + /* only give data read to driver if the device is connected */ if (sdriver && connected) sdriver->get_data(sdevice, &smaster->buf[i]); + devno++; i += sdevice->outbytes; } } diff --git a/include/trace/events/siox.h b/include/trace/events/siox.h new file mode 100644 index 000000000000..6ab0b2cc37fe --- /dev/null +++ b/include/trace/events/siox.h @@ -0,0 +1,66 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM siox + +#if !defined(_TRACE_SIOX_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_SIOX_H + +#include <linux/tracepoint.h> + +TRACE_EVENT(siox_set_data, + TP_PROTO(const struct siox_master *smaster, + const struct siox_device *sdevice, + unsigned int devno, size_t bufoffset), + TP_ARGS(smaster, sdevice, devno, bufoffset), + TP_STRUCT__entry( + __field(int, busno) + __field(unsigned int, devno) + __field(size_t, inbytes) + __dynamic_array(u8, buf, sdevice->inbytes) + ), + TP_fast_assign( + __entry->busno = smaster->busno; + __entry->devno = devno; + __entry->inbytes = sdevice->inbytes; + memcpy(__get_dynamic_array(buf), + smaster->buf + bufoffset, sdevice->inbytes); + ), + TP_printk("siox-%d-%u [%*phD]", + __entry->busno, + __entry->devno, + __entry->inbytes, __get_dynamic_array(buf) + ) +); + +TRACE_EVENT(siox_get_data, + TP_PROTO(const struct siox_master *smaster, + const struct siox_device *sdevice, + unsigned int devno, u8 status_clean, + size_t bufoffset), + TP_ARGS(smaster, sdevice, devno, status_clean, bufoffset), + TP_STRUCT__entry( + __field(int, busno) + __field(unsigned int, devno) + __field(u8, status_clean) + __field(size_t, outbytes) + __dynamic_array(u8, buf, sdevice->outbytes) + ), + TP_fast_assign( + __entry->busno = smaster->busno; + __entry->devno = devno; + __entry->status_clean = status_clean; + __entry->outbytes = sdevice->outbytes; + memcpy(__get_dynamic_array(buf), + smaster->buf + bufoffset, sdevice->outbytes); + ), + TP_printk("siox-%d-%u (%02hhx) [%*phD]", + __entry->busno, + __entry->devno, + __entry->status_clean, + __entry->outbytes, __get_dynamic_array(buf) + ) +); + +#endif /* if !defined(_TRACE_SIOX_H) || defined(TRACE_HEADER_MULTI_READ) */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> -- 2.11.0
Powered by blists - more mailing lists