]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - kernel/trace/kmemtrace.c
kmemtrace: use tracepoints
[linux-2.6-omap-h63xx.git] / kernel / trace / kmemtrace.c
index ae201b3eda89b684732cf90de3c6d38085eff829..4f7b5db5dd06d281edccf0254d07348f120afffa 100644 (file)
@@ -10,6 +10,7 @@
 #include <linux/debugfs.h>
 #include <linux/fs.h>
 #include <linux/seq_file.h>
+#include <linux/tracepoint.h>
 #include <trace/kmemtrace.h>
 
 #include "trace.h"
@@ -29,10 +30,150 @@ static struct tracer_flags kmem_tracer_flags = {
        .opts = kmem_opts
 };
 
-
-static bool kmem_tracing_enabled __read_mostly;
 static struct trace_array *kmemtrace_array;
 
+/* Trace allocations */
+static inline void kmemtrace_alloc(enum kmemtrace_type_id type_id,
+                                  unsigned long call_site,
+                                  const void *ptr,
+                                  size_t bytes_req,
+                                  size_t bytes_alloc,
+                                  gfp_t gfp_flags,
+                                  int node)
+{
+       struct ring_buffer_event *event;
+       struct kmemtrace_alloc_entry *entry;
+       struct trace_array *tr = kmemtrace_array;
+
+       event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
+       if (!event)
+               return;
+       entry   = ring_buffer_event_data(event);
+       tracing_generic_entry_update(&entry->ent, 0, 0);
+
+       entry->ent.type = TRACE_KMEM_ALLOC;
+       entry->call_site = call_site;
+       entry->ptr = ptr;
+       entry->bytes_req = bytes_req;
+       entry->bytes_alloc = bytes_alloc;
+       entry->gfp_flags = gfp_flags;
+       entry->node     =       node;
+
+       ring_buffer_unlock_commit(tr->buffer, event);
+
+       trace_wake_up();
+}
+
+static inline void kmemtrace_free(enum kmemtrace_type_id type_id,
+                                 unsigned long call_site,
+                                 const void *ptr)
+{
+       struct ring_buffer_event *event;
+       struct kmemtrace_free_entry *entry;
+       struct trace_array *tr = kmemtrace_array;
+
+       event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
+       if (!event)
+               return;
+       entry   = ring_buffer_event_data(event);
+       tracing_generic_entry_update(&entry->ent, 0, 0);
+
+       entry->ent.type = TRACE_KMEM_FREE;
+       entry->type_id  = type_id;
+       entry->call_site = call_site;
+       entry->ptr = ptr;
+
+       ring_buffer_unlock_commit(tr->buffer, event);
+
+       trace_wake_up();
+}
+
+static void kmemtrace_kmalloc(unsigned long call_site,
+                             const void *ptr,
+                             size_t bytes_req,
+                             size_t bytes_alloc,
+                             gfp_t gfp_flags)
+{
+       kmemtrace_alloc(KMEMTRACE_TYPE_KMALLOC, call_site, ptr,
+                       bytes_req, bytes_alloc, gfp_flags, -1);
+}
+
+static void kmemtrace_kmem_cache_alloc(unsigned long call_site,
+                                      const void *ptr,
+                                      size_t bytes_req,
+                                      size_t bytes_alloc,
+                                      gfp_t gfp_flags)
+{
+       kmemtrace_alloc(KMEMTRACE_TYPE_CACHE, call_site, ptr,
+                       bytes_req, bytes_alloc, gfp_flags, -1);
+}
+
+static void kmemtrace_kmalloc_node(unsigned long call_site,
+                                  const void *ptr,
+                                  size_t bytes_req,
+                                  size_t bytes_alloc,
+                                  gfp_t gfp_flags,
+                                  int node)
+{
+       kmemtrace_alloc(KMEMTRACE_TYPE_KMALLOC, call_site, ptr,
+                       bytes_req, bytes_alloc, gfp_flags, node);
+}
+
+static void kmemtrace_kmem_cache_alloc_node(unsigned long call_site,
+                                           const void *ptr,
+                                           size_t bytes_req,
+                                           size_t bytes_alloc,
+                                           gfp_t gfp_flags,
+                                           int node)
+{
+       kmemtrace_alloc(KMEMTRACE_TYPE_CACHE, call_site, ptr,
+                       bytes_req, bytes_alloc, gfp_flags, node);
+}
+
+static void kmemtrace_kfree(unsigned long call_site, const void *ptr)
+{
+       kmemtrace_free(KMEMTRACE_TYPE_KMALLOC, call_site, ptr);
+}
+
+static void kmemtrace_kmem_cache_free(unsigned long call_site, const void *ptr)
+{
+       kmemtrace_free(KMEMTRACE_TYPE_CACHE, call_site, ptr);
+}
+
+static int kmemtrace_start_probes(void)
+{
+       int err;
+
+       err = register_trace_kmalloc(kmemtrace_kmalloc);
+       if (err)
+               return err;
+       err = register_trace_kmem_cache_alloc(kmemtrace_kmem_cache_alloc);
+       if (err)
+               return err;
+       err = register_trace_kmalloc_node(kmemtrace_kmalloc_node);
+       if (err)
+               return err;
+       err = register_trace_kmem_cache_alloc_node(kmemtrace_kmem_cache_alloc_node);
+       if (err)
+               return err;
+       err = register_trace_kfree(kmemtrace_kfree);
+       if (err)
+               return err;
+       err = register_trace_kmem_cache_free(kmemtrace_kmem_cache_free);
+
+       return err;
+}
+
+static void kmemtrace_stop_probes(void)
+{
+       unregister_trace_kmalloc(kmemtrace_kmalloc);
+       unregister_trace_kmem_cache_alloc(kmemtrace_kmem_cache_alloc);
+       unregister_trace_kmalloc_node(kmemtrace_kmalloc_node);
+       unregister_trace_kmem_cache_alloc_node(kmemtrace_kmem_cache_alloc_node);
+       unregister_trace_kfree(kmemtrace_kfree);
+       unregister_trace_kmem_cache_free(kmemtrace_kmem_cache_free);
+}
+
 static int kmem_trace_init(struct trace_array *tr)
 {
        int cpu;
@@ -41,14 +182,14 @@ static int kmem_trace_init(struct trace_array *tr)
        for_each_cpu_mask(cpu, cpu_possible_map)
                tracing_reset(tr, cpu);
 
-       kmem_tracing_enabled = true;
+       kmemtrace_start_probes();
 
        return 0;
 }
 
 static void kmem_trace_reset(struct trace_array *tr)
 {
-       kmem_tracing_enabled = false;
+       kmemtrace_stop_probes();
 }
 
 static void kmemtrace_headers(struct seq_file *s)
