7 files changed, 177 insertions, 122 deletions

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index d49b285385e8..f6372b011366 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -15,6 +15,7 @@ struct ext4_inode_info;
 struct mpage_da_data;
 struct ext4_map_blocks;
 struct ext4_extent;
+struct extent_status;
 
 #define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode))
 
@@ -1519,10 +1520,9 @@ DEFINE_EVENT(ext4__map_blocks_enter, ext4_ind_map_blocks_enter,
 );
 
 DECLARE_EVENT_CLASS(ext4__map_blocks_exit,
-        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
-                 ext4_fsblk_t pblk, unsigned int len, int ret),
+        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
 
-        TP_ARGS(inode, lblk, pblk, len, ret),
+        TP_ARGS(inode, map, ret),
 
         TP_STRUCT__entry(
                 __field(        dev_t,          dev             )
@@ -1530,37 +1530,37 @@ DECLARE_EVENT_CLASS(ext4__map_blocks_exit,
                 __field(        ext4_fsblk_t,   pblk            )
                 __field(        ext4_lblk_t,    lblk            )
                 __field(        unsigned int,   len             )
+                __field(        unsigned int,   flags           )
                 __field(        int,            ret             )
         ),
 
         TP_fast_assign(
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
-                __entry->pblk   = pblk;
-                __entry->lblk   = lblk;
-                __entry->len    = len;
+                __entry->pblk   = map->m_pblk;
+                __entry->lblk   = map->m_lblk;
+                __entry->len    = map->m_len;
+                __entry->flags  = map->m_flags;
                 __entry->ret    = ret;
         ),
 
-        TP_printk("dev %d,%d ino %lu lblk %u pblk %llu len %u ret %d",
+        TP_printk("dev %d,%d ino %lu lblk %u pblk %llu len %u flags %x ret %d",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->lblk, __entry->pblk,
-                  __entry->len, __entry->ret)
+                  __entry->len, __entry->flags, __entry->ret)
 );
 
 DEFINE_EVENT(ext4__map_blocks_exit, ext4_ext_map_blocks_exit,
-        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
-                 ext4_fsblk_t pblk, unsigned len, int ret),
+        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
 
-        TP_ARGS(inode, lblk, pblk, len, ret)
+        TP_ARGS(inode, map, ret)
 );
 
 DEFINE_EVENT(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
-        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
-                 ext4_fsblk_t pblk, unsigned len, int ret),
+        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
 
-        TP_ARGS(inode, lblk, pblk, len, ret)
+        TP_ARGS(inode, map, ret)
 );
 
 TRACE_EVENT(ext4_ext_load_extent,
@@ -1680,10 +1680,10 @@ DEFINE_EVENT(ext4__trim, ext4_trim_all_free,
 );
 
 TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
-        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
+        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int flags,
                  unsigned int allocated, ext4_fsblk_t newblock),
 
