7 files changed, 124 insertions, 217 deletions

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 2bfb7d11fc17..c5e1d8865fe4 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -751,12 +751,7 @@ struct ftrace_event_call {
         int             (*regfunc)(void);
         void            (*unregfunc)(void);
         int             id;
-        struct dentry   *raw_dir;
-        int             raw_enabled;
-        int             type;
         int             (*raw_init)(void);
-        int             (*raw_reg)(void);
-        void            (*raw_unreg)(void);
         int             (*show_format)(struct trace_seq *s);
 };
 
diff --git a/kernel/trace/trace_event_types.h b/kernel/trace/trace_event_types.h
index d94179aa1fc2..5cca4c978bde 100644
--- a/kernel/trace/trace_event_types.h
+++ b/kernel/trace/trace_event_types.h
@@ -106,9 +106,10 @@ TRACE_EVENT_FORMAT(print, TRACE_PRINT, print_entry, ignore,
         TRACE_STRUCT(
                 TRACE_FIELD(unsigned long, ip, ip)
                 TRACE_FIELD(unsigned int, depth, depth)
+                TRACE_FIELD(char *, fmt, fmt)
                 TRACE_FIELD_ZERO_CHAR(buf)
         ),
-        TP_RAW_FMT("%08lx (%d) %s")
+        TP_RAW_FMT("%08lx (%d) fmt:%p %s")
 );
 
 TRACE_EVENT_FORMAT(branch, TRACE_BRANCH, trace_branch, ignore,
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index fa32ca320767..1880a6438097 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -59,22 +59,12 @@ static void ftrace_event_enable_disable(struct ftrace_event_call *call,
                         call->enabled = 0;
                         call->unregfunc();
                 }
-                if (call->raw_enabled) {
-                        call->raw_enabled = 0;
-                        call->raw_unreg();
-                }
                 break;
         case 1:
-                if (!call->enabled &&
-                    (call->type & TRACE_EVENT_TYPE_PRINTF)) {
+                if (!call->enabled) {
                         call->enabled = 1;
                         call->regfunc();
                 }
-                if (!call->raw_enabled &&
-                    (call->type & TRACE_EVENT_TYPE_RAW)) {
-                        call->raw_enabled = 1;
-                        call->raw_reg();
-                }
                 break;
         }
 }
@@ -300,7 +290,7 @@ event_enable_read(struct file *filp, char __user *ubuf, size_t cnt,
         struct ftrace_event_call *call = filp->private_data;
         char *buf;
 
-        if (call->enabled || call->raw_enabled)
+        if (call->enabled)
                 buf = "1\n";
         else
                 buf = "0\n";
@@ -346,107 +336,6 @@ event_enable_write(struct file *filp, const char __user *ubuf, size_t cnt,
         return cnt;
 }
 
-static ssize_t
-event_type_read(struct file *filp, char __user *ubuf, size_t cnt,
-                loff_t *ppos)
-{
-        struct ftrace_event_call *call = filp->private_data;
-        char buf[16];
-        int r = 0;
-
-        if (call->type & TRACE_EVENT_TYPE_PRINTF)
-                r += sprintf(buf, "printf\n");
-
-        if (call->type & TRACE_EVENT_TYPE_RAW)
-                r += sprintf(buf+r, "raw\n");
-
-        return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
-}
-
-static ssize_t
-event_type_write(struct file *filp, const char __user *ubuf, size_t cnt,
-                 loff_t *ppos)
-{
-        struct ftrace_event_call *call = filp->private_data;
-        char buf[64];
-
-        /*
-         * If there's only one type, we can't change it.
-         * And currently we always have printf type, and we
-         * may or may not have raw type.
-         *
-         * This is a redundant check, the file should be read
-         * only if this is the case anyway.
-         */
-
-        if (!call->raw_init)
-                return -EPERM;
-
-        if (cnt >= sizeof(buf))
-                return -EINVAL;
-
-        if (copy_from_user(&buf, ubuf, cnt))
-                return -EFAULT;
-
-        buf[cnt] = 0;
-
-        if (!strncmp(buf, "printf", 6) &&
-            (!buf[6] || isspace(buf[6]))) {
-
-                call->type = TRACE_EVENT_TYPE_PRINTF;
-
-                /*
-                 * If raw enabled, the disable it and enable
-                 * printf type.
-                 */
-                if (call->raw_enabled) {
-                        call->raw_enabled = 0;
-                        call->raw_unreg();
-
-                        call->enabled = 1;
-                        call->regfunc();
-                }
-
-        } else if (!strncmp(buf, "raw", 3) &&
-            (!buf[3] || isspace(buf[3]))) {
-
-                call->type = TRACE_EVENT_TYPE_RAW;
-
-                /*
-                 * If printf enabled, the disable it and enable
-                 * raw type.
-                 */
-                if (call->enabled) {
-                        call->enabled = 0;
-                        call->unregfunc();
-
-                        call->raw_enabled = 1;
-                        call->raw_reg();
-                }
-        } else
-                return -EINVAL;
-
-        *ppos += cnt;
-
-        return cnt;
-}
-
-static ssize_t
-event_available_types_read(struct file *filp, char __user *ubuf, size_t cnt,
-                           loff_t *ppos)
-{
-        struct ftrace_event_call *call = filp->private_data;
-        char buf[16];
-        int r = 0;
-
-        r += sprintf(buf, "printf\n");
-
-        if (call->raw_init)
-                r += sprintf(buf+r, "raw\n");
-
-        return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
-}
-
 #undef FIELD
 #define FIELD(type, name)                                               \
         #type, #name, (unsigned int)offsetof(typeof(field), name),      \
@@ -470,6 +359,7 @@ static int trace_write_header(struct trace_seq *s)
                                 FIELD(int, pid),
                                 FIELD(int, tgid));
 }
