From: Borislav Petkov <bp@alien8.de>
To: Sergei Trofimovich <slyfox@gentoo.org>
Cc: Michael Matz <matz@suse.de>, Jakub Jelinek <jakub@redhat.com>,
linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
x86@kernel.org
Subject: Re: [PATCH v2] x86: fix early boot crash on gcc-10
Date: Fri, 17 Apr 2020 09:57:39 +0200 [thread overview]
Message-ID: <20200417075739.GA7322@zn.tnic> (raw)
In-Reply-To: <20200415231930.19755bc7@sf>
On Wed, Apr 15, 2020 at 11:19:30PM +0100, Sergei Trofimovich wrote:
> Ah, that makes sense. Borislav, should I send a fix forward against
> x86 tree to move -fno-stack-protector as it was in v1 patch?
> Or you'll revert v2 and apply v1 ~as is? Or should I send those myself?
Yeah, Peter and I have been discussing something like the below
yesterday. I don't like the additional exports too much but would
disable stack protector only for the one function...
---
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 3bcf27caf6c9..e258a6a21674 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -990,4 +990,8 @@ enum mds_mitigations {
MDS_MITIGATION_VMWERV,
};
+extern int enable_start_cpu0;
+void smp_callin(void);
+void notrace start_secondary(void *unused);
+
#endif /* _ASM_X86_PROCESSOR_H */
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 92e1261ec4ec..7130ca9edc50 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -87,7 +87,13 @@ obj-$(CONFIG_PCI) += early-quirks.o
apm-y := apm_32.o
obj-$(CONFIG_APM) += apm.o
obj-$(CONFIG_SMP) += smp.o
-obj-$(CONFIG_SMP) += smpboot.o
+
+nostackprot := $(call cc-option, -fno-stack-protector)
+CFLAGS_smpboot_aux.o := $(nostackprot)
+
+smpboot_all-y := smpboot.o smpboot_aux.o
+obj-$(CONFIG_SMP) += smpboot_all.o
+
obj-$(CONFIG_X86_TSC) += tsc_sync.o
obj-$(CONFIG_SMP) += setup_percpu.o
obj-$(CONFIG_X86_MPPARSE) += mpparse.o
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 3b9bf8c7e29d..1ce6280999f9 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -153,7 +153,7 @@ static void init_freq_invariance(void);
* Report back to the Boot Processor during boot time or to the caller processor
* during CPU online.
*/
-static void smp_callin(void)
+void smp_callin(void)
{
int cpuid;
@@ -208,65 +208,7 @@ static void smp_callin(void)
}
static int cpu0_logical_apicid;
-static int enable_start_cpu0;
-/*
- * Activate a secondary processor.
- */
-static void notrace start_secondary(void *unused)
-{
- /*
- * Don't put *anything* except direct CPU state initialization
- * before cpu_init(), SMP booting is too fragile that we want to
- * limit the things done here to the most necessary things.
- */
- cr4_init();
-
-#ifdef CONFIG_X86_32
- /* switch away from the initial page table */
- load_cr3(swapper_pg_dir);
- __flush_tlb_all();
-#endif
- load_current_idt();
- cpu_init();
- x86_cpuinit.early_percpu_clock_init();
- preempt_disable();
- smp_callin();
-
- enable_start_cpu0 = 0;
-
- /* otherwise gcc will move up smp_processor_id before the cpu_init */
- barrier();
- /*
- * Check TSC synchronization with the boot CPU:
- */
- check_tsc_sync_target();
-
- speculative_store_bypass_ht_init();
-
- /*
- * Lock vector_lock, set CPU online and bring the vector
- * allocator online. Online must be set with vector_lock held
- * to prevent a concurrent irq setup/teardown from seeing a
- * half valid vector space.
- */
- lock_vector_lock();
- set_cpu_online(smp_processor_id(), true);
- lapic_online();
- unlock_vector_lock();
- cpu_set_state_online(smp_processor_id());
- x86_platform.nmi_init();
-
- /* enable local interrupts */
- local_irq_enable();
-
- /* to prevent fake stack check failure in clock setup */
- boot_init_stack_canary();
-
- x86_cpuinit.setup_percpu_clockev();
-
- wmb();
- cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
-}
+int enable_start_cpu0;
/**
* topology_is_primary_thread - Check whether CPU is the primary SMT thread
diff --git a/arch/x86/kernel/smpboot_aux.c b/arch/x86/kernel/smpboot_aux.c
new file mode 100644
index 000000000000..8863fde54eed
--- /dev/null
+++ b/arch/x86/kernel/smpboot_aux.c
@@ -0,0 +1,70 @@
+#include <linux/cpu.h>
+
+#include <asm/desc.h>
+#include <asm/hw_irq.h>
+#include <asm/spec-ctrl.h>
+#include <asm/processor.h>
+#include <asm/stackprotector.h>
+
+/*
+ * Activate a secondary processor.
+ *
+ * Note: boot_init_stack_canary() sets up the canary value so omit the stack
+ * canary creation for this function only by keeping it in a separate
+ * compilation unit.
+ */
+void notrace start_secondary(void *unused)
+{
+ /*
+ * Don't put *anything* except direct CPU state initialization
+ * before cpu_init(), SMP booting is too fragile that we want to
+ * limit the things done here to the most necessary things.
+ */
+ cr4_init();
+
+#ifdef CONFIG_X86_32
+ /* switch away from the initial page table */
+ load_cr3(swapper_pg_dir);
+ __flush_tlb_all();
+#endif
+ load_current_idt();
+ cpu_init();
+ x86_cpuinit.early_percpu_clock_init();
+ preempt_disable();
+ smp_callin();
+
+ enable_start_cpu0 = 0;
+
+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
+ barrier();
+ /*
+ * Check TSC synchronization with the boot CPU:
+ */
+ check_tsc_sync_target();
+
+ speculative_store_bypass_ht_init();
+
+ /*
+ * Lock vector_lock, set CPU online and bring the vector
+ * allocator online. Online must be set with vector_lock held
+ * to prevent a concurrent irq setup/teardown from seeing a
+ * half valid vector space.
+ */
+ lock_vector_lock();
+ set_cpu_online(smp_processor_id(), true);
+ lapic_online();
+ unlock_vector_lock();
+ cpu_set_state_online(smp_processor_id());
+ x86_platform.nmi_init();
+
+ /* enable local interrupts */
+ local_irq_enable();
+
+ /* to prevent fake stack check failure in clock setup */
+ boot_init_stack_canary();
+
+ x86_cpuinit.setup_percpu_clockev();
+
+ wmb();
+ cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
+}
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
next prev parent reply other threads:[~2020-04-17 7:57 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-14 16:44 [PATCH] x86: fix early boot crash on gcc-10 Sergei Trofimovich
2020-03-16 13:04 ` Peter Zijlstra
2020-03-16 13:26 ` Jakub Jelinek
2020-03-16 13:42 ` Peter Zijlstra
2020-03-16 17:54 ` Borislav Petkov
2020-03-16 18:03 ` Jakub Jelinek
2020-03-17 14:36 ` Borislav Petkov
2020-03-17 14:39 ` Jakub Jelinek
2020-03-17 14:49 ` Borislav Petkov
2020-03-17 16:35 ` David Laight
2020-03-25 13:31 ` Borislav Petkov
2020-03-26 21:54 ` Sergei Trofimovich
2020-03-26 22:35 ` Borislav Petkov
2020-03-28 8:48 ` [PATCH v2] " Sergei Trofimovich
2020-04-13 14:15 ` [tip: x86/urgent] x86: Fix " tip-bot2 for Sergei Trofimovich
2020-04-13 16:35 ` [PATCH v2] x86: fix " Borislav Petkov
2020-04-14 13:50 ` Michael Matz
2020-04-15 7:48 ` Borislav Petkov
2020-04-15 14:53 ` Michael Matz
2020-04-15 22:19 ` Sergei Trofimovich
2020-04-17 7:57 ` Borislav Petkov [this message]
2020-04-17 8:07 ` Jakub Jelinek
2020-04-17 8:42 ` Borislav Petkov
2020-04-17 8:58 ` Jakub Jelinek
2020-04-17 9:09 ` Borislav Petkov
2020-04-17 18:15 ` Nick Desaulniers
2020-04-17 18:22 ` Nick Desaulniers
2020-04-17 19:06 ` Jakub Jelinek
2020-04-17 19:49 ` Nick Desaulniers
2020-04-17 19:53 ` Nick Desaulniers
2020-04-20 14:04 ` Michael Matz
2020-04-22 10:23 ` Borislav Petkov
2020-04-22 11:40 ` Peter Zijlstra
2020-04-22 13:49 ` Borislav Petkov
2020-04-22 13:55 ` Jakub Jelinek
2020-04-22 14:16 ` Martin Liška
2020-04-22 15:06 ` Michael Matz
2020-04-22 16:53 ` Borislav Petkov
2020-04-22 17:02 ` Jakub Jelinek
2020-04-22 18:47 ` Nick Desaulniers
2020-04-22 18:55 ` Nick Desaulniers
2020-04-22 19:21 ` Borislav Petkov
2020-04-22 21:05 ` Nick Desaulniers
2020-04-22 21:26 ` Borislav Petkov
2020-04-22 22:57 ` Nick Desaulniers
2020-04-23 12:53 ` Borislav Petkov
2020-04-23 16:12 ` [PATCH] x86: Fix early boot crash on gcc-10, next try Borislav Petkov
2020-04-23 17:30 ` Borislav Petkov
2020-04-23 18:02 ` Nick Desaulniers
2020-04-23 18:27 ` Borislav Petkov
2020-04-27 11:37 ` [tip: x86/build] x86/build: Check whether the compiler is sane tip-bot2 for Borislav Petkov
2020-04-23 19:40 ` [PATCH] x86: Fix early boot crash on gcc-10, next try Kees Cook
2020-04-25 1:46 ` Arvind Sankar
2020-04-25 8:57 ` Borislav Petkov
2020-04-25 11:09 ` Jürgen Groß
2020-04-25 15:04 ` Arvind Sankar
2020-04-25 17:31 ` Borislav Petkov
2020-04-25 17:52 ` Borislav Petkov
2020-04-27 17:07 ` David Laight
2020-04-25 18:37 ` Segher Boessenkool
2020-04-25 18:53 ` Borislav Petkov
2020-04-25 19:15 ` Segher Boessenkool
2020-04-25 22:17 ` Borislav Petkov
2020-04-25 22:25 ` Arvind Sankar
2020-04-17 10:38 ` [PATCH v2] x86: fix early boot crash on gcc-10 Peter Zijlstra
2020-04-18 13:12 ` David Laight
2020-04-17 10:41 ` Peter Zijlstra
2020-03-16 18:20 ` [PATCH] " Arvind Sankar
2020-03-16 18:54 ` Arvind Sankar
2020-03-16 19:53 ` Arvind Sankar
2020-03-16 20:08 ` Jakub Jelinek
2020-03-16 20:40 ` Arvind Sankar
2020-03-16 22:12 ` Sergei Trofimovich
2020-03-17 11:46 ` Jakub Jelinek
2020-03-17 18:10 ` Sergei Trofimovich
2020-03-16 18:22 ` Arvind Sankar
2020-03-26 23:16 ` [PATCH v2] " Sergei Trofimovich
2020-04-27 11:37 ` [tip: x86/build] x86: Fix early boot crash on gcc-10, next try tip-bot2 for Borislav Petkov
2020-05-15 11:20 ` [tip: x86/urgent] x86: Fix early boot crash on gcc-10, third try tip-bot2 for Borislav Petkov
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=20200417075739.GA7322@zn.tnic \
--to=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jakub@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=matz@suse.de \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=slyfox@gentoo.org \
--cc=tglx@linutronix.de \
--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).