@@ -260,63 +401,6 @@ static enum print_line_t kmemtrace_print_line(struct trace_iterator *iter)
        }
 }
 
-/* Trace allocations */
-void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
-                            unsigned long call_site,
-                            const void *ptr,
-                            size_t bytes_req,
-                            size_t bytes_alloc,
-                            gfp_t gfp_flags,
-                            int node)
-{
-       struct ring_buffer_event *event;
-       struct kmemtrace_alloc_entry *entry;
-       struct trace_array *tr = kmemtrace_array;
-
-       if (!kmem_tracing_enabled)
-               return;
-
-       event = trace_buffer_lock_reserve(tr, TRACE_KMEM_ALLOC,
-                                         sizeof(*entry), 0, 0);
-       if (!event)
-               return;
-       entry   = ring_buffer_event_data(event);
-
-       entry->call_site = call_site;
-       entry->ptr = ptr;
-       entry->bytes_req = bytes_req;
-       entry->bytes_alloc = bytes_alloc;
-       entry->gfp_flags = gfp_flags;
-       entry->node     =       node;
-
-       trace_buffer_unlock_commit(tr, event, 0, 0);
-}
-EXPORT_SYMBOL(kmemtrace_mark_alloc_node);
-
-void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
-                      unsigned long call_site,
-                      const void *ptr)
-{
-       struct ring_buffer_event *event;
-       struct kmemtrace_free_entry *entry;
-       struct trace_array *tr = kmemtrace_array;
-
-       if (!kmem_tracing_enabled)
-               return;
-
-       event = trace_buffer_lock_reserve(tr, TRACE_KMEM_FREE,
-                                         sizeof(*entry), 0, 0);
-       if (!event)
-               return;
-       entry   = ring_buffer_event_data(event);
-       entry->type_id  = type_id;
-       entry->call_site = call_site;
-       entry->ptr = ptr;
-
-       trace_buffer_unlock_commit(tr, event, 0, 0);
-}
-EXPORT_SYMBOL(kmemtrace_mark_free);
-
 static struct tracer kmem_tracer __read_mostly = {
        .name           = "kmemtrace",
        .init           = kmem_trace_init,