Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[safe/jmp/linux-2.6] / kernel / trace / trace_ksym.c
index 11c74f6..faf37fa 100644 (file)
 #include "trace_stat.h"
 #include "trace.h"
 
-/* For now, let us restrict the no. of symbols traced simultaneously to number
+#include <linux/hw_breakpoint.h>
+#include <asm/hw_breakpoint.h>
+
+/*
+ * For now, let us restrict the no. of symbols traced simultaneously to number
  * of available hardware breakpoint registers.
  */
 #define KSYM_TRACER_MAX HBP_NUM
 
 #define KSYM_TRACER_OP_LEN 3 /* rw- */
-#define KSYM_FILTER_ENTRY_LEN (KSYM_NAME_LEN + KSYM_TRACER_OP_LEN + 1)
+
+struct trace_ksym {
+       struct perf_event       **ksym_hbp;
+       struct perf_event_attr  attr;
+#ifdef CONFIG_PROFILE_KSYM_TRACER
+       unsigned long           counter;
+#endif
+       struct hlist_node       ksym_hlist;
+};
 
 static struct trace_array *ksym_trace_array;
 
@@ -44,12 +56,12 @@ static unsigned int ksym_tracing_enabled;
 
 static HLIST_HEAD(ksym_filter_head);
 
+static DEFINE_MUTEX(ksym_tracer_mutex);
+
 #ifdef CONFIG_PROFILE_KSYM_TRACER
 
 #define MAX_UL_INT 0xffffffff
 
