3 files changed, 96 insertions, 2 deletions

diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index a9c87ad8331c..5f889f16b0c8 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -147,7 +147,7 @@ DEFINE_EVENT(kmem_free, kmem_cache_free,
         TP_ARGS(call_site, ptr)
 );
 
-TRACE_EVENT(mm_page_free_direct,
+TRACE_EVENT(mm_page_free,
 
         TP_PROTO(struct page *page, unsigned int order),
 
@@ -169,7 +169,7 @@ TRACE_EVENT(mm_page_free_direct,
                         __entry->order)
 );
 
-TRACE_EVENT(mm_pagevec_free,
+TRACE_EVENT(mm_page_free_batched,
 
         TP_PROTO(struct page *page, int cold),
 
diff --git a/include/trace/events/oom.h b/include/trace/events/oom.h
new file mode 100644
index 000000000000..dd4ba3b92002
--- /dev/null
+++ b/include/trace/events/oom.h
@@ -0,0 +1,33 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM oom
+
+#if !defined(_TRACE_OOM_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_OOM_H
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(oom_score_adj_update,
+
+        TP_PROTO(struct task_struct *task),
+
+        TP_ARGS(task),
+
+        TP_STRUCT__entry(
+                __field(        pid_t,  pid)
+                __array(        char,   comm,   TASK_COMM_LEN )
+                __field(         int,   oom_score_adj)
+        ),
+
+        TP_fast_assign(
+                __entry->pid = task->pid;
+                memcpy(__entry->comm, task->comm, TASK_COMM_LEN);
+                __entry->oom_score_adj = task->signal->oom_score_adj;
+        ),
+
+        TP_printk("pid=%d comm=%s oom_score_adj=%d",
+                __entry->pid, __entry->comm, __entry->oom_score_adj)
+);
+
+#endif
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/task.h b/include/trace/events/task.h
new file mode 100644
index 000000000000..b53add02e929
--- /dev/null
+++ b/include/trace/events/task.h
@@ -0,0 +1,61 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM task
+
+#if !defined(_TRACE_TASK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_TASK_H
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(task_newtask,
+
+        TP_PROTO(struct task_struct *task, unsigned long clone_flags),
+
+        TP_ARGS(task, clone_flags),
+
+        TP_STRUCT__entry(
+                __field(        pid_t,  pid)
+                __array(        char,   comm, TASK_COMM_LEN)
+                __field( unsigned long, clone_flags)
+                __field(        int,    oom_score_adj)
+        ),
+
+        TP_fast_assign(
+                __entry->pid = task->pid;
+                memcpy(__entry->comm, task->comm, TASK_COMM_LEN);
+                __entry->clone_flags = clone_flags;
+                __entry->oom_score_adj = task->signal->oom_score_adj;
+        ),
+
+        TP_printk("pid=%d comm=%s clone_flags=%lx oom_score_adj=%d",
+                __entry->pid, __entry->comm,
+                __entry->clone_flags, __entry->oom_score_adj)
+);
+
+TRACE_EVENT(task_rename,
+
+        TP_PROTO(struct task_struct *task, char *comm),
+
+        TP_ARGS(task, comm),
+
+        TP_STRUCT__entry(
+                __field(        pid_t,  pid)
+                __array(        char, oldcomm,  TASK_COMM_LEN)
+                __array(        char, newcomm,  TASK_COMM_LEN)
+                __field(        int, oom_score_adj)
+        ),
+
+        TP_fast_assign(
+                __entry->pid = task->pid;
+                memcpy(entry->oldcomm, task->comm, TASK_COMM_LEN);
+                memcpy(entry->newcomm, comm, TASK_COMM_LEN);
+                __entry->oom_score_adj = task->signal->oom_score_adj;
+        ),
+
+        TP_printk("pid=%d oldcomm=%s newcomm=%s oom_score_adj=%d",
+                __entry->pid, __entry->oldcomm,
+                __entry->newcomm, __entry->oom_score_adj)
+);
+
+#endif
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>