6 files changed, 282 insertions, 9 deletions

diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index 5fc2dcdd21cd..03996b2bb04f 100644
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@@ -14,6 +14,7 @@ struct snd_soc_codec;
 struct snd_soc_platform;
 struct snd_soc_card;
 struct snd_soc_dapm_widget;
+struct snd_soc_dapm_path;
 
 /*
  * Log register events
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 52ae54828eda..e0dc355fa317 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -36,6 +36,11 @@
                 { CURSEG_COLD_NODE,     "Cold NODE" },                  \
                 { NO_CHECK_TYPE,        "No TYPE" })
 
+#define show_file_type(type)                                            \
+        __print_symbolic(type,                                          \
+                { 0,            "FILE" },                               \
+                { 1,            "DIR" })
+
 #define show_gc_type(type)                                              \
         __print_symbolic(type,                                          \
                 { FG_GC,        "Foreground GC" },                      \
@@ -623,6 +628,52 @@ TRACE_EVENT(f2fs_do_submit_bio,
                 __entry->size)
 );
 
+DECLARE_EVENT_CLASS(f2fs__page,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(int, type)
+                __field(int, dir)
+                __field(pgoff_t, index)
+                __field(int, dirty)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = page->mapping->host->i_sb->s_dev;
+                __entry->ino    = page->mapping->host->i_ino;
+                __entry->type   = type;
+                __entry->dir    = S_ISDIR(page->mapping->host->i_mode);
+                __entry->index  = page->index;
+                __entry->dirty  = PageDirty(page);
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, %s, %s, index = %lu, dirty = %d",
+                show_dev_ino(__entry),
+                show_block_type(__entry->type),
+                show_file_type(__entry->dir),
+                (unsigned long)__entry->index,
+                __entry->dirty)
+);
+
+DEFINE_EVENT(f2fs__page, f2fs_set_page_dirty,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type)
+);
+
+DEFINE_EVENT(f2fs__page, f2fs_vm_page_mkwrite,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type)
+);
+
 TRACE_EVENT(f2fs_submit_write_page,
 
         TP_PROTO(struct page *page, block_t blk_addr, int type),
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index d0c613476620..aece1346ceb7 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -267,14 +267,12 @@ DEFINE_EVENT_PRINT(mm_page, mm_page_pcpu_drain,
 TRACE_EVENT(mm_page_alloc_extfrag,
 
         TP_PROTO(struct page *page,
-                        int alloc_order, int fallback_order,
-                        int alloc_migratetype, int fallback_migratetype,
-                        int change_ownership),
+                int alloc_order, int fallback_order,
+                int alloc_migratetype, int fallback_migratetype, int new_migratetype),
 
         TP_ARGS(page,
                 alloc_order, fallback_order,
-                alloc_migratetype, fallback_migratetype,
-                change_ownership),
+                alloc_migratetype, fallback_migratetype, new_migratetype),
 
         TP_STRUCT__entry(
                 __field(        struct page *,  page                    )
@@ -291,7 +289,7 @@ TRACE_EVENT(mm_page_alloc_extfrag,
                 __entry->fallback_order         = fallback_order;
                 __entry->alloc_migratetype      = alloc_migratetype;
                 __entry->fallback_migratetype   = fallback_migratetype;
-                __entry->change_ownership       = change_ownership;
+                __entry->change_ownership       = (new_migratetype == alloc_migratetype);
         ),
 
         TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
diff --git a/include/trace/events/power_cpu_migrate.h b/include/trace/events/power_cpu_migrate.h
new file mode 100644
index 000000000000..f76dd4de625e
--- /dev/null
+++ b/include/trace/events/power_cpu_migrate.h
@@ -0,0 +1,67 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM power
+
+#if !defined(_TRACE_POWER_CPU_MIGRATE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_POWER_CPU_MIGRATE_H
+
+#include <linux/tracepoint.h>
+
+#define __cpu_migrate_proto                     \
+        TP_PROTO(u64 timestamp,                 \
+                 u32 cpu_hwid)
+#define __cpu_migrate_args                      \
+        TP_ARGS(timestamp,                      \
+                cpu_hwid)
+
+DECLARE_EVENT_CLASS(cpu_migrate,
+
+        __cpu_migrate_proto,
+        __cpu_migrate_args,
+
+        TP_STRUCT__entry(
+                __field(u64,    timestamp               )
+                __field(u32,    cpu_hwid                )
+        ),
+
+        TP_fast_assign(
+                __entry->timestamp = timestamp;
+                __entry->cpu_hwid = cpu_hwid;
+        ),
+
+        TP_printk("timestamp=%llu cpu_hwid=0x%08lX",
+                (unsigned long long)__entry->timestamp,
+                (unsigned long)__entry->cpu_hwid
+        )
+);
+
+#define __define_cpu_migrate_event(name)                \
+        DEFINE_EVENT(cpu_migrate, cpu_migrate_##name,   \
+                __cpu_migrate_proto,                    \
+                __cpu_migrate_args                      \
+        )
+
+__define_cpu_migrate_event(begin);
+__define_cpu_migrate_event(finish);
+__define_cpu_migrate_event(current);
+
+#undef __define_cpu_migrate
+#undef __cpu_migrate_proto
+#undef __cpu_migrate_args
+
+/* This file can get included multiple times, TRACE_HEADER_MULTI_READ at top */
+#ifndef _PWR_CPU_MIGRATE_EVENT_AVOID_DOUBLE_DEFINING
+#define _PWR_CPU_MIGRATE_EVENT_AVOID_DOUBLE_DEFINING
+
+/*
+ * Set from_phys_cpu and to_phys_cpu to CPU_MIGRATE_ALL_CPUS to indicate
+ * a whole-cluster migration:
+ */
+#define CPU_MIGRATE_ALL_CPUS 0x80000000U
+#endif
+
+#endif /* _TRACE_POWER_CPU_MIGRATE_H */
+
+/* This part must be outside protection */
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE power_cpu_migrate
+#include <trace/define_trace.h>
diff --git a/include/trace/events/spi.h b/include/trace/events/spi.h
new file mode 100644
index 000000000000..7e02c983bbe2
--- /dev/null
+++ b/include/trace/events/spi.h
@@ -0,0 +1,156 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM spi
+
+#if !defined(_TRACE_SPI_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_SPI_H
+
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+
+DECLARE_EVENT_CLASS(spi_master,
+
+        TP_PROTO(struct spi_master *master),
+
+        TP_ARGS(master),
+
+        TP_STRUCT__entry(
+                __field(        int,           bus_num             )
+        ),
+
+        TP_fast_assign(
+                __entry->bus_num = master->bus_num;
+        ),
+
+        TP_printk("spi%d", (int)__entry->bus_num)
+
+);
+
+DEFINE_EVENT(spi_master, spi_master_idle,
+
+        TP_PROTO(struct spi_master *master),
+
+        TP_ARGS(master)
+
+);
+
+DEFINE_EVENT(spi_master, spi_master_busy,
+
+        TP_PROTO(struct spi_master *master),
+
+        TP_ARGS(master)
+
+);
+
+DECLARE_EVENT_CLASS(spi_message,
+
+        TP_PROTO(struct spi_message *msg),
+
+        TP_ARGS(msg),
+
+        TP_STRUCT__entry(
+                __field(        int,            bus_num         )
+                __field(        int,            chip_select     )
+                __field(        struct spi_message *,   msg     )
+        ),
+
+        TP_fast_assign(
+                __entry->bus_num = msg->spi->master->bus_num;
+                __entry->chip_select = msg->spi->chip_select;
+                __entry->msg = msg;
+        ),
+
+        TP_printk("spi%d.%d %p", (int)__entry->bus_num,
+                  (int)__entry->chip_select,
+                  (struct spi_message *)__entry->msg)
+);
+
+DEFINE_EVENT(spi_message, spi_message_submit,
+
+        TP_PROTO(struct spi_message *msg),
+
+        TP_ARGS(msg)
+
+);
+
+DEFINE_EVENT(spi_message, spi_message_start,
+
+        TP_PROTO(struct spi_message *msg),
+
+        TP_ARGS(msg)
+
+);
+
+TRACE_EVENT(spi_message_done,
+
+        TP_PROTO(struct spi_message *msg),
+
+        TP_ARGS(msg),
+
+        TP_STRUCT__entry(
+                __field(        int,            bus_num         )
+                __field(        int,            chip_select     )
+                __field(        struct spi_message *,   msg     )
+                __field(        unsigned,       frame           )
+                __field(        unsigned,       actual          )
+        ),
+
+        TP_fast_assign(
+                __entry->bus_num = msg->spi->master->bus_num;
+                __entry->chip_select = msg->spi->chip_select;
+                __entry->msg = msg;
+                __entry->frame = msg->frame_length;
+                __entry->actual = msg->actual_length;
+        ),
+
+        TP_printk("spi%d.%d %p len=%u/%u", (int)__entry->bus_num,
+                  (int)__entry->chip_select,
+                  (struct spi_message *)__entry->msg,
+                  (unsigned)__entry->actual, (unsigned)__entry->frame)
+);
+
+DECLARE_EVENT_CLASS(spi_transfer,
+
+        TP_PROTO(struct spi_message *msg, struct spi_transfer *xfer),
+
+        TP_ARGS(msg, xfer),
+
+        TP_STRUCT__entry(
+                __field(        int,            bus_num         )
+                __field(        int,            chip_select     )
+                __field(        struct spi_transfer *,   xfer   )
+                __field(        int,            len             )
+        ),
+
+        TP_fast_assign(
+                __entry->bus_num = msg->spi->master->bus_num;
+                __entry->chip_select = msg->spi->chip_select;
+                __entry->xfer = xfer;
+                __entry->len = xfer->len;
+        ),
+
+        TP_printk("spi%d.%d %p len=%d", (int)__entry->bus_num,
+                  (int)__entry->chip_select,
+                  (struct spi_message *)__entry->xfer,
+                  (int)__entry->len)
+);
+
+DEFINE_EVENT(spi_transfer, spi_transfer_start,
+
+        TP_PROTO(struct spi_message *msg, struct spi_transfer *xfer),
+
+        TP_ARGS(msg, xfer)
+
+);
+
+DEFINE_EVENT(spi_transfer, spi_transfer_stop,
+
+        TP_PROTO(struct spi_message *msg, struct spi_transfer *xfer),
+
+        TP_ARGS(msg, xfer)
+
+);
+
+#endif /* _TRACE_POWER_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 464ea82e10db..c7bbbe794e65 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -287,11 +287,11 @@ TRACE_EVENT(writeback_queue_io,
                 __field(int,            reason)
         ),
         TP_fast_assign(
-                unsigned long *older_than_this = work->older_than_this;
+                unsigned long older_than_this = work->older_than_this;
                 strncpy(__entry->name, dev_name(wb->bdi->dev), 32);
-                __entry->older  = older_than_this ?  *older_than_this : 0;
+                __entry->older  = older_than_this;
                 __entry->age    = older_than_this ?
-                                  (jiffies - *older_than_this) * 1000 / HZ : -1;
+                                  (jiffies - older_than_this) * 1000 / HZ : -1;
                 __entry->moved  = moved;
                 __entry->reason = work->reason;
         ),