+
 static ssize_t
 event_format_read(struct file *filp, char __user *ubuf, size_t cnt,
                   loff_t *ppos)
@@ -527,13 +417,6 @@ static const struct seq_operations show_set_event_seq_ops = {
         .stop = t_stop,
 };
 
-static const struct file_operations ftrace_avail_fops = {
-        .open = ftrace_event_seq_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
 static const struct file_operations ftrace_set_event_fops = {
         .open = ftrace_event_seq_open,
         .read = seq_read,
@@ -548,17 +431,6 @@ static const struct file_operations ftrace_enable_fops = {
         .write = event_enable_write,
 };
 
-static const struct file_operations ftrace_type_fops = {
-        .open = tracing_open_generic,
-        .read = event_type_read,
-        .write = event_type_write,
-};
-
-static const struct file_operations ftrace_available_types_fops = {
-        .open = tracing_open_generic,
-        .read = event_available_types_read,
-};
-
 static const struct file_operations ftrace_event_format_fops = {
         .open = tracing_open_generic,
         .read = event_format_read,
@@ -647,9 +519,6 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events)
                 }
         }
 
-        /* default the output to printf */
-        call->type = TRACE_EVENT_TYPE_PRINTF;
-
         call->dir = debugfs_create_dir(call->name, d_events);
         if (!call->dir) {
                 pr_warning("Could not create debugfs "
@@ -665,21 +534,6 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events)
                                    "'%s/enable' entry\n", call->name);
         }
 
-        /* Only let type be writable, if we can change it */
-        entry = debugfs_create_file("type",
-                                    call->raw_init ? 0644 : 0444,
-                                    call->dir, call,
-                                    &ftrace_type_fops);
-        if (!entry)
-                pr_warning("Could not create debugfs "
-                           "'%s/type' entry\n", call->name);
-
-        entry = debugfs_create_file("available_types", 0444, call->dir, call,
-                                    &ftrace_available_types_fops);
-        if (!entry)
-                pr_warning("Could not create debugfs "
-                           "'%s/available_types' entry\n", call->name);
-
         /* A trace may not want to export its format */
         if (!call->show_format)
                 return 0;
@@ -704,13 +558,6 @@ static __init int event_trace_init(void)
         if (!d_tracer)
                 return 0;
 
-        entry = debugfs_create_file("available_events", 0444, d_tracer,
-                                    (void *)&show_event_seq_ops,
-                                    &ftrace_avail_fops);
-        if (!entry)
-                pr_warning("Could not create debugfs "
-                           "'available_events' entry\n");
-
         entry = debugfs_create_file("set_event", 0644, d_tracer,
                                     (void *)&show_set_event_seq_ops,
                                     &ftrace_set_event_fops);
diff --git a/kernel/trace/trace_events_stage_1.h b/kernel/trace/trace_events_stage_1.h
index 3830a731424c..edfcbd3a0d1b 100644
--- a/kernel/trace/trace_events_stage_1.h
+++ b/kernel/trace/trace_events_stage_1.h
@@ -18,19 +18,23 @@
 #define TRACE_FORMAT(call, proto, args, fmt)
 
 #undef TRACE_EVENT_FORMAT
