1 files changed, 54 insertions, 29 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index d345d649d073..d86e3252f300 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -34,6 +34,7 @@
 
 #include <linux/stacktrace.h>
 #include <linux/ring_buffer.h>
+#include <linux/irqflags.h>
 
 #include "trace.h"
 
@@ -655,7 +656,11 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
         entry->preempt_count            = pc & 0xff;
         entry->pid                      = (tsk) ? tsk->pid : 0;
         entry->flags =
+#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
                 (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) |
+#else
+                TRACE_FLAG_IRQS_NOSUPPORT |
+#endif
                 ((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) |
                 ((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) |
                 (need_resched() ? TRACE_FLAG_NEED_RESCHED : 0);
@@ -700,6 +705,7 @@ static void ftrace_trace_stack(struct trace_array *tr,
                                unsigned long flags,
                                int skip, int pc)
 {
+#ifdef CONFIG_STACKTRACE
         struct ring_buffer_event *event;
         struct stack_entry *entry;
         struct stack_trace trace;
@@ -725,6 +731,7 @@ static void ftrace_trace_stack(struct trace_array *tr,
 
         save_stack_trace(&trace);
         ring_buffer_unlock_commit(tr->buffer, event, irq_flags);
+#endif
 }
 
 void __trace_stack(struct trace_array *tr,
@@ -851,7 +858,7 @@ ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3)
         preempt_enable_notrace();
 }
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 static void
 function_trace_call(unsigned long ip, unsigned long parent_ip)
 {
@@ -865,9 +872,6 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
         if (unlikely(!ftrace_function_enabled))
                 return;
 
-        if (skip_trace(ip))
-                return;
-
         pc = preempt_count();
         resched = need_resched();
         preempt_disable_notrace();
@@ -1084,17 +1088,20 @@ static void s_stop(struct seq_file *m, void *p)
         mutex_unlock(&trace_types_lock);
 }
 
-#define KRETPROBE_MSG "[unknown/kretprobe'd]"
-
 #ifdef CONFIG_KRETPROBES
-static inline int kretprobed(unsigned long addr)
+static inline const char *kretprobed(const char *name)
 {
-        return addr == (unsigned long)kretprobe_trampoline;
+        static const char tramp_name[] = "kretprobe_trampoline";
+        int size = sizeof(tramp_name);
+
+        if (strncmp(tramp_name, name, size) == 0)
+                return "[unknown/kretprobe'd]";
+        return name;
 }
 #else
-static inline int kretprobed(unsigned long addr)
+static inline const char *kretprobed(const char *name)
 {
-        return 0;
+        return name;
 }
 #endif /* CONFIG_KRETPROBES */
 
@@ -1103,10 +1110,13 @@ seq_print_sym_short(struct trace_seq *s, const char *fmt, unsigned long address)
 {
 #ifdef CONFIG_KALLSYMS
         char str[KSYM_SYMBOL_LEN];
+        const char *name;
 
         kallsyms_lookup(address, NULL, NULL, NULL, str);
 
-        return trace_seq_printf(s, fmt, str);
+        name = kretprobed(str);
+
+        return trace_seq_printf(s, fmt, name);
 #endif
         return 1;
 }
@@ -1117,9 +1127,12 @@ seq_print_sym_offset(struct trace_seq *s, const char *fmt,
 {
 #ifdef CONFIG_KALLSYMS
         char str[KSYM_SYMBOL_LEN];
+        const char *name;
 
         sprint_symbol(str, address);
-        return trace_seq_printf(s, fmt, str);
+        name = kretprobed(str);
+
+        return trace_seq_printf(s, fmt, name);
 #endif
         return 1;
 }
@@ -1246,7 +1259,8 @@ lat_print_generic(struct trace_seq *s, struct trace_entry *entry, int cpu)
         trace_seq_printf(s, "%8.8s-%-5d ", comm, entry->pid);
         trace_seq_printf(s, "%3d", cpu);
         trace_seq_printf(s, "%c%c",
-                        (entry->flags & TRACE_FLAG_IRQS_OFF) ? 'd' : '.',
+                        (entry->flags & TRACE_FLAG_IRQS_OFF) ? 'd' :
+                         (entry->flags & TRACE_FLAG_IRQS_NOSUPPORT) ? 'X' : '.',
                         ((entry->flags & TRACE_FLAG_NEED_RESCHED) ? 'N' : '.'));
 
         hardirq = entry->flags & TRACE_FLAG_HARDIRQ;
@@ -1372,10 +1386,7 @@ print_lat_fmt(struct trace_iterator *iter, unsigned int trace_idx, int cpu)
 
                 seq_print_ip_sym(s, field->ip, sym_flags);
                 trace_seq_puts(s, " (");
-                if (kretprobed(field->parent_ip))
-                        trace_seq_puts(s, KRETPROBE_MSG);
-                else
-                        seq_print_ip_sym(s, field->parent_ip, sym_flags);
+                seq_print_ip_sym(s, field->parent_ip, sym_flags);
                 trace_seq_puts(s, ")\n");
                 break;
         }
@@ -1491,12 +1502,9 @@ static enum print_line_t print_trace_fmt(struct trace_iterator *iter)
                         ret = trace_seq_printf(s, " <-");
                         if (!ret)
                                 return TRACE_TYPE_PARTIAL_LINE;
-                        if (kretprobed(field->parent_ip))
-                                ret = trace_seq_puts(s, KRETPROBE_MSG);
-                        else
-                                ret = seq_print_ip_sym(s,
-                                                       field->parent_ip,
-                                                       sym_flags);
+                        ret = seq_print_ip_sym(s,
+                                               field->parent_ip,
+                                               sym_flags);
                         if (!ret)
                                 return TRACE_TYPE_PARTIAL_LINE;
                 }
@@ -1747,7 +1755,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter)
                 return TRACE_TYPE_HANDLED;
 
         SEQ_PUT_FIELD_RET(s, entry->pid);
