]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - kernel/trace/trace.h
ftrace: remove printks from irqsoff trace
[mv-sheeva.git] / kernel / trace / trace.h
index f5b32ca0b457b52430931d02f3beb4db669118c8..c460e85e94ed81ddb64283c9bb4ea7749a384663 100644 (file)
@@ -6,6 +6,18 @@
 #include <linux/sched.h>
 #include <linux/clocksource.h>
 
+enum trace_type {
+       __TRACE_FIRST_TYPE = 0,
+
+       TRACE_FN,
+       TRACE_CTX,
+       TRACE_WAKE,
+       TRACE_STACK,
+       TRACE_SPECIAL,
+
+       __TRACE_LAST_TYPE
+};
+
 /*
  * Function trace entry - function address and parent function addres:
  */
@@ -23,6 +35,26 @@ struct ctx_switch_entry {
        unsigned char           prev_state;
        unsigned int            next_pid;
        unsigned char           next_prio;
+       unsigned char           next_state;
+};
+
+/*
+ * Special (free-form) trace entry:
+ */
+struct special_entry {
+       unsigned long           arg1;
+       unsigned long           arg2;
+       unsigned long           arg3;
+};
+
+/*
+ * Stack-trace entry:
+ */
+
+#define FTRACE_STACK_ENTRIES   8
+
+struct stack_entry {
+       unsigned long           caller[FTRACE_STACK_ENTRIES];
 };
 
 /*
@@ -38,10 +70,11 @@ struct trace_entry {
        char                    preempt_count;
        int                     pid;
        cycle_t                 t;
-       unsigned long           idx;
        union {
                struct ftrace_entry             fn;
                struct ctx_switch_entry         ctx;
+               struct special_entry            special;
+               struct stack_entry              stack;
        };
 };
 
@@ -55,7 +88,8 @@ struct trace_entry {
 struct trace_array_cpu {
        struct list_head        trace_pages;
        atomic_t                disabled;
-       cycle_t                 time_offset;
+       raw_spinlock_t          lock;
+       struct lock_class_key   lock_key;
 
        /* these fields get copied into max-trace: */
        unsigned                trace_head_idx;
