linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: x86@kernel.org
Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
	Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 02/17] x86, lto: Mark all top level asm statements as .text
Date: Thu, 21 Mar 2019 14:59:54 -0700	[thread overview]
Message-ID: <20190321220009.29334-3-andi@firstfloor.org> (raw)
In-Reply-To: <20190321220009.29334-1-andi@firstfloor.org>

From: Andi Kleen <ak@linux.intel.com>

With gcc 8 toplevel assembler statements that do not mark themselves
as .text may end up in other sections. I had boot crashes because
various assembler statements ended up in the middle of the initcall
section.

Always mark all the top level assembler statements as text
so that they switch to the right section.

For AMD "vide", which is only used on 32bit kernels, I also
marked it as 32bit only.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 arch/x86/include/asm/paravirt_types.h | 2 +-
 arch/x86/kernel/cpu/amd.c             | 5 ++++-
 arch/x86/kernel/kprobes/core.c        | 1 +
 arch/x86/lib/error-inject.c           | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index 2474e434a6f7..e246577a643b 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -372,7 +372,7 @@ extern struct paravirt_patch_template pv_ops;
 
 #define DEF_NATIVE(ops, name, code)					\
 	__visible extern const char start_##ops##_##name[], end_##ops##_##name[];	\
-	asm(NATIVE_LABEL("start_", ops, name) code NATIVE_LABEL("end_", ops, name))
+	asm(".text\n\t" NATIVE_LABEL("start_", ops, name) code NATIVE_LABEL("end_", ops, name))
 
 unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len);
 unsigned paravirt_patch_default(u8 type, void *insnbuf,
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 01004bfb1a1b..fb6a64bd765f 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -82,11 +82,14 @@ static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)
  *	performance at the same time..
  */
 
+#ifdef CONFIG_X86_32
 extern __visible void vide(void);
-__asm__(".globl vide\n"
+__asm__(".text\n"
+	".globl vide\n"
 	".type vide, @function\n"
 	".align 4\n"
 	"vide: ret\n");
+#endif
 
 static void init_amd_k5(struct cpuinfo_x86 *c)
 {
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index a034cb808e7e..31ab91c9c4e9 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -715,6 +715,7 @@ NOKPROBE_SYMBOL(kprobe_int3_handler);
  * calls trampoline_handler() runs, which calls the kretprobe's handler.
  */
 asm(
+	".text\n"
 	".global kretprobe_trampoline\n"
 	".type kretprobe_trampoline, @function\n"
 	"kretprobe_trampoline:\n"
diff --git a/arch/x86/lib/error-inject.c b/arch/x86/lib/error-inject.c
index 3cdf06128d13..be5b5fb1598b 100644
--- a/arch/x86/lib/error-inject.c
+++ b/arch/x86/lib/error-inject.c
@@ -6,6 +6,7 @@
 asmlinkage void just_return_func(void);
 
 asm(
+	".text\n"
 	".type just_return_func, @function\n"
 	".globl just_return_func\n"
 	"just_return_func:\n"
-- 
2.20.1


  parent reply	other threads:[~2019-03-21 22:01 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-21 21:59 Fixes and cleanup from LTO tree Andi Kleen
2019-03-21 21:59 ` [PATCH 01/17] kbuild: Disable -Waddress-of-packed-member for gcc 9 Andi Kleen
2019-03-22 13:58   ` Arnd Bergmann
2019-03-22 16:31     ` Andi Kleen
2019-03-22 16:39     ` Peter Zijlstra
2019-03-22 16:57       ` Arnd Bergmann
2019-03-22 16:58       ` Andi Kleen
2019-03-25 16:27         ` David Laight
2019-04-01  1:04     ` Masahiro Yamada
2019-03-21 21:59 ` Andi Kleen [this message]
2019-03-26 17:03   ` [PATCH 02/17] x86, lto: Mark all top level asm statements as .text Thomas Gleixner
2019-03-26 21:38     ` Andi Kleen
2019-03-26 22:25       ` Thomas Gleixner
2019-03-27  0:55         ` Andi Kleen
2019-03-27  1:08           ` Andi Kleen
2019-03-27 14:20           ` Thomas Gleixner
2019-03-27 14:39             ` Ingo Molnar
2019-03-27 14:59             ` Andi Kleen
2019-03-27 15:08               ` Thomas Gleixner
2019-03-27 15:45                 ` Andi Kleen
2019-03-27 19:08                   ` Thomas Gleixner
2019-03-27 20:40                     ` Andi Kleen
2019-03-27 21:55                       ` Thomas Gleixner
2019-03-27 22:29                         ` Andi Kleen
2019-03-27 22:50                           ` Thomas Gleixner
2019-04-02  8:54                             ` Thomas Gleixner
2019-03-21 21:59 ` [PATCH 03/17] x86: Don't inline __const_udelay Andi Kleen
2019-03-21 21:59 ` [PATCH 04/17] init: Add __noreorder and mark initcalls __noreorder Andi Kleen
2019-03-21 21:59 ` [PATCH 05/17] Use C version for SYSCALL_ALIAS Andi Kleen
2019-03-21 21:59 ` [PATCH 06/17] locking/core: Mark spinlocks noinline when inline spinlocks are disabled Andi Kleen
2019-03-21 21:59 ` [PATCH 07/17] amdkfd: Fix extern declaration Andi Kleen
2019-03-21 22:00 ` [PATCH 08/17] x86/speculation: Fix __initconst in bugs.c Andi Kleen
2019-03-26 17:24   ` Thomas Gleixner
2019-03-21 22:00 ` [PATCH 09/17] x86/kvm: Make steal_time visible Andi Kleen
2019-03-21 22:00 ` [PATCH 10/17] delta: Fix buffer overrun in delta_ipc_open Andi Kleen
2019-04-01 13:37   ` Hugues FRUCHET
2019-04-01 16:54     ` Andi Kleen
2019-04-02  9:56       ` Hugues FRUCHET
2019-03-21 22:00 ` [PATCH 11/17] x86/kprobes: Make trampoline_handler global and visible Andi Kleen
2019-03-23  9:45   ` Masami Hiramatsu
2019-03-23 14:35     ` Andi Kleen
2019-03-25  1:53       ` Masami Hiramatsu
2019-03-21 22:00 ` [PATCH 12/17] afs: Avoid section confusion in CM_NAME Andi Kleen
2019-03-21 22:00 ` [PATCH 13/17] ASoC: AMD: Fix incorrect extern Andi Kleen
2019-03-21 22:00 ` [PATCH 14/17] crypto: Don't mark AES tables const and cacheline_aligned Andi Kleen
2019-03-26  8:42   ` Rasmus Villemoes
2019-03-26 18:30     ` Andi Kleen
2019-03-21 22:00 ` [PATCH 15/17] x86/hyperv: Make hv_vcpu_is_preempted visible Andi Kleen
2019-03-26  8:15   ` Yi Sun
2019-03-21 22:00 ` [PATCH 16/17] x86/xen: Mark xen_vcpu_stolen as __visible Andi Kleen
2019-03-21 22:00 ` [PATCH 17/17] dm: Fix const confusion in dm Andi Kleen
2019-03-22  8:34 ` [PATCH 12/17] afs: Avoid section confusion in CM_NAME David Howells
2019-03-26 17:00 ` Fixes and cleanup from LTO tree Thomas Gleixner

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=20190321220009.29334-3-andi@firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=ak@linux.intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=x86@kernel.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).