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 v2 2/4] arm64: vdso32: Detect binutils support for dmb ishld
Date: Thu, 26 Sep 2019 14:38:03 +0100 [thread overview]
Message-ID: <20190926133805.52348-3-vincenzo.frascino@arm.com> (raw)
In-Reply-To: <20190926133805.52348-1-vincenzo.frascino@arm.com>
As reported by Will Deacon, older versions of binutils that do not
support certain types of memory barriers can cause build failure of the
vdso32 library.
Add a compilation time mechanism that detects if binutils supports those
instructions and configure the kernel accordingly.
Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
---
arch/arm64/Kbuild | 6 ++++++
arch/arm64/include/asm/vdso/compat_barrier.h | 2 +-
arch/arm64/kernel/vdso32/Makefile | 9 +++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/Kbuild b/arch/arm64/Kbuild
index d6465823b281..75cf8c796d0e 100644
--- a/arch/arm64/Kbuild
+++ b/arch/arm64/Kbuild
@@ -4,3 +4,9 @@ obj-$(CONFIG_NET) += net/
obj-$(CONFIG_KVM) += kvm/
obj-$(CONFIG_XEN) += xen/
obj-$(CONFIG_CRYPTO) += crypto/
+
+# as-instr-compat
+# Usage: cflags-y += $(call as-instr-compat,instr,option1,option2)
+
+as-instr-compat = $(call try-run,\
+ printf "%b\n" "$(1)" | $(COMPATCC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3))
diff --git a/arch/arm64/include/asm/vdso/compat_barrier.h b/arch/arm64/include/asm/vdso/compat_barrier.h
index fb60a88b5ed4..3fd8fd6d8fc2 100644
--- a/arch/arm64/include/asm/vdso/compat_barrier.h
+++ b/arch/arm64/include/asm/vdso/compat_barrier.h
@@ -20,7 +20,7 @@
#define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory")
-#if __LINUX_ARM_ARCH__ >= 8
+#if __LINUX_ARM_ARCH__ >= 8 && defined(CONFIG_AS_DMB_ISHLD)
#define aarch32_smp_mb() dmb(ish)
#define aarch32_smp_rmb() dmb(ishld)
#define aarch32_smp_wmb() dmb(ishst)
diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile
index 1fba0776ed40..22f0d31ea528 100644
--- a/arch/arm64/kernel/vdso32/Makefile
+++ b/arch/arm64/kernel/vdso32/Makefile
@@ -17,6 +17,8 @@ cc32-disable-warning = $(call try-run,\
$(COMPATCC) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
cc32-ldoption = $(call try-run,\
$(COMPATCC) $(1) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2))
+cc32-as-instr = $(call try-run,\
+ printf "%b\n" "$(1)" | $(COMPATCC) $(VDSO_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3))
# We cannot use the global flags to compile the vDSO files, the main reason
# being that the 32-bit compiler may be older than the main (64-bit) compiler
@@ -55,6 +57,7 @@ endif
VDSO_CAFLAGS += -fPIC -fno-builtin -fno-stack-protector
VDSO_CAFLAGS += -DDISABLE_BRANCH_PROFILING
+
# Try to compile for ARMv8. If the compiler is too old and doesn't support it,
# fall back to v7. There is no easy way to check for what architecture the code
# is being compiled, so define a macro specifying that (see arch/arm/Makefile).
@@ -91,6 +94,12 @@ VDSO_CFLAGS += -Wno-int-to-pointer-cast
VDSO_AFLAGS := $(VDSO_CAFLAGS)
VDSO_AFLAGS += -D__ASSEMBLY__
+# Check for binutils support for dmb ishld
+dmbinstr := $(call cc32-as-instr,dmb ishld,-DCONFIG_AS_DMB_ISHLD=1)
+
+VDSO_CFLAGS += $(dmbinstr)
+VDSO_AFLAGS += $(dmbinstr)
+
VDSO_LDFLAGS := $(VDSO_CPPFLAGS)
# From arm vDSO Makefile
VDSO_LDFLAGS += -Wl,-Bsymbolic -Wl,--no-undefined -Wl,-soname=linux-vdso.so.1
--
2.23.0
next prev parent reply other threads:[~2019-09-26 13:38 UTC|newest]
Thread overview: 67+ 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 ` [PATCH 1/4] arm64: vdso32: Introduce COMPAT_CC_IS_GCC Vincenzo Frascino
2019-09-26 8:06 ` Catalin Marinas
2019-09-26 10:56 ` Vincenzo Frascino
2019-09-26 11:02 ` Vincenzo Frascino
2019-09-26 15:23 ` Catalin Marinas
2019-09-26 12:22 ` Vincenzo Frascino
2019-09-26 15:17 ` Catalin Marinas
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 8:30 ` Catalin Marinas
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 8:32 ` Catalin Marinas
2019-09-26 11:03 ` Vincenzo Frascino
2019-09-26 6:03 ` [PATCH 4/4] arm64: Remove gettimeofday.S Vincenzo Frascino
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 ` [PATCH v2 1/4] arm64: vdso32: Introduce COMPAT_CC_IS_GCC Vincenzo Frascino
2019-09-26 15:13 ` Catalin Marinas
2019-09-26 13:38 ` Vincenzo Frascino [this message]
2019-09-26 14:26 ` [PATCH v2 2/4] arm64: vdso32: Detect binutils support for dmb ishld Catalin Marinas
2019-09-26 20:19 ` Vincenzo Frascino
2019-09-26 15:59 ` Catalin Marinas
2019-09-26 21:17 ` Vincenzo Frascino
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 15:22 ` Catalin Marinas
2019-09-26 13:38 ` [PATCH v2 4/4] arm64: Remove gettimeofday.S Vincenzo Frascino
2019-09-26 15:31 ` [PATCH v2 0/4] arm64: vdso32: Address various issues Catalin Marinas
2019-09-26 20:29 ` Vincenzo Frascino
2019-09-26 21:43 ` [PATCH v3 0/5]arm64: " Vincenzo Frascino
2019-09-26 21:43 ` [PATCH v3 1/5] arm64: vdso32: Introduce COMPAT_CC_IS_GCC Vincenzo Frascino
2019-09-27 9:24 ` Catalin Marinas
2019-10-01 13:14 ` Will Deacon
2019-10-01 13:27 ` Catalin Marinas
2019-10-01 14:20 ` Vincenzo Frascino
2019-10-01 14:20 ` Will Deacon
2019-10-01 14:37 ` Vincenzo Frascino
2019-10-01 14:43 ` Will Deacon
2019-10-01 14:59 ` Vincenzo Frascino
2019-10-01 15:30 ` Catalin Marinas
2019-10-01 16:46 ` Will Deacon
2019-10-01 16:59 ` Nick Desaulniers
2019-10-01 17:07 ` Will Deacon
2019-10-01 17:12 ` Nick Desaulniers
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-27 9:25 ` Catalin Marinas
2019-10-01 13:26 ` Will Deacon
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-27 9:26 ` Catalin Marinas
2019-10-01 13:21 ` Will Deacon
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 ` [PATCH v3 5/5] arm64: vdso32: Remove jump label config option in Makefile Vincenzo Frascino
2019-09-27 9:27 ` Catalin Marinas
2019-09-27 10:46 ` [PATCH v3 0/5]arm64: vdso32: Address various issues Catalin Marinas
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=20190926133805.52348-3-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: 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).