Linux 6.9-rc4
[sfrench/cifs-2.6.git] / kernel / trace / trace.h
index 005f08629b8bed8d9d6ec0bcc5a10255cc0d7094..64450615ca0cbfa71ffe0e9fb077b556dab2aa2d 100644 (file)
 #include <linux/mmiotrace.h>
 #include <linux/tracepoint.h>
 #include <linux/ftrace.h>
+#include <linux/trace.h>
 #include <linux/hw_breakpoint.h>
 #include <linux/trace_seq.h>
 #include <linux/trace_events.h>
 #include <linux/compiler.h>
 #include <linux/glob.h>
+#include <linux/irq_work.h>
+#include <linux/workqueue.h>
+#include <linux/ctype.h>
+#include <linux/once_lite.h>
+
+#include "pid_list.h"
 
 #ifdef CONFIG_FTRACE_SYSCALLS
-#include <asm/unistd.h>                /* For NR_SYSCALLS           */
+#include <asm/unistd.h>                /* For NR_syscalls           */
 #include <asm/syscall.h>       /* some archs define it here */
 #endif
 
+#define TRACE_MODE_WRITE       0640
+#define TRACE_MODE_READ                0440
+
 enum trace_type {
        __TRACE_FIRST_TYPE = 0,
 
@@ -40,7 +50,10 @@ enum trace_type {
        TRACE_BLK,
        TRACE_BPUTS,
        TRACE_HWLAT,
+       TRACE_OSNOISE,
+       TRACE_TIMERLAT,
        TRACE_RAW_DATA,
+       TRACE_FUNC_REPEATS,
 
        __TRACE_LAST_TYPE,
 };
@@ -49,48 +62,73 @@ enum trace_type {
 #undef __field
 #define __field(type, item)            type    item;
 
+#undef __field_fn
+#define __field_fn(type, item)         type    item;
+
 #undef __field_struct
 #define __field_struct(type, item)     __field(type, item)
 
 #undef __field_desc
 #define __field_desc(type, container, item)
 
+#undef __field_packed
+#define __field_packed(type, container, item)
+
 #undef __array
 #define __array(type, item, size)      type    item[size];
 
+/*
+ * For backward compatibility, older user space expects to see the
+ * kernel_stack event with a fixed size caller field. But today the fix
+ * size is ignored by the kernel, and the real structure is dynamic.
+ * Expose to user space: "unsigned long caller[8];" but the real structure
+ * will be "unsigned long caller[] __counted_by(size)"
+ */
+#undef __stack_array
+#define __stack_array(type, item, size, field)         type item[] __counted_by(field);
+
 #undef __array_desc
 #define __array_desc(type, container, item, size)
 
 #undef __dynamic_array
 #define __dynamic_array(type, item)    type    item[];
 
+#undef __rel_dynamic_array
+#define __rel_dynamic_array(type, item)        type    item[];
+
 #undef F_STRUCT
 #define F_STRUCT(args...)              args
 
 #undef FTRACE_ENTRY
-#define FTRACE_ENTRY(name, struct_name, id, tstruct, print, filter)    \
+#define FTRACE_ENTRY(name, struct_name, id, tstruct, print)            \
        struct struct_name {                                            \
                struct trace_entry      ent;                            \
                tstruct                                                 \
        }
 
 #undef FTRACE_ENTRY_DUP
-#define FTRACE_ENTRY_DUP(name, name_struct, id, tstruct, printk, filter)
+#define FTRACE_ENTRY_DUP(name, name_struct, id, tstruct, printk)
 
 #undef FTRACE_ENTRY_REG
-#define FTRACE_ENTRY_REG(name, struct_name, id, tstruct, print,        \
-                        filter, regfn) \
-       FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print), \
-                    filter)
+#define FTRACE_ENTRY_REG(name, struct_name, id, tstruct, print,        regfn)  \
+       FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print))
 
 #undef FTRACE_ENTRY_PACKED
-#define FTRACE_ENTRY_PACKED(name, struct_name, id, tstruct, print,     \
-                           filter)                                     \
-       FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print), \
-                    filter) __packed
+#define FTRACE_ENTRY_PACKED(name, struct_name, id, tstruct, print)     \
+       FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print)) __packed
 
 #include "trace_entries.h"
 
