Commit 5f06a790 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:
 "The bulk of the diffstat consists of changes to our uaccess routines
  so that they fall back to bytewise copying prior to reporting complete
  failure when the initial (multi-byte) access faults.

  However, the most disappointing change here is that we've had to bump
  ARCH_DMA_MINALIGN back to 128 bytes thanks to Qualcomm's "Kryo" CPU,
  which ended up in the MSM8996 mobile SoC. Still, at least we're now
  aware of this design and one of the hardware designers confirmed the
  L2 cacheline size for us.

  Summary:

   - Fix instrumentation annotations for entry code

   - Ensure kernel MTE state is restored correctly on resume from suspend

   - Fix MTE fault from new strlen() routine

   - Fallback to byte-wise accesses on initial uaccess fault

   - Bump Clang requirement for BTI

   - Revert ARCH_DMA_MINALIGN back to 128 bytes (shakes fist at Qualcomm)"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: entry: fix KCOV suppression
  arm64: entry: add missing noinstr
  arm64: mte: fix restoration of GCR_EL1 from suspend
  arm64: Avoid premature usercopy failure
  arm64: Restrict ARM64_BTI_KERNEL to clang 12.0.0 and newer
  Revert "arm64: cache: Lower ARCH_DMA_MINALIGN to 64 (L1_CACHE_BYTES)"
  arm64: Add missing header <asm/smp.h> in two files
  arm64: fix strlen() with CONFIG_KASAN_HW_TAGS
parents 872f8ede e6f85cbe

arch/arm64/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1605,7 +1605,8 @@ config ARM64_BTI_KERNEL 
	depends on CC_HAS_BRANCH_PROT_PAC_RET_BTI

	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94697

	depends on !CC_IS_GCC || GCC_VERSION >= 100100

	depends on !(CC_IS_CLANG && GCOV_KERNEL)

	# https://github.com/llvm/llvm-project/commit/a88c722e687e6780dcd6a58718350dc76fcc4cc9

	depends on !CC_IS_CLANG || CLANG_VERSION >= 120000

	depends on (!FUNCTION_GRAPH_TRACER || DYNAMIC_FTRACE_WITH_REGS)

	help

	  Build the kernel with Branch Target Identification annotations

arch/arm64/include/asm/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
 * cache before the transfer is done, causing old data to be seen by

 * the CPU.

 */

#define ARCH_DMA_MINALIGN	L1_CACHE_BYTES

#define ARCH_DMA_MINALIGN	(128)



#ifdef CONFIG_KASAN_SW_TAGS

#define ARCH_SLAB_MINALIGN	(1ULL << KASAN_SHADOW_SCALE_SHIFT)

arch/arm64/include/asm/smp_plat.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <linux/cpumask.h>



#include <asm/smp.h>

#include <asm/types.h>



struct mpidr_hash {

arch/arm64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ CFLAGS_syscall.o += -fno-stack-protector 
# It's not safe to invoke KCOV when portions of the kernel environment aren't

# available or are out-of-sync with HW state. Since `noinstr` doesn't always

# inhibit KCOV instrumentation, disable it for the entire compilation unit.

KCOV_INSTRUMENT_entry.o := n

KCOV_INSTRUMENT_entry-common.o := n

KCOV_INSTRUMENT_idle.o := n



# Object file lists.

arch/arm64/kernel/cpufeature.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
#include <asm/mmu_context.h>

#include <asm/mte.h>

#include <asm/processor.h>

#include <asm/smp.h>

#include <asm/sysreg.h>

#include <asm/traps.h>

#include <asm/virt.h>