Merge commit 'tracing/core' into tracing/kprobes
authorFrederic Weisbecker <fweisbec@gmail.com>
Thu, 10 Sep 2009 23:09:23 +0000 (01:09 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Thu, 10 Sep 2009 23:09:23 +0000 (01:09 +0200)
Conflicts:
kernel/trace/trace_export.c
kernel/trace/trace_kprobe.c

Merge reason: This topic branch lacks an important
build fix in tracing/core:

0dd7b74787eaf7858c6c573353a83c3e2766e674:
tracing: Fix double CPP substitution in TRACE_EVENT_FN

that prevents from multiple tracepoint headers inclusion crashes.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
1  2 
include/linux/ftrace_event.h
include/linux/syscalls.h
include/trace/ftrace.h
kernel/trace/Kconfig
kernel/trace/trace.h
kernel/trace/trace_events.c
kernel/trace/trace_export.c
kernel/trace/trace_kprobe.c
kernel/trace/trace_syscalls.c

@@@ -93,13 -93,17 +93,17 @@@ void tracing_generic_entry_update(struc
                                  unsigned long flags,
                                  int pc);
  struct ring_buffer_event *
- trace_current_buffer_lock_reserve(int type, unsigned long len,
+ trace_current_buffer_lock_reserve(struct ring_buffer **current_buffer,
+                                 int type, unsigned long len,
                                  unsigned long flags, int pc);
- void trace_current_buffer_unlock_commit(struct ring_buffer_event *event,
+ void trace_current_buffer_unlock_commit(struct ring_buffer *buffer,
+                                       struct ring_buffer_event *event,
                                        unsigned long flags, int pc);
- void trace_nowake_buffer_unlock_commit(struct ring_buffer_event *event,
+ void trace_nowake_buffer_unlock_commit(struct ring_buffer *buffer,
+                                      struct ring_buffer_event *event,
                                        unsigned long flags, int pc);
- void trace_current_buffer_discard_commit(struct ring_buffer_event *event);
+ void trace_current_buffer_discard_commit(struct ring_buffer *buffer,
+                                        struct ring_buffer_event *event);
  
  void tracing_record_cmdline(struct task_struct *tsk);
  
@@@ -112,12 -116,12 +116,12 @@@ struct ftrace_event_call 
        struct dentry           *dir;
        struct trace_event      *event;
        int                     enabled;
 -      int                     (*regfunc)(void *);
 -      void                    (*unregfunc)(void *);
 +      int                     (*regfunc)(struct ftrace_event_call *);
 +      void                    (*unregfunc)(struct ftrace_event_call *);
        int                     id;
 -      int                     (*raw_init)(void);
 -      int                     (*show_format)(struct ftrace_event_call *call,
 -                                             struct trace_seq *s);
 +      int                     (*raw_init)(struct ftrace_event_call *);
 +      int                     (*show_format)(struct ftrace_event_call *,
 +                                             struct trace_seq *);
        int                     (*define_fields)(struct ftrace_event_call *);
        struct list_head        fields;
        int                     filter_active;
  #define MAX_FILTER_PRED               32
  #define MAX_FILTER_STR_VAL    128
  
- extern int init_preds(struct ftrace_event_call *call);
  extern void destroy_preds(struct ftrace_event_call *call);
  extern int filter_match_preds(struct ftrace_event_call *call, void *rec);
- extern int filter_current_check_discard(struct ftrace_event_call *call,
+ extern int filter_current_check_discard(struct ring_buffer *buffer,
+                                       struct ftrace_event_call *call,
                                        void *rec,
                                        struct ring_buffer_event *event);
  
@@@ -147,12 -151,11 +151,12 @@@ enum 
        FILTER_PTR_STRING,
  };
  
 -extern int trace_define_field(struct ftrace_event_call *call,
 -                            const char *type, const char *name,
 -                            int offset, int size, int is_signed,
 -                            int filter_type);
  extern int trace_define_common_fields(struct ftrace_event_call *call);
 +extern int trace_define_field(struct ftrace_event_call *call, const char *type,
 +                            const char *name, int offset, int size,
 +                            int is_signed, int filter_type);
 +extern int trace_add_event_call(struct ftrace_event_call *call);
 +extern void trace_remove_event_call(struct ftrace_event_call *call);
  
  #define is_signed_type(type)  (((type)(-1)) < 0)
  
diff --combined include/linux/syscalls.h
@@@ -165,7 -165,7 +165,7 @@@ static void prof_sysexit_disable_##snam
        struct trace_event enter_syscall_print_##sname = {              \
                .trace                  = print_syscall_enter,          \
        };                                                              \
 -      static int init_enter_##sname(void)                             \
 +      static int init_enter_##sname(struct ftrace_event_call *call)   \
        {                                                               \
                int num, id;                                            \
                num = syscall_name_to_nr("sys"#sname);                  \
                event_enter_##sname.id = id;                            \
                set_syscall_enter_id(num, id);                          \
                INIT_LIST_HEAD(&event_enter_##sname.fields);            \
-               init_preds(&event_enter_##sname);                       \
                return 0;                                               \
        }                                                               \
        TRACE_SYS_ENTER_PROFILE(sname);                                 \
        struct trace_event exit_syscall_print_##sname = {               \
                .trace                  = print_syscall_exit,           \
        };                                                              \
 -      static int init_exit_##sname(void)                              \
 +      static int init_exit_##sname(struct ftrace_event_call *call)    \
        {                                                               \
                int num, id;                                            \
                num = syscall_name_to_nr("sys"#sname);                  \
                event_exit_##sname.id = id;                             \
                set_syscall_exit_id(num, id);                           \
                INIT_LIST_HEAD(&event_exit_##sname.fields);             \
-               init_preds(&event_exit_##sname);                        \
                return 0;                                               \
        }                                                               \
        TRACE_SYS_EXIT_PROFILE(sname);                                  \
diff --combined include/trace/ftrace.h
        };                                                      \
        static struct ftrace_event_call event_##name
  
+ #undef __cpparg
+ #define __cpparg(arg...) arg
  /* Callbacks are meaningless to ftrace. */
  #undef TRACE_EVENT_FN
- #define TRACE_EVENT_FN(name, proto, args, tstruct,            \
-               assign, print, reg, unreg)                      \
-       TRACE_EVENT(name, TP_PROTO(proto), TP_ARGS(args),       \
-               TP_STRUCT__entry(tstruct),                      \
-               TP_fast_assign(assign),                         \
-               TP_printk(print))
+ #define TRACE_EVENT_FN(name, proto, args, tstruct,                    \
+               assign, print, reg, unreg)                              \
+       TRACE_EVENT(name, __cpparg(proto), __cpparg(args),              \
+               __cpparg(tstruct), __cpparg(assign), __cpparg(print))   \
  
  #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
  
@@@ -434,7 -435,7 +435,7 @@@ static void ftrace_profile_disable_##ca
   *    event_trace_printk(_RET_IP_, "<call>: " <fmt>);
   * }
   *
 - * static int ftrace_reg_event_<call>(void)
 + * static int ftrace_reg_event_<call>(struct ftrace_event_call *unused)
   * {
   *    int ret;
   *
   *    return ret;
   * }
   *
 - * static void ftrace_unreg_event_<call>(void)
 + * static void ftrace_unreg_event_<call>(struct ftrace_event_call *unused)
   * {
   *    unregister_trace_<call>(ftrace_event_<call>);
   * }
   * {
   *    struct ring_buffer_event *event;
   *    struct ftrace_raw_<call> *entry; <-- defined in stage 1
+  *    struct ring_buffer *buffer;
   *    unsigned long irq_flags;
   *    int pc;
   *
   *    local_save_flags(irq_flags);
   *    pc = preempt_count();
   *
-  *    event = trace_current_buffer_lock_reserve(event_<call>.id,
+  *    event = trace_current_buffer_lock_reserve(&buffer,
+  *                              event_<call>.id,
   *                              sizeof(struct ftrace_raw_<call>),
   *                              irq_flags, pc);
   *    if (!event)
   *    <assign>;  <-- Here we assign the entries by the __field and
   *                    __array macros.
   *
-  *    trace_current_buffer_unlock_commit(event, irq_flags, pc);
+  *    trace_current_buffer_unlock_commit(buffer, event, irq_flags, pc);
   * }
   *
 - * static int ftrace_raw_reg_event_<call>(void)
 + * static int ftrace_raw_reg_event_<call>(struct ftrace_event_call *unused)
   * {
   *    int ret;
   *
   *    return ret;
   * }
   *
 - * static void ftrace_unreg_event_<call>(void)
 + * static void ftrace_unreg_event_<call>(struct ftrace_event_call *unused)
   * {
   *    unregister_trace_<call>(ftrace_raw_event_<call>);
   * }
   *    .trace                  = ftrace_raw_output_<call>, <-- stage 2
   * };
   *
 - * static int ftrace_raw_init_event_<call>(void)
 + * static int ftrace_raw_init_event_<call>(struct ftrace_event_call *unused)
   * {
   *    int id;
   *
@@@ -567,6 -570,7 +570,7 @@@ static void ftrace_raw_event_##call(pro
        struct ftrace_event_call *event_call = &event_##call;           \
        struct ring_buffer_event *event;                                \
        struct ftrace_raw_##call *entry;                                \
+       struct ring_buffer *buffer;                                     \
        unsigned long irq_flags;                                        \
        int __data_size;                                                \
        int pc;                                                         \
                                                                        \
        __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
                                                                        \
-       event = trace_current_buffer_lock_reserve(event_##call.id,      \
+       event = trace_current_buffer_lock_reserve(&buffer,              \
+                                event_##call.id,                       \
                                 sizeof(*entry) + __data_size,          \
                                 irq_flags, pc);                        \
        if (!event)                                                     \
                                                                        \
        { assign; }                                                     \
                                                                        \
-       if (!filter_current_check_discard(event_call, entry, event))    \
-               trace_nowake_buffer_unlock_commit(event, irq_flags, pc); \
+       if (!filter_current_check_discard(buffer, event_call, entry, event)) \
+               trace_nowake_buffer_unlock_commit(buffer,               \
+                                                 event, irq_flags, pc); \
  }                                                                     \
                                                                        \
 -static int ftrace_raw_reg_event_##call(void *ptr)                     \
 +static int ftrace_raw_reg_event_##call(struct ftrace_event_call *unused)\
  {                                                                     \
        int ret;                                                        \
                                                                        \
        return ret;                                                     \
  }                                                                     \
                                                                        \
 -static void ftrace_raw_unreg_event_##call(void *ptr)                  \
 +static void ftrace_raw_unreg_event_##call(struct ftrace_event_call *unused)\
  {                                                                     \
        unregister_trace_##call(ftrace_raw_event_##call);               \
  }                                                                     \
@@@ -612,7 -618,7 +618,7 @@@ static struct trace_event ftrace_event_
        .trace                  = ftrace_raw_output_##call,             \
  };                                                                    \
                                                                        \
 -static int ftrace_raw_init_event_##call(void)                         \
 +static int ftrace_raw_init_event_##call(struct ftrace_event_call *unused)\
  {                                                                     \
        int id;                                                         \
                                                                        \
                return -ENODEV;                                         \
        event_##call.id = id;                                           \
        INIT_LIST_HEAD(&event_##call.fields);                           \
-       init_preds(&event_##call);                                      \
        return 0;                                                       \
  }                                                                     \
                                                                        \
diff --combined kernel/trace/Kconfig
@@@ -60,9 -60,14 +60,14 @@@ config EVENT_TRACIN
        bool
  
  config CONTEXT_SWITCH_TRACER
-       select MARKERS
        bool
  
+ config RING_BUFFER_ALLOW_SWAP
+       bool
+       help
+        Allow the use of ring_buffer_swap_cpu.
+        Adds a very slight overhead to tracing when enabled.
  # All tracer options should select GENERIC_TRACER. For those options that are
  # enabled by all tracers (context switch and event tracer) they select TRACING.
  # This allows those options to appear when no other tracer is selected. But the
@@@ -147,6 -152,7 +152,7 @@@ config IRQSOFF_TRACE
        select TRACE_IRQFLAGS
        select GENERIC_TRACER
        select TRACER_MAX_TRACE
+       select RING_BUFFER_ALLOW_SWAP
        help
          This option measures the time spent in irqs-off critical
          sections, with microsecond accuracy.
@@@ -168,6 -174,7 +174,7 @@@ config PREEMPT_TRACE
        depends on PREEMPT
        select GENERIC_TRACER
        select TRACER_MAX_TRACE
+       select RING_BUFFER_ALLOW_SWAP
        help
          This option measures the time spent in preemption off critical
          sections, with microsecond accuracy.
@@@ -411,18 -418,6 +418,18 @@@ config BLK_DEV_IO_TRAC
  
          If unsure, say N.
  
 +config KPROBE_TRACER
 +      depends on KPROBES
 +      depends on X86
 +      bool "Trace kprobes"
 +      select TRACING
 +      select GENERIC_TRACER
 +      help
 +        This tracer probes everywhere where kprobes can probe it, and
 +        records various registers and memories specified by user.
 +        This also allows you to trace kprobe probe points as a dynamic
 +        defined events. It provides per-probe event filtering interface.
 +
  config DYNAMIC_FTRACE
        bool "enable/disable ftrace tracepoints dynamically"
        depends on FUNCTION_TRACER
diff --combined kernel/trace/trace.h
@@@ -205,30 -205,6 +205,30 @@@ struct syscall_trace_exit 
        unsigned long           ret;
  };
  
 +struct kprobe_trace_entry {
 +      struct trace_entry      ent;
 +      unsigned long           ip;
 +      int                     nargs;
 +      unsigned long           args[];
 +};
 +
 +#define SIZEOF_KPROBE_TRACE_ENTRY(n)                  \
 +      (offsetof(struct kprobe_trace_entry, args) +    \
 +      (sizeof(unsigned long) * (n)))
 +
 +struct kretprobe_trace_entry {
 +      struct trace_entry      ent;
 +      unsigned long           func;
 +      unsigned long           ret_ip;
 +      int                     nargs;
 +      unsigned long           args[];
 +};
 +
 +#define SIZEOF_KRETPROBE_TRACE_ENTRY(n)                       \
 +      (offsetof(struct kretprobe_trace_entry, args) + \
 +      (sizeof(unsigned long) * (n)))
 +
 +
  
  /*
   * trace_flag_type is an enumeration that holds different
@@@ -258,9 -234,6 +258,6 @@@ struct trace_array_cpu 
        atomic_t                disabled;
        void                    *buffer_page;   /* ring buffer spare */
  
-       /* these fields get copied into max-trace: */
-       unsigned long           trace_idx;
-       unsigned long           overrun;
        unsigned long           saved_latency;
        unsigned long           critical_start;
        unsigned long           critical_end;
        unsigned long           nice;
        unsigned long           policy;
        unsigned long           rt_priority;
+       unsigned long           skipped_entries;
        cycle_t                 preempt_timestamp;
        pid_t                   pid;
        uid_t                   uid;
@@@ -441,12 -415,13 +439,13 @@@ void init_tracer_sysprof_debugfs(struc
  
  struct ring_buffer_event;
  
- struct ring_buffer_event *trace_buffer_lock_reserve(struct trace_array *tr,
-                                                   int type,
-                                                   unsigned long len,
-                                                   unsigned long flags,
-                                                   int pc);
- void trace_buffer_unlock_commit(struct trace_array *tr,
+ struct ring_buffer_event *
+ trace_buffer_lock_reserve(struct ring_buffer *buffer,
+                         int type,
+                         unsigned long len,
+                         unsigned long flags,
+                         int pc);
+ void trace_buffer_unlock_commit(struct ring_buffer *buffer,
                                struct ring_buffer_event *event,
                                unsigned long flags, int pc);
  
@@@ -497,18 -472,20 +496,20 @@@ void unregister_tracer(struct tracer *t
  
  extern unsigned long nsecs_to_usecs(unsigned long nsecs);
  
+ #ifdef CONFIG_TRACER_MAX_TRACE
  extern unsigned long tracing_max_latency;
  extern unsigned long tracing_thresh;
  
  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);
+ #endif /* CONFIG_TRACER_MAX_TRACE */
  
  #ifdef CONFIG_STACKTRACE
- void ftrace_trace_stack(struct trace_array *tr, unsigned long flags,
+ void ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags,
                        int skip, int pc);
  
- void ftrace_trace_userstack(struct trace_array *tr, unsigned long flags,
+ void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags,
                            int pc);
  
  void __trace_stack(struct trace_array *tr, unsigned long flags, int skip,
@@@ -589,6 -566,11 +590,11 @@@ extern in
  trace_vbprintk(unsigned long ip, const char *fmt, va_list args);
  extern int
  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, ...);
  
  extern unsigned long trace_flags;
  
@@@ -92,7 -92,9 +92,7 @@@ int trace_define_common_fields(struct f
  }
  EXPORT_SYMBOL_GPL(trace_define_common_fields);
  
 -#ifdef CONFIG_MODULES
 -
 -static void trace_destroy_fields(struct ftrace_event_call *call)
 +void trace_destroy_fields(struct ftrace_event_call *call)
  {
        struct ftrace_event_field *field, *next;
  
        }
  }
  
 -#endif /* CONFIG_MODULES */
 -
  static void ftrace_event_enable_disable(struct ftrace_event_call *call,
                                        int enable)
  {
                if (call->enabled) {
                        call->enabled = 0;
                        tracing_stop_cmdline_record();
 -                      call->unregfunc(call->data);
 +                      call->unregfunc(call);
                }
                break;
        case 1:
                if (!call->enabled) {
                        call->enabled = 1;
                        tracing_start_cmdline_record();
 -                      call->regfunc(call->data);
 +                      call->regfunc(call);
                }
                break;
        }
@@@ -987,43 -991,27 +987,43 @@@ event_create_dir(struct ftrace_event_ca
        return 0;
  }
  
 -#define for_each_event(event, start, end)                     \
 -      for (event = start;                                     \
 -           (unsigned long)event < (unsigned long)end;         \
 -           event++)
 +static int __trace_add_event_call(struct ftrace_event_call *call)
 +{
 +      struct dentry *d_events;
 +      int ret;
  
 -#ifdef CONFIG_MODULES
 +      if (!call->name)
 +              return -EINVAL;
  
 -static LIST_HEAD(ftrace_module_file_list);
 +      if (call->raw_init) {
 +              ret = call->raw_init(call);
 +              if (ret < 0) {
 +                      if (ret != -ENOSYS)
 +                              pr_warning("Could not initialize trace "
 +                              "events/%s\n", call->name);
 +                      return ret;
 +              }
 +      }
  
 -/*
 - * Modules must own their file_operations to keep up with
 - * reference counting.
 - */
 -struct ftrace_module_file_ops {
 -      struct list_head                list;
 -      struct module                   *mod;
 -      struct file_operations          id;
 -      struct file_operations          enable;
 -      struct file_operations          format;
 -      struct file_operations          filter;
 -};
 +      d_events = event_trace_events_dir();
 +      if (!d_events)
 +              return -ENOENT;
 +
 +      list_add(&call->list, &ftrace_events);
 +      return event_create_dir(call, d_events, &ftrace_event_id_fops,
 +                              &ftrace_enable_fops, &ftrace_event_filter_fops,
 +                              &ftrace_event_format_fops);
 +}
 +
 +/* Add an additional event_call dynamically */
 +int trace_add_event_call(struct ftrace_event_call *call)
 +{
 +      int ret;
 +      mutex_lock(&event_mutex);
 +      ret = __trace_add_event_call(call);
 +      mutex_unlock(&event_mutex);
 +      return ret;
 +}
  
  static void remove_subsystem_dir(const char *name)
  {
        }
  }
  
 +static void __trace_remove_event_call(struct ftrace_event_call *call)
 +{
 +      ftrace_event_enable_disable(call, 0);
 +      if (call->event)
 +              __unregister_ftrace_event(call->event);
 +      debugfs_remove_recursive(call->dir);
 +      list_del(&call->list);
 +      trace_destroy_fields(call);
 +      destroy_preds(call);
 +      remove_subsystem_dir(call->system);
 +}
 +
 +/* Remove an event_call */
 +void trace_remove_event_call(struct ftrace_event_call *call)
 +{
 +      mutex_lock(&event_mutex);
 +      __trace_remove_event_call(call);
 +      mutex_unlock(&event_mutex);
 +}
 +
 +#define for_each_event(event, start, end)                     \
 +      for (event = start;                                     \
 +           (unsigned long)event < (unsigned long)end;         \
 +           event++)
 +
 +#ifdef CONFIG_MODULES
 +
 +static LIST_HEAD(ftrace_module_file_list);
 +
 +/*
 + * Modules must own their file_operations to keep up with
 + * reference counting.
 + */
 +struct ftrace_module_file_ops {
 +      struct list_head                list;
 +      struct module                   *mod;
 +      struct file_operations          id;
 +      struct file_operations          enable;
 +      struct file_operations          format;
 +      struct file_operations          filter;
 +};
 +
  static struct ftrace_module_file_ops *
  trace_create_file_ops(struct module *mod)
  {
@@@ -1150,7 -1096,7 +1150,7 @@@ static void trace_module_add_events(str
                if (!call->name)
                        continue;
                if (call->raw_init) {
 -                      ret = call->raw_init();
 +                      ret = call->raw_init(call);
                        if (ret < 0) {
                                if (ret != -ENOSYS)
                                        pr_warning("Could not initialize trace "
@@@ -1185,7 -1131,14 +1185,7 @@@ static void trace_module_remove_events(
        list_for_each_entry_safe(call, p, &ftrace_events, list) {
                if (call->mod == mod) {
                        found = true;
 -                      ftrace_event_enable_disable(call, 0);
 -                      if (call->event)
 -                              __unregister_ftrace_event(call->event);
 -                      debugfs_remove_recursive(call->dir);
 -                      list_del(&call->list);
 -                      trace_destroy_fields(call);
 -                      destroy_preds(call);
 -                      remove_subsystem_dir(call->system);
 +                      __trace_remove_event_call(call);
                }
        }
  
@@@ -1303,7 -1256,7 +1303,7 @@@ static __init int event_trace_init(void
                if (!call->name)
                        continue;
                if (call->raw_init) {
 -                      ret = call->raw_init();
 +                      ret = call->raw_init(call);
                        if (ret < 0) {
                                if (ret != -ENOSYS)
                                        pr_warning("Could not initialize trace "
@@@ -1485,6 -1438,7 +1485,7 @@@ static voi
  function_test_events_call(unsigned long ip, unsigned long parent_ip)
  {
        struct ring_buffer_event *event;
+       struct ring_buffer *buffer;
        struct ftrace_entry *entry;
        unsigned long flags;
        long disabled;
  
        local_save_flags(flags);
  
-       event = trace_current_buffer_lock_reserve(TRACE_FN, sizeof(*entry),
+       event = trace_current_buffer_lock_reserve(&buffer,
+                                                 TRACE_FN, sizeof(*entry),
                                                  flags, pc);
        if (!event)
                goto out;
        entry->ip                       = ip;
        entry->parent_ip                = parent_ip;
  
-       trace_nowake_buffer_unlock_commit(event, flags, pc);
+       trace_nowake_buffer_unlock_commit(buffer, event, flags, pc);
  
   out:
        atomic_dec(&per_cpu(test_event_disable, cpu));
@@@ -42,9 -42,9 +42,9 @@@ extern void __bad_type_size(void)
        if (!ret)                                                       \
                return 0;
  
 -#undef TRACE_FIELD_ZERO_CHAR
 -#define TRACE_FIELD_ZERO_CHAR(item)                                   \
 -      ret = trace_seq_printf(s, "\tfield:char " #item ";\t"           \
 +#undef TRACE_FIELD_ZERO
 +#define TRACE_FIELD_ZERO(type, item)                                  \
 +      ret = trace_seq_printf(s, "\tfield:" #type " " #item ";\t"      \
                               "offset:%u;\tsize:0;\n",                 \
                               (unsigned int)offsetof(typeof(field), item)); \
        if (!ret)                                                       \
@@@ -92,6 -92,9 +92,6 @@@ ftrace_format_##call(struct ftrace_even
  
  #include "trace_event_types.h"
  
 -#undef TRACE_ZERO_CHAR
 -#define TRACE_ZERO_CHAR(arg)
 -
  #undef TRACE_FIELD
  #define TRACE_FIELD(type, item, assign)\
        entry->item = assign;
  #define TRACE_FIELD_SIGN(type, item, assign, is_signed)       \
        TRACE_FIELD(type, item, assign)
  
 +#undef TRACE_FIELD_ZERO
 +#define TRACE_FIELD_ZERO(type, item)
 +
  #undef TP_CMD
  #define TP_CMD(cmd...)        cmd
  
  #define TRACE_FIELD_SPECIAL(type_item, item, len, cmd)        \
        cmd;
  
-       init_preds(event_call);
 +static int ftrace_raw_init_event(struct ftrace_event_call *event_call)
 +{
 +      INIT_LIST_HEAD(&event_call->fields);
++
 +      return 0;
 +}
 +
  #undef TRACE_EVENT_FORMAT
  #define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt)    \
  int ftrace_define_fields_##call(struct ftrace_event_call *event_call);        \
 -static int ftrace_raw_init_event_##call(void);                                \
                                                                        \
  struct ftrace_event_call __used                                               \
  __attribute__((__aligned__(4)))                                               \
@@@ -134,10 -128,15 +134,10 @@@ __attribute__((section("_ftrace_events"
        .name                   = #call,                                \
        .id                     = proto,                                \
        .system                 = __stringify(TRACE_SYSTEM),            \
 -      .raw_init               = ftrace_raw_init_event_##call,         \
 +      .raw_init               = ftrace_raw_init_event,                \
        .show_format            = ftrace_format_##call,                 \
        .define_fields          = ftrace_define_fields_##call,          \
- };
+ };                                                                    \
 -static int ftrace_raw_init_event_##call(void)                         \
 -{                                                                     \
 -      INIT_LIST_HEAD(&event_##call.fields);                           \
 -      return 0;                                                       \
 -}                                                                     \
  
  #undef TRACE_EVENT_FORMAT_NOFILTER
  #define TRACE_EVENT_FORMAT_NOFILTER(call, proto, args, fmt, tstruct,  \
@@@ -180,8 -179,8 +180,8 @@@ __attribute__((section("_ftrace_events"
        if (ret)                                                        \
                return ret;
  
 -#undef TRACE_FIELD_ZERO_CHAR
 -#define TRACE_FIELD_ZERO_CHAR(item)
 +#undef TRACE_FIELD_ZERO
 +#define TRACE_FIELD_ZERO(type, item)
  
  #undef TRACE_EVENT_FORMAT
  #define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt)    \
index f4ec3fc,0000000..19a6de6
mode 100644,000000..100644
--- /dev/null
@@@ -1,1231 -1,0 +1,1233 @@@
-       event = trace_current_buffer_lock_reserve(call->id, size,
 +/*
 + * kprobe based kernel tracer
 + *
 + * Created by Masami Hiramatsu <mhiramat@redhat.com>
 + *
 + * This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License version 2 as
 + * published by the Free Software Foundation.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 + */
 +
 +#include <linux/module.h>
 +#include <linux/uaccess.h>
 +#include <linux/kprobes.h>
 +#include <linux/seq_file.h>
 +#include <linux/slab.h>
 +#include <linux/smp.h>
 +#include <linux/debugfs.h>
 +#include <linux/types.h>
 +#include <linux/string.h>
 +#include <linux/ctype.h>
 +#include <linux/ptrace.h>
 +
 +#include "trace.h"
 +#include "trace_output.h"
 +
 +#define MAX_TRACE_ARGS 128
 +#define MAX_ARGSTR_LEN 63
 +#define MAX_EVENT_NAME_LEN 64
 +
 +/* currently, trace_kprobe only supports X86. */
 +
 +struct fetch_func {
 +      unsigned long (*func)(struct pt_regs *, void *);
 +      void *data;
 +};
 +
 +static __kprobes unsigned long call_fetch(struct fetch_func *f,
 +                                        struct pt_regs *regs)
 +{
 +      return f->func(regs, f->data);
 +}
 +
 +/* fetch handlers */
 +static __kprobes unsigned long fetch_register(struct pt_regs *regs,
 +                                            void *offset)
 +{
 +      return regs_get_register(regs, (unsigned int)((unsigned long)offset));
 +}
 +
 +static __kprobes unsigned long fetch_stack(struct pt_regs *regs,
 +                                         void *num)
 +{
 +      return regs_get_kernel_stack_nth(regs,
 +                                       (unsigned int)((unsigned long)num));
 +}
 +
 +static __kprobes unsigned long fetch_memory(struct pt_regs *regs, void *addr)
 +{
 +      unsigned long retval;
 +
 +      if (probe_kernel_address(addr, retval))
 +              return 0;
 +      return retval;
 +}
 +
 +static __kprobes unsigned long fetch_argument(struct pt_regs *regs, void *num)
 +{
 +      return regs_get_argument_nth(regs, (unsigned int)((unsigned long)num));
 +}
 +
 +static __kprobes unsigned long fetch_retvalue(struct pt_regs *regs,
 +                                            void *dummy)
 +{
 +      return regs_return_value(regs);
 +}
 +
 +static __kprobes unsigned long fetch_ip(struct pt_regs *regs, void *dummy)
 +{
 +      return instruction_pointer(regs);
 +}
 +
 +static __kprobes unsigned long fetch_stack_address(struct pt_regs *regs,
 +                                                 void *dummy)
 +{
 +      return kernel_stack_pointer(regs);
 +}
 +
 +/* Memory fetching by symbol */
 +struct symbol_cache {
 +      char *symbol;
 +      long offset;
 +      unsigned long addr;
 +};
 +
 +static unsigned long update_symbol_cache(struct symbol_cache *sc)
 +{
 +      sc->addr = (unsigned long)kallsyms_lookup_name(sc->symbol);
 +      if (sc->addr)
 +              sc->addr += sc->offset;
 +      return sc->addr;
 +}
 +
 +static void free_symbol_cache(struct symbol_cache *sc)
 +{
 +      kfree(sc->symbol);
 +      kfree(sc);
 +}
 +
 +static struct symbol_cache *alloc_symbol_cache(const char *sym, long offset)
 +{
 +      struct symbol_cache *sc;
 +
 +      if (!sym || strlen(sym) == 0)
 +              return NULL;
 +      sc = kzalloc(sizeof(struct symbol_cache), GFP_KERNEL);
 +      if (!sc)
 +              return NULL;
 +
 +      sc->symbol = kstrdup(sym, GFP_KERNEL);
 +      if (!sc->symbol) {
 +              kfree(sc);
 +              return NULL;
 +      }
 +      sc->offset = offset;
 +
 +      update_symbol_cache(sc);
 +      return sc;
 +}
 +
 +static __kprobes unsigned long fetch_symbol(struct pt_regs *regs, void *data)
 +{
 +      struct symbol_cache *sc = data;
 +
 +      if (sc->addr)
 +              return fetch_memory(regs, (void *)sc->addr);
 +      else
 +              return 0;
 +}
 +
 +/* Special indirect memory access interface */
 +struct indirect_fetch_data {
 +      struct fetch_func orig;
 +      long offset;
 +};
 +
 +static __kprobes unsigned long fetch_indirect(struct pt_regs *regs, void *data)
 +{
 +      struct indirect_fetch_data *ind = data;
 +      unsigned long addr;
 +
 +      addr = call_fetch(&ind->orig, regs);
 +      if (addr) {
 +              addr += ind->offset;
 +              return fetch_memory(regs, (void *)addr);
 +      } else
 +              return 0;
 +}
 +
 +static __kprobes void free_indirect_fetch_data(struct indirect_fetch_data *data)
 +{
 +      if (data->orig.func == fetch_indirect)
 +              free_indirect_fetch_data(data->orig.data);
 +      else if (data->orig.func == fetch_symbol)
 +              free_symbol_cache(data->orig.data);
 +      kfree(data);
 +}
 +
 +/**
 + * kprobe_trace_core
 + */
 +
 +struct trace_probe {
 +      struct list_head        list;
 +      union {
 +              struct kprobe           kp;
 +              struct kretprobe        rp;
 +      };
 +      unsigned long           nhit;
 +      const char              *symbol;        /* symbol name */
 +      struct ftrace_event_call        call;
 +      struct trace_event              event;
 +      unsigned int            nr_args;
 +      struct fetch_func       args[];
 +};
 +
 +#define SIZEOF_TRACE_PROBE(n)                 \
 +      (offsetof(struct trace_probe, args) +   \
 +      (sizeof(struct fetch_func) * (n)))
 +
 +static int kprobe_trace_func(struct kprobe *kp, struct pt_regs *regs);
 +static int kretprobe_trace_func(struct kretprobe_instance *ri,
 +                              struct pt_regs *regs);
 +
 +static __kprobes int probe_is_return(struct trace_probe *tp)
 +{
 +      return (tp->rp.handler == kretprobe_trace_func);
 +}
 +
 +static __kprobes const char *probe_symbol(struct trace_probe *tp)
 +{
 +      return tp->symbol ? tp->symbol : "unknown";
 +}
 +
 +static __kprobes long probe_offset(struct trace_probe *tp)
 +{
 +      return (probe_is_return(tp)) ? tp->rp.kp.offset : tp->kp.offset;
 +}
 +
 +static __kprobes void *probe_address(struct trace_probe *tp)
 +{
 +      return (probe_is_return(tp)) ? tp->rp.kp.addr : tp->kp.addr;
 +}
 +
 +static int probe_arg_string(char *buf, size_t n, struct fetch_func *ff)
 +{
 +      int ret = -EINVAL;
 +
 +      if (ff->func == fetch_argument)
 +              ret = snprintf(buf, n, "a%lu", (unsigned long)ff->data);
 +      else if (ff->func == fetch_register) {
 +              const char *name;
 +              name = regs_query_register_name((unsigned int)((long)ff->data));
 +              ret = snprintf(buf, n, "%%%s", name);
 +      } else if (ff->func == fetch_stack)
 +              ret = snprintf(buf, n, "s%lu", (unsigned long)ff->data);
 +      else if (ff->func == fetch_memory)
 +              ret = snprintf(buf, n, "@0x%p", ff->data);
 +      else if (ff->func == fetch_symbol) {
 +              struct symbol_cache *sc = ff->data;
 +              ret = snprintf(buf, n, "@%s%+ld", sc->symbol, sc->offset);
 +      } else if (ff->func == fetch_retvalue)
 +              ret = snprintf(buf, n, "rv");
 +      else if (ff->func == fetch_ip)
 +              ret = snprintf(buf, n, "ra");
 +      else if (ff->func == fetch_stack_address)
 +              ret = snprintf(buf, n, "sa");
 +      else if (ff->func == fetch_indirect) {
 +              struct indirect_fetch_data *id = ff->data;
 +              size_t l = 0;
 +              ret = snprintf(buf, n, "%+ld(", id->offset);
 +              if (ret >= n)
 +                      goto end;
 +              l += ret;
 +              ret = probe_arg_string(buf + l, n - l, &id->orig);
 +              if (ret < 0)
 +                      goto end;
 +              l += ret;
 +              ret = snprintf(buf + l, n - l, ")");
 +              ret += l;
 +      }
 +end:
 +      if (ret >= n)
 +              return -ENOSPC;
 +      return ret;
 +}
 +
 +static int register_probe_event(struct trace_probe *tp);
 +static void unregister_probe_event(struct trace_probe *tp);
 +
 +static DEFINE_MUTEX(probe_lock);
 +static LIST_HEAD(probe_list);
 +
 +static struct trace_probe *alloc_trace_probe(const char *symbol,
 +                                           const char *event, int nargs)
 +{
 +      struct trace_probe *tp;
 +
 +      tp = kzalloc(SIZEOF_TRACE_PROBE(nargs), GFP_KERNEL);
 +      if (!tp)
 +              return ERR_PTR(-ENOMEM);
 +
 +      if (symbol) {
 +              tp->symbol = kstrdup(symbol, GFP_KERNEL);
 +              if (!tp->symbol)
 +                      goto error;
 +      }
 +      if (!event)
 +              goto error;
 +      tp->call.name = kstrdup(event, GFP_KERNEL);
 +      if (!tp->call.name)
 +              goto error;
 +
 +      INIT_LIST_HEAD(&tp->list);
 +      return tp;
 +error:
 +      kfree(tp->symbol);
 +      kfree(tp);
 +      return ERR_PTR(-ENOMEM);
 +}
 +
 +static void free_trace_probe(struct trace_probe *tp)
 +{
 +      int i;
 +
 +      for (i = 0; i < tp->nr_args; i++)
 +              if (tp->args[i].func == fetch_symbol)
 +                      free_symbol_cache(tp->args[i].data);
 +              else if (tp->args[i].func == fetch_indirect)
 +                      free_indirect_fetch_data(tp->args[i].data);
 +
 +      kfree(tp->call.name);
 +      kfree(tp->symbol);
 +      kfree(tp);
 +}
 +
 +static struct trace_probe *find_probe_event(const char *event)
 +{
 +      struct trace_probe *tp;
 +
 +      list_for_each_entry(tp, &probe_list, list)
 +              if (!strcmp(tp->call.name, event))
 +                      return tp;
 +      return NULL;
 +}
 +
 +static void __unregister_trace_probe(struct trace_probe *tp)
 +{
 +      if (probe_is_return(tp))
 +              unregister_kretprobe(&tp->rp);
 +      else
 +              unregister_kprobe(&tp->kp);
 +}
 +
 +/* Unregister a trace_probe and probe_event: call with locking probe_lock */
 +static void unregister_trace_probe(struct trace_probe *tp)
 +{
 +      unregister_probe_event(tp);
 +      __unregister_trace_probe(tp);
 +      list_del(&tp->list);
 +}
 +
 +/* Register a trace_probe and probe_event */
 +static int register_trace_probe(struct trace_probe *tp)
 +{
 +      struct trace_probe *old_tp;
 +      int ret;
 +
 +      mutex_lock(&probe_lock);
 +
 +      if (probe_is_return(tp))
 +              ret = register_kretprobe(&tp->rp);
 +      else
 +              ret = register_kprobe(&tp->kp);
 +
 +      if (ret) {
 +              pr_warning("Could not insert probe(%d)\n", ret);
 +              if (ret == -EILSEQ) {
 +                      pr_warning("Probing address(0x%p) is not an "
 +                                 "instruction boundary.\n",
 +                                 probe_address(tp));
 +                      ret = -EINVAL;
 +              }
 +              goto end;
 +      }
 +      /* register as an event */
 +      old_tp = find_probe_event(tp->call.name);
 +      if (old_tp) {
 +              /* delete old event */
 +              unregister_trace_probe(old_tp);
 +              free_trace_probe(old_tp);
 +      }
 +      ret = register_probe_event(tp);
 +      if (ret) {
 +              pr_warning("Faild to register probe event(%d)\n", ret);
 +              __unregister_trace_probe(tp);
 +      }
 +      list_add_tail(&tp->list, &probe_list);
 +end:
 +      mutex_unlock(&probe_lock);
 +      return ret;
 +}
 +
 +/* Split symbol and offset. */
 +static int split_symbol_offset(char *symbol, long *offset)
 +{
 +      char *tmp;
 +      int ret;
 +
 +      if (!offset)
 +              return -EINVAL;
 +
 +      tmp = strchr(symbol, '+');
 +      if (!tmp)
 +              tmp = strchr(symbol, '-');
 +
 +      if (tmp) {
 +              /* skip sign because strict_strtol doesn't accept '+' */
 +              ret = strict_strtol(tmp + 1, 0, offset);
 +              if (ret)
 +                      return ret;
 +              if (*tmp == '-')
 +                      *offset = -(*offset);
 +              *tmp = '\0';
 +      } else
 +              *offset = 0;
 +      return 0;
 +}
 +
 +#define PARAM_MAX_ARGS 16
 +#define PARAM_MAX_STACK (THREAD_SIZE / sizeof(unsigned long))
 +
 +static int parse_probe_arg(char *arg, struct fetch_func *ff, int is_return)
 +{
 +      int ret = 0;
 +      unsigned long param;
 +      long offset;
 +      char *tmp;
 +
 +      switch (arg[0]) {
 +      case 'a':       /* argument */
 +              ret = strict_strtoul(arg + 1, 10, &param);
 +              if (ret || param > PARAM_MAX_ARGS)
 +                      ret = -EINVAL;
 +              else {
 +                      ff->func = fetch_argument;
 +                      ff->data = (void *)param;
 +              }
 +              break;
 +      case 'r':       /* retval or retaddr */
 +              if (is_return && arg[1] == 'v') {
 +                      ff->func = fetch_retvalue;
 +                      ff->data = NULL;
 +              } else if (is_return && arg[1] == 'a') {
 +                      ff->func = fetch_ip;
 +                      ff->data = NULL;
 +              } else
 +                      ret = -EINVAL;
 +              break;
 +      case '%':       /* named register */
 +              ret = regs_query_register_offset(arg + 1);
 +              if (ret >= 0) {
 +                      ff->func = fetch_register;
 +                      ff->data = (void *)(unsigned long)ret;
 +                      ret = 0;
 +              }
 +              break;
 +      case 's':       /* stack */
 +              if (arg[1] == 'a') {
 +                      ff->func = fetch_stack_address;
 +                      ff->data = NULL;
 +              } else {
 +                      ret = strict_strtoul(arg + 1, 10, &param);
 +                      if (ret || param > PARAM_MAX_STACK)
 +                              ret = -EINVAL;
 +                      else {
 +                              ff->func = fetch_stack;
 +                              ff->data = (void *)param;
 +                      }
 +              }
 +              break;
 +      case '@':       /* memory or symbol */
 +              if (isdigit(arg[1])) {
 +                      ret = strict_strtoul(arg + 1, 0, &param);
 +                      if (ret)
 +                              break;
 +                      ff->func = fetch_memory;
 +                      ff->data = (void *)param;
 +              } else {
 +                      ret = split_symbol_offset(arg + 1, &offset);
 +                      if (ret)
 +                              break;
 +                      ff->data = alloc_symbol_cache(arg + 1,
 +                                                            offset);
 +                      if (ff->data)
 +                              ff->func = fetch_symbol;
 +                      else
 +                              ret = -EINVAL;
 +              }
 +              break;
 +      case '+':       /* indirect memory */
 +      case '-':
 +              tmp = strchr(arg, '(');
 +              if (!tmp) {
 +                      ret = -EINVAL;
 +                      break;
 +              }
 +              *tmp = '\0';
 +              ret = strict_strtol(arg + 1, 0, &offset);
 +              if (ret)
 +                      break;
 +              if (arg[0] == '-')
 +                      offset = -offset;
 +              arg = tmp + 1;
 +              tmp = strrchr(arg, ')');
 +              if (tmp) {
 +                      struct indirect_fetch_data *id;
 +                      *tmp = '\0';
 +                      id = kzalloc(sizeof(struct indirect_fetch_data),
 +                                   GFP_KERNEL);
 +                      if (!id)
 +                              return -ENOMEM;
 +                      id->offset = offset;
 +                      ret = parse_probe_arg(arg, &id->orig, is_return);
 +                      if (ret)
 +                              kfree(id);
 +                      else {
 +                              ff->func = fetch_indirect;
 +                              ff->data = (void *)id;
 +                      }
 +              } else
 +                      ret = -EINVAL;
 +              break;
 +      default:
 +              /* TODO: support custom handler */
 +              ret = -EINVAL;
 +      }
 +      return ret;
 +}
 +
 +static int create_trace_probe(int argc, char **argv)
 +{
 +      /*
 +       * Argument syntax:
 +       *  - Add kprobe: p[:EVENT] SYMBOL[+OFFS|-OFFS]|ADDRESS [FETCHARGS]
 +       *  - Add kretprobe: r[:EVENT] SYMBOL[+0] [FETCHARGS]
 +       * Fetch args:
 +       *  aN  : fetch Nth of function argument. (N:0-)
 +       *  rv  : fetch return value
 +       *  ra  : fetch return address
 +       *  sa  : fetch stack address
 +       *  sN  : fetch Nth of stack (N:0-)
 +       *  @ADDR       : fetch memory at ADDR (ADDR should be in kernel)
 +       *  @SYM[+|-offs] : fetch memory at SYM +|- offs (SYM is a data symbol)
 +       *  %REG        : fetch register REG
 +       * Indirect memory fetch:
 +       *  +|-offs(ARG) : fetch memory at ARG +|- offs address.
 +       */
 +      struct trace_probe *tp;
 +      struct kprobe *kp;
 +      int i, ret = 0;
 +      int is_return = 0;
 +      char *symbol = NULL, *event = NULL;
 +      long offset = 0;
 +      void *addr = NULL;
 +
 +      if (argc < 2)
 +              return -EINVAL;
 +
 +      if (argv[0][0] == 'p')
 +              is_return = 0;
 +      else if (argv[0][0] == 'r')
 +              is_return = 1;
 +      else
 +              return -EINVAL;
 +
 +      if (argv[0][1] == ':') {
 +              event = &argv[0][2];
 +              if (strlen(event) == 0) {
 +                      pr_info("Event name is not specifiled\n");
 +                      return -EINVAL;
 +              }
 +      }
 +
 +      if (isdigit(argv[1][0])) {
 +              if (is_return)
 +                      return -EINVAL;
 +              /* an address specified */
 +              ret = strict_strtoul(&argv[0][2], 0, (unsigned long *)&addr);
 +              if (ret)
 +                      return ret;
 +      } else {
 +              /* a symbol specified */
 +              symbol = argv[1];
 +              /* TODO: support .init module functions */
 +              ret = split_symbol_offset(symbol, &offset);
 +              if (ret)
 +                      return ret;
 +              if (offset && is_return)
 +                      return -EINVAL;
 +      }
 +      argc -= 2; argv += 2;
 +
 +      /* setup a probe */
 +      if (!event) {
 +              /* Make a new event name */
 +              char buf[MAX_EVENT_NAME_LEN];
 +              if (symbol)
 +                      snprintf(buf, MAX_EVENT_NAME_LEN, "%c@%s%+ld",
 +                               is_return ? 'r' : 'p', symbol, offset);
 +              else
 +                      snprintf(buf, MAX_EVENT_NAME_LEN, "%c@0x%p",
 +                               is_return ? 'r' : 'p', addr);
 +              tp = alloc_trace_probe(symbol, buf, argc);
 +      } else
 +              tp = alloc_trace_probe(symbol, event, argc);
 +      if (IS_ERR(tp))
 +              return PTR_ERR(tp);
 +
 +      if (is_return) {
 +              kp = &tp->rp.kp;
 +              tp->rp.handler = kretprobe_trace_func;
 +      } else {
 +              kp = &tp->kp;
 +              tp->kp.pre_handler = kprobe_trace_func;
 +      }
 +
 +      if (tp->symbol) {
 +              kp->symbol_name = tp->symbol;
 +              kp->offset = offset;
 +      } else
 +              kp->addr = addr;
 +
 +      /* parse arguments */
 +      ret = 0;
 +      for (i = 0; i < argc && i < MAX_TRACE_ARGS; i++) {
 +              if (strlen(argv[i]) > MAX_ARGSTR_LEN) {
 +                      pr_info("Argument%d(%s) is too long.\n", i, argv[i]);
 +                      ret = -ENOSPC;
 +                      goto error;
 +              }
 +              ret = parse_probe_arg(argv[i], &tp->args[i], is_return);
 +              if (ret)
 +                      goto error;
 +      }
 +      tp->nr_args = i;
 +
 +      ret = register_trace_probe(tp);
 +      if (ret)
 +              goto error;
 +      return 0;
 +
 +error:
 +      free_trace_probe(tp);
 +      return ret;
 +}
 +
 +static void cleanup_all_probes(void)
 +{
 +      struct trace_probe *tp;
 +
 +      mutex_lock(&probe_lock);
 +      /* TODO: Use batch unregistration */
 +      while (!list_empty(&probe_list)) {
 +              tp = list_entry(probe_list.next, struct trace_probe, list);
 +              unregister_trace_probe(tp);
 +              free_trace_probe(tp);
 +      }
 +      mutex_unlock(&probe_lock);
 +}
 +
 +
 +/* Probes listing interfaces */
 +static void *probes_seq_start(struct seq_file *m, loff_t *pos)
 +{
 +      mutex_lock(&probe_lock);
 +      return seq_list_start(&probe_list, *pos);
 +}
 +
 +static void *probes_seq_next(struct seq_file *m, void *v, loff_t *pos)
 +{
 +      return seq_list_next(v, &probe_list, pos);
 +}
 +
 +static void probes_seq_stop(struct seq_file *m, void *v)
 +{
 +      mutex_unlock(&probe_lock);
 +}
 +
 +static int probes_seq_show(struct seq_file *m, void *v)
 +{
 +      struct trace_probe *tp = v;
 +      int i, ret;
 +      char buf[MAX_ARGSTR_LEN + 1];
 +
 +      seq_printf(m, "%c", probe_is_return(tp) ? 'r' : 'p');
 +      seq_printf(m, ":%s", tp->call.name);
 +
 +      if (tp->symbol)
 +              seq_printf(m, " %s%+ld", probe_symbol(tp), probe_offset(tp));
 +      else
 +              seq_printf(m, " 0x%p", probe_address(tp));
 +
 +      for (i = 0; i < tp->nr_args; i++) {
 +              ret = probe_arg_string(buf, MAX_ARGSTR_LEN, &tp->args[i]);
 +              if (ret < 0) {
 +                      pr_warning("Argument%d decoding error(%d).\n", i, ret);
 +                      return ret;
 +              }
 +              seq_printf(m, " %s", buf);
 +      }
 +      seq_printf(m, "\n");
 +      return 0;
 +}
 +
 +static const struct seq_operations probes_seq_op = {
 +      .start  = probes_seq_start,
 +      .next   = probes_seq_next,
 +      .stop   = probes_seq_stop,
 +      .show   = probes_seq_show
 +};
 +
 +static int probes_open(struct inode *inode, struct file *file)
 +{
 +      if ((file->f_mode & FMODE_WRITE) &&
 +          (file->f_flags & O_TRUNC))
 +              cleanup_all_probes();
 +
 +      return seq_open(file, &probes_seq_op);
 +}
 +
 +static int command_trace_probe(const char *buf)
 +{
 +      char **argv;
 +      int argc = 0, ret = 0;
 +
 +      argv = argv_split(GFP_KERNEL, buf, &argc);
 +      if (!argv)
 +              return -ENOMEM;
 +
 +      if (argc)
 +              ret = create_trace_probe(argc, argv);
 +
 +      argv_free(argv);
 +      return ret;
 +}
 +
 +#define WRITE_BUFSIZE 128
 +
 +static ssize_t probes_write(struct file *file, const char __user *buffer,
 +                          size_t count, loff_t *ppos)
 +{
 +      char *kbuf, *tmp;
 +      int ret;
 +      size_t done;
 +      size_t size;
 +
 +      kbuf = kmalloc(WRITE_BUFSIZE, GFP_KERNEL);
 +      if (!kbuf)
 +              return -ENOMEM;
 +
 +      ret = done = 0;
 +      while (done < count) {
 +              size = count - done;
 +              if (size >= WRITE_BUFSIZE)
 +                      size = WRITE_BUFSIZE - 1;
 +              if (copy_from_user(kbuf, buffer + done, size)) {
 +                      ret = -EFAULT;
 +                      goto out;
 +              }
 +              kbuf[size] = '\0';
 +              tmp = strchr(kbuf, '\n');
 +              if (tmp) {
 +                      *tmp = '\0';
 +                      size = tmp - kbuf + 1;
 +              } else if (done + size < count) {
 +                      pr_warning("Line length is too long: "
 +                                 "Should be less than %d.", WRITE_BUFSIZE);
 +                      ret = -EINVAL;
 +                      goto out;
 +              }
 +              done += size;
 +              /* Remove comments */
 +              tmp = strchr(kbuf, '#');
 +              if (tmp)
 +                      *tmp = '\0';
 +
 +              ret = command_trace_probe(kbuf);
 +              if (ret)
 +                      goto out;
 +      }
 +      ret = done;
 +out:
 +      kfree(kbuf);
 +      return ret;
 +}
 +
 +static const struct file_operations kprobe_events_ops = {
 +      .owner          = THIS_MODULE,
 +      .open           = probes_open,
 +      .read           = seq_read,
 +      .llseek         = seq_lseek,
 +      .release        = seq_release,
 +      .write          = probes_write,
 +};
 +
 +/* Probes profiling interfaces */
 +static int probes_profile_seq_show(struct seq_file *m, void *v)
 +{
 +      struct trace_probe *tp = v;
 +
 +      seq_printf(m, "  %-44s %15lu %15lu\n", tp->call.name, tp->nhit,
 +                 probe_is_return(tp) ? tp->rp.kp.nmissed : tp->kp.nmissed);
 +
 +      return 0;
 +}
 +
 +static const struct seq_operations profile_seq_op = {
 +      .start  = probes_seq_start,
 +      .next   = probes_seq_next,
 +      .stop   = probes_seq_stop,
 +      .show   = probes_profile_seq_show
 +};
 +
 +static int profile_open(struct inode *inode, struct file *file)
 +{
 +      return seq_open(file, &profile_seq_op);
 +}
 +
 +static const struct file_operations kprobe_profile_ops = {
 +      .owner          = THIS_MODULE,
 +      .open           = profile_open,
 +      .read           = seq_read,
 +      .llseek         = seq_lseek,
 +      .release        = seq_release,
 +};
 +
 +/* Kprobe handler */
 +static __kprobes int kprobe_trace_func(struct kprobe *kp, struct pt_regs *regs)
 +{
 +      struct trace_probe *tp = container_of(kp, struct trace_probe, kp);
 +      struct kprobe_trace_entry *entry;
 +      struct ring_buffer_event *event;
++      struct ring_buffer *buffer;
 +      int size, i, pc;
 +      unsigned long irq_flags;
 +      struct ftrace_event_call *call = &tp->call;
 +
 +      tp->nhit++;
 +
 +      local_save_flags(irq_flags);
 +      pc = preempt_count();
 +
 +      size = SIZEOF_KPROBE_TRACE_ENTRY(tp->nr_args);
 +
-       if (!filter_current_check_discard(call, entry, event))
-               trace_nowake_buffer_unlock_commit(event, irq_flags, pc);
++      event = trace_current_buffer_lock_reserve(&buffer, call->id, size,
 +                                                irq_flags, pc);
 +      if (!event)
 +              return 0;
 +
 +      entry = ring_buffer_event_data(event);
 +      entry->nargs = tp->nr_args;
 +      entry->ip = (unsigned long)kp->addr;
 +      for (i = 0; i < tp->nr_args; i++)
 +              entry->args[i] = call_fetch(&tp->args[i], regs);
 +
-       event = trace_current_buffer_lock_reserve(call->id, size,
++      if (!filter_current_check_discard(buffer, call, entry, event))
++              trace_nowake_buffer_unlock_commit(buffer, event, irq_flags, pc);
 +      return 0;
 +}
 +
 +/* Kretprobe handler */
 +static __kprobes int kretprobe_trace_func(struct kretprobe_instance *ri,
 +                                        struct pt_regs *regs)
 +{
 +      struct trace_probe *tp = container_of(ri->rp, struct trace_probe, rp);
 +      struct kretprobe_trace_entry *entry;
 +      struct ring_buffer_event *event;
++      struct ring_buffer *buffer;
 +      int size, i, pc;
 +      unsigned long irq_flags;
 +      struct ftrace_event_call *call = &tp->call;
 +
 +      local_save_flags(irq_flags);
 +      pc = preempt_count();
 +
 +      size = SIZEOF_KRETPROBE_TRACE_ENTRY(tp->nr_args);
 +
-       if (!filter_current_check_discard(call, entry, event))
-               trace_nowake_buffer_unlock_commit(event, irq_flags, pc);
++      event = trace_current_buffer_lock_reserve(&buffer, call->id, size,
 +                                                irq_flags, pc);
 +      if (!event)
 +              return 0;
 +
 +      entry = ring_buffer_event_data(event);
 +      entry->nargs = tp->nr_args;
 +      entry->func = (unsigned long)probe_address(tp);
 +      entry->ret_ip = (unsigned long)ri->ret_addr;
 +      for (i = 0; i < tp->nr_args; i++)
 +              entry->args[i] = call_fetch(&tp->args[i], regs);
 +
-       init_preds(event_call);
++      if (!filter_current_check_discard(buffer, call, entry, event))
++              trace_nowake_buffer_unlock_commit(buffer, event, irq_flags, pc);
 +
 +      return 0;
 +}
 +
 +/* Event entry printers */
 +enum print_line_t
 +print_kprobe_event(struct trace_iterator *iter, int flags)
 +{
 +      struct kprobe_trace_entry *field;
 +      struct trace_seq *s = &iter->seq;
 +      int i;
 +
 +      field = (struct kprobe_trace_entry *)iter->ent;
 +
 +      if (!seq_print_ip_sym(s, field->ip, flags | TRACE_ITER_SYM_OFFSET))
 +              goto partial;
 +
 +      if (!trace_seq_puts(s, ":"))
 +              goto partial;
 +
 +      for (i = 0; i < field->nargs; i++)
 +              if (!trace_seq_printf(s, " 0x%lx", field->args[i]))
 +                      goto partial;
 +
 +      if (!trace_seq_puts(s, "\n"))
 +              goto partial;
 +
 +      return TRACE_TYPE_HANDLED;
 +partial:
 +      return TRACE_TYPE_PARTIAL_LINE;
 +}
 +
 +enum print_line_t
 +print_kretprobe_event(struct trace_iterator *iter, int flags)
 +{
 +      struct kretprobe_trace_entry *field;
 +      struct trace_seq *s = &iter->seq;
 +      int i;
 +
 +      field = (struct kretprobe_trace_entry *)iter->ent;
 +
 +      if (!seq_print_ip_sym(s, field->ret_ip, flags | TRACE_ITER_SYM_OFFSET))
 +              goto partial;
 +
 +      if (!trace_seq_puts(s, " <- "))
 +              goto partial;
 +
 +      if (!seq_print_ip_sym(s, field->func, flags & ~TRACE_ITER_SYM_OFFSET))
 +              goto partial;
 +
 +      if (!trace_seq_puts(s, ":"))
 +              goto partial;
 +
 +      for (i = 0; i < field->nargs; i++)
 +              if (!trace_seq_printf(s, " 0x%lx", field->args[i]))
 +                      goto partial;
 +
 +      if (!trace_seq_puts(s, "\n"))
 +              goto partial;
 +
 +      return TRACE_TYPE_HANDLED;
 +partial:
 +      return TRACE_TYPE_PARTIAL_LINE;
 +}
 +
 +static int probe_event_enable(struct ftrace_event_call *call)
 +{
 +      struct trace_probe *tp = (struct trace_probe *)call->data;
 +
 +      if (probe_is_return(tp))
 +              return enable_kretprobe(&tp->rp);
 +      else
 +              return enable_kprobe(&tp->kp);
 +}
 +
 +static void probe_event_disable(struct ftrace_event_call *call)
 +{
 +      struct trace_probe *tp = (struct trace_probe *)call->data;
 +
 +      if (probe_is_return(tp))
 +              disable_kretprobe(&tp->rp);
 +      else
 +              disable_kprobe(&tp->kp);
 +}
 +
 +static int probe_event_raw_init(struct ftrace_event_call *event_call)
 +{
 +      INIT_LIST_HEAD(&event_call->fields);
++
 +      return 0;
 +}
 +
 +#undef DEFINE_FIELD
 +#define DEFINE_FIELD(type, item, name, is_signed)                     \
 +      do {                                                            \
 +              ret = trace_define_field(event_call, #type, name,       \
 +                                       offsetof(typeof(field), item), \
 +                                       sizeof(field.item), is_signed, \
 +                                       FILTER_OTHER);                 \
 +              if (ret)                                                \
 +                      return ret;                                     \
 +      } while (0)
 +
 +static int kprobe_event_define_fields(struct ftrace_event_call *event_call)
 +{
 +      int ret, i;
 +      struct kprobe_trace_entry field;
 +      char buf[MAX_ARGSTR_LEN + 1];
 +      struct trace_probe *tp = (struct trace_probe *)event_call->data;
 +
 +      ret = trace_define_common_fields(event_call);
 +      if (!ret)
 +              return ret;
 +
 +      DEFINE_FIELD(unsigned long, ip, "ip", 0);
 +      DEFINE_FIELD(int, nargs, "nargs", 1);
 +      for (i = 0; i < tp->nr_args; i++) {
 +              /* Set argN as a field */
 +              sprintf(buf, "arg%d", i);
 +              DEFINE_FIELD(unsigned long, args[i], buf, 0);
 +              /* Set argument string as an alias field */
 +              ret = probe_arg_string(buf, MAX_ARGSTR_LEN, &tp->args[i]);
 +              if (ret < 0)
 +                      return ret;
 +              DEFINE_FIELD(unsigned long, args[i], buf, 0);
 +      }
 +      return 0;
 +}
 +
 +static int kretprobe_event_define_fields(struct ftrace_event_call *event_call)
 +{
 +      int ret, i;
 +      struct kretprobe_trace_entry field;
 +      char buf[MAX_ARGSTR_LEN + 1];
 +      struct trace_probe *tp = (struct trace_probe *)event_call->data;
 +
 +      ret = trace_define_common_fields(event_call);
 +      if (!ret)
 +              return ret;
 +
 +      DEFINE_FIELD(unsigned long, func, "func", 0);
 +      DEFINE_FIELD(unsigned long, ret_ip, "ret_ip", 0);
 +      DEFINE_FIELD(int, nargs, "nargs", 1);
 +      for (i = 0; i < tp->nr_args; i++) {
 +              /* Set argN as a field */
 +              sprintf(buf, "arg%d", i);
 +              DEFINE_FIELD(unsigned long, args[i], buf, 0);
 +              /* Set argument string as an alias field */
 +              ret = probe_arg_string(buf, MAX_ARGSTR_LEN, &tp->args[i]);
 +              if (ret < 0)
 +                      return ret;
 +              DEFINE_FIELD(unsigned long, args[i], buf, 0);
 +      }
 +      return 0;
 +}
 +
 +static int __probe_event_show_format(struct trace_seq *s,
 +                                   struct trace_probe *tp, const char *fmt,
 +                                   const char *arg)
 +{
 +      int i, ret;
 +      char buf[MAX_ARGSTR_LEN + 1];
 +
 +      /* Show aliases */
 +      for (i = 0; i < tp->nr_args; i++) {
 +              ret = probe_arg_string(buf, MAX_ARGSTR_LEN, &tp->args[i]);
 +              if (ret < 0)
 +                      return ret;
 +              if (!trace_seq_printf(s, "\talias: %s;\toriginal: arg%d;\n",
 +                                    buf, i))
 +                      return 0;
 +      }
 +      /* Show format */
 +      if (!trace_seq_printf(s, "\nprint fmt: \"%s", fmt))
 +              return 0;
 +
 +      for (i = 0; i < tp->nr_args; i++)
 +              if (!trace_seq_puts(s, " 0x%lx"))
 +                      return 0;
 +
 +      if (!trace_seq_printf(s, "\", %s", arg))
 +              return 0;
 +
 +      for (i = 0; i < tp->nr_args; i++)
 +              if (!trace_seq_printf(s, ", arg%d", i))
 +                      return 0;
 +
 +      return trace_seq_puts(s, "\n");
 +}
 +
 +#undef SHOW_FIELD
 +#define SHOW_FIELD(type, item, name)                                  \
 +      do {                                                            \
 +              ret = trace_seq_printf(s, "\tfield: " #type " %s;\t"    \
 +                              "offset:%u;\tsize:%u;\n", name,         \
 +                              (unsigned int)offsetof(typeof(field), item),\
 +                              (unsigned int)sizeof(type));            \
 +              if (!ret)                                               \
 +                      return 0;                                       \
 +      } while (0)
 +
 +static int kprobe_event_show_format(struct ftrace_event_call *call,
 +                                  struct trace_seq *s)
 +{
 +      struct kprobe_trace_entry field __attribute__((unused));
 +      int ret, i;
 +      char buf[8];
 +      struct trace_probe *tp = (struct trace_probe *)call->data;
 +
 +      SHOW_FIELD(unsigned long, ip, "ip");
 +      SHOW_FIELD(int, nargs, "nargs");
 +
 +      /* Show fields */
 +      for (i = 0; i < tp->nr_args; i++) {
 +              sprintf(buf, "arg%d", i);
 +              SHOW_FIELD(unsigned long, args[i], buf);
 +      }
 +      trace_seq_puts(s, "\n");
 +
 +      return __probe_event_show_format(s, tp, "%lx:", "ip");
 +}
 +
 +static int kretprobe_event_show_format(struct ftrace_event_call *call,
 +                                     struct trace_seq *s)
 +{
 +      struct kretprobe_trace_entry field __attribute__((unused));
 +      int ret, i;
 +      char buf[8];
 +      struct trace_probe *tp = (struct trace_probe *)call->data;
 +
 +      SHOW_FIELD(unsigned long, func, "func");
 +      SHOW_FIELD(unsigned long, ret_ip, "ret_ip");
 +      SHOW_FIELD(int, nargs, "nargs");
 +
 +      /* Show fields */
 +      for (i = 0; i < tp->nr_args; i++) {
 +              sprintf(buf, "arg%d", i);
 +              SHOW_FIELD(unsigned long, args[i], buf);
 +      }
 +      trace_seq_puts(s, "\n");
 +
 +      return __probe_event_show_format(s, tp, "%lx <- %lx:",
 +                                        "func, ret_ip");
 +}
 +
 +static int register_probe_event(struct trace_probe *tp)
 +{
 +      struct ftrace_event_call *call = &tp->call;
 +      int ret;
 +
 +      /* Initialize ftrace_event_call */
 +      call->system = "kprobes";
 +      if (probe_is_return(tp)) {
 +              tp->event.trace = print_kretprobe_event;
 +              call->raw_init = probe_event_raw_init;
 +              call->show_format = kretprobe_event_show_format;
 +              call->define_fields = kretprobe_event_define_fields;
 +      } else {
 +              tp->event.trace = print_kprobe_event;
 +              call->raw_init = probe_event_raw_init;
 +              call->show_format = kprobe_event_show_format;
 +              call->define_fields = kprobe_event_define_fields;
 +      }
 +      call->event = &tp->event;
 +      call->id = register_ftrace_event(&tp->event);
 +      if (!call->id)
 +              return -ENODEV;
 +      call->enabled = 1;
 +      call->regfunc = probe_event_enable;
 +      call->unregfunc = probe_event_disable;
 +      call->data = tp;
 +      ret = trace_add_event_call(call);
 +      if (ret) {
 +              pr_info("Failed to register kprobe event: %s\n", call->name);
 +              unregister_ftrace_event(&tp->event);
 +      }
 +      return ret;
 +}
 +
 +static void unregister_probe_event(struct trace_probe *tp)
 +{
 +      /* tp->event is unregistered in trace_remove_event_call() */
 +      trace_remove_event_call(&tp->call);
 +}
 +
 +/* Make a debugfs interface for controling probe points */
 +static __init int init_kprobe_trace(void)
 +{
 +      struct dentry *d_tracer;
 +      struct dentry *entry;
 +
 +      d_tracer = tracing_init_dentry();
 +      if (!d_tracer)
 +              return 0;
 +
 +      entry = debugfs_create_file("kprobe_events", 0644, d_tracer,
 +                                  NULL, &kprobe_events_ops);
 +
 +      /* Event list interface */
 +      if (!entry)
 +              pr_warning("Could not create debugfs "
 +                         "'kprobe_events' entry\n");
 +
 +      /* Profile interface */
 +      entry = debugfs_create_file("kprobe_profile", 0444, d_tracer,
 +                                  NULL, &kprobe_profile_ops);
 +
 +      if (!entry)
 +              pr_warning("Could not create debugfs "
 +                         "'kprobe_profile' entry\n");
 +      return 0;
 +}
 +fs_initcall(init_kprobe_trace);
 +
 +
 +#ifdef CONFIG_FTRACE_STARTUP_TEST
 +
 +static int kprobe_trace_selftest_target(int a1, int a2, int a3,
 +                                      int a4, int a5, int a6)
 +{
 +      return a1 + a2 + a3 + a4 + a5 + a6;
 +}
 +
 +static __init int kprobe_trace_self_tests_init(void)
 +{
 +      int ret;
 +      int (*target)(int, int, int, int, int, int);
 +
 +      target = kprobe_trace_selftest_target;
 +
 +      pr_info("Testing kprobe tracing: ");
 +
 +      ret = command_trace_probe("p:testprobe kprobe_trace_selftest_target "
 +                                "a1 a2 a3 a4 a5 a6");
 +      if (WARN_ON_ONCE(ret))
 +              pr_warning("error enabling function entry\n");
 +
 +      ret = command_trace_probe("r:testprobe2 kprobe_trace_selftest_target "
 +                                "ra rv");
 +      if (WARN_ON_ONCE(ret))
 +              pr_warning("error enabling function return\n");
 +
 +      ret = target(1, 2, 3, 4, 5, 6);
 +
 +      cleanup_all_probes();
 +
 +      pr_cont("OK\n");
 +      return 0;
 +}
 +
 +late_initcall(kprobe_trace_self_tests_init);
 +
 +#endif
@@@ -11,8 -11,8 +11,8 @@@
  static DEFINE_MUTEX(syscall_trace_lock);
  static int sys_refcount_enter;
  static int sys_refcount_exit;
- static DECLARE_BITMAP(enabled_enter_syscalls, FTRACE_SYSCALL_MAX);
- static DECLARE_BITMAP(enabled_exit_syscalls, FTRACE_SYSCALL_MAX);
+ static DECLARE_BITMAP(enabled_enter_syscalls, NR_syscalls);
+ static DECLARE_BITMAP(enabled_exit_syscalls, NR_syscalls);
  
  enum print_line_t
  print_syscall_enter(struct trace_iterator *iter, int flags)
@@@ -223,10 -223,13 +223,13 @@@ void ftrace_syscall_enter(struct pt_reg
        struct syscall_trace_enter *entry;
        struct syscall_metadata *sys_data;
        struct ring_buffer_event *event;
+       struct ring_buffer *buffer;
        int size;
        int syscall_nr;
  
        syscall_nr = syscall_get_nr(current, regs);
+       if (syscall_nr < 0)
+               return;
        if (!test_bit(syscall_nr, enabled_enter_syscalls))
                return;
  
  
        size = sizeof(*entry) + sizeof(unsigned long) * sys_data->nb_args;
  
-       event = trace_current_buffer_lock_reserve(sys_data->enter_id, size,
-                                                       0, 0);
+       event = trace_current_buffer_lock_reserve(&buffer, sys_data->enter_id,
+                                                 size, 0, 0);
        if (!event)
                return;
  
        entry->nr = syscall_nr;
        syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args);
  
-       if (!filter_current_check_discard(sys_data->enter_event, entry, event))
-               trace_current_buffer_unlock_commit(event, 0, 0);
+       if (!filter_current_check_discard(buffer, sys_data->enter_event,
+                                         entry, event))
+               trace_current_buffer_unlock_commit(buffer, event, 0, 0);
  }
  
  void ftrace_syscall_exit(struct pt_regs *regs, long ret)
        struct syscall_trace_exit *entry;
        struct syscall_metadata *sys_data;
        struct ring_buffer_event *event;
+       struct ring_buffer *buffer;
        int syscall_nr;
  
        syscall_nr = syscall_get_nr(current, regs);
+       if (syscall_nr < 0)
+               return;
        if (!test_bit(syscall_nr, enabled_exit_syscalls))
                return;
  
        if (!sys_data)
                return;
  
-       event = trace_current_buffer_lock_reserve(sys_data->exit_id,
+       event = trace_current_buffer_lock_reserve(&buffer, sys_data->exit_id,
                                sizeof(*entry), 0, 0);
        if (!event)
                return;
        entry->nr = syscall_nr;
        entry->ret = syscall_get_return_value(current, regs);
  
-       if (!filter_current_check_discard(sys_data->exit_event, entry, event))
-               trace_current_buffer_unlock_commit(event, 0, 0);
+       if (!filter_current_check_discard(buffer, sys_data->exit_event,
+                                         entry, event))
+               trace_current_buffer_unlock_commit(buffer, event, 0, 0);
  }
  
 -int reg_event_syscall_enter(void *ptr)
 +int reg_event_syscall_enter(struct ftrace_event_call *call)
  {
        int ret = 0;
        int num;
        char *name;
  
 -      name = (char *)ptr;
 +      name = (char *)call->data;
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return -ENOSYS;
        mutex_lock(&syscall_trace_lock);
        if (!sys_refcount_enter)
        return ret;
  }
  
 -void unreg_event_syscall_enter(void *ptr)
 +void unreg_event_syscall_enter(struct ftrace_event_call *call)
  {
        int num;
        char *name;
  
 -      name = (char *)ptr;
 +      name = (char *)call->data;
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return;
        mutex_lock(&syscall_trace_lock);
        sys_refcount_enter--;
        mutex_unlock(&syscall_trace_lock);
  }
  
 -int reg_event_syscall_exit(void *ptr)
 +int reg_event_syscall_exit(struct ftrace_event_call *call)
  {
        int ret = 0;
        int num;
        char *name;
  
 -      name = (char *)ptr;
 +      name = call->data;
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return -ENOSYS;
        mutex_lock(&syscall_trace_lock);
        if (!sys_refcount_exit)
        return ret;
  }
  
 -void unreg_event_syscall_exit(void *ptr)
 +void unreg_event_syscall_exit(struct ftrace_event_call *call)
  {
        int num;
        char *name;
  
 -      name = (char *)ptr;
 +      name = call->data;
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return;
        mutex_lock(&syscall_trace_lock);
        sys_refcount_exit--;
@@@ -369,8 -377,8 +377,8 @@@ struct trace_event event_syscall_exit 
  
  #ifdef CONFIG_EVENT_PROFILE
  
- static DECLARE_BITMAP(enabled_prof_enter_syscalls, FTRACE_SYSCALL_MAX);
- static DECLARE_BITMAP(enabled_prof_exit_syscalls, FTRACE_SYSCALL_MAX);
+ static DECLARE_BITMAP(enabled_prof_enter_syscalls, NR_syscalls);
+ static DECLARE_BITMAP(enabled_prof_exit_syscalls, NR_syscalls);
  static int sys_prof_refcount_enter;
  static int sys_prof_refcount_exit;
  
@@@ -416,7 -424,7 +424,7 @@@ int reg_prof_syscall_enter(char *name
        int num;
  
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return -ENOSYS;
  
        mutex_lock(&syscall_trace_lock);
@@@ -438,7 -446,7 +446,7 @@@ void unreg_prof_syscall_enter(char *nam
        int num;
  
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return;
  
        mutex_lock(&syscall_trace_lock);
@@@ -477,7 -485,7 +485,7 @@@ int reg_prof_syscall_exit(char *name
        int num;
  
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return -ENOSYS;
  
        mutex_lock(&syscall_trace_lock);
@@@ -499,7 -507,7 +507,7 @@@ void unreg_prof_syscall_exit(char *name
        int num;
  
        num = syscall_name_to_nr(name);
-       if (num < 0 || num >= FTRACE_SYSCALL_MAX)
+       if (num < 0 || num >= NR_syscalls)
                return;
  
        mutex_lock(&syscall_trace_lock);