-#define TRACE_EVENT_FORMAT(name, proto, args, fmt, tstruct, tpfmt)      \
-        struct ftrace_raw_##name {                                      \
-                struct trace_entry      ent;                            \
-                tstruct                                                 \
-        };                                                              \
-        static struct ftrace_event_call event_##name
+#define TRACE_EVENT_FORMAT(name, proto, args, fmt, tstruct, tpfmt)
+
+#undef __array
+#define __array(type, item, len)        type    item[len];
 
-#undef TRACE_STRUCT
-#define TRACE_STRUCT(args...) args
+#undef __field
+#define __field(type, item)             type    item;
 
-#define TRACE_FIELD(type, item, assign) \
-        type item;
-#define TRACE_FIELD_SPECIAL(type_item, item, cmd) \
-        type_item;
+#undef TP_STRUCT__entry
+#define TP_STRUCT__entry(args...) args
+
+#undef TRACE_EVENT
+#define TRACE_EVENT(name, proto, args, tstruct, print, assign)  \
+        struct ftrace_raw_##name {                              \
+                struct trace_entry      ent;                    \
+                tstruct                                         \
+        };                                                      \
+        static struct ftrace_event_call event_##name
 
 #include <trace/trace_event_types.h>
diff --git a/kernel/trace/trace_events_stage_2.h b/kernel/trace/trace_events_stage_2.h
index 8e2e0f56c2a8..d91bf4c56661 100644
--- a/kernel/trace/trace_events_stage_2.h
+++ b/kernel/trace/trace_events_stage_2.h
@@ -32,23 +32,14 @@
  * in binary.
  */
 
-#undef TRACE_STRUCT
-#define TRACE_STRUCT(args...) args
+#undef __entry
+#define __entry field
 
-#undef TRACE_FIELD
-#define TRACE_FIELD(type, item, assign) \
-        field->item,
+#undef TP_printk
+#define TP_printk(fmt, args...) fmt "\n", args
 
-#undef TRACE_FIELD_SPECIAL
-#define TRACE_FIELD_SPECIAL(type_item, item, cmd) \
-        field->item,
-
-
-#undef TP_RAW_FMT
-#define TP_RAW_FMT(args...)     args
-
-#undef TRACE_EVENT_FORMAT
-#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt)      \
+#undef TRACE_EVENT
+#define TRACE_EVENT(call, proto, args, tstruct, print, assign)          \
 enum print_line_t                                                       \
 ftrace_raw_output_##call(struct trace_iterator *iter, int flags)        \
 {                                                                       \
@@ -66,14 +57,76 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags)	\
                                                                         \
         field = (typeof(field))entry;                                   \
                                                                         \
-        ret = trace_seq_printf(s, tpfmt "%s", tstruct "\n");            \
+        ret = trace_seq_printf(s, print);                               \
         if (!ret)                                                       \
                 return TRACE_TYPE_PARTIAL_LINE;                         \
                                                                         \
         return TRACE_TYPE_HANDLED;                                      \
 }
-
+        
 #include <trace/trace_event_types.h>
 
-#include "trace_format.h"
+/*
+ * Setup the showing format of trace point.
+ *
+ * int
+ * ftrace_format_##call(struct trace_seq *s)
+ * {
+ *      struct ftrace_raw_##call field;
+ *      int ret;
+ *
+ *      ret = trace_seq_printf(s, #type " " #item ";"
+ *                             " size:%d; offset:%d;\n",
+ *                             sizeof(field.type),
+ *                             offsetof(struct ftrace_raw_##call,
+ *                                      item));
+ *
+ * }
+ */
+
+#undef TP_STRUCT__entry
+#define TP_STRUCT__entry(args...) args
+
+#undef __field
+#define __field(type, item)                                     \
+        ret = trace_seq_printf(s, "\tfield:" #type " " #item ";\t"      \
+                               "offset:%u;\tsize:%u;\n",                \
+                               (unsigned int)offsetof(typeof(field), item), \
+                               (unsigned int)sizeof(field.item));       \
+        if (!ret)                                                       \
+                return 0;
+
+#undef __array
+#define __array(type, item, len)                                                \
+        ret = trace_seq_printf(s, "\tfield:" #type " " #item "[" #len "];\t"    \
+                               "offset:%u;\tsize:%u;\n",                \
+                               (unsigned int)offsetof(typeof(field), item), \
+                               (unsigned int)sizeof(field.item));       \
+        if (!ret)                                                       \
+                return 0;
+
+#undef __entry
+#define __entry "REC"
+
+#undef TP_printk
+#define TP_printk(fmt, args...) "%s, %s\n", #fmt, #args
+
+#undef TP_fast_assign
+#define TP_fast_assign(args...) args
+
+#undef TRACE_EVENT
+#define TRACE_EVENT(call, proto, args, tstruct, print, func)            \
+static int                                                              \
+ftrace_format_##call(struct trace_seq *s)                               \
+{                                                                       \
+        struct ftrace_raw_##call field;                                 \
+        int ret;                                                        \
+                                                                        \
+        tstruct;                                                        \
+                                                                        \
+        trace_seq_printf(s, "\nprint fmt: " print);                     \
+                                                                        \
+        return ret;                                                     \
+}
+
 #include <trace/trace_event_types.h>
diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h
index 41b82b93c9c7..8e398d864096 100644
--- a/kernel/trace/trace_events_stage_3.h
+++ b/kernel/trace/trace_events_stage_3.h
@@ -144,27 +144,15 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
         .unregfunc              = ftrace_unreg_event_##call,            \
 }
 
-#undef TRACE_FIELD
-#define TRACE_FIELD(type, item, assign)\
-        entry->item = assign;
-
-#undef TRACE_FIELD
-#define TRACE_FIELD(type, item, assign)\
-        entry->item = assign;
-
-#undef TP_CMD
-#define TP_CMD(cmd...)  cmd
-
-#undef TRACE_ENTRY
-#define TRACE_ENTRY     entry
+#undef TRACE_EVENT_FORMAT
+#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, raw)        \
+        TRACE_FORMAT(call, PARAMS(proto), PARAMS(args), PARAMS(fmt))
 
-#undef TRACE_FIELD_SPECIAL
-#define TRACE_FIELD_SPECIAL(type_item, item, cmd) \
-        cmd;
+#undef __entry
+#define __entry entry
 
-#undef TRACE_EVENT_FORMAT
-#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt)      \
-_TRACE_FORMAT(call, PARAMS(proto), PARAMS(args), PARAMS(fmt))           \
+#undef TRACE_EVENT
+#define TRACE_EVENT(call, proto, args, tstruct, print, assign)          \
                                                                         \
 static struct ftrace_event_call event_##call;                           \
                                                                         \
@@ -185,7 +173,7 @@ static void ftrace_raw_event_##call(proto)				\
                 return;                                                 \
         entry   = ring_buffer_event_data(event);                        \
                                                                         \
-        tstruct;                                                        \
+        assign;                                                         \
                                                                         \
         trace_current_buffer_unlock_commit(event, irq_flags, pc);       \
 }                                                                       \
@@ -226,10 +214,8 @@ __attribute__((__aligned__(4)))						\
 __attribute__((section("_ftrace_events"))) event_##call = {             \
         .name                   = #call,                                \
         .system                 = __stringify(TRACE_SYSTEM),            \
-        .regfunc                = ftrace_reg_event_##call,              \
-        .unregfunc              = ftrace_unreg_event_##call,            \
         .raw_init               = ftrace_raw_init_event_##call,         \
-        .raw_reg                = ftrace_raw_reg_event_##call,          \
-        .raw_unreg              = ftrace_raw_unreg_event_##call,        \
+        .regfunc                = ftrace_raw_reg_event_##call,          \
+        .unregfunc              = ftrace_raw_unreg_event_##call,        \
         .show_format            = ftrace_format_##call,                 \
 }
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
index e62bc10f8103..23ae78430d58 100644
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@ -15,7 +15,28 @@
 
 #include "trace_output.h"
 
-#include "trace_format.h"
+
+#undef TRACE_STRUCT
+#define TRACE_STRUCT(args...) args
+
+#undef TRACE_FIELD
+#define TRACE_FIELD(type, item, assign)                                 \
+        ret = trace_seq_printf(s, "\tfield:" #type " " #item ";\t"      \
+                               "offset:%u;\tsize:%u;\n",                \
+                               (unsigned int)offsetof(typeof(field), item), \
+                               (unsigned int)sizeof(field.item));       \
+        if (!ret)                                                       \
+                return 0;
+
+
+#undef TRACE_FIELD_SPECIAL
+#define TRACE_FIELD_SPECIAL(type_item, item, cmd)                       \
+        ret = trace_seq_printf(s, "\tfield special:" #type_item ";\t"   \
+                               "offset:%u;\tsize:%u;\n",                \
+                               (unsigned int)offsetof(typeof(field), item), \
+                               (unsigned int)sizeof(field.item));       \
+        if (!ret)                                                       \
+                return 0;
 
 #undef TRACE_FIELD_ZERO_CHAR
 #define TRACE_FIELD_ZERO_CHAR(item)                                     \