-        SEQ_PUT_FIELD_RET(s, iter->cpu);
+        SEQ_PUT_FIELD_RET(s, entry->cpu);
         SEQ_PUT_FIELD_RET(s, iter->ts);
 
         switch (entry->type) {
@@ -1928,6 +1936,7 @@ __tracing_open(struct inode *inode, struct file *file, int *ret)
                         ring_buffer_read_finish(iter->buffer_iter[cpu]);
         }
         mutex_unlock(&trace_types_lock);
+        kfree(iter);
 
         return ERR_PTR(-ENOMEM);
 }
@@ -2379,9 +2388,10 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf,
         int i;
         size_t ret;
 
+        ret = cnt;
+
         if (cnt > max_tracer_type_len)
                 cnt = max_tracer_type_len;
-        ret = cnt;
 
         if (copy_from_user(&buf, ubuf, cnt))
                 return -EFAULT;
@@ -2414,8 +2424,8 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf,
  out:
         mutex_unlock(&trace_types_lock);
 
-        if (ret == cnt)
-                filp->f_pos += cnt;
+        if (ret > 0)
+                filp->f_pos += ret;
 
         return ret;
 }
@@ -2667,7 +2677,7 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
 {
         unsigned long val;
         char buf[64];
-        int ret;
+        int ret, cpu;
         struct trace_array *tr = filp->private_data;
 
         if (cnt >= sizeof(buf))
@@ -2695,6 +2705,14 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
                 goto out;
         }
 
+        /* disable all cpu buffers */
+        for_each_tracing_cpu(cpu) {
+                if (global_trace.data[cpu])
+                        atomic_inc(&global_trace.data[cpu]->disabled);
+                if (max_tr.data[cpu])
+                        atomic_inc(&max_tr.data[cpu]->disabled);
+        }
+
         if (val != global_trace.entries) {
                 ret = ring_buffer_resize(global_trace.buffer, val);
                 if (ret < 0) {
@@ -2726,6 +2744,13 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
         if (tracing_disabled)
                 cnt = -ENOMEM;
  out:
+        for_each_tracing_cpu(cpu) {
+                if (global_trace.data[cpu])
+                        atomic_dec(&global_trace.data[cpu]->disabled);
+                if (max_tr.data[cpu])
+                        atomic_dec(&max_tr.data[cpu]->disabled);
+        }
+
         max_tr.entries = global_trace.entries;
         mutex_unlock(&trace_types_lock);
 
@@ -3097,7 +3122,7 @@ void ftrace_dump(void)
         dump_ran = 1;
 
         /* No turning back! */
-        ftrace_kill_atomic();
+        ftrace_kill();
 
         for_each_tracing_cpu(cpu) {
                 atomic_inc(&global_trace.data[cpu]->disabled);