lkml.org 
[lkml]   [2018]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/urgent] compiler-gcc.h: Add __attribute__((gnu_inline)) to all inline declarations
    Commit-ID:  d03db2bc26f0e4a6849ad649a09c9c73fccdc656
    Gitweb: https://git.kernel.org/tip/d03db2bc26f0e4a6849ad649a09c9c73fccdc656
    Author: Nick Desaulniers <ndesaulniers@google.com>
    AuthorDate: Thu, 21 Jun 2018 09:23:22 -0700
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Tue, 3 Jul 2018 10:56:27 +0200

    compiler-gcc.h: Add __attribute__((gnu_inline)) to all inline declarations

    Functions marked extern inline do not emit an externally visible
    function when the gnu89 C standard is used. Some KBUILD Makefiles
    overwrite KBUILD_CFLAGS. This is an issue for GCC 5.1+ users as without
    an explicit C standard specified, the default is gnu11. Since c99, the
    semantics of extern inline have changed such that an externally visible
    function is always emitted. This can lead to multiple definition errors
    of extern inline functions at link time of compilation units whose build
    files have removed an explicit C standard compiler flag for users of GCC
    5.1+ or Clang.

    Suggested-by: Arnd Bergmann <arnd@arndb.de>
    Suggested-by: H. Peter Anvin <hpa@zytor.com>
    Suggested-by: Joe Perches <joe@perches.com>
    Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
    Acked-by: Juergen Gross <jgross@suse.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: acme@redhat.com
    Cc: akataria@vmware.com
    Cc: akpm@linux-foundation.org
    Cc: andrea.parri@amarulasolutions.com
    Cc: ard.biesheuvel@linaro.org
    Cc: aryabinin@virtuozzo.com
    Cc: astrachan@google.com
    Cc: boris.ostrovsky@oracle.com
    Cc: brijesh.singh@amd.com
    Cc: caoj.fnst@cn.fujitsu.com
    Cc: geert@linux-m68k.org
    Cc: ghackmann@google.com
    Cc: gregkh@linuxfoundation.org
    Cc: jan.kiszka@siemens.com
    Cc: jarkko.sakkinen@linux.intel.com
    Cc: jpoimboe@redhat.com
    Cc: keescook@google.com
    Cc: kirill.shutemov@linux.intel.com
    Cc: kstewart@linuxfoundation.org
    Cc: linux-efi@vger.kernel.org
    Cc: linux-kbuild@vger.kernel.org
    Cc: manojgupta@google.com
    Cc: mawilcox@microsoft.com
    Cc: michal.lkml@markovi.net
    Cc: mjg59@google.com
    Cc: mka@chromium.org
    Cc: pombredanne@nexb.com
    Cc: rientjes@google.com
    Cc: rostedt@goodmis.org
    Cc: sedat.dilek@gmail.com
    Cc: thomas.lendacky@amd.com
    Cc: tstellar@redhat.com
    Cc: tweek@google.com
    Cc: virtualization@lists.linux-foundation.org
    Cc: will.deacon@arm.com
    Cc: yamada.masahiro@socionext.com
    Link: http://lkml.kernel.org/r/20180621162324.36656-2-ndesaulniers@google.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    include/linux/compiler-gcc.h | 29 ++++++++++++++++++++++-------
    1 file changed, 22 insertions(+), 7 deletions(-)

    diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
    index fd282c7d3e5e..573f5a7d42d4 100644
    --- a/include/linux/compiler-gcc.h
    +++ b/include/linux/compiler-gcc.h
    @@ -65,6 +65,18 @@
    #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
    #endif

    +/*
    + * Feature detection for gnu_inline (gnu89 extern inline semantics). Either
    + * __GNUC_STDC_INLINE__ is defined (not using gnu89 extern inline semantics,
    + * and we opt in to the gnu89 semantics), or __GNUC_STDC_INLINE__ is not
    + * defined so the gnu89 semantics are the default.
    + */
    +#ifdef __GNUC_STDC_INLINE__
    +# define __gnu_inline __attribute__((gnu_inline))
    +#else
    +# define __gnu_inline
    +#endif
    +
    /*
    * Force always-inline if the user requests it so via the .config,
    * or if gcc is too old.
    @@ -72,19 +84,22 @@
    * -Wunused-function. This turns out to avoid the need for complex #ifdef
    * directives. Suppress the warning in clang as well by using "unused"
    * function attribute, which is redundant but not harmful for gcc.
    + * Prefer gnu_inline, so that extern inline functions do not emit an
    + * externally visible function. This makes extern inline behave as per gnu89
    + * semantics rather than c99. This prevents multiple symbol definition errors
    + * of extern inline functions at link time.
    + * A lot of inline functions can cause havoc with function tracing.
    */
    #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \
    !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)
    -#define inline inline __attribute__((always_inline,unused)) notrace
    -#define __inline__ __inline__ __attribute__((always_inline,unused)) notrace
    -#define __inline __inline __attribute__((always_inline,unused)) notrace
    +#define inline \
    + inline __attribute__((always_inline, unused)) notrace __gnu_inline
    #else
    -/* A lot of inline functions can cause havoc with function tracing */
    -#define inline inline __attribute__((unused)) notrace
    -#define __inline__ __inline__ __attribute__((unused)) notrace
    -#define __inline __inline __attribute__((unused)) notrace
    +#define inline inline __attribute__((unused)) notrace __gnu_inline
    #endif

    +#define __inline__ inline
    +#define __inline inline
    #define __always_inline inline __attribute__((always_inline))
    #define noinline __attribute__((noinline))

    \
     
     \ /
      Last update: 2018-07-03 18:00    [W:2.959 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site