-        TP_ARGS(inode, map, allocated, newblock),
+        TP_ARGS(inode, map, flags, allocated, newblock),
 
         TP_STRUCT__entry(
                 __field(        dev_t,          dev             )
@@ -1699,7 +1699,7 @@ TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
         TP_fast_assign(
                 __entry->dev            = inode->i_sb->s_dev;
                 __entry->ino            = inode->i_ino;
-                __entry->flags          = map->m_flags;
+                __entry->flags          = flags;
                 __entry->lblk           = map->m_lblk;
                 __entry->pblk           = map->m_pblk;
                 __entry->len            = map->m_len;
@@ -1707,7 +1707,7 @@ TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
                 __entry->newblk         = newblock;
         ),
 
-        TP_printk("dev %d,%d ino %lu m_lblk %u m_pblk %llu m_len %u flags %d"
+        TP_printk("dev %d,%d ino %lu m_lblk %u m_pblk %llu m_len %u flags %x "
                   "allocated %d newblock %llu",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
@@ -2055,6 +2055,106 @@ TRACE_EVENT(ext4_ext_remove_space_done,
                   (unsigned short) __entry->eh_entries)
 );
 
+TRACE_EVENT(ext4_es_insert_extent,
+        TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t len),
+
+        TP_ARGS(inode, start, len),
+
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        loff_t, start                   )
+                __field(        loff_t, len                     )
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->start  = start;
+                __entry->len    = len;
+        ),
+
+        TP_printk("dev %d,%d ino %lu es [%lld/%lld)",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->start, __entry->len)
+);
+
+TRACE_EVENT(ext4_es_remove_extent,
+        TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t len),
+
+        TP_ARGS(inode, start, len),
+
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        loff_t, start                   )
+                __field(        loff_t, len                     )
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->start  = start;
+                __entry->len    = len;
+        ),
+
+        TP_printk("dev %d,%d ino %lu es [%lld/%lld)",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->start, __entry->len)
+);
+
+TRACE_EVENT(ext4_es_find_extent_enter,
+        TP_PROTO(struct inode *inode, ext4_lblk_t start),
+
+        TP_ARGS(inode, start),
+
+        TP_STRUCT__entry(
+                __field(        dev_t,          dev             )
+                __field(        ino_t,          ino             )
+                __field(        ext4_lblk_t,    start           )
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->start  = start;
+        ),
+
+        TP_printk("dev %d,%d ino %lu start %u",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino, __entry->start)
+);
+
+TRACE_EVENT(ext4_es_find_extent_exit,
+        TP_PROTO(struct inode *inode, struct extent_status *es,
+                 ext4_lblk_t ret),
+
+        TP_ARGS(inode, es, ret),
+
+        TP_STRUCT__entry(
+                __field(        dev_t,          dev             )
+                __field(        ino_t,          ino             )
+                __field(        ext4_lblk_t,    start           )
+                __field(        ext4_lblk_t,    len             )
+                __field(        ext4_lblk_t,    ret             )
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->start  = es->start;
+                __entry->len    = es->len;
+                __entry->ret    = ret;
+        ),
+
+        TP_printk("dev %d,%d ino %lu es [%u/%u) ret %u",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->start, __entry->len, __entry->ret)
+);
+
 #endif /* _TRACE_EXT4_H */
 
 /* This part must be outside protection */
