[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/3] x86/retpoline: rename retpoline Kconfig check to include GCC prefix
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Wed, 16 Feb 2022 10:02:58 +0100
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=59r7fbZ3K+LcmEoyCa8BNqjqMu4sOS5sUKRPzfo807I=; b=DBpS0kWXM22tGUAlKqFmPblAc+gLjLRJ/C8P+HCTe13EOXTwztlvZ7jXkW72N5XnjAMUx0kvP44wM86LgA9ceBHVztICjes9NTyx73HYF6ggTJR6JnUJ+shRxQ/3+8FeVnWfEMhH3uSA8ojOSEAAsLX8XkWJbjgYKV2YkMOJhTLY5UQILpjUPyp8UZSGktqqsYJlDdQ+N/o/NFMLaitrRsrvBJ8yRFN3mQWKj53Yhmg9HzLuK10c8Vm2QVCnXpHNL64vUIpFJuoIIpupJo688qB6Te5p9v2LNzr7X7MOrhcmo0BfRtsrYgsICuJK8QABOvCDbrAvnRKt9R8pAbSPEw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Af6tIjKOtVUQrHbUplyOLy2st/jtjqZlBI6RkRbPbDddnW/XyCIeyVku3K3jEtiTzh6hbS2q2i3LzfLY4ipIJzLDfuIatHMqvdj/UhTf7tFIhV0o8Rhoj9SmoYT34jUfWzU9RmVEFCe9HCfPJ1DhBrQur0UFUfapaWa0K8R4aU9ul7f2QEAH7xcC4sVLFSqDNNTPHkY26S3t8tewOuXFEEVNSE8mnTLlxwdUMaaBDgihf0j/MwRm8bLHocAsEO2PDsPYJosaOPPArTqMMJ4iwqvKJ+NQ5BNiA4JnzqKjB69ROKZNiITXY80DHebU879J6cRk8fOspb1t1+QrCckZTA==
- Authentication-results: esa4.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com
- Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Wed, 16 Feb 2022 09:03:31 +0000
- Ironport-data: A9a23:XcQIJq/vyKShVaQhluP9DrUDXHmTJUtcMsCJ2f8bNWPcYEJGY0x3n GQbCG/Sa/nYazCke41/bNy/900CsJDWxtFrSQo+rC48E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si9AttENlFEkvU2ybuOU5NXsZ2YhFWeIdA970Ug5w7Rg3NYx6TSEK1jlV e3a8pW31GCNg1aYAkpMg05UgEoy1BhakGpwUm0WPZinjneH/5UmJMt3yZWKB2n5WuFp8tuSH I4v+l0bElTxpH/BAvv9+lryn9ZjrrT6ZWBigVIOM0Sub4QrSoXfHc/XOdJFAXq7hQllkPhVw eUS9ryNGDtxYKKPxrQjYxNVHRxhaPguFL/veRBTsOSWxkzCNXDt3+9vHAc9OohwFuRfWD8Us 6ZCcXZUM07F17neLLGTE4GAguw5K8bmJsUHs2xIxjDFF/c2B5vERs0m4PcGgmpt25gTR54yY eJFRH1Qch3DZiFiFVYVJp0bueal2XDgJmgwRFW9+vNsvjm7IBZK+KfpGMrYfJqNX8o9tkSSq 3/C/m/5KgoHL9HZwj2Amlq8i+mKkS7lVYY6ELyj6uUskFCV3nYUChAdSR28u/bRt6Klc4sBc QpOoHNo9PVsshzwJjXgY/GmiFqNjkFfe+cBL7Vk50LTmpTk6QuXO3dRG1atd+canMMxQDUr0 HqAkNXoGSFjvdWpdJ6NyluHhWjsYHZIdAfucQdBFFJYuIe7/OnfmzqSFo4LLUKjsjHi9dgcK RiupTN2ubgchNVjO06TrQGe2GLESnQko2cICuTrsoCNs1sRiG2NPdXABb3nARBodtvxor6p5 iVspiRmxLpSZaxhbQTUKAn3IJmn5uyeLBrXikN1Ep8q+lyFoiD/IdENuWsvdRYwaK7onAMFh meJ5Gu9A7cJYhOXgVJfOdrtW6zGM4C8fTgaahwkRoUXOcUgHON21CpveVSRzwjQfLsEyskC1 WOgWZ/0Vx4yUP0/pBLvHrt1+eJ7l0gWmDKILbimnkvP7FZrTCPMIVvzGADVNb5RAWLtiFi9z uuzwOPQm0UFC7yhOHCKmWPRRHhTRUUG6VnNg5U/XsaIIxZ8GXFnDPnUwLg7fJdikbgTneDNl kxRkGcDoLYmrXGYewiMdF55b7bjAcR2oX4hZHR+Nle0wXkzJ42o6f5HJZcweLAm8s1lzOJ1E KZZK5nRXKwXR2SV4SkZYLn8sJdmKEahizWRMnf3ezM4ZZNhGVDEo4e2Ygv1+SASJSOrrs9i8 aa43wbWTMNbFQRvBcrbcty1yFa1sSRPke5+RRKQcNJSZF/t4M5hLCmo1q07JMQFKBPiwDqG1 lnJXUdE9LeV+4JsqYvHn6GJqYutAtBSJEsCEjmJ96uyOAnb4nGnnd1KXtGXcG2PT2jz4qijO 7lYlqmuLP0dkV9WmINgCLI3n7km7t7iqrIGnARpGHLHMwaiBr96eyTU2MBOsutGx6NDuBvwU UWKo4EINbKMMcLjMVgQOAt6MbjTiaBKwmHfvaYvPUH3xC5r577WA0xdMi6FhDFZMLYoYpgux v0suZJO5gGy4vbw3g1qUsyAG7ywE0E9
- Ironport-hdrordr: A9a23:gi13batuwAMAQHMUoL2Cv3h57skC7IMji2hC6mlwRA09TyXGra 6TdaUguiMc1gx8ZJhBo7C90KnpewK6yXcT2/hvAV7CZnibhILMFuBfBOTZskTd8kHFh4tgPO JbAtJD4b7LfChHZKTBkXGF+r8bqbHtms3Y5pa9854ud3AWV0gJ1XYJNu/xKDwReOApP+tcKH LKjfA32QZINE5nJPiTNz0gZazuttfLnJXpbVovAAMm0hCHiXeN5KThGxaV8x8CW3cXqI1SvV Ttokjc3OGOovu7whjT2yv66IlXosLozp9mCNaXgsYYBz3wgkKDZZhnWZeFoDcpydvfpWoCoZ 3pmVMNLs5z43TeciWcpgbs4RDp1HIU53rr2Taj8DLeiP28YAh/J9tKhIpffBecwVEnpstA3K VC2H/cn4ZLDDvb9R6NpuTgZlVPrA6ZsHAimekcgzh0So0FcoJcqoQZ4Qd8DIoAJiTn84oqed MeQv003MwmMm9yUkqp/FWGmLeXLzEO91a9Mwc/U/WuonhrdCsT9Tpd+CQd9k1wgq7VBaM0oN gsCZ4Y5o2mePVmGp6VNN1xMvdfNVa9NC4kSFjiWmgPNJt3c04l+KSHq4nc2omRCeg1Jd0J6d L8bG8=
- Ironport-sdr: jIAXe5Vxu4CM9GEz4a5xJuIb5Ahw5XpIqKYwYMiMlF8t3J/8ZqM/z3fZHVfR8VoqISu6HGILdk rREPM29RDkG+C1Qu2IY0BU5DkF9q0D8VuHh4yRDDBhXAnth6zIj+i38z6RrkHPBxOWkijwRhEE zJUNkAglnSOQbHBQ2ah8zbUyCtBNzrEwdxT10x7ja0qUL7/ZEiLzzvK8uH7iZDsbP4/eiFPjNA JEE82ACrIoP6anNNVTdTlukZHougpf+yHbIDr3GpE2Jnq/1iWBl8cfGj4LryvPVdISke2euFSl 5nO2hpqcIb1lCH1EwKLrcEcp
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Current retpoline checks apply to GCC only, so make it obvious by
prefixing the Kconfig option with GCC. Keep the previous option as a
way to signal generic retpoline support regardless of the underlying
compiler.
No functional change intended.
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
xen/arch/x86/Kconfig | 6 +++++-
xen/arch/x86/arch.mk | 8 ++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index b4abfca46f..2cd713724f 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -32,9 +32,13 @@ config ARCH_DEFCONFIG
string
default "arch/x86/configs/x86_64_defconfig"
-config INDIRECT_THUNK
+config GCC_INDIRECT_THUNK
def_bool $(cc-option,-mindirect-branch-register)
+config INDIRECT_THUNK
+ depends on GCC_INDIRECT_THUNK
+ def_bool y
+
config HAS_AS_CET_SS
# binutils >= 2.29 or LLVM >= 6
def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy)
diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk
index fa7cf38443..2da4bdb1ed 100644
--- a/xen/arch/x86/arch.mk
+++ b/xen/arch/x86/arch.mk
@@ -42,10 +42,10 @@ CFLAGS += -mno-red-zone -fpic
# SSE setup for variadic function calls.
CFLAGS += -mno-sse $(call cc-option,$(CC),-mskip-rax-setup)
-# Compile with thunk-extern, indirect-branch-register if avaiable.
-CFLAGS-$(CONFIG_INDIRECT_THUNK) += -mindirect-branch=thunk-extern
-CFLAGS-$(CONFIG_INDIRECT_THUNK) += -mindirect-branch-register
-CFLAGS-$(CONFIG_INDIRECT_THUNK) += -fno-jump-tables
+# Compile with gcc thunk-extern, indirect-branch-register if available.
+CFLAGS-$(CONFIG_GCC_INDIRECT_THUNK) += -mindirect-branch=thunk-extern
+CFLAGS-$(CONFIG_GCC_INDIRECT_THUNK) += -mindirect-branch-register
+CFLAGS-$(CONFIG_GCC_INDIRECT_THUNK) += -fno-jump-tables
# If supported by the compiler, reduce stack alignment to 8 bytes. But allow
# this to be overridden elsewhere.
--
2.34.1
|
