From: Vincenzo Frascino <vincenzo.frascino@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: vincenzo.frascino@arm.com, ard.biesheuvel@linaro.org, ndesaulniers@google.com, catalin.marinas@arm.com, will@kernel.org, tglx@linutronix.de Subject: [PATCH 1/4] arm64: vdso32: Introduce COMPAT_CC_IS_GCC Date: Thu, 26 Sep 2019 07:03:50 +0100 [thread overview] Message-ID: <20190926060353.54894-2-vincenzo.frascino@arm.com> (raw) In-Reply-To: <20190926060353.54894-1-vincenzo.frascino@arm.com> As reported by Will Deacon the .config file and the generated include/config/auto.conf can end up out of sync after a set of commands since CONFIG_CROSS_COMPILE_COMPAT_VDSO is not updated correctly. The sequence can be reproduced as follows: $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig [...] $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- menuconfig [set CONFIG_CROSS_COMPILE_COMPAT_VDSO="arm-linux-gnueabihf-"] $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- Which results in: arch/arm64/Makefile:62: CROSS_COMPILE_COMPAT not defined or empty, the compat vDSO will not be built even though the compat vDSO has been built: $ file arch/arm64/kernel/vdso32/vdso.so arch/arm64/kernel/vdso32/vdso.so: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, BuildID[sha1]=c67f6c786f2d2d6f86c71f708595594aa25247f6, stripped A similar case that involves changing the configuration parameter multiple times can be reconducted to the same family of problems. The reason behind it comes from the fact that the master Makefile includes that architecture Makefile twice, once before the syncconfig and one after. Since the synchronization of the files happens only upon syncconfig, the architecture Makefile included before this event does not see the change in configuration. As a consequence of this it is not possible to handle the cross compiler definitions inside the architecture Makefile. Address the problem removing CONFIG_CROSS_COMPILE_COMPAT_VDSO and moving the detection of the correct compiler into Kconfig via COMPAT_CC_IS_GCC. As a consequence of this it is not possible anymore to set the compat cross compiler from menuconfig but it requires to be exported via command line. E.g.: $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- CROSS_COMPILE_COMPAT=arm-linux-gnueabihf Cc: Will Deacon <will@kernel.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> --- arch/arm64/Kconfig | 5 ++++- arch/arm64/Makefile | 15 ++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 37c610963eee..afe8c948b493 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -110,7 +110,7 @@ config ARM64 select GENERIC_STRNLEN_USER select GENERIC_TIME_VSYSCALL select GENERIC_GETTIMEOFDAY - select GENERIC_COMPAT_VDSO if (!CPU_BIG_ENDIAN && COMPAT) + select GENERIC_COMPAT_VDSO if (!CPU_BIG_ENDIAN && COMPAT && COMPAT_CC_IS_GCC) select HANDLE_DOMAIN_IRQ select HARDIRQS_SW_RESEND select HAVE_PCI @@ -313,6 +313,9 @@ config KASAN_SHADOW_OFFSET default 0xeffffff900000000 if ARM64_VA_BITS_36 && KASAN_SW_TAGS default 0xffffffffffffffff +config COMPAT_CC_IS_GCC + def_bool $(success,$(CROSS_COMPILE_COMPAT)gcc --version | head -n 1 | grep -q arm) + source "arch/arm64/Kconfig.platforms" menu "Kernel Features" diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 84a3d502c5a5..34f53eb11878 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -54,19 +54,8 @@ $(warning Detected assembler with broken .inst; disassembly will be unreliable) endif ifeq ($(CONFIG_GENERIC_COMPAT_VDSO), y) - CROSS_COMPILE_COMPAT ?= $(CONFIG_CROSS_COMPILE_COMPAT_VDSO:"%"=%) - - ifeq ($(CONFIG_CC_IS_CLANG), y) - $(warning CROSS_COMPILE_COMPAT is clang, the compat vDSO will not be built) - else ifeq ($(strip $(CROSS_COMPILE_COMPAT)),) - $(warning CROSS_COMPILE_COMPAT not defined or empty, the compat vDSO will not be built) - else ifeq ($(shell which $(CROSS_COMPILE_COMPAT)gcc 2> /dev/null),) - $(error $(CROSS_COMPILE_COMPAT)gcc not found, check CROSS_COMPILE_COMPAT) - else - export CROSS_COMPILE_COMPAT - export CONFIG_COMPAT_VDSO := y - compat_vdso := -DCONFIG_COMPAT_VDSO=1 - endif + export CONFIG_COMPAT_VDSO := y + compat_vdso := -DCONFIG_COMPAT_VDSO=1 endif KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr) $(brokengasinst) \ -- 2.23.0
WARNING: multiple messages have this Message-ID (diff)
From: Vincenzo Frascino <vincenzo.frascino@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: ard.biesheuvel@linaro.org, catalin.marinas@arm.com, ndesaulniers@google.com, tglx@linutronix.de, vincenzo.frascino@arm.com, will@kernel.org Subject: [PATCH 1/4] arm64: vdso32: Introduce COMPAT_CC_IS_GCC Date: Thu, 26 Sep 2019 07:03:50 +0100 [thread overview] Message-ID: <20190926060353.54894-2-vincenzo.frascino@arm.com> (raw) In-Reply-To: <20190926060353.54894-1-vincenzo.frascino@arm.com> As reported by Will Deacon the .config file and the generated include/config/auto.conf can end up out of sync after a set of commands since CONFIG_CROSS_COMPILE_COMPAT_VDSO is not updated correctly. The sequence can be reproduced as follows: $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig [...] $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- menuconfig [set CONFIG_CROSS_COMPILE_COMPAT_VDSO="arm-linux-gnueabihf-"] $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- Which results in: arch/arm64/Makefile:62: CROSS_COMPILE_COMPAT not defined or empty, the compat vDSO will not be built even though the compat vDSO has been built: $ file arch/arm64/kernel/vdso32/vdso.so arch/arm64/kernel/vdso32/vdso.so: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, BuildID[sha1]=c67f6c786f2d2d6f86c71f708595594aa25247f6, stripped A similar case that involves changing the configuration parameter multiple times can be reconducted to the same family of problems. The reason behind it comes from the fact that the master Makefile includes that architecture Makefile twice, once before the syncconfig and one after. Since the synchronization of the files happens only upon syncconfig, the architecture Makefile included before this event does not see the change in configuration. As a consequence of this it is not possible to handle the cross compiler definitions inside the architecture Makefile. Address the problem removing CONFIG_CROSS_COMPILE_COMPAT_VDSO and moving the detection of the correct compiler into Kconfig via COMPAT_CC_IS_GCC. As a consequence of this it is not possible anymore to set the compat cross compiler from menuconfig but it requires to be exported via command line. E.g.: $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- CROSS_COMPILE_COMPAT=arm-linux-gnueabihf Cc: Will Deacon <will@kernel.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> --- arch/arm64/Kconfig | 5 ++++- arch/arm64/Makefile | 15 ++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 37c610963eee..afe8c948b493 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -110,7 +110,7 @@ config ARM64 select GENERIC_STRNLEN_USER select GENERIC_TIME_VSYSCALL select GENERIC_GETTIMEOFDAY - select GENERIC_COMPAT_VDSO if (!CPU_BIG_ENDIAN && COMPAT) + select GENERIC_COMPAT_VDSO if (!CPU_BIG_ENDIAN && COMPAT && COMPAT_CC_IS_GCC) select HANDLE_DOMAIN_IRQ select HARDIRQS_SW_RESEND select HAVE_PCI @@ -313,6 +313,9 @@ config KASAN_SHADOW_OFFSET default 0xeffffff900000000 if ARM64_VA_BITS_36 && KASAN_SW_TAGS default 0xffffffffffffffff +config COMPAT_CC_IS_GCC + def_bool $(success,$(CROSS_COMPILE_COMPAT)gcc --version | head -n 1 | grep -q arm) + source "arch/arm64/Kconfig.platforms" menu "Kernel Features" diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 84a3d502c5a5..34f53eb11878 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -54,19 +54,8 @@ $(warning Detected assembler with broken .inst; disassembly will be unreliable) endif ifeq ($(CONFIG_GENERIC_COMPAT_VDSO), y) - CROSS_COMPILE_COMPAT ?= $(CONFIG_CROSS_COMPILE_COMPAT_VDSO:"%"=%) - - ifeq ($(CONFIG_CC_IS_CLANG), y) - $(warning CROSS_COMPILE_COMPAT is clang, the compat vDSO will not be built) - else ifeq ($(strip $(CROSS_COMPILE_COMPAT)),) - $(warning CROSS_COMPILE_COMPAT not defined or empty, the compat vDSO will not be built) - else ifeq ($(shell which $(CROSS_COMPILE_COMPAT)gcc 2> /dev/null),) - $(error $(CROSS_COMPILE_COMPAT)gcc not found, check CROSS_COMPILE_COMPAT) - else - export CROSS_COMPILE_COMPAT - export CONFIG_COMPAT_VDSO := y - compat_vdso := -DCONFIG_COMPAT_VDSO=1 - endif + export CONFIG_COMPAT_VDSO := y + compat_vdso := -DCONFIG_COMPAT_VDSO=1 endif KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr) $(brokengasinst) \ -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-09-26 6:05 UTC|newest] Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-20 14:27 Problems with arm64 compat vdso Will Deacon 2019-09-20 16:33 ` Vincenzo Frascino 2019-09-23 16:41 ` Ard Biesheuvel 2019-09-24 12:11 ` Vincenzo Frascino 2019-09-24 18:06 ` Nick Desaulniers 2019-09-24 20:42 ` Vincenzo Frascino 2019-09-25 15:58 ` Ard Biesheuvel 2019-09-26 6:03 ` [PATCH 0/4] arm64: vdso32: Address various issues Vincenzo Frascino 2019-09-26 6:03 ` Vincenzo Frascino 2019-09-26 6:03 ` Vincenzo Frascino [this message] 2019-09-26 6:03 ` [PATCH 1/4] arm64: vdso32: Introduce COMPAT_CC_IS_GCC Vincenzo Frascino 2019-09-26 8:06 ` Catalin Marinas 2019-09-26 8:06 ` Catalin Marinas 2019-09-26 10:56 ` Vincenzo Frascino 2019-09-26 10:56 ` Vincenzo Frascino 2019-09-26 11:02 ` Vincenzo Frascino 2019-09-26 11:02 ` Vincenzo Frascino 2019-09-26 15:23 ` Catalin Marinas 2019-09-26 15:23 ` Catalin Marinas 2019-09-26 12:22 ` Vincenzo Frascino 2019-09-26 12:22 ` Vincenzo Frascino 2019-09-26 15:17 ` Catalin Marinas 2019-09-26 15:17 ` Catalin Marinas 2019-09-26 20:17 ` Vincenzo Frascino 2019-09-26 20:17 ` Vincenzo Frascino 2019-09-26 6:03 ` [PATCH 2/4] arm64: vdso32: Detect binutils support for dmb ishld Vincenzo Frascino 2019-09-26 6:03 ` Vincenzo Frascino 2019-09-26 8:30 ` Catalin Marinas 2019-09-26 8:30 ` Catalin Marinas 2019-09-26 10:59 ` Vincenzo Frascino 2019-09-26 10:59 ` Vincenzo Frascino 2019-09-26 6:03 ` [PATCH 3/4] arm64: vdso32: Fix compilation warning Vincenzo Frascino 2019-09-26 6:03 ` Vincenzo Frascino 2019-09-26 8:32 ` Catalin Marinas 2019-09-26 8:32 ` Catalin Marinas 2019-09-26 11:03 ` Vincenzo Frascino 2019-09-26 11:03 ` Vincenzo Frascino 2019-09-26 6:03 ` [PATCH 4/4] arm64: Remove gettimeofday.S Vincenzo Frascino 2019-09-26 6:03 ` Vincenzo Frascino 2019-09-26 8:34 ` Catalin Marinas 2019-09-26 8:34 ` Catalin Marinas 2019-09-26 13:38 ` [PATCH v2 0/4] arm64: vdso32: Address various issues Vincenzo Frascino 2019-09-26 13:38 ` Vincenzo Frascino 2019-09-26 13:38 ` [PATCH v2 1/4] arm64: vdso32: Introduce COMPAT_CC_IS_GCC Vincenzo Frascino 2019-09-26 13:38 ` Vincenzo Frascino 2019-09-26 15:13 ` Catalin Marinas 2019-09-26 15:13 ` Catalin Marinas 2019-09-26 13:38 ` [PATCH v2 2/4] arm64: vdso32: Detect binutils support for dmb ishld Vincenzo Frascino 2019-09-26 13:38 ` Vincenzo Frascino 2019-09-26 14:26 ` Catalin Marinas 2019-09-26 14:26 ` Catalin Marinas 2019-09-26 20:19 ` Vincenzo Frascino 2019-09-26 20:19 ` Vincenzo Frascino 2019-09-26 15:59 ` Catalin Marinas 2019-09-26 15:59 ` Catalin Marinas 2019-09-26 21:17 ` Vincenzo Frascino 2019-09-26 21:17 ` Vincenzo Frascino 2019-09-26 16:23 ` Nick Desaulniers 2019-09-26 16:23 ` Nick Desaulniers 2019-09-26 13:38 ` [PATCH v2 3/4] arm64: vdso32: Fix compilation warning Vincenzo Frascino 2019-09-26 13:38 ` Vincenzo Frascino 2019-09-26 15:22 ` Catalin Marinas 2019-09-26 15:22 ` Catalin Marinas 2019-09-26 13:38 ` [PATCH v2 4/4] arm64: Remove gettimeofday.S Vincenzo Frascino 2019-09-26 13:38 ` Vincenzo Frascino 2019-09-26 15:31 ` [PATCH v2 0/4] arm64: vdso32: Address various issues Catalin Marinas 2019-09-26 15:31 ` Catalin Marinas 2019-09-26 20:29 ` Vincenzo Frascino 2019-09-26 20:29 ` Vincenzo Frascino 2019-09-26 21:43 ` [PATCH v3 0/5]arm64: " Vincenzo Frascino 2019-09-26 21:43 ` Vincenzo Frascino 2019-09-26 21:43 ` [PATCH v3 1/5] arm64: vdso32: Introduce COMPAT_CC_IS_GCC Vincenzo Frascino 2019-09-26 21:43 ` Vincenzo Frascino 2019-09-27 9:24 ` Catalin Marinas 2019-09-27 9:24 ` Catalin Marinas 2019-10-01 13:14 ` Will Deacon 2019-10-01 13:14 ` Will Deacon 2019-10-01 13:27 ` Catalin Marinas 2019-10-01 13:27 ` Catalin Marinas 2019-10-01 14:20 ` Vincenzo Frascino 2019-10-01 14:20 ` Vincenzo Frascino 2019-10-01 14:20 ` Will Deacon 2019-10-01 14:20 ` Will Deacon 2019-10-01 14:37 ` Vincenzo Frascino 2019-10-01 14:37 ` Vincenzo Frascino 2019-10-01 14:43 ` Will Deacon 2019-10-01 14:43 ` Will Deacon 2019-10-01 14:59 ` Vincenzo Frascino 2019-10-01 14:59 ` Vincenzo Frascino 2019-10-01 15:30 ` Catalin Marinas 2019-10-01 15:30 ` Catalin Marinas 2019-10-01 16:46 ` Will Deacon 2019-10-01 16:46 ` Will Deacon 2019-10-01 16:59 ` Nick Desaulniers 2019-10-01 16:59 ` Nick Desaulniers 2019-10-01 17:07 ` Will Deacon 2019-10-01 17:07 ` Will Deacon 2019-10-01 17:12 ` Nick Desaulniers 2019-10-01 17:12 ` Nick Desaulniers 2019-10-01 17:14 ` Will Deacon 2019-10-01 17:14 ` Will Deacon 2019-09-26 21:43 ` [PATCH v3 2/5] arm64: vdso32: Detect binutils support for dmb ishld Vincenzo Frascino 2019-09-26 21:43 ` Vincenzo Frascino 2019-09-27 9:25 ` Catalin Marinas 2019-09-27 9:25 ` Catalin Marinas 2019-10-01 13:26 ` Will Deacon 2019-10-01 13:26 ` Will Deacon 2019-10-01 14:23 ` Vincenzo Frascino 2019-10-01 14:23 ` Vincenzo Frascino 2019-09-26 21:43 ` [PATCH v3 3/5] arm64: vdso32: Fix compilation warning Vincenzo Frascino 2019-09-26 21:43 ` Vincenzo Frascino 2019-09-27 9:26 ` Catalin Marinas 2019-09-27 9:26 ` Catalin Marinas 2019-10-01 13:21 ` Will Deacon 2019-10-01 13:21 ` Will Deacon 2019-10-01 14:41 ` Vincenzo Frascino 2019-10-01 14:41 ` Vincenzo Frascino 2019-09-26 21:43 ` [PATCH v3 4/5] arm64: Remove gettimeofday.S Vincenzo Frascino 2019-09-26 21:43 ` Vincenzo Frascino 2019-09-26 21:43 ` [PATCH v3 5/5] arm64: vdso32: Remove jump label config option in Makefile Vincenzo Frascino 2019-09-26 21:43 ` Vincenzo Frascino 2019-09-27 9:27 ` Catalin Marinas 2019-09-27 9:27 ` Catalin Marinas 2019-09-27 10:46 ` [PATCH v3 0/5]arm64: vdso32: Address various issues Catalin Marinas 2019-09-27 10:46 ` Catalin Marinas 2019-10-01 13:27 ` Will Deacon 2019-10-01 13:27 ` Will Deacon
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=20190926060353.54894-2-vincenzo.frascino@arm.com \ --to=vincenzo.frascino@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=ndesaulniers@google.com \ --cc=tglx@linutronix.de \ --cc=will@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.