Debian's clang carries a patch that makes the default FPU mode
'vfp3-d16' instead of 'neon' for 'armv7-a' to avoid generating NEON
instructions on hardware that does not support them:
https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/-/raw/5a61ca6f21b4ad8…https://bugs.debian.org/841474https://bugs.debian.org/842142https://bugs.debian.org/914268
This results in the following build error when clang's integrated
assembler is used because the '.arch' directive overrides the '.fpu'
directive:
arch/arm/crypto/curve25519-core.S:25:2: error: instruction requires: NEON
vmov.i32 q0, #1
^
arch/arm/crypto/curve25519-core.S:26:2: error: instruction requires: NEON
vshr.u64 q1, q0, #7
^
arch/arm/crypto/curve25519-core.S:27:2: error: instruction requires: NEON
vshr.u64 q0, q0, #8
^
arch/arm/crypto/curve25519-core.S:28:2: error: instruction requires: NEON
vmov.i32 d4, #19
^
Shuffle the order of the '.arch' and '.fpu' directives so that the code
builds regardless of the default FPU mode. This has been tested against
both clang with and without Debian's patch and GCC.
Cc: stable(a)vger.kernel.org
Fixes: d8f1308a025f ("crypto: arm/curve25519 - wire up NEON implementation")
Link: https://github.com/ClangBuiltLinux/continuous-integration2/issues/118
Reported-by: Arnd Bergmann <arnd(a)arndb.de>
Suggested-by: Arnd Bergmann <arnd(a)arndb.de>
Suggested-by: Jessica Clarke <jrtc27(a)jrtc27.com>
Signed-off-by: Nathan Chancellor <nathan(a)kernel.org>
---
arch/arm/crypto/curve25519-core.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/crypto/curve25519-core.S b/arch/arm/crypto/curve25519-core.S
index be18af52e7dc..b697fa5d059a 100644
--- a/arch/arm/crypto/curve25519-core.S
+++ b/arch/arm/crypto/curve25519-core.S
@@ -10,8 +10,8 @@
#include <linux/linkage.h>
.text
-.fpu neon
.arch armv7-a
+.fpu neon
.align 4
ENTRY(curve25519_neon)
base-commit: e49d033bddf5b565044e2abe4241353959bc9120
--
2.31.1.189.g2e36527f23
This is the start of the stable review cycle for the 5.11.15 release.
There are 23 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sat, 17 Apr 2021 14:44:01 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.11.15-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.11.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.11.15-rc1
Russell King <rmk+kernel(a)armlinux.org.uk>
net: sfp: cope with SFPs that set both LOS normal and LOS inverted
Arnaldo Carvalho de Melo <acme(a)redhat.com>
perf map: Tighten snprintf() string precision to pass gcc check on some 32-bit arches
Florian Westphal <fw(a)strlen.de>
netfilter: x_tables: fix compat match/target pad out-of-bound write
Pavel Begunkov <asml.silence(a)gmail.com>
block: don't ignore REQ_NOWAIT for direct IO
Zihao Yu <yuzihao(a)ict.ac.cn>
riscv,entry: fix misaligned base for excp_vect_table
Jens Axboe <axboe(a)kernel.dk>
io_uring: don't mark S_ISBLK async work as unbounded
Damien Le Moal <damien.lemoal(a)wdc.com>
null_blk: fix command timeout completion handling
Matthew Wilcox (Oracle) <willy(a)infradead.org>
idr test suite: Create anchor before launching throbber
Matthew Wilcox (Oracle) <willy(a)infradead.org>
idr test suite: Take RCU read lock in idr_find_test_1
Matthew Wilcox (Oracle) <willy(a)infradead.org>
radix tree test suite: Register the main thread with the RCU library
Yufen Yu <yuyufen(a)huawei.com>
block: only update parent bi_status when bio fail
Matthew Wilcox (Oracle) <willy(a)infradead.org>
radix tree test suite: Fix compilation
Matthew Wilcox (Oracle) <willy(a)infradead.org>
XArray: Fix splitting to non-zero orders
Mikko Perttunen <mperttunen(a)nvidia.com>
gpu: host1x: Use different lock classes for each client
Dmitry Osipenko <digetx(a)gmail.com>
drm/tegra: dc: Don't set PLL clock to 0Hz
Stefan Raspl <raspl(a)linux.ibm.com>
tools/kvm_stat: Add restart delay
Steven Rostedt (VMware) <rostedt(a)goodmis.org>
ftrace: Check if pages were allocated before calling free_pages()
Bob Peterson <rpeterso(a)redhat.com>
gfs2: report "already frozen/thawed" errors
Arnd Bergmann <arnd(a)arndb.de>
drm/imx: imx-ldb: fix out of bounds array access warning
Suzuki K Poulose <suzuki.poulose(a)arm.com>
KVM: arm64: Disable guest access to trace filter controls
Suzuki K Poulose <suzuki.poulose(a)arm.com>
KVM: arm64: Hide system instruction access to Trace registers
Andrew Price <anprice(a)redhat.com>
gfs2: Flag a withdraw if init_threads() fails
Jia-Ju Bai <baijiaju1990(a)gmail.com>
interconnect: core: fix error return code of icc_link_destroy()
-------------
Diffstat:
Makefile | 4 +--
arch/arm64/include/asm/kvm_arm.h | 1 +
arch/arm64/kernel/cpufeature.c | 1 -
arch/arm64/kvm/debug.c | 2 ++
arch/riscv/kernel/entry.S | 1 +
block/bio.c | 2 +-
drivers/block/null_blk/main.c | 26 ++++++++++++++----
drivers/block/null_blk/null_blk.h | 1 +
drivers/gpu/drm/imx/imx-ldb.c | 10 +++++++
drivers/gpu/drm/tegra/dc.c | 10 +++----
drivers/gpu/host1x/bus.c | 10 ++++---
drivers/interconnect/core.c | 2 ++
drivers/net/phy/sfp.c | 36 +++++++++++++++----------
fs/block_dev.c | 4 +++
fs/gfs2/super.c | 14 ++++++----
fs/io_uring.c | 2 +-
include/linux/host1x.h | 9 ++++++-
kernel/trace/ftrace.c | 9 ++++---
lib/test_xarray.c | 26 +++++++++---------
lib/xarray.c | 4 +--
net/ipv4/netfilter/arp_tables.c | 2 ++
net/ipv4/netfilter/ip_tables.c | 2 ++
net/ipv6/netfilter/ip6_tables.c | 2 ++
net/netfilter/x_tables.c | 10 ++-----
tools/kvm/kvm_stat/kvm_stat.service | 1 +
tools/perf/util/map.c | 7 +++--
tools/testing/radix-tree/idr-test.c | 10 +++++--
tools/testing/radix-tree/linux/compiler_types.h | 0
tools/testing/radix-tree/multiorder.c | 2 ++
tools/testing/radix-tree/xarray.c | 2 ++
30 files changed, 142 insertions(+), 70 deletions(-)