From: Ingo Molnar <mingo@kernel.org>
To: Jakub Jelinek <jakub@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Oleg Nesterov <oleg@redhat.com>,
Fengguang Wu <fengguang.wu@intel.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH, -v2] compiler/gcc4: Add quirk for 'asm goto' miscompilation bug
Date: Thu, 10 Oct 2013 10:55:06 +0200 [thread overview]
Message-ID: <20131010085506.GA11775@gmail.com> (raw)
In-Reply-To: <20131010084535.GA10620@gmail.com>
* Ingo Molnar <mingo@kernel.org> wrote:
> * Jakub Jelinek <jakub@redhat.com> wrote:
>
> > On Thu, Oct 10, 2013 at 10:24:30AM +0200, Ingo Molnar wrote:
> > > Something like the patch below? (Totally untested and all that.)
> > >
> > > Notes:
> > >
> > > - If the bug is fixed in 4.8.3 then the version check can be sharpened
> > > from 99999 to 40803.
> >
> > The bug is likely going to be fixed already for 4.8.2 (to be released
> > next week or so).
> >
> > > - I'd really prefer this quirk versus having to add the extra barrier to
> > > the label, as it makes the actual usage sites a lot less painful.
> >
> > Please check how much it bloats the generated code.
>
> on Linus's latest tree plain 'asm goto' is only rarely used, so the size
> impact of the patch, on x86-64 defconfig, is zero:
>
> vmlinux:
> text data bss dec hex filename
> 11166823 1448024 1187840 13802687 d29cbf vmlinux.before
> 11166823 1448024 1187840 13802687 d29cbf vmlinux.after
> 1f7c3c1fd71b4b1327965bcfbc7a77fb vmlinux.before
> 3b246add801bc170e47096b712942395 vmlinux.after
>
> Using GCC 4.8.1.
>
> > Also, for the bitops patch, you probably want an asm_volatile_goto variant.
>
> Also, for mutex_64.h - good point, will fix that.
See the updated patch below. I've added a 4.8.2 version cutoff.
Thanks,
Ingo
===================>
Subject: compiler/gcc4: Add quirk for 'asm goto' miscompilation bug
From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 10 Oct 2013 10:16:30 +0200
Fengguang Wu, Oleg Nesterov and Peter Zijlstra tracked down
a kernel crash to a GCC bug: GCC miscompiles certain 'asm goto'
constructs, as outlined here:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
Implement a workaround suggested by Jakub Jelinek.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Reported-by: Oleg Nesterov <oleg@redhat.com>
Reported-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Suggested-by: Jakub Jelinek <jakub@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/arm/include/asm/jump_label.h | 2 +-
arch/mips/include/asm/jump_label.h | 2 +-
arch/powerpc/include/asm/jump_label.h | 2 +-
arch/s390/include/asm/jump_label.h | 2 +-
arch/sparc/include/asm/jump_label.h | 2 +-
arch/x86/include/asm/cpufeature.h | 6 +++---
arch/x86/include/asm/jump_label.h | 2 +-
arch/x86/include/asm/mutex_64.h | 4 ++--
include/linux/compiler-gcc4.h | 16 ++++++++++++++++
9 files changed, 27 insertions(+), 11 deletions(-)
Index: tip/arch/arm/include/asm/jump_label.h
===================================================================
--- tip.orig/arch/arm/include/asm/jump_label.h
+++ tip/arch/arm/include/asm/jump_label.h
@@ -16,7 +16,7 @@
static __always_inline bool arch_static_branch(struct static_key *key)
{
- asm goto("1:\n\t"
+ asm_goto("1:\n\t"
JUMP_LABEL_NOP "\n\t"
".pushsection __jump_table, \"aw\"\n\t"
".word 1b, %l[l_yes], %c0\n\t"
Index: tip/arch/mips/include/asm/jump_label.h
===================================================================
--- tip.orig/arch/mips/include/asm/jump_label.h
+++ tip/arch/mips/include/asm/jump_label.h
@@ -22,7 +22,7 @@
static __always_inline bool arch_static_branch(struct static_key *key)
{
- asm goto("1:\tnop\n\t"
+ asm_goto("1:\tnop\n\t"
"nop\n\t"
".pushsection __jump_table, \"aw\"\n\t"
WORD_INSN " 1b, %l[l_yes], %0\n\t"
Index: tip/arch/powerpc/include/asm/jump_label.h
===================================================================
--- tip.orig/arch/powerpc/include/asm/jump_label.h
+++ tip/arch/powerpc/include/asm/jump_label.h
@@ -19,7 +19,7 @@
static __always_inline bool arch_static_branch(struct static_key *key)
{
- asm goto("1:\n\t"
+ asm_goto("1:\n\t"
"nop\n\t"
".pushsection __jump_table, \"aw\"\n\t"
JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t"
Index: tip/arch/s390/include/asm/jump_label.h
===================================================================
--- tip.orig/arch/s390/include/asm/jump_label.h
+++ tip/arch/s390/include/asm/jump_label.h
@@ -15,7 +15,7 @@
static __always_inline bool arch_static_branch(struct static_key *key)
{
- asm goto("0: brcl 0,0\n"
+ asm_goto("0: brcl 0,0\n"
".pushsection __jump_table, \"aw\"\n"
ASM_ALIGN "\n"
ASM_PTR " 0b, %l[label], %0\n"
Index: tip/arch/sparc/include/asm/jump_label.h
===================================================================
--- tip.orig/arch/sparc/include/asm/jump_label.h
+++ tip/arch/sparc/include/asm/jump_label.h
@@ -9,7 +9,7 @@
static __always_inline bool arch_static_branch(struct static_key *key)
{
- asm goto("1:\n\t"
+ asm_goto("1:\n\t"
"nop\n\t"
"nop\n\t"
".pushsection __jump_table, \"aw\"\n\t"
Index: tip/arch/x86/include/asm/cpufeature.h
===================================================================
--- tip.orig/arch/x86/include/asm/cpufeature.h
+++ tip/arch/x86/include/asm/cpufeature.h
@@ -374,7 +374,7 @@ static __always_inline __pure bool __sta
* Catch too early usage of this before alternatives
* have run.
*/
- asm goto("1: jmp %l[t_warn]\n"
+ asm_goto("1: jmp %l[t_warn]\n"
"2:\n"
".section .altinstructions,\"a\"\n"
" .long 1b - .\n"
@@ -388,7 +388,7 @@ static __always_inline __pure bool __sta
#endif
- asm goto("1: jmp %l[t_no]\n"
+ asm_goto("1: jmp %l[t_no]\n"
"2:\n"
".section .altinstructions,\"a\"\n"
" .long 1b - .\n"
@@ -453,7 +453,7 @@ static __always_inline __pure bool _stat
* have. Thus, we force the jump to the widest, 4-byte, signed relative
* offset even though the last would often fit in less bytes.
*/
- asm goto("1: .byte 0xe9\n .long %l[t_dynamic] - 2f\n"
+ asm_goto("1: .byte 0xe9\n .long %l[t_dynamic] - 2f\n"
"2:\n"
".section .altinstructions,\"a\"\n"
" .long 1b - .\n" /* src offset */
Index: tip/arch/x86/include/asm/jump_label.h
===================================================================
--- tip.orig/arch/x86/include/asm/jump_label.h
+++ tip/arch/x86/include/asm/jump_label.h
@@ -18,7 +18,7 @@
static __always_inline bool arch_static_branch(struct static_key *key)
{
- asm goto("1:"
+ asm_goto("1:"
".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t"
".pushsection __jump_table, \"aw\" \n\t"
_ASM_ALIGN "\n\t"
Index: tip/arch/x86/include/asm/mutex_64.h
===================================================================
--- tip.orig/arch/x86/include/asm/mutex_64.h
+++ tip/arch/x86/include/asm/mutex_64.h
@@ -20,7 +20,7 @@
static inline void __mutex_fastpath_lock(atomic_t *v,
void (*fail_fn)(atomic_t *))
{
- asm volatile goto(LOCK_PREFIX " decl %0\n"
+ asm_volatile_goto(LOCK_PREFIX " decl %0\n"
" jns %l[exit]\n"
: : "m" (v->counter)
: "memory", "cc"
@@ -75,7 +75,7 @@ static inline int __mutex_fastpath_lock_
static inline void __mutex_fastpath_unlock(atomic_t *v,
void (*fail_fn)(atomic_t *))
{
- asm volatile goto(LOCK_PREFIX " incl %0\n"
+ asm_volatile_goto(LOCK_PREFIX " incl %0\n"
" jg %l[exit]\n"
: : "m" (v->counter)
: "memory", "cc"
Index: tip/include/linux/compiler-gcc4.h
===================================================================
--- tip.orig/include/linux/compiler-gcc4.h
+++ tip/include/linux/compiler-gcc4.h
@@ -65,6 +65,22 @@
#define __visible __attribute__((externally_visible))
#endif
+/*
+ * GCC 'asm goto' miscompiles certain code sequences:
+ *
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+ *
+ * Work it around via quirk suggested by Jakub Jelinek.
+ * Fixed in GCC 4.8.2 and later versions.
+ */
+#if GCC_VERSION <= 40801
+# define __asm_goto(vol, x...) do { asm vol goto(x); asm (""); } while (0)
+#else
+# define __asm_goto(vol, x...) do { asm vol goto(x); } while (0)
+#endif
+
+#define asm_goto(x...) __asm_goto(,x)
+#define asm_volatile_goto(x...) __asm_goto(volatile, x)
#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
#if GCC_VERSION >= 40400
next prev parent reply other threads:[~2013-10-10 8:55 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-05 23:44 [x86] BUG: unable to handle kernel paging request at 00740060 Fengguang Wu
2013-10-05 23:47 ` [x86] BUG: unable to handle kernel paging request at 08000060 Fengguang Wu
2013-10-06 7:27 ` Mike Galbraith
2013-10-06 7:36 ` Fengguang Wu
2013-10-07 8:49 ` Peter Zijlstra
2013-10-07 9:17 ` Fengguang Wu
2013-10-07 9:36 ` Peter Zijlstra
2013-10-07 9:46 ` Fengguang Wu
2013-10-07 8:55 ` [x86] BUG: unable to handle kernel paging request at 00740060 Peter Zijlstra
2013-10-07 9:08 ` Peter Zijlstra
2013-10-07 11:32 ` Fengguang Wu
2013-10-07 9:27 ` Fengguang Wu
2013-10-07 18:47 ` Linus Torvalds
2013-10-08 7:51 ` Fengguang Wu
2013-10-08 16:21 ` Linus Torvalds
2013-10-08 17:15 ` [x86] BUG: unable to handle kernel NULL pointer dereference at (null) Fengguang Wu
2013-10-08 17:31 ` Linus Torvalds
2013-10-09 1:09 ` Fengguang Wu
2013-10-09 1:33 ` Linus Torvalds
2013-10-08 18:51 ` [x86] BUG: unable to handle kernel paging request at 00740060 Oleg Nesterov
2013-10-08 19:05 ` Jakub Jelinek
2013-10-08 19:20 ` Linus Torvalds
2013-10-08 19:34 ` Linus Torvalds
2013-10-08 19:35 ` Oleg Nesterov
2013-10-08 19:49 ` Linus Torvalds
2013-10-09 1:43 ` Mike Galbraith
2013-10-08 19:05 ` Linus Torvalds
2013-10-08 16:46 ` Oleg Nesterov
2013-10-08 14:34 ` Oleg Nesterov
2013-10-09 8:04 ` Fengguang Wu
2013-10-09 12:19 ` Fengguang Wu
2013-10-09 12:21 ` Fengguang Wu
2013-10-09 12:27 ` Peter Zijlstra
2013-10-09 12:52 ` Ingo Molnar
2013-10-09 17:18 ` Ingo Molnar
2013-10-10 2:15 ` Mike Galbraith
2013-10-09 12:56 ` Fengguang Wu
2013-10-09 12:43 ` Oleg Nesterov
2013-10-09 14:07 ` Peter Zijlstra
2013-10-09 14:17 ` Oleg Nesterov
2013-10-09 14:32 ` Ingo Molnar
2013-10-09 14:33 ` Peter Zijlstra
2013-10-09 14:46 ` Peter Zijlstra
2013-10-09 18:16 ` Jakub Jelinek
2013-10-09 18:54 ` Linus Torvalds
2013-10-09 19:02 ` Peter Zijlstra
2013-10-09 19:08 ` Jakub Jelinek
2013-10-10 6:22 ` Ingo Molnar
2013-10-10 6:51 ` Jakub Jelinek
2013-10-10 8:04 ` Jakub Jelinek
2013-10-10 8:24 ` [PATCH] gcc4: Add 'asm goto' miscompilation quirk Ingo Molnar
2013-10-10 8:31 ` Jakub Jelinek
2013-10-10 8:45 ` Ingo Molnar
2013-10-10 8:55 ` Ingo Molnar [this message]
2013-10-10 11:56 ` [PATCH, -v2] compiler/gcc4: Add quirk for 'asm goto' miscompilation bug Peter Zijlstra
2013-10-10 12:32 ` Jakub Jelinek
2013-10-10 13:10 ` Peter Zijlstra
2013-10-10 15:04 ` Ingo Molnar
2013-10-10 14:04 ` [PATCH] gcc4: Add 'asm goto' miscompilation quirk Richard Henderson
2013-10-10 14:27 ` Jakub Jelinek
2013-10-10 15:12 ` [PATCH, -v3] compiler/gcc4: Add quirk for 'asm goto' miscompilation bug Ingo Molnar
2013-10-10 16:15 ` Richard Henderson
2013-10-10 16:49 ` Ingo Molnar
2013-10-11 4:35 ` Fengguang Wu
2013-10-11 5:46 ` Ingo Molnar
2013-10-11 6:51 ` Fengguang Wu
2013-10-11 9:30 ` Fengguang Wu
2013-10-12 17:03 ` Ingo Molnar
2013-10-10 8:34 ` [PATCH] gcc4: Add 'asm goto' miscompilation quirk Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131010085506.GA11775@gmail.com \
--to=mingo@kernel.org \
--cc=fengguang.wu@intel.com \
--cc=jakub@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rth@twiddle.net \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).