-static DEFINE_MUTEX(ksym_tracer_mutex);
-
 void ksym_collect_stats(unsigned long hbp_hit_addr)
 {
        struct hlist_node *node;
@@ -57,7 +69,7 @@ void ksym_collect_stats(unsigned long hbp_hit_addr)
 
        rcu_read_lock();
        hlist_for_each_entry_rcu(entry, node, &ksym_filter_head, ksym_hlist) {
-               if ((entry->ksym_addr == hbp_hit_addr) &&
+               if ((entry->attr.bp_addr == hbp_hit_addr) &&
                    (entry->counter <= MAX_UL_INT)) {
                        entry->counter++;
                        break;
@@ -67,34 +79,38 @@ void ksym_collect_stats(unsigned long hbp_hit_addr)
 }
 #endif /* CONFIG_PROFILE_KSYM_TRACER */
 
-void ksym_hbp_handler(struct hw_breakpoint *hbp, struct pt_regs *regs)
+void ksym_hbp_handler(struct perf_event *hbp, int nmi,
+                     struct perf_sample_data *data,
+                     struct pt_regs *regs)
 {
        struct ring_buffer_event *event;
-       struct trace_array *tr;
-       struct trace_ksym *entry;
+       struct ksym_trace_entry *entry;
+       struct ring_buffer *buffer;
        int pc;
 
        if (!ksym_tracing_enabled)
                return;
 
-       tr = ksym_trace_array;
+       buffer = ksym_trace_array->buffer;
+
        pc = preempt_count();
 
-       event = trace_buffer_lock_reserve(tr, TRACE_KSYM,
+       event = trace_buffer_lock_reserve(buffer, TRACE_KSYM,
                                                        sizeof(*entry), 0, pc);
        if (!event)
                return;
 
-       entry = ring_buffer_event_data(event);
-       strlcpy(entry->ksym_name, hbp->info.name, KSYM_SYMBOL_LEN);
-       entry->ksym_hbp = hbp;
-       entry->ip = instruction_pointer(regs);
-       strlcpy(entry->p_name, current->comm, TASK_COMM_LEN);
+       entry           = ring_buffer_event_data(event);
+       entry->ip       = instruction_pointer(regs);
+       entry->type     = hw_breakpoint_type(hbp);
+       entry->addr     = hw_breakpoint_addr(hbp);
+       strlcpy(entry->cmd, current->comm, TASK_COMM_LEN);
+
 #ifdef CONFIG_PROFILE_KSYM_TRACER
-       ksym_collect_stats(hbp->info.address);
+       ksym_collect_stats(hw_breakpoint_addr(hbp));
 #endif /* CONFIG_PROFILE_KSYM_TRACER */
 
-       trace_buffer_unlock_commit(tr, event, 0, pc);
+       trace_buffer_unlock_commit(buffer, event, 0, pc);
 }
 
 /* Valid access types are represented as
@@ -105,37 +121,27 @@ void ksym_hbp_handler(struct hw_breakpoint *hbp, struct pt_regs *regs)
  * --x : Set Execution Break points (Not available yet)
  *
  */
-static int ksym_trace_get_access_type(char *access_str)
+static int ksym_trace_get_access_type(char *str)
 {
-       int pos, access = 0;
+       int access = 0;
 
-       for (pos = 0; pos < KSYM_TRACER_OP_LEN; pos++) {
-               switch (access_str[pos]) {
-               case 'r':
-                       access += (pos == 0) ? 4 : -1;
-                       break;
-               case 'w':
-                       access += (pos == 1) ? 2 : -1;
-                       break;
-               case '-':
-                       break;
-               default:
-                       return -EINVAL;
-               }
-       }
+       if (str[0] == 'r')
+               access |= HW_BREAKPOINT_R;
+
+       if (str[1] == 'w')
+               access |= HW_BREAKPOINT_W;
+
+       if (str[2] == 'x')
+               access |= HW_BREAKPOINT_X;
 
        switch (access) {
-       case 6:
-               access = HW_BREAKPOINT_RW;
-               break;
-       case 2:
-               access = HW_BREAKPOINT_WRITE;
-               break;
-       case 0:
-               access = 0;
+       case HW_BREAKPOINT_R:
+       case HW_BREAKPOINT_W:
+       case HW_BREAKPOINT_W | HW_BREAKPOINT_R:
+               return access;
+       default:
+               return -EINVAL;
        }
-
-       return access;
 }
 
 /*
@@ -153,28 +159,26 @@ static int ksym_trace_get_access_type(char *access_str)
 static int parse_ksym_trace_str(char *input_string, char **ksymname,
                                                        unsigned long *addr)
 {
-       char *delimiter = ":";
        int ret;
 
-       ret = -EINVAL;
-       *ksymname = strsep(&input_string, delimiter);
+       *ksymname = strsep(&input_string, ":");
        *addr = kallsyms_lookup_name(*ksymname);
 
        /* Check for malformed request: (2), (1) and (5) */
        if ((!input_string) ||
-               (strlen(input_string) != (KSYM_TRACER_OP_LEN + 1)) ||
-                       (*addr == 0))
-               goto return_code;
+           (strlen(input_string) != KSYM_TRACER_OP_LEN) ||
+           (*addr == 0))
+               return -EINVAL;;
+
        ret = ksym_trace_get_access_type(input_string);
 
-return_code:
        return ret;
 }
 
 int process_new_ksym_entry(char *ksymname, int op, unsigned long addr)
 {
        struct trace_ksym *entry;
-       int ret;
+       int ret = -ENOMEM;
 
        if (ksym_filter_entry_count >= KSYM_TRACER_MAX) {
                printk(KERN_ERR "ksym_tracer: Maximum limit:(%d) reached. No"
@@ -187,32 +191,32 @@ int process_new_ksym_entry(char *ksymname, int op, unsigned long addr)
        if (!entry)
                return -ENOMEM;
 
-       entry->ksym_hbp = kzalloc(sizeof(struct hw_breakpoint), GFP_KERNEL);
-       if (!entry->ksym_hbp) {
-               kfree(entry);
-               return -ENOMEM;
-       }
+       hw_breakpoint_init(&entry->attr);
 
-       entry->ksym_hbp->info.name = ksymname;
-       entry->ksym_hbp->info.type = op;
-       entry->ksym_addr = entry->ksym_hbp->info.address = addr;
-#ifdef CONFIG_X86
-       entry->ksym_hbp->info.len = HW_BREAKPOINT_LEN_4;
-#endif
-       entry->ksym_hbp->triggered = (void *)ksym_hbp_handler;
+       entry->attr.bp_type = op;
+       entry->attr.bp_addr = addr;
+       entry->attr.bp_len = HW_BREAKPOINT_LEN_4;
 
-       ret = register_kernel_hw_breakpoint(entry->ksym_hbp);
-       if (ret < 0) {
+       ret = -EAGAIN;
+       entry->ksym_hbp = register_wide_hw_breakpoint(&entry->attr,
+                                       ksym_hbp_handler);
+
+       if (IS_ERR(entry->ksym_hbp)) {
+               ret = PTR_ERR(entry->ksym_hbp);
                printk(KERN_INFO "ksym_tracer request failed. Try again"
                                        " later!!\n");
-               kfree(entry->ksym_hbp);
-               kfree(entry);
-               return -EAGAIN;
+               goto err;
        }
+
        hlist_add_head_rcu(&(entry->ksym_hlist), &ksym_filter_head);
        ksym_filter_entry_count++;
 
        return 0;
+
+err:
+       kfree(entry);
+
+       return ret;
 }
 
 static ssize_t ksym_trace_filter_read(struct file *filp, char __user *ubuf,
@@ -220,25 +224,53 @@ static ssize_t ksym_trace_filter_read(struct file *filp, char __user *ubuf,
 {
        struct trace_ksym *entry;
        struct hlist_node *node;
-       char buf[KSYM_FILTER_ENTRY_LEN * KSYM_TRACER_MAX];
-       ssize_t ret, cnt = 0;
+       struct trace_seq *s;
+       ssize_t cnt = 0;
+       int ret;
+
+       s = kmalloc(sizeof(*s), GFP_KERNEL);
+       if (!s)
+               return -ENOMEM;
+       trace_seq_init(s);
 
        mutex_lock(&ksym_tracer_mutex);
 
        hlist_for_each_entry(entry, node, &ksym_filter_head, ksym_hlist) {
-               cnt += snprintf(&buf[cnt], KSYM_FILTER_ENTRY_LEN - cnt, "%s:",
-                               entry->ksym_hbp->info.name);
-               if (entry->ksym_hbp->info.type == HW_BREAKPOINT_WRITE)
-                       cnt += snprintf(&buf[cnt], KSYM_FILTER_ENTRY_LEN - cnt,
-                                                               "-w-\n");
-               else if (entry->ksym_hbp->info.type == HW_BREAKPOINT_RW)
-                       cnt += snprintf(&buf[cnt], KSYM_FILTER_ENTRY_LEN - cnt,
-                                                               "rw-\n");
+               ret = trace_seq_printf(s, "%pS:",
+                               (void *)(unsigned long)entry->attr.bp_addr);
+               if (entry->attr.bp_type == HW_BREAKPOINT_R)
+                       ret = trace_seq_puts(s, "r--\n");
+               else if (entry->attr.bp_type == HW_BREAKPOINT_W)
+                       ret = trace_seq_puts(s, "-w-\n");
+               else if (entry->attr.bp_type == (HW_BREAKPOINT_W | HW_BREAKPOINT_R))
+                       ret = trace_seq_puts(s, "rw-\n");
+               WARN_ON_ONCE(!ret);
        }
-       ret = simple_read_from_buffer(ubuf, count, ppos, buf, strlen(buf));
+
+       cnt = simple_read_from_buffer(ubuf, count, ppos, s->buffer, s->len);
+
        mutex_unlock(&ksym_tracer_mutex);
 
-       return ret;
+       kfree(s);
+
+       return cnt;
+}
+
+static void __ksym_trace_reset(void)
+{
+       struct trace_ksym *entry;
+       struct hlist_node *node, *node1;
+
+       mutex_lock(&ksym_tracer_mutex);
+       hlist_for_each_entry_safe(entry, node, node1, &ksym_filter_head,
+                                                               ksym_hlist) {
+               unregister_wide_hw_breakpoint(entry->ksym_hbp);
+               ksym_filter_entry_count--;
+               hlist_del_rcu(&(entry->ksym_hlist));
+               synchronize_rcu();
+               kfree(entry);
+       }
+       mutex_unlock(&ksym_tracer_mutex);
 }
 
 static ssize_t ksym_trace_filter_write(struct file *file,
@@ -247,76 +279,80 @@ static ssize_t ksym_trace_filter_write(struct file *file,
 {
        struct trace_ksym *entry;
        struct hlist_node *node;
-       char *input_string, *ksymname = NULL;
+       char *buf, *input_string, *ksymname = NULL;
        unsigned long ksym_addr = 0;
        int ret, op, changed = 0;
 
-       /* Ignore echo "" > ksym_trace_filter */
-       if (count == 0)
-               return 0;
-
-       input_string = kzalloc(count, GFP_KERNEL);
-       if (!input_string)
+       buf = kzalloc(count + 1, GFP_KERNEL);
+       if (!buf)
                return -ENOMEM;
 
-       if (copy_from_user(input_string, buffer, count)) {
-               kfree(input_string);
-               return -EFAULT;
+       ret = -EFAULT;
+       if (copy_from_user(buf, buffer, count))
+               goto out;
+
+       buf[count] = '\0';
+       input_string = strstrip(buf);
+
+       /*
+        * Clear all breakpoints if:
+        * 1: echo > ksym_trace_filter
+        * 2: echo 0 > ksym_trace_filter
+        * 3: echo "*:---" > ksym_trace_filter
+        */
+       if (!buf[0] || !strcmp(buf, "0") ||
+           !strcmp(buf, "*:---")) {
+               __ksym_trace_reset();
+               ret = 0;
+               goto out;
        }
 
        ret = op = parse_ksym_trace_str(input_string, &ksymname, &ksym_addr);
-       if (ret < 0) {
-               kfree(input_string);
-               return ret;
-       }
+       if (ret < 0)
+               goto out;
 
        mutex_lock(&ksym_tracer_mutex);
 
        ret = -EINVAL;
        hlist_for_each_entry(entry, node, &ksym_filter_head, ksym_hlist) {
-               if (entry->ksym_addr == ksym_addr) {
+               if (entry->attr.bp_addr == ksym_addr) {
                        /* Check for malformed request: (6) */
-                       if (entry->ksym_hbp->info.type != op)
+                       if (entry->attr.bp_type != op)
                                changed = 1;
                        else
-                               goto err_ret;
+                               goto out_unlock;
                        break;
                }
        }
        if (changed) {
-               unregister_kernel_hw_breakpoint(entry->ksym_hbp);
-               entry->ksym_hbp->info.type = op;
+               unregister_wide_hw_breakpoint(entry->ksym_hbp);
+               entry->attr.bp_type = op;
+               ret = 0;
                if (op > 0) {
-                       ret = register_kernel_hw_breakpoint(entry->ksym_hbp);
-                       if (ret == 0) {
-                               ret = count;
-                               goto unlock_ret_path;
-                       }
+                       entry->ksym_hbp =
+                               register_wide_hw_breakpoint(&entry->attr,
+                                       ksym_hbp_handler);
+                       if (IS_ERR(entry->ksym_hbp))
+                               ret = PTR_ERR(entry->ksym_hbp);
+                       else
+                               goto out_unlock;
                }
+               /* Error or "symbol:---" case: drop it */
                ksym_filter_entry_count--;
                hlist_del_rcu(&(entry->ksym_hlist));
                synchronize_rcu();
-               kfree(entry->ksym_hbp);
                kfree(entry);
-               ret = count;
-               goto err_ret;
+               goto out_unlock;
        } else {
                /* Check for malformed request: (4) */
-               if (op == 0)
-                       goto err_ret;
-               ret = process_new_ksym_entry(ksymname, op, ksym_addr);
-               if (ret)
-                       goto err_ret;
+               if (op)
+                       ret = process_new_ksym_entry(ksymname, op, ksym_addr);
        }
-       ret = count;
-       goto unlock_ret_path;
-
-err_ret:
-       kfree(input_string);
-
-unlock_ret_path:
+out_unlock:
        mutex_unlock(&ksym_tracer_mutex);
-       return ret;
+out:
+       kfree(buf);
+       return !ret ? count : ret;
 }
 
 static const struct file_operations ksym_tracing_fops = {
@@ -327,30 +363,8 @@ static const struct file_operations ksym_tracing_fops = {
 
 static void ksym_trace_reset(struct trace_array *tr)
 {
-       struct trace_ksym *entry;
-       struct hlist_node *node, *node1;
-
        ksym_tracing_enabled = 0;
-
-       mutex_lock(&ksym_tracer_mutex);
-       hlist_for_each_entry_safe(entry, node, node1, &ksym_filter_head,
-                                                               ksym_hlist) {
-               unregister_kernel_hw_breakpoint(entry->ksym_hbp);
-               ksym_filter_entry_count--;
-               hlist_del_rcu(&(entry->ksym_hlist));
-               synchronize_rcu();
-               /* Free the 'input_string' only if reset
-                * after startup self-test
-                */
-#ifdef CONFIG_FTRACE_SELFTEST
-               if (strncmp(entry->ksym_hbp->info.name, KSYM_SELFTEST_ENTRY,
-                                       strlen(KSYM_SELFTEST_ENTRY)) != 0)
-#endif /* CONFIG_FTRACE_SELFTEST*/
-                       kfree(entry->ksym_hbp->info.name);
-               kfree(entry->ksym_hbp);
-               kfree(entry);
-       }
-       mutex_unlock(&ksym_tracer_mutex);
+       __ksym_trace_reset();
 }
 
 static int ksym_trace_init(struct trace_array *tr)
@@ -367,20 +381,19 @@ static int ksym_trace_init(struct trace_array *tr)
 
 static void ksym_trace_print_header(struct seq_file *m)
 {
-
        seq_puts(m,
-                "#       TASK-PID      CPU#      Symbol         Type    "
-                "Function         \n");
+                "#       TASK-PID   CPU#      Symbol                    "
+                "Type    Function\n");
        seq_puts(m,
-                "#          |           |          |              |         "
-                "|            \n");
+                "#          |        |          |                       "
+                " |         |\n");
 }
 
 static enum print_line_t ksym_trace_output(struct trace_iterator *iter)
 {
        struct trace_entry *entry = iter->ent;
        struct trace_seq *s = &iter->seq;
-       struct trace_ksym *field;
+       struct ksym_trace_entry *field;
        char str[KSYM_SYMBOL_LEN];
        int ret;
 
@@ -389,16 +402,19 @@ static enum print_line_t ksym_trace_output(struct trace_iterator *iter)
 
        trace_assign_type(field, entry);
 
-       ret = trace_seq_printf(s, "%-15s %-5d %-3d %-20s ", field->p_name,
-                               entry->pid, iter->cpu, field->ksym_name);
+       ret = trace_seq_printf(s, "%11s-%-5d [%03d] %pS", field->cmd,
+                               entry->pid, iter->cpu, (char *)field->addr);
        if (!ret)
                return TRACE_TYPE_PARTIAL_LINE;
 
-       switch (field->ksym_hbp->info.type) {
-       case HW_BREAKPOINT_WRITE:
+       switch (field->type) {
+       case HW_BREAKPOINT_R:
+               ret = trace_seq_printf(s, " R  ");
+               break;
+       case HW_BREAKPOINT_W:
                ret = trace_seq_printf(s, " W  ");
                break;
-       case HW_BREAKPOINT_RW:
+       case HW_BREAKPOINT_R | HW_BREAKPOINT_W:
                ret = trace_seq_printf(s, " RW ");
                break;
        default:
@@ -409,7 +425,7 @@ static enum print_line_t ksym_trace_output(struct trace_iterator *iter)
                return TRACE_TYPE_PARTIAL_LINE;
 
        sprint_symbol(str, field->ip);
-       ret = trace_seq_printf(s, "%-20s\n", str);
+       ret = trace_seq_printf(s, "%s\n", str);
        if (!ret)
                return TRACE_TYPE_PARTIAL_LINE;
 
@@ -450,8 +466,10 @@ device_initcall(init_ksym_trace);
 #ifdef CONFIG_PROFILE_KSYM_TRACER
 static int ksym_tracer_stat_headers(struct seq_file *m)
 {
-       seq_printf(m, "   Access type    ");
-       seq_printf(m, "            Symbol                     Counter     \n");
+       seq_puts(m, "  Access Type ");
+       seq_puts(m, "  Symbol                                       Counter\n");
+       seq_puts(m, "  ----------- ");
+       seq_puts(m, "  ------                                       -------\n");
        return 0;
 }
 
@@ -464,32 +482,34 @@ static int ksym_tracer_stat_show(struct seq_file *m, void *v)
 
        entry = hlist_entry(stat, struct trace_ksym, ksym_hlist);
 
-       if (entry->ksym_hbp)
-               access_type = entry->ksym_hbp->info.type;
+       access_type = entry->attr.bp_type;
 
        switch (access_type) {
-       case HW_BREAKPOINT_WRITE:
-               seq_printf(m, "     W     ");
+       case HW_BREAKPOINT_R:
+               seq_puts(m, "  R           ");
+               break;
+       case HW_BREAKPOINT_W:
+               seq_puts(m, "  W           ");
                break;
-       case HW_BREAKPOINT_RW:
-               seq_printf(m, "     RW    ");
+       case HW_BREAKPOINT_R | HW_BREAKPOINT_W:
+               seq_puts(m, "  RW          ");
                break;
        default:
-               seq_printf(m, "     NA    ");
+               seq_puts(m, "  NA          ");
        }
 
-       if (lookup_symbol_name(entry->ksym_addr, fn_name) >= 0)
-               seq_printf(m, "               %s                 ", fn_name);
+       if (lookup_symbol_name(entry->attr.bp_addr, fn_name) >= 0)
+               seq_printf(m, "  %-36s", fn_name);
        else
-               seq_printf(m, "               <NA>                ");
+               seq_printf(m, "  %-36s", "<NA>");
+       seq_printf(m, " %15lu\n", entry->counter);
 
-       seq_printf(m, "%15lu\n", entry->counter);
        return 0;
 }
 
 static void *ksym_tracer_stat_start(struct tracer_stat *trace)
 {
-       return &(ksym_filter_head.first);
+       return ksym_filter_head.first;
 }
 
 static void *