1 files changed, 58 insertions, 24 deletions

diff --git a/kernel/trace/kmemtrace.c b/kernel/trace/kmemtrace.c
index ae259f04ee39..d8c2d0c91b4c 100644
--- a/kernel/trace/kmemtrace.c
+++ b/kernel/trace/kmemtrace.c
@@ -208,47 +208,81 @@ static void kmemtrace_headers(struct seq_file *s)
 }
 
 /*
- * The two following functions give the original output from kmemtrace,
- * or something close to....perhaps they need some missing things
+ * The following functions give the original output from kmemtrace,
+ * plus the origin CPU, since reordering occurs in-kernel now.
  */
+
+#define KMEMTRACE_USER_ALLOC    0
+#define KMEMTRACE_USER_FREE     1
+
+struct kmemtrace_user_event {
+        u8              event_id;
+        u8              type_id;
+        u16             event_size;
+        u32             cpu;
+        u64             timestamp;
+        unsigned long   call_site;
+        unsigned long   ptr;
+};
+
+struct kmemtrace_user_event_alloc {
+        size_t          bytes_req;
+        size_t          bytes_alloc;
+        unsigned        gfp_flags;
+        int             node;
+};
+
 static enum print_line_t
-kmemtrace_print_alloc_original(struct trace_iterator *iter,
-                                struct kmemtrace_alloc_entry *entry)
+kmemtrace_print_alloc_user(struct trace_iterator *iter,
+                           struct kmemtrace_alloc_entry *entry)
 {
         struct trace_seq *s = &iter->seq;
-        int ret;
-
-        /* Taken from the old linux/kmemtrace.h */
-        ret = trace_seq_printf(s, "type_id %d call_site %lu ptr %lu "
-          "bytes_req %lu bytes_alloc %lu gfp_flags %lu node %d\n",
-           entry->type_id, entry->call_site, (unsigned long) entry->ptr,
-           (unsigned long) entry->bytes_req, (unsigned long) entry->bytes_alloc,
-           (unsigned long) entry->gfp_flags, entry->node);
+        struct kmemtrace_user_event *ev;
+        struct kmemtrace_user_event_alloc *ev_alloc;
 
-        if (!ret)
+        ev = trace_seq_reserve(s, sizeof(*ev));
+        if (!ev)
+                return TRACE_TYPE_PARTIAL_LINE;
+        ev->event_id = KMEMTRACE_USER_ALLOC;
+        ev->type_id = entry->type_id;
+        ev->event_size = sizeof(*ev) + sizeof(*ev_alloc);
+        ev->cpu = iter->cpu;
+        ev->timestamp = iter->ts;
+        ev->call_site = entry->call_site; 
+        ev->ptr = (unsigned long) entry->ptr;
+
+        ev_alloc = trace_seq_reserve(s, sizeof(*ev_alloc));
+        if (!ev_alloc)
                 return TRACE_TYPE_PARTIAL_LINE;
+        ev_alloc->bytes_req = entry->bytes_req;
+        ev_alloc->bytes_alloc = entry->bytes_alloc;
+        ev_alloc->gfp_flags = entry->gfp_flags;
+        ev_alloc->node = entry->node;
 
         return TRACE_TYPE_HANDLED;
 }
 
 static enum print_line_t
-kmemtrace_print_free_original(struct trace_iterator *iter,
-                                struct kmemtrace_free_entry *entry)
+kmemtrace_print_free_user(struct trace_iterator *iter,
+                          struct kmemtrace_free_entry *entry)
 {
         struct trace_seq *s = &iter->seq;
-        int ret;
+        struct kmemtrace_user_event *ev;
 
-        /* Taken from the old linux/kmemtrace.h */
-        ret = trace_seq_printf(s, "type_id %d call_site %lu ptr %lu\n",
-           entry->type_id, entry->call_site, (unsigned long) entry->ptr);
-
-        if (!ret)
+        ev = trace_seq_reserve(s, sizeof(*ev));
+        if (!ev)
                 return TRACE_TYPE_PARTIAL_LINE;
+        ev->event_id = KMEMTRACE_USER_FREE;
+        ev->type_id = entry->type_id;
+        ev->event_size = sizeof(*ev);
+        ev->cpu = iter->cpu;
+        ev->timestamp = iter->ts;
+        ev->call_site = entry->call_site; 
+        ev->ptr = (unsigned long) entry->ptr;
 
         return TRACE_TYPE_HANDLED;
 }
 
-
 /* The two other following provide a more minimalistic output */
 static enum print_line_t
 kmemtrace_print_alloc_compress(struct trace_iterator *iter,
@@ -385,7 +419,7 @@ static enum print_line_t kmemtrace_print_line(struct trace_iterator *iter)
                 if (kmem_tracer_flags.val & TRACE_KMEM_OPT_MINIMAL)
                         return kmemtrace_print_alloc_compress(iter, field);
                 else
-                        return kmemtrace_print_alloc_original(iter, field);
+                        return kmemtrace_print_alloc_user(iter, field);
         }
 
         case TRACE_KMEM_FREE: {
@@ -394,7 +428,7 @@ static enum print_line_t kmemtrace_print_line(struct trace_iterator *iter)
                 if (kmem_tracer_flags.val & TRACE_KMEM_OPT_MINIMAL)
                         return kmemtrace_print_free_compress(iter, field);
                 else
-                        return kmemtrace_print_free_original(iter, field);
+                        return kmemtrace_print_free_user(iter, field);
         }
 
         default: