From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Meelis Roos <mroos@linux.ee>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Zhenzhong Duan <zhenzhong.duan@oracle.com>,
Borislav Petkov <bp@alien8.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
Ben Hutchings <ben@decadent.org.uk>
Subject: [PATCH 4.9 27/38] x86/build: Fix compiler support check for CONFIG_RETPOLINE
Date: Thu, 10 Mar 2022 15:13:40 +0100 [thread overview]
Message-ID: <20220310140808.928982540@linuxfoundation.org> (raw)
In-Reply-To: <20220310140808.136149678@linuxfoundation.org>
From: Masahiro Yamada <yamada.masahiro@socionext.com>
commit 25896d073d8a0403b07e6dec56f58e6c33678207 upstream.
It is troublesome to add a diagnostic like this to the Makefile
parse stage because the top-level Makefile could be parsed with
a stale include/config/auto.conf.
Once you are hit by the error about non-retpoline compiler, the
compilation still breaks even after disabling CONFIG_RETPOLINE.
The easiest fix is to move this check to the "archprepare" like
this commit did:
829fe4aa9ac1 ("x86: Allow generating user-space headers without a compiler")
Reported-by: Meelis Roos <mroos@linux.ee>
Tested-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support")
Link: http://lkml.kernel.org/r/1543991239-18476-1-git-send-email-yamada.masahiro@socionext.com
Link: https://lkml.org/lkml/2018/12/4/206
Signed-off-by: Ingo Molnar <mingo@kernel.org>
[bwh: Backported to 4.9: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/x86/Makefile | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -221,9 +221,6 @@ ifdef CONFIG_RETPOLINE
RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk
RETPOLINE_CFLAGS += $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))
- ifeq ($(RETPOLINE_CFLAGS),)
- $(error You are building kernel with non-retpoline compiler, please update your compiler.)
- endif
KBUILD_CFLAGS += $(RETPOLINE_CFLAGS)
endif
@@ -240,6 +237,13 @@ archprepare:
ifeq ($(CONFIG_KEXEC_FILE),y)
$(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
endif
+ifdef CONFIG_RETPOLINE
+ifeq ($(RETPOLINE_CFLAGS),)
+ @echo "You are building kernel with non-retpoline compiler." >&2
+ @echo "Please update your compiler." >&2
+ @false
+endif
+endif
###
# Kernel objects
next prev parent reply other threads:[~2022-03-10 14:20 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-10 14:13 [PATCH 4.9 00/38] 4.9.306-rc2 review Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 01/38] x86/speculation: Add RETPOLINE_AMD support to the inline asm CALL_NOSPEC variant Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 02/38] x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 03/38] x86/retpoline: Remove minimal retpoline support Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 04/38] Documentation: Add section about CPU vulnerabilities for Spectre Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 05/38] Documentation: Add swapgs description to the Spectre v1 documentation Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 06/38] Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 07/38] x86/speculation: Merge one test in spectre_v2_user_select_mitigation() Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 08/38] x86,bugs: Unconditionally allow spectre_v2=retpoline,amd Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 09/38] x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 10/38] x86/speculation: Add eIBRS + Retpoline options Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 11/38] Documentation/hw-vuln: Update spectre doc Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 12/38] x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 13/38] x86/speculation: Use generic retpoline by default on AMD Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 14/38] x86/speculation: Update link to AMD speculation whitepaper Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 15/38] x86/speculation: Warn about Spectre v2 LFENCE mitigation Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 16/38] x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 17/38] arm/arm64: Provide a wrapper for SMCCC 1.1 calls Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 18/38] arm/arm64: smccc/psci: add arm_smccc_1_1_get_conduit() Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 19/38] ARM: report Spectre v2 status through sysfs Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 20/38] ARM: early traps initialisation Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 21/38] ARM: use LOADADDR() to get load address of sections Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 22/38] ARM: Spectre-BHB workaround Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 23/38] ARM: include unprivileged BPF status in Spectre V2 reporting Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 24/38] ARM: fix build error when BPF_SYSCALL is disabled Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 25/38] ARM: fix co-processor register typo Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 26/38] ARM: Do not use NOCROSSREFS directive with ld.lld Greg Kroah-Hartman
2022-03-10 14:13 ` Greg Kroah-Hartman [this message]
2022-03-10 14:13 ` [PATCH 4.9 28/38] x86, modpost: Replace last remnants of RETPOLINE with CONFIG_RETPOLINE Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 29/38] ARM: fix build warning in proc-v7-bugs.c Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 30/38] xen/xenbus: dont let xenbus_grant_ring() remove grants in error case Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 31/38] xen/grant-table: add gnttab_try_end_foreign_access() Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 32/38] xen/blkfront: dont use gnttab_query_foreign_access() for mapped status Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 33/38] xen/netfront: " Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 34/38] xen/scsifront: " Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 35/38] xen/gntalloc: dont use gnttab_query_foreign_access() Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 36/38] xen: remove gnttab_query_foreign_access() Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 37/38] xen/gnttab: fix gnttab_end_foreign_access() without page specified Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 38/38] xen/netfront: react properly to failing gnttab_end_foreign_access_ref() Greg Kroah-Hartman
2022-03-10 18:00 ` [PATCH 4.9 00/38] 4.9.306-rc2 review Pavel Machek
2022-03-10 18:48 ` Jon Hunter
2022-03-10 19:35 ` Shuah Khan
2022-03-10 20:14 ` Florian Fainelli
2022-03-11 1:13 ` Guenter Roeck
2022-03-11 13:35 ` Naresh Kamboju
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=20220310140808.928982540@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=ben@decadent.org.uk \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mroos@linux.ee \
--cc=peterz@infradead.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=yamada.masahiro@socionext.com \
--cc=zhenzhong.duan@oracle.com \
/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).