+/* Use this for memory failure errors */
+#define MEM_FAIL(condition, fmt, ...)                                  \
+       DO_ONCE_LITE_IF(condition, pr_err, "ERROR: " fmt, ##__VA_ARGS__)
+
+#define FAULT_STRING "(fault)"
+
+#define HIST_STACKTRACE_DEPTH  16
+#define HIST_STACKTRACE_SIZE   (HIST_STACKTRACE_DEPTH * sizeof(unsigned long))
+#define HIST_STACKTRACE_SKIP   5
+
 /*
  * syscalls are special, and need special handling, this is why
  * they are not included in trace_entries.h
@@ -112,29 +150,25 @@ struct kprobe_trace_entry_head {
        unsigned long           ip;
 };
 
+struct eprobe_trace_entry_head {
+       struct trace_entry      ent;
+};
+
 struct kretprobe_trace_entry_head {
        struct trace_entry      ent;
        unsigned long           func;
        unsigned long           ret_ip;
 };
 
-/*
- * trace_flag_type is an enumeration that holds different
- * states when a trace occurs. These are:
- *  IRQS_OFF           - interrupts were disabled
- *  IRQS_NOSUPPORT     - arch does not support irqs_disabled_flags
- *  NEED_RESCHED       - reschedule is requested
- *  HARDIRQ            - inside an interrupt handler
- *  SOFTIRQ            - inside a softirq handler
- */
-enum trace_flag_type {
-       TRACE_FLAG_IRQS_OFF             = 0x01,
-       TRACE_FLAG_IRQS_NOSUPPORT       = 0x02,
-       TRACE_FLAG_NEED_RESCHED         = 0x04,
-       TRACE_FLAG_HARDIRQ              = 0x08,
-       TRACE_FLAG_SOFTIRQ              = 0x10,
-       TRACE_FLAG_PREEMPT_RESCHED      = 0x20,
-       TRACE_FLAG_NMI                  = 0x40,
+struct fentry_trace_entry_head {
+       struct trace_entry      ent;
+       unsigned long           ip;
+};
+
+struct fexit_trace_entry_head {
+       struct trace_entry      ent;
+       unsigned long           func;
+       unsigned long           ret_ip;
 };
 
 #define TRACE_BUF_SIZE         1024
@@ -164,18 +198,18 @@ struct trace_array_cpu {
        kuid_t                  uid;
        char                    comm[TASK_COMM_LEN];
 
-       bool                    ignore_pid;
 #ifdef CONFIG_FUNCTION_TRACER
-       bool                    ftrace_ignore_pid;
+       int                     ftrace_ignore_pid;
 #endif
+       bool                    ignore_pid;
 };
 
 struct tracer;
 struct trace_option_dentry;
 
-struct trace_buffer {
+struct array_buffer {
        struct trace_array              *tr;
-       struct ring_buffer              *buffer;
+       struct trace_buffer             *buffer;
        struct trace_array_cpu __percpu *data;
        u64                             time_start;
        int                             cpu;
@@ -188,11 +222,39 @@ struct trace_options {
        struct trace_option_dentry      *topts;
 };
 
-struct trace_pid_list {
-       int                             pid_max;
-       unsigned long                   *pids;
+struct trace_pid_list *trace_pid_list_alloc(void);
+void trace_pid_list_free(struct trace_pid_list *pid_list);
+bool trace_pid_list_is_set(struct trace_pid_list *pid_list, unsigned int pid);
+int trace_pid_list_set(struct trace_pid_list *pid_list, unsigned int pid);
+int trace_pid_list_clear(struct trace_pid_list *pid_list, unsigned int pid);
+int trace_pid_list_first(struct trace_pid_list *pid_list, unsigned int *pid);
+int trace_pid_list_next(struct trace_pid_list *pid_list, unsigned int pid,
+                       unsigned int *next);
+
+enum {
+       TRACE_PIDS              = BIT(0),
+       TRACE_NO_PIDS           = BIT(1),
 };
 
+static inline bool pid_type_enabled(int type, struct trace_pid_list *pid_list,
+                                   struct trace_pid_list *no_pid_list)
+{
+       /* Return true if the pid list in type has pids */
+       return ((type & TRACE_PIDS) && pid_list) ||
+               ((type & TRACE_NO_PIDS) && no_pid_list);
+}
+
+static inline bool still_need_pid_events(int type, struct trace_pid_list *pid_list,
+                                        struct trace_pid_list *no_pid_list)
+{
+       /*
+        * Turning off what is in @type, return true if the "other"
+        * pid list, still has pids in it.
+        */
+       return (!(type & TRACE_PIDS) && pid_list) ||
+               (!(type & TRACE_NO_PIDS) && no_pid_list);
+}
+
 typedef bool (*cond_update_fn_t)(struct trace_array *tr, void *cond_data);
 
 /**
@@ -205,7 +267,7 @@ typedef bool (*cond_update_fn_t)(struct trace_array *tr, void *cond_data);
  * tracing_snapshot_cond(tr, cond_data), the cond_data passed in is
  * passed in turn to the cond_snapshot.update() function.  That data
  * can be compared by the update() implementation with the cond_data
- * contained wihin the struct cond_snapshot instance associated with
+ * contained within the struct cond_snapshot instance associated with
  * the trace_array.  Because the tr->max_lock is held throughout the
  * update() call, the update() function can directly retrieve the
  * cond_snapshot and cond_data associated with the per-instance
@@ -230,7 +292,7 @@ typedef bool (*cond_update_fn_t)(struct trace_array *tr, void *cond_data);
  *     take the snapshot, by returning 'true' if so, 'false' if no
  *     snapshot should be taken.  Because the max_lock is held for
  *     the duration of update(), the implementation is safe to
- *     directly retrieven and save any implementation data it needs
+ *     directly retrieved and save any implementation data it needs
  *     to in association with the snapshot.
  */
 struct cond_snapshot {
@@ -238,6 +300,17 @@ struct cond_snapshot {
        cond_update_fn_t                update;
 };
 
+/*
+ * struct trace_func_repeats - used to keep track of the consecutive
+ * (on the same CPU) calls of a single function.
+ */
+struct trace_func_repeats {
+       unsigned long   ip;
+       unsigned long   parent_ip;
+       unsigned long   count;
+       u64             ts_last_call;
+};
+
 /*
  * The trace array - an array of per-CPU trace arrays. This is the
  * highest level data structure that individual tracers deal with.
@@ -246,7 +319,7 @@ struct cond_snapshot {
 struct trace_array {
        struct list_head        list;
        char                    *name;
-       struct trace_buffer     trace_buffer;
+       struct array_buffer     array_buffer;
 #ifdef CONFIG_TRACER_MAX_TRACE
        /*
         * The max_buffer is used to snapshot the trace when a maximum
@@ -254,18 +327,24 @@ struct trace_array {
         * Some tracers will use this to store a maximum trace while
         * it continues examining live traces.
         *
-        * The buffers for the max_buffer are set up the same as the trace_buffer
+        * The buffers for the max_buffer are set up the same as the array_buffer
         * When a snapshot is taken, the buffer of the max_buffer is swapped
-        * with the buffer of the trace_buffer and the buffers are reset for
-        * the trace_buffer so the tracing can continue.
+        * with the buffer of the array_buffer and the buffers are reset for
+        * the array_buffer so the tracing can continue.
         */
-       struct trace_buffer     max_buffer;
+       struct array_buffer     max_buffer;
        bool                    allocated_snapshot;
-#endif
-#if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)
+       spinlock_t              snapshot_trigger_lock;
+       unsigned int            snapshot;
        unsigned long           max_latency;
+#ifdef CONFIG_FSNOTIFY
+       struct dentry           *d_max_latency;
+       struct work_struct      fsnotify_work;
+       struct irq_work         fsnotify_irqwork;
+#endif
 #endif
        struct trace_pid_list   __rcu *filtered_pids;
+       struct trace_pid_list   __rcu *filtered_no_pids;
        /*
         * max_lock is used to protect the swapping of buffers
         * when taking a max snapshot. The buffers themselves are
@@ -298,20 +377,25 @@ struct trace_array {
        unsigned char           trace_flags_index[TRACE_FLAGS_MAX_SIZE];
        unsigned int            flags;
        raw_spinlock_t          start_lock;
+       const char              *system_names;
        struct list_head        err_log;
        struct dentry           *dir;
        struct dentry           *options;
        struct dentry           *percpu_dir;
-       struct dentry           *event_dir;
+       struct eventfs_inode    *event_dir;
        struct trace_options    *topts;
        struct list_head        systems;
        struct list_head        events;
        struct trace_event_file *trace_marker_file;
        cpumask_var_t           tracing_cpumask; /* only trace on set CPUs */
+       /* one per_cpu trace_pipe can be opened by only one user */
+       cpumask_var_t           pipe_cpumask;
        int                     ref;
+       int                     trace_ref;
 #ifdef CONFIG_FUNCTION_TRACER
        struct ftrace_ops       *ops;
        struct trace_pid_list   __rcu *function_pids;
+       struct trace_pid_list   __rcu *function_no_pids;
 #ifdef CONFIG_DYNAMIC_FTRACE
        /* All of these are protected by the ftrace_lock */
        struct list_head        func_probes;
@@ -321,11 +405,17 @@ struct trace_array {
        /* function tracing enabled */
        int                     function_enabled;
 #endif
-       int                     time_stamp_abs_ref;
+       int                     no_filter_buffering_ref;
        struct list_head        hist_vars;
 #ifdef CONFIG_TRACER_SNAPSHOT
        struct cond_snapshot    *cond_snapshot;
 #endif
+       struct trace_func_repeats       __percpu *last_func_repeats;
+       /*
+        * On boot up, the ring buffer is set to the minimum size, so that
+        * we do not waste memory on systems that are not using tracing.
+        */
+       bool ring_buffer_expanded;
 };
 
 enum {
@@ -337,9 +427,12 @@ extern struct list_head ftrace_trace_arrays;
 extern struct mutex trace_types_lock;
 
 extern int trace_array_get(struct trace_array *tr);
-extern void trace_array_put(struct trace_array *tr);
+extern int tracing_check_open_get_tr(struct trace_array *tr);
+extern struct trace_array *trace_array_find(const char *instance);
+extern struct trace_array *trace_array_find_get(const char *instance);
 
-extern int tracing_set_time_stamp_abs(struct trace_array *tr, bool abs);
+extern u64 tracing_event_time_stamp(struct trace_buffer *buffer, struct ring_buffer_event *rbe);
+extern int tracing_set_filter_buffering(struct trace_array *tr, bool set);
 extern int tracing_set_clock(struct trace_array *tr, const char *clockstr);
 
 extern bool trace_clock_in_ns(struct trace_array *tr);
@@ -365,11 +458,11 @@ static inline struct trace_array *top_trace_array(void)
        __builtin_types_compatible_p(typeof(var), type *)
 
 #undef IF_ASSIGN
-#define IF_ASSIGN(var, entry, etype, id)               \
-       if (FTRACE_CMP_TYPE(var, etype)) {              \
-               var = (typeof(var))(entry);             \
-               WARN_ON(id && (entry)->type != id);     \
-               break;                                  \
+#define IF_ASSIGN(var, entry, etype, id)                       \
+       if (FTRACE_CMP_TYPE(var, etype)) {                      \
+               var = (typeof(var))(entry);                     \
+               WARN_ON(id != 0 && (entry)->type != id);        \
+               break;                                          \
        }
 
 /* Will cause compile errors if type is not found. */
@@ -398,6 +491,8 @@ extern void __ftrace_bad_type(void);
                IF_ASSIGN(var, ent, struct bprint_entry, TRACE_BPRINT); \
                IF_ASSIGN(var, ent, struct bputs_entry, TRACE_BPUTS);   \
                IF_ASSIGN(var, ent, struct hwlat_entry, TRACE_HWLAT);   \
+               IF_ASSIGN(var, ent, struct osnoise_entry, TRACE_OSNOISE);\
+               IF_ASSIGN(var, ent, struct timerlat_entry, TRACE_TIMERLAT);\
                IF_ASSIGN(var, ent, struct raw_data_entry, TRACE_RAW_DATA);\
                IF_ASSIGN(var, ent, struct trace_mmiotrace_rw,          \
                          TRACE_MMIO_RW);                               \
@@ -408,6 +503,8 @@ extern void __ftrace_bad_type(void);
                          TRACE_GRAPH_ENT);             \
                IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry,      \
                          TRACE_GRAPH_RET);             \
+               IF_ASSIGN(var, ent, struct func_repeats_entry,          \
+                         TRACE_FUNC_REPEATS);                          \
                __ftrace_bad_type();                                    \
        } while (0)
 
@@ -497,7 +594,6 @@ struct tracer {
        struct tracer           *next;
        struct tracer_flags     *flags;
        int                     enabled;
-       int                     ref;
        bool                    print_max;
        bool                    allow_instances;
 #ifdef CONFIG_TRACER_MAX_TRACE
@@ -507,168 +603,6 @@ struct tracer {
        bool                    noboot;
 };
 
-
-/* Only current can touch trace_recursion */
-
-/*
- * For function tracing recursion:
- *  The order of these bits are important.
- *
- *  When function tracing occurs, the following steps are made:
- *   If arch does not support a ftrace feature:
- *    call internal function (uses INTERNAL bits) which calls...
- *   If callback is registered to the "global" list, the list
- *    function is called and recursion checks the GLOBAL bits.
- *    then this function calls...
- *   The function callback, which can use the FTRACE bits to
- *    check for recursion.
- *
- * Now if the arch does not suppport a feature, and it calls
- * the global list function which calls the ftrace callback
- * all three of these steps will do a recursion protection.
- * There's no reason to do one if the previous caller already
- * did. The recursion that we are protecting against will
- * go through the same steps again.
- *
- * To prevent the multiple recursion checks, if a recursion
- * bit is set that is higher than the MAX bit of the current
- * check, then we know that the check was made by the previous
- * caller, and we can skip the current check.
- */
-enum {
-       TRACE_BUFFER_BIT,
-       TRACE_BUFFER_NMI_BIT,
-       TRACE_BUFFER_IRQ_BIT,
-       TRACE_BUFFER_SIRQ_BIT,
-
-       /* Start of function recursion bits */
-       TRACE_FTRACE_BIT,
-       TRACE_FTRACE_NMI_BIT,
-       TRACE_FTRACE_IRQ_BIT,
-       TRACE_FTRACE_SIRQ_BIT,
-
-       /* INTERNAL_BITs must be greater than FTRACE_BITs */
-       TRACE_INTERNAL_BIT,
-       TRACE_INTERNAL_NMI_BIT,
-       TRACE_INTERNAL_IRQ_BIT,
-       TRACE_INTERNAL_SIRQ_BIT,
-
-       TRACE_BRANCH_BIT,
-/*
- * Abuse of the trace_recursion.
- * As we need a way to maintain state if we are tracing the function
- * graph in irq because we want to trace a particular function that
- * was called in irq context but we have irq tracing off. Since this
- * can only be modified by current, we can reuse trace_recursion.
- */
-       TRACE_IRQ_BIT,
-
-       /* Set if the function is in the set_graph_function file */
-       TRACE_GRAPH_BIT,
-
-       /*
-        * In the very unlikely case that an interrupt came in
-        * at a start of graph tracing, and we want to trace
-        * the function in that interrupt, the depth can be greater
-        * than zero, because of the preempted start of a previous
-        * trace. In an even more unlikely case, depth could be 2
-        * if a softirq interrupted the start of graph tracing,
-        * followed by an interrupt preempting a start of graph
-        * tracing in the softirq, and depth can even be 3
-        * if an NMI came in at the start of an interrupt function
-        * that preempted a softirq start of a function that
-        * preempted normal context!!!! Luckily, it can't be
-        * greater than 3, so the next two bits are a mask
-        * of what the depth is when we set TRACE_GRAPH_BIT
-        */
-
-       TRACE_GRAPH_DEPTH_START_BIT,
-       TRACE_GRAPH_DEPTH_END_BIT,
-
-       /*
-        * To implement set_graph_notrace, if this bit is set, we ignore
-        * function graph tracing of called functions, until the return
-        * function is called to clear it.
-        */
-       TRACE_GRAPH_NOTRACE_BIT,
-};
-
-#define trace_recursion_set(bit)       do { (current)->trace_recursion |= (1<<(bit)); } while (0)
-#define trace_recursion_clear(bit)     do { (current)->trace_recursion &= ~(1<<(bit)); } while (0)
-#define trace_recursion_test(bit)      ((current)->trace_recursion & (1<<(bit)))
-
-#define trace_recursion_depth() \
-       (((current)->trace_recursion >> TRACE_GRAPH_DEPTH_START_BIT) & 3)
-#define trace_recursion_set_depth(depth) \
-       do {                                                            \
-               current->trace_recursion &=                             \
-                       ~(3 << TRACE_GRAPH_DEPTH_START_BIT);            \
-               current->trace_recursion |=                             \
-                       ((depth) & 3) << TRACE_GRAPH_DEPTH_START_BIT;   \
-       } while (0)
-
-#define TRACE_CONTEXT_BITS     4
-
-#define TRACE_FTRACE_START     TRACE_FTRACE_BIT
-#define TRACE_FTRACE_MAX       ((1 << (TRACE_FTRACE_START + TRACE_CONTEXT_BITS)) - 1)
-
-#define TRACE_LIST_START       TRACE_INTERNAL_BIT
-#define TRACE_LIST_MAX         ((1 << (TRACE_LIST_START + TRACE_CONTEXT_BITS)) - 1)
-
-#define TRACE_CONTEXT_MASK     TRACE_LIST_MAX
-
-static __always_inline int trace_get_context_bit(void)
-{
-       int bit;
-
-       if (in_interrupt()) {
-               if (in_nmi())
-                       bit = 0;
-
-               else if (in_irq())
-                       bit = 1;
-               else
-                       bit = 2;
-       } else
-               bit = 3;
-
-       return bit;
-}
-
-static __always_inline int trace_test_and_set_recursion(int start, int max)
-{
-       unsigned int val = current->trace_recursion;
-       int bit;
-
-       /* A previous recursion check was made */
-       if ((val & TRACE_CONTEXT_MASK) > max)
-               return 0;
-
-       bit = trace_get_context_bit() + start;
-       if (unlikely(val & (1 << bit)))
-               return -1;
-
-       val |= 1 << bit;
-       current->trace_recursion = val;
-       barrier();
-
-       return bit;
-}
-
-static __always_inline void trace_clear_recursion(int bit)
-{
-       unsigned int val = current->trace_recursion;
-
-       if (!bit)
-               return;
-
-       bit = 1 << bit;
-       val &= ~bit;
-
-       barrier();
-       current->trace_recursion = val;
-}
-
 static inline struct ring_buffer_iter *
 trace_buffer_iter(struct trace_iterator *iter, int cpu)
 {
@@ -677,11 +611,15 @@ trace_buffer_iter(struct trace_iterator *iter, int cpu)
 
 int tracer_init(struct tracer *t, struct trace_array *tr);
 int tracing_is_enabled(void);
-void tracing_reset(struct trace_buffer *buf, int cpu);
-void tracing_reset_online_cpus(struct trace_buffer *buf);
-void tracing_reset_current(int cpu);
+void tracing_reset_online_cpus(struct array_buffer *buf);
 void tracing_reset_all_online_cpus(void);
+void tracing_reset_all_online_cpus_unlocked(void);
 int tracing_open_generic(struct inode *inode, struct file *filp);
+int tracing_open_generic_tr(struct inode *inode, struct file *filp);
+int tracing_release_generic_tr(struct inode *inode, struct file *file);
+int tracing_open_file_tr(struct inode *inode, struct file *filp);
+int tracing_release_file_tr(struct inode *inode, struct file *filp);
+int tracing_single_release_file_tr(struct inode *inode, struct file *filp);
 bool tracing_is_disabled(void);
 bool tracer_tracing_is_on(struct trace_array *tr);
 void tracer_tracing_on(struct trace_array *tr);
@@ -692,16 +630,15 @@ struct dentry *trace_create_file(const char *name,
                                 void *data,
                                 const struct file_operations *fops);
 
-struct dentry *tracing_init_dentry(void);
+int tracing_init_dentry(void);
 
 struct ring_buffer_event;
 
 struct ring_buffer_event *
-trace_buffer_lock_reserve(struct ring_buffer *buffer,
+trace_buffer_lock_reserve(struct trace_buffer *buffer,
                          int type,
                          unsigned long len,
-                         unsigned long flags,
-                         int pc);
+                         unsigned int trace_ctx);
 
 struct trace_entry *tracing_get_trace_entry(struct trace_array *tr,
                                                struct trace_array_cpu *data);
@@ -709,9 +646,15 @@ struct trace_entry *tracing_get_trace_entry(struct trace_array *tr,
 struct trace_entry *trace_find_next_entry(struct trace_iterator *iter,
                                          int *ent_cpu, u64 *ent_ts);
 
-void trace_buffer_unlock_commit_nostack(struct ring_buffer *buffer,
+void trace_buffer_unlock_commit_nostack(struct trace_buffer *buffer,
                                        struct ring_buffer_event *event);
 
+bool trace_is_tracepoint_string(const char *str);
+const char *trace_event_format(struct trace_iterator *iter, const char *fmt);
+void trace_check_vprintf(struct trace_iterator *iter, const char *fmt,
+                        va_list ap) __printf(2, 0);
+char *trace_iter_expand_format(struct trace_iterator *iter);
+
 int trace_empty(struct trace_iterator *iter);
 
 void *trace_find_next_entry_inc(struct trace_iterator *iter);
@@ -726,15 +669,14 @@ unsigned long trace_total_entries(struct trace_array *tr);
 void trace_function(struct trace_array *tr,
                    unsigned long ip,
                    unsigned long parent_ip,
-                   unsigned long flags, int pc);
+                   unsigned int trace_ctx);
 void trace_graph_function(struct trace_array *tr,
                    unsigned long ip,
                    unsigned long parent_ip,
-                   unsigned long flags, int pc);
+                   unsigned int trace_ctx);
 void trace_latency_header(struct seq_file *m);
 void trace_default_header(struct seq_file *m);
 void print_trace_header(struct seq_file *m, struct trace_iterator *iter);
-int trace_empty(struct trace_iterator *iter);
 
 void trace_graph_return(struct ftrace_graph_ret *trace);
 int trace_graph_entry(struct ftrace_graph_ent *trace);
@@ -766,6 +708,7 @@ extern int pid_max;
 bool trace_find_filtered_pid(struct trace_pid_list *filtered_pids,
                             pid_t search_pid);
 bool trace_ignore_this_task(struct trace_pid_list *filtered_pids,
+                           struct trace_pid_list *filtered_no_pids,
                            struct task_struct *task);
 void trace_filter_add_remove_task(struct trace_pid_list *pid_list,
                                  struct task_struct *self,
@@ -773,7 +716,6 @@ void trace_filter_add_remove_task(struct trace_pid_list *pid_list,
 void *trace_pid_next(struct trace_pid_list *pid_list, void *v, loff_t *pos);
 void *trace_pid_start(struct trace_pid_list *pid_list, loff_t *pos);
 int trace_pid_show(struct seq_file *m, void *v);
-void trace_free_pid_list(struct trace_pid_list *pid_list);
 int trace_pid_write(struct trace_pid_list *filtered_pids,
                    struct trace_pid_list **new_pid_list,
                    const char __user *ubuf, size_t cnt);
@@ -783,18 +725,31 @@ void update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu,
                   void *cond_data);
 void update_max_tr_single(struct trace_array *tr,
                          struct task_struct *tsk, int cpu);
+
+#ifdef CONFIG_FSNOTIFY
+#define LATENCY_FS_NOTIFY
+#endif
 #endif /* CONFIG_TRACER_MAX_TRACE */
 
+#ifdef LATENCY_FS_NOTIFY
+void latency_fsnotify(struct trace_array *tr);
+#else
+static inline void latency_fsnotify(struct trace_array *tr) { }
+#endif
+
 #ifdef CONFIG_STACKTRACE
-void __trace_stack(struct trace_array *tr, unsigned long flags, int skip,
-                  int pc);
+void __trace_stack(struct trace_array *tr, unsigned int trace_ctx, int skip);
 #else
-static inline void __trace_stack(struct trace_array *tr, unsigned long flags,
-                                int skip, int pc)
+static inline void __trace_stack(struct trace_array *tr, unsigned int trace_ctx,
+                                int skip)
 {
 }
 #endif /* CONFIG_STACKTRACE */
 
+void trace_last_func_repeats(struct trace_array *tr,
+                            struct trace_func_repeats *last_info,
+                            unsigned int trace_ctx);
+
 extern u64 ftrace_now(int cpu);
 
 extern void trace_find_cmdline(int pid, char comm[]);
@@ -803,6 +758,8 @@ extern void trace_event_follow_fork(struct trace_array *tr, bool enable);
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 extern unsigned long ftrace_update_tot_cnt;
+extern unsigned long ftrace_number_of_pages;
+extern unsigned long ftrace_number_of_groups;
 void ftrace_init_trace_array(struct trace_array *tr);
 #else
 static inline void ftrace_init_trace_array(struct trace_array *tr) { }
@@ -812,10 +769,12 @@ extern int DYN_FTRACE_TEST_NAME(void);
 #define DYN_FTRACE_TEST_NAME2 trace_selftest_dynamic_test_func2
 extern int DYN_FTRACE_TEST_NAME2(void);
 
-extern bool ring_buffer_expanded;
+extern void trace_set_ring_buffer_expanded(struct trace_array *tr);
 extern bool tracing_selftest_disabled;
 
 #ifdef CONFIG_FTRACE_STARTUP_TEST
+extern void __init disable_tracing_selftest(const char *reason);
+
 extern int trace_selftest_startup_function(struct tracer *trace,
                                           struct trace_array *tr);
 extern int trace_selftest_startup_function_graph(struct tracer *trace,
@@ -839,6 +798,9 @@ extern int trace_selftest_startup_branch(struct tracer *trace,
  */
 #define __tracer_data          __refdata
 #else
+static inline void __init disable_tracing_selftest(const char *reason)
+{
+}
 /* Tracers are seldom changed. Optimize when selftests are disabled. */
 #define __tracer_data          __read_mostly
 #endif /* CONFIG_FTRACE_STARTUP_TEST */
@@ -852,9 +814,7 @@ trace_vprintk(unsigned long ip, const char *fmt, va_list args);
 extern int
 trace_array_vprintk(struct trace_array *tr,
                    unsigned long ip, const char *fmt, va_list args);
-int trace_array_printk(struct trace_array *tr,
-                      unsigned long ip, const char *fmt, ...);
-int trace_array_printk_buf(struct ring_buffer *buffer,
+int trace_array_printk_buf(struct trace_buffer *buffer,
                           unsigned long ip, const char *fmt, ...);
 void trace_printk_seq(struct trace_seq *s);
 enum print_line_t print_trace_line(struct trace_iterator *iter);
@@ -905,6 +865,8 @@ static __always_inline bool ftrace_hash_empty(struct ftrace_hash *hash)
 #define TRACE_GRAPH_PRINT_TAIL          0x100
 #define TRACE_GRAPH_SLEEP_TIME          0x200
 #define TRACE_GRAPH_GRAPH_TIME          0x400
+#define TRACE_GRAPH_PRINT_RETVAL        0x800
+#define TRACE_GRAPH_PRINT_RETVAL_HEX    0x1000
 #define TRACE_GRAPH_PRINT_FILL_SHIFT   28
 #define TRACE_GRAPH_PRINT_FILL_MASK    (0x3 << TRACE_GRAPH_PRINT_FILL_SHIFT)
 
@@ -925,28 +887,37 @@ extern void graph_trace_open(struct trace_iterator *iter);
 extern void graph_trace_close(struct trace_iterator *iter);
 extern int __trace_graph_entry(struct trace_array *tr,
                               struct ftrace_graph_ent *trace,
-                              unsigned long flags, int pc);
+                              unsigned int trace_ctx);
 extern void __trace_graph_return(struct trace_array *tr,
                                 struct ftrace_graph_ret *trace,
-                                unsigned long flags, int pc);
+                                unsigned int trace_ctx);
 
 #ifdef CONFIG_DYNAMIC_FTRACE
-extern struct ftrace_hash *ftrace_graph_hash;
-extern struct ftrace_hash *ftrace_graph_notrace_hash;
+extern struct ftrace_hash __rcu *ftrace_graph_hash;
+extern struct ftrace_hash __rcu *ftrace_graph_notrace_hash;
 
 static inline int ftrace_graph_addr(struct ftrace_graph_ent *trace)
 {
        unsigned long addr = trace->func;
        int ret = 0;
+       struct ftrace_hash *hash;
 
        preempt_disable_notrace();
 
-       if (ftrace_hash_empty(ftrace_graph_hash)) {
+       /*
+        * Have to open code "rcu_dereference_sched()" because the
+        * function graph tracer can be called when RCU is not
+        * "watching".
+        * Protected with schedule_on_each_cpu(ftrace_sync)
+        */
+       hash = rcu_dereference_protected(ftrace_graph_hash, !preemptible());
+
+       if (ftrace_hash_empty(hash)) {
                ret = 1;
                goto out;
        }
 
-       if (ftrace_lookup_ip(ftrace_graph_hash, addr)) {
+       if (ftrace_lookup_ip(hash, addr)) {
 
                /*
                 * This needs to be cleared on the return functions
@@ -960,7 +931,7 @@ static inline int ftrace_graph_addr(struct ftrace_graph_ent *trace)
                 * is set, and called by an interrupt handler, we still
                 * want to trace it.
                 */
-               if (in_irq())
+               if (in_hardirq())
                        trace_recursion_set(TRACE_IRQ_BIT);
                else
                        trace_recursion_clear(TRACE_IRQ_BIT);
@@ -982,10 +953,20 @@ static inline void ftrace_graph_addr_finish(struct ftrace_graph_ret *trace)
 static inline int ftrace_graph_notrace_addr(unsigned long addr)
 {
        int ret = 0;
+       struct ftrace_hash *notrace_hash;
 
        preempt_disable_notrace();
 
-       if (ftrace_lookup_ip(ftrace_graph_notrace_hash, addr))
+       /*
+        * Have to open code "rcu_dereference_sched()" because the
+        * function graph tracer can be called when RCU is not
+        * "watching".
+        * Protected with schedule_on_each_cpu(ftrace_sync)
+        */
+       notrace_hash = rcu_dereference_protected(ftrace_graph_notrace_hash,
+                                                !preemptible());
+
+       if (ftrace_lookup_ip(notrace_hash, addr))
                ret = 1;
 
        preempt_enable_notrace();
@@ -1027,6 +1008,10 @@ print_graph_function_flags(struct trace_iterator *iter, u32 flags)
 extern struct list_head ftrace_pids;
 
 #ifdef CONFIG_FUNCTION_TRACER
+
+#define FTRACE_PID_IGNORE      -1
+#define FTRACE_PID_TRACE       -2
+
 struct ftrace_func_command {
        struct list_head        list;
        char                    *name;
@@ -1038,12 +1023,15 @@ struct ftrace_func_command {
 extern bool ftrace_filter_param __initdata;
 static inline int ftrace_trace_task(struct trace_array *tr)
 {
-       return !this_cpu_read(tr->trace_buffer.data->ftrace_ignore_pid);
+       return this_cpu_read(tr->array_buffer.data->ftrace_ignore_pid) !=
+               FTRACE_PID_IGNORE;
 }
 extern int ftrace_is_dead(void);
 int ftrace_create_function_files(struct trace_array *tr,
                                 struct dentry *parent);
 void ftrace_destroy_function_files(struct trace_array *tr);
+int ftrace_allocate_ftrace_ops(struct trace_array *tr);
+void ftrace_free_ftrace_ops(struct trace_array *tr);
 void ftrace_init_global_array_ops(struct trace_array *tr);
 void ftrace_init_array_ops(struct trace_array *tr, ftrace_func_t func);
 void ftrace_reset_array_ops(struct trace_array *tr);
@@ -1065,6 +1053,11 @@ ftrace_create_function_files(struct trace_array *tr,
 {
        return 0;
 }
+static inline int ftrace_allocate_ftrace_ops(struct trace_array *tr)
+{
+       return 0;
+}
+static inline void ftrace_free_ftrace_ops(struct trace_array *tr) { }
 static inline void ftrace_destroy_function_files(struct trace_array *tr) { }
 static inline __init void
 ftrace_init_global_array_ops(struct trace_array *tr) { }
@@ -1126,6 +1119,11 @@ int unregister_ftrace_command(struct ftrace_func_command *cmd);
 void ftrace_create_filter_files(struct ftrace_ops *ops,
                                struct dentry *parent);
 void ftrace_destroy_filter_files(struct ftrace_ops *ops);
+
+extern int ftrace_set_filter(struct ftrace_ops *ops, unsigned char *buf,
+                            int len, int reset);
+extern int ftrace_set_notrace(struct ftrace_ops *ops, unsigned char *buf,
+                             int len, int reset);
 #else
 struct ftrace_func_command;
 
@@ -1237,6 +1235,7 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf,
                C(HEX,                  "hex"),                 \
                C(BIN,                  "bin"),                 \
                C(BLOCK,                "block"),               \
+               C(FIELDS,               "fields"),              \
                C(PRINTK,               "trace_printk"),        \
                C(ANNOTATE,             "annotate"),            \
                C(USERSTACKTRACE,       "userstacktrace"),      \
@@ -1251,6 +1250,8 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf,
                C(IRQ_INFO,             "irq-info"),            \
                C(MARKERS,              "markers"),             \
                C(EVENT_FORK,           "event-fork"),          \
+               C(PAUSE_ON_TRACE,       "pause-on-trace"),      \
+               C(HASH_PTR,             "hash-ptr"),    /* Print hashed pointer */ \
                FUNCTION_FLAGS                                  \
                FGRAPH_FLAGS                                    \
                STACK_FLAGS                                     \
@@ -1312,7 +1313,15 @@ static inline void trace_branch_disable(void)
 #endif /* CONFIG_BRANCH_TRACER */
 
 /* set ring buffers to default size if not already done so */
-int tracing_update_buffers(void);
+int tracing_update_buffers(struct trace_array *tr);
+
+union trace_synth_field {
+       u8                              as_u8;
+       u16                             as_u16;
+       u32                             as_u32;
+       u64                             as_u64;
+       struct trace_dynamic_info       as_dynamic;
+};
 
 struct ftrace_event_field {
        struct list_head        link;
@@ -1322,6 +1331,7 @@ struct ftrace_event_field {
        int                     offset;
        int                     size;
        int                     is_signed;
+       int                     len;
 };
 
 struct prog_entry;
@@ -1342,50 +1352,64 @@ struct trace_subsystem_dir {
        struct list_head                list;
        struct event_subsystem          *subsystem;
        struct trace_array              *tr;
-       struct dentry                   *entry;
+       struct eventfs_inode            *ei;
        int                             ref_count;
        int                             nr_events;
 };
 
 extern int call_filter_check_discard(struct trace_event_call *call, void *rec,
-                                    struct ring_buffer *buffer,
+                                    struct trace_buffer *buffer,
                                     struct ring_buffer_event *event);
 
 void trace_buffer_unlock_commit_regs(struct trace_array *tr,
-                                    struct ring_buffer *buffer,
+                                    struct trace_buffer *buffer,
                                     struct ring_buffer_event *event,
-                                    unsigned long flags, int pc,
+                                    unsigned int trcace_ctx,
                                     struct pt_regs *regs);
 
 static inline void trace_buffer_unlock_commit(struct trace_array *tr,
-                                             struct ring_buffer *buffer,
+                                             struct trace_buffer *buffer,
                                              struct ring_buffer_event *event,
-                                             unsigned long flags, int pc)
+                                             unsigned int trace_ctx)
 {
-       trace_buffer_unlock_commit_regs(tr, buffer, event, flags, pc, NULL);
+       trace_buffer_unlock_commit_regs(tr, buffer, event, trace_ctx, NULL);
 }
 
+DECLARE_PER_CPU(bool, trace_taskinfo_save);
+int trace_save_cmdline(struct task_struct *tsk);
+int trace_create_savedcmd(void);
+int trace_alloc_tgid_map(void);
+void trace_free_saved_cmdlines_buffer(void);
+
+extern const struct file_operations tracing_saved_cmdlines_fops;
+extern const struct file_operations tracing_saved_tgids_fops;
+extern const struct file_operations tracing_saved_cmdlines_size_fops;
+
 DECLARE_PER_CPU(struct ring_buffer_event *, trace_buffered_event);
 DECLARE_PER_CPU(int, trace_buffered_event_cnt);
 void trace_buffered_event_disable(void);
 void trace_buffered_event_enable(void);
 
+void early_enable_events(struct trace_array *tr, char *buf, bool disable_first);
+
 static inline void
-__trace_event_discard_commit(struct ring_buffer *buffer,
+__trace_event_discard_commit(struct trace_buffer *buffer,
                             struct ring_buffer_event *event)
 {
        if (this_cpu_read(trace_buffered_event) == event) {
-               /* Simply release the temp buffer */
+               /* Simply release the temp buffer and enable preemption */
                this_cpu_dec(trace_buffered_event_cnt);
+               preempt_enable_notrace();
                return;
        }
+       /* ring_buffer_discard_commit() enables preemption */
        ring_buffer_discard_commit(buffer, event);
 }
 
 /*
  * Helper function for event_trigger_unlock_commit{_regs}().
  * If there are event triggers attached to this event that requires
- * filtering against its fields, then they wil be called as the
+ * filtering against its fields, then they will be called as the
  * entry already holds the field information of the current event.
  *
  * It also checks if the event should be discarded or not.
@@ -1397,7 +1421,7 @@ __trace_event_discard_commit(struct ring_buffer *buffer,
  */
 static inline bool
 __event_trigger_test_discard(struct trace_event_file *file,
-                            struct ring_buffer *buffer,
+                            struct trace_buffer *buffer,
                             struct ring_buffer_event *event,
                             void *entry,
                             enum event_trigger_type *tt)
@@ -1405,26 +1429,37 @@ __event_trigger_test_discard(struct trace_event_file *file,
        unsigned long eflags = file->flags;
 
        if (eflags & EVENT_FILE_FL_TRIGGER_COND)
-               *tt = event_triggers_call(file, entry, event);
+               *tt = event_triggers_call(file, buffer, entry, event);
 
-       if (test_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags) ||
-           (unlikely(file->flags & EVENT_FILE_FL_FILTERED) &&
-            !filter_match_preds(file->filter, entry))) {
-               __trace_event_discard_commit(buffer, event);
-               return true;
-       }
+       if (likely(!(file->flags & (EVENT_FILE_FL_SOFT_DISABLED |
+                                   EVENT_FILE_FL_FILTERED |
+                                   EVENT_FILE_FL_PID_FILTER))))
+               return false;
+
+       if (file->flags & EVENT_FILE_FL_SOFT_DISABLED)
+               goto discard;
+
+       if (file->flags & EVENT_FILE_FL_FILTERED &&
+           !filter_match_preds(file->filter, entry))
+               goto discard;
+
+       if ((file->flags & EVENT_FILE_FL_PID_FILTER) &&
+           trace_event_ignore_this_pid(file))
+               goto discard;
 
        return false;
+ discard:
+       __trace_event_discard_commit(buffer, event);
+       return true;
 }
 
 /**
  * event_trigger_unlock_commit - handle triggers and finish event commit
- * @file: The file pointer assoctiated to the event
+ * @file: The file pointer associated with the event
  * @buffer: The ring buffer that the event is being written to
  * @event: The event meta data in the ring buffer
  * @entry: The event itself
- * @irq_flags: The state of the interrupts at the start of the event
- * @pc: The state of the preempt count at the start of the event.
+ * @trace_ctx: The tracing context flags.
  *
  * This is a helper function to handle triggers that require data
  * from the event itself. It also tests the event against filters and
@@ -1432,47 +1467,14 @@ __event_trigger_test_discard(struct trace_event_file *file,
  */
 static inline void
 event_trigger_unlock_commit(struct trace_event_file *file,
-                           struct ring_buffer *buffer,
+                           struct trace_buffer *buffer,
                            struct ring_buffer_event *event,
-                           void *entry, unsigned long irq_flags, int pc)
-{
-       enum event_trigger_type tt = ETT_NONE;
-
-       if (!__event_trigger_test_discard(file, buffer, event, entry, &tt))
-               trace_buffer_unlock_commit(file->tr, buffer, event, irq_flags, pc);
-
-       if (tt)
-               event_triggers_post_call(file, tt);
-}
-
-/**
- * event_trigger_unlock_commit_regs - handle triggers and finish event commit
- * @file: The file pointer assoctiated to the event
- * @buffer: The ring buffer that the event is being written to
- * @event: The event meta data in the ring buffer
- * @entry: The event itself
- * @irq_flags: The state of the interrupts at the start of the event
- * @pc: The state of the preempt count at the start of the event.
- *
- * This is a helper function to handle triggers that require data
- * from the event itself. It also tests the event against filters and
- * if the event is soft disabled and should be discarded.
- *
- * Same as event_trigger_unlock_commit() but calls
- * trace_buffer_unlock_commit_regs() instead of trace_buffer_unlock_commit().
- */
-static inline void
-event_trigger_unlock_commit_regs(struct trace_event_file *file,
-                                struct ring_buffer *buffer,
-                                struct ring_buffer_event *event,
-                                void *entry, unsigned long irq_flags, int pc,
-                                struct pt_regs *regs)
+                           void *entry, unsigned int trace_ctx)
 {
        enum event_trigger_type tt = ETT_NONE;
 
        if (!__event_trigger_test_discard(file, buffer, event, entry, &tt))
-               trace_buffer_unlock_commit_regs(file->tr, buffer, event,
-                                               irq_flags, pc, regs);
+               trace_buffer_unlock_commit(file->tr, buffer, event, trace_ctx);
 
        if (tt)
                event_triggers_post_call(file, tt);
@@ -1494,8 +1496,6 @@ event_trigger_unlock_commit_regs(struct trace_event_file *file,
 struct filter_pred;
 struct regex;
 
-typedef int (*filter_pred_fn_t) (struct filter_pred *pred, void *event);
-
 typedef int (*regex_match_func)(char *str, struct regex *r, int len);
 
 enum regex_type {
@@ -1514,20 +1514,10 @@ struct regex {
        regex_match_func        match;
 };
 
-struct filter_pred {
-       filter_pred_fn_t        fn;
-       u64                     val;
-       struct regex            regex;
-       unsigned short          *ops;
-       struct ftrace_event_field *field;
-       int                     offset;
-       int                     not;
-       int                     op;
-};
-
 static inline bool is_string_field(struct ftrace_event_field *field)
 {
        return field->filter_type == FILTER_DYN_STRING ||
+              field->filter_type == FILTER_RDYN_STRING ||
               field->filter_type == FILTER_STATIC_STRING ||
               field->filter_type == FILTER_PTR_STRING ||
               field->filter_type == FILTER_COMM;
@@ -1562,8 +1552,10 @@ extern void trace_event_enable_cmd_record(bool enable);
 extern void trace_event_enable_tgid_record(bool enable);
 
 extern int event_trace_init(void);
+extern int init_events(void);
 extern int event_trace_add_tracer(struct dentry *parent, struct trace_array *tr);
 extern int event_trace_del_tracer(struct trace_array *tr);
+extern void __trace_early_add_events(struct trace_array *tr);
 
 extern struct trace_event_file *__find_event_file(struct trace_array *tr,
                                                  const char *system,
@@ -1582,6 +1574,8 @@ extern struct list_head ftrace_events;
 
 extern const struct file_operations event_trigger_fops;
 extern const struct file_operations event_hist_fops;
+extern const struct file_operations event_hist_debug_fops;
+extern const struct file_operations event_inject_fops;
 
 #ifdef CONFIG_HIST_TRIGGERS
 extern int register_trigger_hist_cmd(void);
@@ -1594,9 +1588,14 @@ static inline int register_trigger_hist_enable_disable_cmds(void) { return 0; }
 extern int register_trigger_cmds(void);
 extern void clear_event_triggers(struct trace_array *tr);
 
+enum {
+       EVENT_TRIGGER_FL_PROBE          = BIT(0),
+};
+
 struct event_trigger_data {
        unsigned long                   count;
        int                             ref;
+       int                             flags;
        struct event_trigger_ops        *ops;
        struct event_command            *cmd_ops;
        struct event_filter __rcu       *filter;
@@ -1623,24 +1622,20 @@ struct enable_trigger_data {
 };
 
 extern int event_enable_trigger_print(struct seq_file *m,
-                                     struct event_trigger_ops *ops,
-                                     struct event_trigger_data *data);
-extern void event_enable_trigger_free(struct event_trigger_ops *ops,
                                      struct event_trigger_data *data);
-extern int event_enable_trigger_func(struct event_command *cmd_ops,
-                                    struct trace_event_file *file,
-                                    char *glob, char *cmd, char *param);
+extern void event_enable_trigger_free(struct event_trigger_data *data);
+extern int event_enable_trigger_parse(struct event_command *cmd_ops,
+                                     struct trace_event_file *file,
+                                     char *glob, char *cmd,
+                                     char *param_and_filter);
 extern int event_enable_register_trigger(char *glob,
-                                        struct event_trigger_ops *ops,
                                         struct event_trigger_data *data,
                                         struct trace_event_file *file);
 extern void event_enable_unregister_trigger(char *glob,
-                                           struct event_trigger_ops *ops,
                                            struct event_trigger_data *test,
                                            struct trace_event_file *file);
 extern void trigger_data_free(struct event_trigger_data *data);
-extern int event_trigger_init(struct event_trigger_ops *ops,
-                             struct event_trigger_data *data);
+extern int event_trigger_init(struct event_trigger_data *data);
 extern int trace_event_trigger_enable_disable(struct trace_event_file *file,
                                              int trigger_enable);
 extern void update_cond_flag(struct trace_event_file *file);
@@ -1661,6 +1656,34 @@ get_named_trigger_data(struct event_trigger_data *data);
 extern int register_event_command(struct event_command *cmd);
 extern int unregister_event_command(struct event_command *cmd);
 extern int register_trigger_hist_enable_disable_cmds(void);
+extern bool event_trigger_check_remove(const char *glob);
+extern bool event_trigger_empty_param(const char *param);
+extern int event_trigger_separate_filter(char *param_and_filter, char **param,
+                                        char **filter, bool param_required);
+extern struct event_trigger_data *
+event_trigger_alloc(struct event_command *cmd_ops,
+                   char *cmd,
+                   char *param,
+                   void *private_data);
+extern int event_trigger_parse_num(char *trigger,
+                                  struct event_trigger_data *trigger_data);
+extern int event_trigger_set_filter(struct event_command *cmd_ops,
+                                   struct trace_event_file *file,
+                                   char *param,
+                                   struct event_trigger_data *trigger_data);
+extern void event_trigger_reset_filter(struct event_command *cmd_ops,
+                                      struct event_trigger_data *trigger_data);
+extern int event_trigger_register(struct event_command *cmd_ops,
+                                 struct trace_event_file *file,
+                                 char *glob,
+                                 struct event_trigger_data *trigger_data);
+extern void event_trigger_unregister(struct event_command *cmd_ops,
+                                    struct trace_event_file *file,
+                                    char *glob,
+                                    struct event_trigger_data *trigger_data);
+
+extern void event_file_get(struct trace_event_file *file);
+extern void event_file_put(struct trace_event_file *file);
 
 /**
  * struct event_trigger_ops - callbacks for trace event triggers
@@ -1668,10 +1691,20 @@ extern int register_trigger_hist_enable_disable_cmds(void);
  * The methods in this structure provide per-event trigger hooks for
  * various trigger operations.
  *
+ * The @init and @free methods are used during trigger setup and
+ * teardown, typically called from an event_command's @parse()
+ * function implementation.
+ *
+ * The @print method is used to print the trigger spec.
+ *
+ * The @trigger method is the function that actually implements the
+ * trigger and is called in the context of the triggering event
+ * whenever that event occurs.
+ *
  * All the methods below, except for @init() and @free(), must be
  * implemented.
  *
- * @func: The trigger 'probe' function called when the triggering
+ * @trigger: The trigger 'probe' function called when the triggering
  *     event occurs.  The data passed into this callback is the data
  *     that was supplied to the event_command @reg() function that
  *     registered the trigger (see struct event_command) along with
@@ -1700,15 +1733,13 @@ extern int register_trigger_hist_enable_disable_cmds(void);
  *     (see trace_event_triggers.c).
  */
 struct event_trigger_ops {
-       void                    (*func)(struct event_trigger_data *data,
-                                       void *rec,
-                                       struct ring_buffer_event *rbe);
-       int                     (*init)(struct event_trigger_ops *ops,
-                                       struct event_trigger_data *data);
-       void                    (*free)(struct event_trigger_ops *ops,
-                                       struct event_trigger_data *data);
+       void                    (*trigger)(struct event_trigger_data *data,
+                                          struct trace_buffer *buffer,
+                                          void *rec,
+                                          struct ring_buffer_event *rbe);
+       int                     (*init)(struct event_trigger_data *data);
+       void                    (*free)(struct event_trigger_data *data);
        int                     (*print)(struct seq_file *m,
-                                        struct event_trigger_ops *ops,
                                         struct event_trigger_data *data);
 };
 
@@ -1751,7 +1782,7 @@ struct event_trigger_ops {
  * All the methods below, except for @set_filter() and @unreg_all(),
  * must be implemented.
  *
- * @func: The callback function responsible for parsing and
+ * @parse: The callback function responsible for parsing and
  *     registering the trigger written to the 'trigger' file by the
  *     user.  It allocates the trigger instance and registers it with
  *     the appropriate trace event.  It makes use of the other
@@ -1786,21 +1817,24 @@ struct event_trigger_ops {
  *
  * @get_trigger_ops: The callback function invoked to retrieve the
  *     event_trigger_ops implementation associated with the command.
+ *     This callback function allows a single event_command to
+ *     support multiple trigger implementations via different sets of
+ *     event_trigger_ops, depending on the value of the @param
+ *     string.
  */
 struct event_command {
        struct list_head        list;
        char                    *name;
        enum event_trigger_type trigger_type;
        int                     flags;
-       int                     (*func)(struct event_command *cmd_ops,
-                                       struct trace_event_file *file,
-                                       char *glob, char *cmd, char *params);
+       int                     (*parse)(struct event_command *cmd_ops,
+                                        struct trace_event_file *file,
+                                        char *glob, char *cmd,
+                                        char *param_and_filter);
        int                     (*reg)(char *glob,
-                                      struct event_trigger_ops *ops,
                                       struct event_trigger_data *data,
                                       struct trace_event_file *file);
        void                    (*unreg)(char *glob,
-                                        struct event_trigger_ops *ops,
                                         struct event_trigger_data *data,
                                         struct trace_event_file *file);
        void                    (*unreg_all)(struct trace_event_file *file);
@@ -1869,22 +1903,29 @@ extern const char *__start___tracepoint_str[];
 extern const char *__stop___tracepoint_str[];
 
 void trace_printk_control(bool enabled);
-void trace_printk_init_buffers(void);
 void trace_printk_start_comm(void);
 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
 int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
 
+/* Used from boot time tracer */
+extern int trace_set_options(struct trace_array *tr, char *option);
+extern int tracing_set_tracer(struct trace_array *tr, const char *buf);
+extern ssize_t tracing_resize_ring_buffer(struct trace_array *tr,
+                                         unsigned long size, int cpu_id);
+extern int tracing_set_cpumask(struct trace_array *tr,
+                               cpumask_var_t tracing_cpumask_new);
+
+
 #define MAX_EVENT_NAME_LEN     64
 
-extern int trace_run_command(const char *buf, int (*createfn)(int, char**));
 extern ssize_t trace_parse_run_command(struct file *file,
                const char __user *buffer, size_t count, loff_t *ppos,
-               int (*createfn)(int, char**));
+               int (*createfn)(const char *));
 
 extern unsigned int err_pos(char *cmd, const char *str);
 extern void tracing_log_err(struct trace_array *tr,
                            const char *loc, const char *cmd,
-                           const char **errs, u8 type, u8 pos);
+                           const char **errs, u8 type, u16 pos);
 
 /*
  * Normal trace_printk() and friends allocates special buffers
@@ -1898,17 +1939,15 @@ extern void tracing_log_err(struct trace_array *tr,
 #define internal_trace_puts(str) __trace_puts(_THIS_IP_, str, strlen(str))
 
 #undef FTRACE_ENTRY
-#define FTRACE_ENTRY(call, struct_name, id, tstruct, print, filter)    \
+#define FTRACE_ENTRY(call, struct_name, id, tstruct, print)    \
        extern struct trace_event_call                                  \
        __aligned(4) event_##call;
 #undef FTRACE_ENTRY_DUP
-#define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print, filter)        \
-       FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print), \
-                    filter)
+#define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print)        \
+       FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))
 #undef FTRACE_ENTRY_PACKED
-#define FTRACE_ENTRY_PACKED(call, struct_name, id, tstruct, print, filter) \
-       FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print), \
-                    filter)
+#define FTRACE_ENTRY_PACKED(call, struct_name, id, tstruct, print) \
+       FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))
 
 #include "trace_entries.h"
 
@@ -1933,6 +1972,9 @@ static inline const char *get_syscall_name(int syscall)
 #ifdef CONFIG_EVENT_TRACING
 void trace_event_init(void);
 void trace_event_eval_update(struct trace_eval_map **map, int len);
+/* Used from boot time tracer */
+extern int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set);
+extern int trigger_process_regex(struct trace_event_file *file, char *buff);
 #else
 static inline void __init trace_event_init(void) { }
 static inline void trace_event_eval_update(struct trace_eval_map **map, int len) { }
@@ -1941,12 +1983,16 @@ static inline void trace_event_eval_update(struct trace_eval_map **map, int len)
 #ifdef CONFIG_TRACER_SNAPSHOT
 void tracing_snapshot_instance(struct trace_array *tr);
 int tracing_alloc_snapshot_instance(struct trace_array *tr);
+int tracing_arm_snapshot(struct trace_array *tr);
+void tracing_disarm_snapshot(struct trace_array *tr);
 #else
 static inline void tracing_snapshot_instance(struct trace_array *tr) { }
 static inline int tracing_alloc_snapshot_instance(struct trace_array *tr)
 {
        return 0;
 }
+static inline int tracing_arm_snapshot(struct trace_array *tr) { return 0; }
+static inline void tracing_disarm_snapshot(struct trace_array *tr) { }
 #endif
 
 #ifdef CONFIG_PREEMPT_TRACER
@@ -1964,8 +2010,6 @@ static inline void tracer_hardirqs_on(unsigned long a0, unsigned long a1) { }
 static inline void tracer_hardirqs_off(unsigned long a0, unsigned long a1) { }
 #endif
 
-extern struct trace_iterator *tracepoint_print_iter;
-
 /*
  * Reset the state of the trace_iterator so that it can read consumed data.
  * Normally, the trace_iterator is used for reading the data when it is not
@@ -1973,15 +2017,68 @@ extern struct trace_iterator *tracepoint_print_iter;
  */
 static __always_inline void trace_iterator_reset(struct trace_iterator *iter)
 {
-       const size_t offset = offsetof(struct trace_iterator, seq);
+       memset_startat(iter, 0, seq);
+       iter->pos = -1;
+}
 
-       /*
-        * Keep gcc from complaining about overwriting more than just one
-        * member in the structure.
-        */
-       memset((char *)iter + offset, 0, sizeof(struct trace_iterator) - offset);
+/* Check the name is good for event/group/fields */
+static inline bool __is_good_name(const char *name, bool hash_ok)
+{
+       if (!isalpha(*name) && *name != '_' && (!hash_ok || *name != '-'))
+               return false;
+       while (*++name != '\0') {
+               if (!isalpha(*name) && !isdigit(*name) && *name != '_' &&
+                   (!hash_ok || *name != '-'))
+                       return false;
+       }
+       return true;
+}
 
-       iter->pos = -1;
+/* Check the name is good for event/group/fields */
+static inline bool is_good_name(const char *name)
+{
+       return __is_good_name(name, false);
+}
+
+/* Check the name is good for system */
+static inline bool is_good_system_name(const char *name)
+{
+       return __is_good_name(name, true);
+}
+
+/* Convert certain expected symbols into '_' when generating event names */
+static inline void sanitize_event_name(char *name)
+{
+       while (*name++ != '\0')
+               if (*name == ':' || *name == '.')
+                       *name = '_';
+}
+
+/*
+ * This is a generic way to read and write a u64 value from a file in tracefs.
+ *
+ * The value is stored on the variable pointed by *val. The value needs
+ * to be at least *min and at most *max. The write is protected by an
+ * existing *lock.
+ */
+struct trace_min_max_param {
+       struct mutex    *lock;
+       u64             *val;
+       u64             *min;
+       u64             *max;
+};
+
+#define U64_STR_SIZE           24      /* 20 digits max */
+
+extern const struct file_operations trace_min_max_fops;
+
+#ifdef CONFIG_RV
+extern int rv_init_interface(void);
+#else
+static inline int rv_init_interface(void)
+{
+       return 0;
 }
+#endif
 
 #endif /* _LINUX_KERNEL_TRACE_H */