diff --git a/include/trace/events/migrate.h b/include/trace/events/migrate.h
new file mode 100644
index 000000000000..ec2a6ccfd7e5
--- /dev/null
+++ b/include/trace/events/migrate.h
@@ -0,0 +1,51 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM migrate
+
+#if !defined(_TRACE_MIGRATE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_MIGRATE_H
+
+#define MIGRATE_MODE                                            \
+        {MIGRATE_ASYNC,         "MIGRATE_ASYNC"},               \
+        {MIGRATE_SYNC_LIGHT,    "MIGRATE_SYNC_LIGHT"},          \
+        {MIGRATE_SYNC,          "MIGRATE_SYNC"}         
+
+#define MIGRATE_REASON                                          \
+        {MR_COMPACTION,         "compaction"},                  \
+        {MR_MEMORY_FAILURE,     "memory_failure"},              \
+        {MR_MEMORY_HOTPLUG,     "memory_hotplug"},              \
+        {MR_SYSCALL,            "syscall_or_cpuset"},           \
+        {MR_MEMPOLICY_MBIND,    "mempolicy_mbind"},             \
+        {MR_CMA,                "cma"}
+
+TRACE_EVENT(mm_migrate_pages,
+
+        TP_PROTO(unsigned long succeeded, unsigned long failed,
+                 enum migrate_mode mode, int reason),
+
+        TP_ARGS(succeeded, failed, mode, reason),
+
+        TP_STRUCT__entry(
+                __field(        unsigned long,          succeeded)
+                __field(        unsigned long,          failed)
+                __field(        enum migrate_mode,      mode)
+                __field(        int,                    reason)
+        ),
+
+        TP_fast_assign(
+                __entry->succeeded      = succeeded;
+                __entry->failed         = failed;
+                __entry->mode           = mode;
+                __entry->reason         = reason;
+        ),
+
+        TP_printk("nr_succeeded=%lu nr_failed=%lu mode=%s reason=%s",
+                __entry->succeeded,
+                __entry->failed,
+                __print_symbolic(__entry->mode, MIGRATE_MODE),
+                __print_symbolic(__entry->reason, MIGRATE_REASON))
+);
+
+#endif /* _TRACE_MIGRATE_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/oom.h b/include/trace/events/oom.h
index dd4ba3b92002..1e974983757e 100644
--- a/include/trace/events/oom.h
+++ b/include/trace/events/oom.h
@@ -14,7 +14,7 @@ TRACE_EVENT(oom_score_adj_update,
         TP_STRUCT__entry(
                 __field(        pid_t,  pid)
                 __array(        char,   comm,   TASK_COMM_LEN )
-                __field(         int,   oom_score_adj)
+                __field(        short,  oom_score_adj)
         ),
 
         TP_fast_assign(
@@ -23,7 +23,7 @@ TRACE_EVENT(oom_score_adj_update,
                 __entry->oom_score_adj = task->signal->oom_score_adj;
         ),
 
-        TP_printk("pid=%d comm=%s oom_score_adj=%d",
+        TP_printk("pid=%d comm=%s oom_score_adj=%hd",
                 __entry->pid, __entry->comm, __entry->oom_score_adj)
 );
 
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
index 5bde94d8585b..d4f559b1ec34 100644
--- a/include/trace/events/rcu.h
+++ b/include/trace/events/rcu.h
@@ -549,6 +549,7 @@ TRACE_EVENT(rcu_torture_read,
  *      "EarlyExit": rcu_barrier_callback() piggybacked, thus early exit.
  *      "Inc1": rcu_barrier_callback() piggyback check counter incremented.
  *      "Offline": rcu_barrier_callback() found offline CPU
+ *      "OnlineNoCB": rcu_barrier_callback() found online no-CBs CPU.
  *      "OnlineQ": rcu_barrier_callback() found online CPU with callbacks.
  *      "OnlineNQ": rcu_barrier_callback() found online CPU, no callbacks.
  *      "IRQ": An rcu_barrier_callback() callback posted on remote CPU.
diff --git a/include/trace/events/task.h b/include/trace/events/task.h
index b53add02e929..102a646e1996 100644
--- a/include/trace/events/task.h
+++ b/include/trace/events/task.h
@@ -15,7 +15,7 @@ TRACE_EVENT(task_newtask,
                 __field(        pid_t,  pid)
                 __array(        char,   comm, TASK_COMM_LEN)
                 __field( unsigned long, clone_flags)
-                __field(        int,    oom_score_adj)
+                __field(        short,  oom_score_adj)
         ),
 
         TP_fast_assign(
@@ -25,7 +25,7 @@ TRACE_EVENT(task_newtask,
                 __entry->oom_score_adj = task->signal->oom_score_adj;
         ),
 
-        TP_printk("pid=%d comm=%s clone_flags=%lx oom_score_adj=%d",
+        TP_printk("pid=%d comm=%s clone_flags=%lx oom_score_adj=%hd",
                 __entry->pid, __entry->comm,
                 __entry->clone_flags, __entry->oom_score_adj)
 );
@@ -40,7 +40,7 @@ TRACE_EVENT(task_rename,
                 __field(        pid_t,  pid)
                 __array(        char, oldcomm,  TASK_COMM_LEN)
                 __array(        char, newcomm,  TASK_COMM_LEN)
-                __field(        int, oom_score_adj)
+                __field(        short,  oom_score_adj)
         ),
 
         TP_fast_assign(
@@ -50,7 +50,7 @@ TRACE_EVENT(task_rename,
                 __entry->oom_score_adj = task->signal->oom_score_adj;
         ),
 
-        TP_printk("pid=%d oldcomm=%s newcomm=%s oom_score_adj=%d",
+        TP_printk("pid=%d oldcomm=%s newcomm=%s oom_score_adj=%hd",
                 __entry->pid, __entry->oldcomm,
                 __entry->newcomm, __entry->oom_score_adj)
 );
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index a763888a36f9..40dc5e8fe340 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -545,8 +545,7 @@ ftrace_raw_event_##call(void *__data, proto)				\
         { assign; }                                                     \
                                                                         \
         if (!filter_current_check_discard(buffer, event_call, entry, event)) \
-                trace_nowake_buffer_unlock_commit(buffer,               \
-                                                  event, irq_flags, pc); \
+                trace_buffer_unlock_commit(buffer, event, irq_flags, pc); \
 }
 /*
  * The ftrace_test_probe is compiled out, it is only here as a build time check
@@ -620,79 +619,6 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
 
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
-/*
- * Define the insertion callback to perf events
- *
- * The job is very similar to ftrace_raw_event_<call> except that we don't
- * insert in the ring buffer but in a perf counter.
- *
- * static void ftrace_perf_<call>(proto)
- * {
- *      struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;
- *      struct ftrace_event_call *event_call = &event_<call>;
- *      extern void perf_tp_event(int, u64, u64, void *, int);
- *      struct ftrace_raw_##call *entry;
- *      struct perf_trace_buf *trace_buf;
- *      u64 __addr = 0, __count = 1;
- *      unsigned long irq_flags;
- *      struct trace_entry *ent;
- *      int __entry_size;
- *      int __data_size;
- *      int __cpu
- *      int pc;
- *
- *      pc = preempt_count();
- *
- *      __data_size = ftrace_get_offsets_<call>(&__data_offsets, args);
- *
- *      // Below we want to get the aligned size by taking into account
- *      // the u32 field that will later store the buffer size
- *      __entry_size = ALIGN(__data_size + sizeof(*entry) + sizeof(u32),
- *                           sizeof(u64));
- *      __entry_size -= sizeof(u32);
- *
- *      // Protect the non nmi buffer
- *      // This also protects the rcu read side
- *      local_irq_save(irq_flags);
- *      __cpu = smp_processor_id();
- *
- *      if (in_nmi())
- *              trace_buf = rcu_dereference_sched(perf_trace_buf_nmi);
- *      else
- *              trace_buf = rcu_dereference_sched(perf_trace_buf);
- *
- *      if (!trace_buf)
- *              goto end;
- *
- *      trace_buf = per_cpu_ptr(trace_buf, __cpu);
- *
- *      // Avoid recursion from perf that could mess up the buffer
- *      if (trace_buf->recursion++)
- *              goto end_recursion;
- *
- *      raw_data = trace_buf->buf;
- *
- *      // Make recursion update visible before entering perf_tp_event
- *      // so that we protect from perf recursions.
- *
- *      barrier();
- *
- *      //zero dead bytes from alignment to avoid stack leak to userspace:
- *      *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL;
- *      entry = (struct ftrace_raw_<call> *)raw_data;
- *      ent = &entry->ent;
- *      tracing_generic_entry_update(ent, irq_flags, pc);
- *      ent->type = event_call->id;
- *
- *      <tstruct> <- do some jobs with dynamic arrays
- *
- *      <assign>  <- affect our values
- *
- *      perf_tp_event(event_call->id, __addr, __count, entry,
- *                   __entry_size);  <- submit them to perf counter
- *
- * }
- */
 
 #ifdef CONFIG_PERF_EVENTS
 
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 31966a4fb8cc..84bc4197e736 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -31,27 +31,4 @@ struct syscall_metadata {
         struct ftrace_event_call *exit_event;
 };
 
-#ifdef CONFIG_FTRACE_SYSCALLS
-extern unsigned long arch_syscall_addr(int nr);
-extern int init_syscall_trace(struct ftrace_event_call *call);
-
-extern int reg_event_syscall_enter(struct ftrace_event_call *call);
-extern void unreg_event_syscall_enter(struct ftrace_event_call *call);
-extern int reg_event_syscall_exit(struct ftrace_event_call *call);
-extern void unreg_event_syscall_exit(struct ftrace_event_call *call);
-extern int
-ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s);
-enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags,
-                                      struct trace_event *event);
-enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags,
-                                     struct trace_event *event);
-#endif
-
-#ifdef CONFIG_PERF_EVENTS
-int perf_sysenter_enable(struct ftrace_event_call *call);
-void perf_sysenter_disable(struct ftrace_event_call *call);
-int perf_sysexit_enable(struct ftrace_event_call *call);
-void perf_sysexit_disable(struct ftrace_event_call *call);
-#endif
-
 #endif /* _TRACE_SYSCALL_H */