tracing: Fix ftrace_event_call alignment for use with gcc 4.5

commit 86c38a31aa7f2dd6e74a262710bf8ebf7455acc5 upstream.

GCC 4.5 introduces behavior that forces the alignment of structures to
 use the largest possible value. The default value is 32 bytes, so if
 some structures are defined with a 4-byte alignment and others aren't
 declared with an alignment constraint at all - it will align at 32-bytes.

 For things like the ftrace events, this results in a non-standard array.
 When initializing the ftrace subsystem, we traverse the _ftrace_events
 section and call the initialization callback for each event. When the
 structures are misaligned, we could be treating another part of the
 structure (or the zeroed out space between them) as a function pointer.

 This patch forces the alignment for all the ftrace_event_call structures
 to 4 bytes.

 Without this patch, the kernel fails to boot very early when built with
 gcc 4.5.

 It's trivial to check the alignment of the members of the array, so it
 might be worthwhile to add something to the build system to do that
 automatically. Unfortunately, that only covers this case. I've asked one
 of the gcc developers about adding a warning when this condition is seen.

Cc: stable@kernel.org
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
LKML-Reference: <4B85770B.6010901@suse.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Andreas Radke <a.radke@arcor.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 93515c6190a7b8d01b8c0f0fc99293d5f6d9e0ee..6ba163fb3684d83e8b044cb4f808dfe3c570f5af 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -153,7 +153,8 @@ static void prof_sysexit_disable_##sname(void)                                     \
 #define __SC_STR_TDECL6(t, a, ...)     #t, __SC_STR_TDECL5(__VA_ARGS__)
 
 #define SYSCALL_TRACE_ENTER_EVENT(sname)                               \
-       static struct ftrace_event_call event_enter_##sname;            \
+       static struct ftrace_event_call                                 \
+       __attribute__((__aligned__(4))) event_enter_##sname;            \
        struct trace_event enter_syscall_print_##sname = {              \
                .trace                  = print_syscall_enter,          \
        };                                                              \
@@ -189,7 +190,8 @@ static void prof_sysexit_disable_##sname(void)                                     \
        }
 
 #define SYSCALL_TRACE_EXIT_EVENT(sname)                                        \
-       static struct ftrace_event_call event_exit_##sname;             \
+       static struct ftrace_event_call                                 \
+       __attribute__((__aligned__(4))) event_exit_##sname;             \
        struct trace_event exit_syscall_print_##sname = {               \
                .trace                  = print_syscall_exit,           \
        };                                                              \

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index dacb8ef6700071238a3293799f57610909c6f22f..4b6a4a3001677d1482caac5df7e1d6167dd025c2 100644 (file)
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -43,7 +43,8 @@
                tstruct                                         \
                char                    __data[0];              \
        };                                                      \
-       static struct ftrace_event_call event_##name
+       static struct ftrace_event_call                 \
+       __attribute__((__aligned__(4))) event_##name
 
 #undef __cpparg
 #define __cpparg(arg...) arg

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 405cb850b75d9a308d04d198946e9b0e8da21a39..374d4eeea9eab4b5a45fde30d5da975bd777b06c 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -746,7 +746,8 @@ extern const char *__stop___trace_bprintk_fmt[];
 
 #undef FTRACE_ENTRY
 #define FTRACE_ENTRY(call, struct_name, id, tstruct, print)            \
-       extern struct ftrace_event_call event_##call;
+       extern struct ftrace_event_call                                 \
+       __attribute__((__aligned__(4))) event_##call;
 #undef FTRACE_ENTRY_DUP
 #define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print)                \
        FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))