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, luto@kernel.org
Subject: [PATCH v5 2/6] arm64: vdso32: Detect binutils support for dmb ishld
Date: Thu, 3 Oct 2019 18:48:34 +0100 [thread overview]
Message-ID: <20191003174838.8872-3-vincenzo.frascino@arm.com> (raw)
In-Reply-To: <20191003174838.8872-1-vincenzo.frascino@arm.com>
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>
Reported-by: Will Deacon <will@kernel.org>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Tested-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm64/include/asm/vdso/compat_barrier.h | 2 +-
arch/arm64/kernel/vdso32/Makefile | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
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 19e0d3115ffe..77aa61340374 100644
--- a/arch/arm64/kernel/vdso32/Makefile
+++ b/arch/arm64/kernel/vdso32/Makefile
@@ -15,6 +15,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
@@ -53,6 +55,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).
@@ -89,6 +92,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-10-03 17:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 17:48 [PATCH v5 0/6] arm64: vdso32: Address various issues Vincenzo Frascino
2019-10-03 17:48 ` [PATCH v5 1/6] arm64: vdso32: Fix syncconfig errors Vincenzo Frascino
2019-10-03 17:48 ` Vincenzo Frascino [this message]
2019-10-03 20:18 ` [PATCH v5 2/6] arm64: vdso32: Detect binutils support for dmb ishld Nick Desaulniers
2019-10-03 20:49 ` Will Deacon
2019-10-03 20:56 ` Nick Desaulniers
2019-10-03 20:59 ` Will Deacon
2019-10-03 21:50 ` Nick Desaulniers
2019-10-03 17:48 ` [PATCH v5 3/6] arm64: Remove gettimeofday.S Vincenzo Frascino
2019-10-03 17:48 ` [PATCH v5 4/6] arm64: vdso32: Remove jump label config option in Makefile Vincenzo Frascino
2019-10-03 17:48 ` [PATCH v5 5/6] arm64: Remove vdso_datapage.h Vincenzo Frascino
2019-10-03 17:48 ` [PATCH v5 6/6] lib: vdso: Remove CROSS_COMPILE_COMPAT_VDSO Vincenzo Frascino
2019-10-07 13:31 ` [PATCH v5 0/6] arm64: vdso32: Address various issues Will Deacon
2019-10-07 13:54 ` Vincenzo Frascino
2019-10-07 14:15 ` Will Deacon
2019-10-07 14:37 ` Vincenzo Frascino
2019-10-07 17:48 ` Vincenzo Frascino
2019-10-08 9:07 ` 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=20191003174838.8872-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=luto@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).