@@ -63,6 +97,7 @@ struct trace_array_cpu {
        void                    *trace_head; /* producer */
        void                    *trace_tail; /* consumer */
        unsigned long           trace_idx;
+       unsigned long           overrun;
        unsigned long           saved_latency;
        unsigned long           critical_start;
        unsigned long           critical_end;
@@ -88,6 +123,7 @@ struct trace_array {
        long                    ctrl;
        int                     cpu;
        cycle_t                 time_start;
+       struct task_struct      *waiter;
        struct trace_array_cpu  *data[NR_CPUS];
 };
 
@@ -99,14 +135,19 @@ struct tracer {
        void                    (*init)(struct trace_array *tr);
        void                    (*reset)(struct trace_array *tr);
        void                    (*open)(struct trace_iterator *iter);
+       void                    (*pipe_open)(struct trace_iterator *iter);
        void                    (*close)(struct trace_iterator *iter);
        void                    (*start)(struct trace_iterator *iter);
        void                    (*stop)(struct trace_iterator *iter);
+       ssize_t                 (*read)(struct trace_iterator *iter,
+                                       struct file *filp, char __user *ubuf,
+                                       size_t cnt, loff_t *ppos);
        void                    (*ctrl_update)(struct trace_array *tr);
 #ifdef CONFIG_FTRACE_STARTUP_TEST
        int                     (*selftest)(struct tracer *trace,
                                            struct trace_array *tr);
 #endif
+       int                     (*print_line)(struct trace_iterator *iter);
        struct tracer           *next;
        int                     print_max;
 };
@@ -114,6 +155,7 @@ struct tracer {
 struct trace_seq {
        unsigned char           buffer[PAGE_SIZE];
        unsigned int            len;
+       unsigned int            readpos;
 };
 
 /*
@@ -121,10 +163,14 @@ struct trace_seq {
  * results to users and which routines might sleep, etc:
  */
 struct trace_iterator {
-       struct trace_seq        seq;
        struct trace_array      *tr;
        struct tracer           *trace;
+       void                    *private;
+       long                    last_overrun[NR_CPUS];
+       long                    overrun[NR_CPUS];
 
+       /* The below is zeroed out in pipe_read */
+       struct trace_seq        seq;
        struct trace_entry      *ent;
        int                     cpu;
 
@@ -139,7 +185,7 @@ struct trace_iterator {
        long                    idx;
 };
 
-void notrace tracing_reset(struct trace_array_cpu *data);
+void tracing_reset(struct trace_array_cpu *data);
 int tracing_open_generic(struct inode *inode, struct file *filp);
 struct dentry *tracing_init_dentry(void);
 void ftrace(struct trace_array *tr,
@@ -154,6 +200,22 @@ void tracing_sched_switch_trace(struct trace_array *tr,
                                unsigned long flags);
 void tracing_record_cmdline(struct task_struct *tsk);
 
+void tracing_sched_wakeup_trace(struct trace_array *tr,
+                               struct trace_array_cpu *data,
+                               struct task_struct *wakee,
+                               struct task_struct *cur,
+                               unsigned long flags);
+void trace_special(struct trace_array *tr,
+                  struct trace_array_cpu *data,
+                  unsigned long arg1,
+                  unsigned long arg2,
+                  unsigned long arg3);
+void trace_function(struct trace_array *tr,
+                   struct trace_array_cpu *data,
+                   unsigned long ip,
+                   unsigned long parent_ip,
+                   unsigned long flags);
+
 void tracing_start_function_trace(void);
 void tracing_stop_function_trace(void);
 int register_tracer(struct tracer *type);
@@ -164,28 +226,18 @@ extern unsigned long nsecs_to_usecs(unsigned long nsecs);
 extern unsigned long tracing_max_latency;
 extern unsigned long tracing_thresh;
 
+extern atomic_t trace_record_cmdline_enabled;
+
 void update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu);
 void update_max_tr_single(struct trace_array *tr,
                          struct task_struct *tsk, int cpu);
 
-static inline notrace cycle_t now(int cpu)
-{
-       return cpu_clock(cpu);
-}
-
-#ifdef CONFIG_SCHED_TRACER
-extern void notrace
-wakeup_sched_switch(struct task_struct *prev, struct task_struct *next);
-#else
-static inline void
-wakeup_sched_switch(struct task_struct *prev, struct task_struct *next)
-{
-}
-#endif
+extern cycle_t ftrace_now(int cpu);
 
 #ifdef CONFIG_CONTEXT_SWITCH_TRACER
 typedef void
 (*tracer_switch_func_t)(void *private,
+                       void *__rq,
                        struct task_struct *prev,
                        struct task_struct *next);
 
@@ -195,13 +247,12 @@ struct tracer_switch_ops {
        struct tracer_switch_ops        *next;
 };
 
-extern int register_tracer_switch(struct tracer_switch_ops *ops);
-extern int unregister_tracer_switch(struct tracer_switch_ops *ops);
-
 #endif /* CONFIG_CONTEXT_SWITCH_TRACER */
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 extern unsigned long ftrace_update_tot_cnt;
+#define DYN_FTRACE_TEST_NAME trace_selftest_dynamic_test_func
+extern int DYN_FTRACE_TEST_NAME(void);
 #endif
 
 #ifdef CONFIG_FTRACE_STARTUP_TEST
@@ -232,5 +283,31 @@ extern int trace_selftest_startup_sched_switch(struct tracer *trace,
 #endif /* CONFIG_FTRACE_STARTUP_TEST */
 
 extern void *head_page(struct trace_array_cpu *data);
+extern int trace_seq_printf(struct trace_seq *s, const char *fmt, ...);
+extern ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
+                                size_t cnt);
+extern long ns2usecs(cycle_t nsec);
+
+extern unsigned long trace_flags;
+
+/*
+ * trace_iterator_flags is an enumeration that defines bit
+ * positions into trace_flags that controls the output.
+ *
+ * NOTE: These bits must match the trace_options array in
+ *       trace.c.
+ */
+enum trace_iterator_flags {
+       TRACE_ITER_PRINT_PARENT         = 0x01,
+       TRACE_ITER_SYM_OFFSET           = 0x02,
+       TRACE_ITER_SYM_ADDR             = 0x04,
+       TRACE_ITER_VERBOSE              = 0x08,
+       TRACE_ITER_RAW                  = 0x10,
+       TRACE_ITER_HEX                  = 0x20,
+       TRACE_ITER_BIN                  = 0x40,
+       TRACE_ITER_BLOCK                = 0x80,
+       TRACE_ITER_STACKTRACE           = 0x100,
+       TRACE_ITER_SCHED_TREE           = 0x200,
+};
 
 #endif /* _LINUX_KERNEL_TRACE_H */