| Message ID | 20180913235941.31211-3-miguel.ojeda.sandonis@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [1/2] Compiler Attributes: naked was fixed in gcc 4.6 | expand |
On 13.09.2018 16:59, Miguel Ojeda wrote: > The naked attribute is supported by at least gcc >= 4.6 (for ARM, > which is the only current user), gcc >= 8 (for x86), clang >= 3.1 > and icc >= 13. See https://godbolt.org/z/350Dyc > > Therefore, move it out of compiler-gcc.h so that the definition > is shared by all compilers. > > This also fixes Clang support for ARM32 --- 815f0ddb346c > ("include/linux/compiler*.h: make compiler-*.h mutually exclusive"). > > Cc: Stefan Agner <stefan@agner.ch> > Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> > Cc: Eli Friedman <efriedma@codeaurora.org> > Cc: Christopher Li <sparse@chrisli.org> > Cc: Kees Cook <keescook@chromium.org> > Cc: Ingo Molnar <mingo@kernel.org> > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> > Cc: Joe Perches <joe@perches.com> > Cc: Dominique Martinet <asmadeus@codewreck.org> > Cc: Linus Torvalds <torvalds@linux-foundation.org> > Cc: linux-sparse@vger.kernel.org > Suggested-by: Arnd Bergmann <arnd@arndb.de> > Reviewed-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> > Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> Reviewed-by: Stefan Agner <stefan@agner.ch> Ideally this two patches should go into v4.19. Not sure which path the patch should take, MAINTAINERS is not quite clear about that. This fixes 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive") for ARM32, which has been merged directly by Linus, afaict... -- Stefan > --- > include/linux/compiler-gcc.h | 8 -------- > include/linux/compiler_types.h | 8 ++++++++ > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h > index 25d3dd6b2702..4d36b27214fd 100644 > --- a/include/linux/compiler-gcc.h > +++ b/include/linux/compiler-gcc.h > @@ -79,14 +79,6 @@ > #define __noretpoline __attribute__((indirect_branch("keep"))) > #endif > > -/* > - * it doesn't make sense on ARM (currently the only user of __naked) > - * to trace naked functions because then mcount is called without > - * stack and frame pointer being set up and there is no chance to > - * restore the lr register to the value before mcount was called. > - */ > -#define __naked __attribute__((naked)) notrace > - > #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) > > #define __optimize(level) __attribute__((__optimize__(level))) > diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h > index 3525c179698c..db192becfec4 100644 > --- a/include/linux/compiler_types.h > +++ b/include/linux/compiler_types.h > @@ -226,6 +226,14 @@ struct ftrace_likely_data { > #define notrace __attribute__((no_instrument_function)) > #endif > > +/* > + * it doesn't make sense on ARM (currently the only user of __naked) > + * to trace naked functions because then mcount is called without > + * stack and frame pointer being set up and there is no chance to > + * restore the lr register to the value before mcount was called. > + */ > +#define __naked __attribute__((naked)) notrace > + > #define __compiler_offsetof(a, b) __builtin_offsetof(a, b) > > /*
On Mon, Sep 17, 2018 at 08:19:50PM -0700, Stefan Agner wrote: > On 13.09.2018 16:59, Miguel Ojeda wrote: > > The naked attribute is supported by at least gcc >= 4.6 (for ARM, > > which is the only current user), gcc >= 8 (for x86), clang >= 3.1 > > and icc >= 13. See https://godbolt.org/z/350Dyc > > > > Therefore, move it out of compiler-gcc.h so that the definition > > is shared by all compilers. > > > > This also fixes Clang support for ARM32 --- 815f0ddb346c > > ("include/linux/compiler*.h: make compiler-*.h mutually exclusive"). > > > > Cc: Stefan Agner <stefan@agner.ch> > > Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> > > Cc: Eli Friedman <efriedma@codeaurora.org> > > Cc: Christopher Li <sparse@chrisli.org> > > Cc: Kees Cook <keescook@chromium.org> > > Cc: Ingo Molnar <mingo@kernel.org> > > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> > > Cc: Joe Perches <joe@perches.com> > > Cc: Dominique Martinet <asmadeus@codewreck.org> > > Cc: Linus Torvalds <torvalds@linux-foundation.org> > > Cc: linux-sparse@vger.kernel.org > > Suggested-by: Arnd Bergmann <arnd@arndb.de> > > Reviewed-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> > > Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > > Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> > > Reviewed-by: Stefan Agner <stefan@agner.ch> > > Ideally this two patches should go into v4.19. Not sure which path the patch should take, MAINTAINERS is not quite clear about that. This fixes 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive") for ARM32, which has been merged directly by > Linus, afaict... Good point, can you resend these to me with all of the acks added so far? thanks, greg k-h
On Tue, Sep 18, 2018 at 9:30 AM, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > On Mon, Sep 17, 2018 at 08:19:50PM -0700, Stefan Agner wrote: >> On 13.09.2018 16:59, Miguel Ojeda wrote: >> > The naked attribute is supported by at least gcc >= 4.6 (for ARM, >> > which is the only current user), gcc >= 8 (for x86), clang >= 3.1 >> > and icc >= 13. See https://godbolt.org/z/350Dyc >> > >> > Therefore, move it out of compiler-gcc.h so that the definition >> > is shared by all compilers. >> > >> > This also fixes Clang support for ARM32 --- 815f0ddb346c >> > ("include/linux/compiler*.h: make compiler-*.h mutually exclusive"). >> > >> > Cc: Stefan Agner <stefan@agner.ch> >> > Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> >> > Cc: Eli Friedman <efriedma@codeaurora.org> >> > Cc: Christopher Li <sparse@chrisli.org> >> > Cc: Kees Cook <keescook@chromium.org> >> > Cc: Ingo Molnar <mingo@kernel.org> >> > Cc: Geert Uytterhoeven <geert@linux-m68k.org> >> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >> > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> >> > Cc: Joe Perches <joe@perches.com> >> > Cc: Dominique Martinet <asmadeus@codewreck.org> >> > Cc: Linus Torvalds <torvalds@linux-foundation.org> >> > Cc: linux-sparse@vger.kernel.org >> > Suggested-by: Arnd Bergmann <arnd@arndb.de> >> > Reviewed-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> >> > Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> >> > Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> >> >> Reviewed-by: Stefan Agner <stefan@agner.ch> >> >> Ideally this two patches should go into v4.19. Not sure which path the patch should take, MAINTAINERS is not quite clear about that. This fixes 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive") for ARM32, which has been merged directly by >> Linus, afaict... > > Good point, can you resend these to me with all of the acks added so > far? Sure (I think only Stefan is the added ack, though). Cheers, Miguel
On 18.09.2018 09:06, Miguel Ojeda wrote: > On Tue, Sep 18, 2018 at 9:30 AM, Greg Kroah-Hartman > <gregkh@linuxfoundation.org> wrote: >> On Mon, Sep 17, 2018 at 08:19:50PM -0700, Stefan Agner wrote: >>> On 13.09.2018 16:59, Miguel Ojeda wrote: >>> > The naked attribute is supported by at least gcc >= 4.6 (for ARM, >>> > which is the only current user), gcc >= 8 (for x86), clang >= 3.1 >>> > and icc >= 13. See https://godbolt.org/z/350Dyc >>> > >>> > Therefore, move it out of compiler-gcc.h so that the definition >>> > is shared by all compilers. >>> > >>> > This also fixes Clang support for ARM32 --- 815f0ddb346c >>> > ("include/linux/compiler*.h: make compiler-*.h mutually exclusive"). >>> > >>> > Cc: Stefan Agner <stefan@agner.ch> >>> > Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> >>> > Cc: Eli Friedman <efriedma@codeaurora.org> >>> > Cc: Christopher Li <sparse@chrisli.org> >>> > Cc: Kees Cook <keescook@chromium.org> >>> > Cc: Ingo Molnar <mingo@kernel.org> >>> > Cc: Geert Uytterhoeven <geert@linux-m68k.org> >>> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >>> > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> >>> > Cc: Joe Perches <joe@perches.com> >>> > Cc: Dominique Martinet <asmadeus@codewreck.org> >>> > Cc: Linus Torvalds <torvalds@linux-foundation.org> >>> > Cc: linux-sparse@vger.kernel.org >>> > Suggested-by: Arnd Bergmann <arnd@arndb.de> >>> > Reviewed-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> >>> > Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> >>> > Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> >>> >>> Reviewed-by: Stefan Agner <stefan@agner.ch> >>> >>> Ideally this two patches should go into v4.19. Not sure which path the patch should take, MAINTAINERS is not quite clear about that. This fixes 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive") for ARM32, which has been merged directly by >>> Linus, afaict... >> >> Good point, can you resend these to me with all of the acks added so >> far? > > Sure (I think only Stefan is the added ack, though). > Thanks Miguel. You can also add my Tested-by: Stefan Agner <stefan@agner.ch> to the two patches. -- Stefan > Cheers, > Miguel
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 25d3dd6b2702..4d36b27214fd 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -79,14 +79,6 @@ #define __noretpoline __attribute__((indirect_branch("keep"))) #endif -/* - * it doesn't make sense on ARM (currently the only user of __naked) - * to trace naked functions because then mcount is called without - * stack and frame pointer being set up and there is no chance to - * restore the lr register to the value before mcount was called. - */ -#define __naked __attribute__((naked)) notrace - #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) #define __optimize(level) __attribute__((__optimize__(level))) diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index 3525c179698c..db192becfec4 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -226,6 +226,14 @@ struct ftrace_likely_data { #define notrace __attribute__((no_instrument_function)) #endif +/* + * it doesn't make sense on ARM (currently the only user of __naked) + * to trace naked functions because then mcount is called without + * stack and frame pointer being set up and there is no chance to + * restore the lr register to the value before mcount was called. + */ +#define __naked __attribute__((naked)) notrace + #define __compiler_offsetof(a, b) __builtin_offsetof(a, b) /*
The naked attribute is supported by at least gcc >= 4.6 (for ARM, which is the only current user), gcc >= 8 (for x86), clang >= 3.1 and icc >= 13. See https://godbolt.org/z/350Dyc Therefore, move it out of compiler-gcc.h so that the definition is shared by all compilers. This also fixes Clang support for ARM32 --- 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive"). Cc: Stefan Agner <stefan@agner.ch> Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Eli Friedman <efriedma@codeaurora.org> Cc: Christopher Li <sparse@chrisli.org> Cc: Kees Cook <keescook@chromium.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Joe Perches <joe@perches.com> Cc: Dominique Martinet <asmadeus@codewreck.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-sparse@vger.kernel.org Suggested-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> --- include/linux/compiler-gcc.h | 8 -------- include/linux/compiler_types.h | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-)