Revert "tracing: Move event storage for array from macro to standalone function"

I originally wrote commit 35bb4399bd0e to shrink the size of the overhead of
tracepoints by several kilobytes. Later, I received a patch from Vaibhav
Nagarnaik that fixed a bug in the same code that this commit touches. Not
only did it fix a bug, it also removed code and shrunk the size of the
overhead of trace events even more than this commit did.

Since this commit is scheduled for 3.15 and Vaibhav's patch is already in
mainline, I need to revert this patch in order to keep it from conflicting
with Vaibhav's patch. Not to mention, Vaibhav's patch makes this patch
obsolete.

Link: http://lkml.kernel.org/r/20140320225637.0226041b@gandalf.local.home
Cc: Vaibhav Nagarnaik <vnagarnaik@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 9d3fe065839879cd6f048c79a523bcc2c39ed578..cdc975929d152f84ee8de342cdae64dc925a4657 100644 (file)
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -221,6 +221,10 @@ void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer,
 
 void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer);
 
+int ftrace_event_define_field(struct ftrace_event_call *call,
+                             char *type, int len, char *item, int offset,
+                             int field_size, int sign, int filter);
+
 enum {
        TRACE_EVENT_FL_FILTERED_BIT,
        TRACE_EVENT_FL_CAP_ANY_BIT,
@@ -519,6 +523,10 @@ enum {
        FILTER_TRACE_FN,
 };
 
+#define EVENT_STORAGE_SIZE 128
+extern struct mutex event_storage_mutex;
+extern char event_storage[EVENT_STORAGE_SIZE];
+
 extern int trace_event_raw_init(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,

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index e15ae4010d516fd8a9319a3644e05e222428aab4..d1d91875faa52248b6629a76390ce3e9d039571b 100644 (file)
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -302,11 +302,15 @@ static struct trace_event_functions ftrace_event_type_funcs_##call = {    \
 #undef __array
 #define __array(type, item, len)                                       \
        do {                                                            \
+               mutex_lock(&event_storage_mutex);                       \
                BUILD_BUG_ON(len > MAX_FILTER_STR_VAL);                 \
-               ret = ftrace_event_define_field(event_call, #type, len, \
-                               #item, offsetof(typeof(field), item),   \
-                               sizeof(field.item),                     \
-                               is_signed_type(type), FILTER_OTHER); \
+               snprintf(event_storage, sizeof(event_storage),          \
+                        "%s[%d]", #type, len);                         \
+               ret = trace_define_field(event_call, event_storage, #item, \
+                                offsetof(typeof(field), item),         \
+                                sizeof(field.item),                    \
+                                is_signed_type(type), FILTER_OTHER);   \
+               mutex_unlock(&event_storage_mutex);                     \
                if (ret)                                                \
                        return ret;                                     \
        } while (0);

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index b8f73b333a3cecce6ad01623485be05c5dd33542..2f7b8e31e3a4c21930e4231544accd56954d2623 100644 (file)
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -27,6 +27,12 @@
 
 DEFINE_MUTEX(event_mutex);
 
+DEFINE_MUTEX(event_storage_mutex);
+EXPORT_SYMBOL_GPL(event_storage_mutex);
+
+char event_storage[EVENT_STORAGE_SIZE];
+EXPORT_SYMBOL_GPL(event_storage);
+
 LIST_HEAD(ftrace_events);
 static LIST_HEAD(ftrace_common_fields);
 

diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
index 39c746c5ae734bf3dbe0da69e98c0524fd6941b9..7c3e3e72e2b6bd2f0a6bd929ff67526497281b4a 100644 (file)
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@ -96,10 +96,14 @@ static void __always_unused ____ftrace_check_##name(void)           \
 #define __array(type, item, len)                                       \
        do {                                                            \
                BUILD_BUG_ON(len > MAX_FILTER_STR_VAL);                 \
-               ret = ftrace_event_define_field(event_call, #type, len, \
-                               #item, offsetof(typeof(field), item),   \
-                               sizeof(field.item),                     \
-                               is_signed_type(type), filter_type);     \
+               mutex_lock(&event_storage_mutex);                       \
+               snprintf(event_storage, sizeof(event_storage),          \
+                        "%s[%d]", #type, len);                         \
+               ret = trace_define_field(event_call, event_storage, #item, \
+                                offsetof(typeof(field), item),         \
+                                sizeof(field.item),                    \
+                                is_signed_type(type), filter_type);    \
+               mutex_unlock(&event_storage_mutex);                     \
                if (ret)                                                \
                        return ret;                                     \
        } while (0);

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index ee8d74840b88316c5d41aba0ccd0d931ebf2644d..ca0e79e2abaa6a76fc4d9b83035bb7e829cb1402 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -20,10 +20,6 @@ static struct hlist_head event_hash[EVENT_HASHSIZE] __read_mostly;
 
 static int next_event_type = __TRACE_LAST_TYPE + 1;
 
-#define EVENT_STORAGE_SIZE 128
-static DEFINE_MUTEX(event_storage_mutex);
-static char event_storage[EVENT_STORAGE_SIZE];
-
 int trace_print_seq(struct seq_file *m, struct trace_seq *s)
 {
        int len = s->len >= PAGE_SIZE ? PAGE_SIZE - 1 : s->len;
@@ -474,23 +470,6 @@ int ftrace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...)
 }
 EXPORT_SYMBOL_GPL(ftrace_output_call);
 
-int ftrace_event_define_field(struct ftrace_event_call *call,
-                             char *type, int len, char *item, int offset,
-                             int field_size, int sign, int filter)
-{
-       int ret;
-
-       mutex_lock(&event_storage_mutex);
-       snprintf(event_storage, sizeof(event_storage),
-                "%s[%d]", type, len);
-       ret = trace_define_field(call, event_storage, item, offset,
-                                field_size, sign, filter);
-       mutex_unlock(&event_storage_mutex);
-
-       return ret;
-}
-EXPORT_SYMBOL_GPL(ftrace_event_define_field);
-
 #ifdef CONFIG_KRETPROBES
 static inline const char *kretprobed(const char *name)
 {