Commit 24172e0d 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:
 "There's more here than I would ideally like at this stage, but there's
  been a steady trickle of fixes and some of them took a few rounds of
  review.

  The bulk of the changes are fixing some fallout from the recent BBM
  level two support which allows the linear map to be split from block
  to page mappings at runtime, but inadvertently led to sleeping in
  atomic context on some paths where the linear map was already mapped
  with page granularity. The fix is simply to avoid splitting in those
  cases but the implementation of that is a little involved.

  The other interesting fix is addressing a catastophic performance
  issue with our per-cpu atomics discovered by Paul in the SRCU locking
  code but which took some interactions with the hardware folks to
  resolve.

  Summary:

   - Avoid sleeping in atomic context when changing linear map
     permissions for DEBUG_PAGEALLOC or KFENCE

   - Rework printing of Spectre mitigation status to avoid hardlockup
     when enabling per-task mitigations on the context-switch path

   - Reject kernel modules when instruction patching fails either due to
     the DWARF-based SCS patching or because of an alternatives callback
     residing outside of the core kernel text

   - Propagate error when updating kernel memory permissions in kprobes

   - Drop pointless, incorrect message when enabling the ACPI SPCR
     console

   - Use value-returning LSE instructions for per-cpu atomics to reduce
     latency in SRCU locking routines"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Reject modules with internal alternative callbacks
  arm64: Fail module loading if dynamic SCS patching fails
  arm64: proton-pack: Fix hard lockup due to print in scheduler context
  arm64: proton-pack: Drop print when !CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY
  arm64: mm: Tidy up force_pte_mapping()
  arm64: mm: Optimize range_split_to_ptes()
  arm64: mm: Don't sleep in split_kernel_leaf_mapping() when in atomic context
  arm64: kprobes: check the return value of set_memory_rox()
  arm64: acpi: Drop message logging SPCR default console
  Revert "ACPI: Suppress misleading SPCR console message when SPCR table is absent"
  arm64: Use load LSE atomics for the non-return per-CPU atomic operations
parents 8341374f 8e8ae788

arch/arm64/include/asm/alternative.h

+5 −2
Original line number Diff line number Diff line
@@ -26,9 +26,12 @@ void __init apply_alternatives_all(void); 
bool alternative_is_applied(u16 cpucap);



#ifdef CONFIG_MODULES

void apply_alternatives_module(void *start, size_t length);

int apply_alternatives_module(void *start, size_t length);

#else

static inline void apply_alternatives_module(void *start, size_t length) { }

static inline int apply_alternatives_module(void *start, size_t length)

{

	return 0;

}

#endif



void alt_cb_patch_nops(struct alt_instr *alt, __le32 *origptr,

arch/arm64/include/asm/kfence.h

+1 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 


#include <asm/set_memory.h>



static inline bool arch_kfence_init_pool(void) { return true; }



static inline bool kfence_protect_page(unsigned long addr, bool protect)

{

	set_memory_valid(addr, 1, !protect);
@@ -25,6 +23,7 @@ static inline bool arm64_kfence_can_set_direct_map(void) 
{

	return !kfence_early_init;

}

bool arch_kfence_init_pool(void);

#else /* CONFIG_KFENCE */

static inline bool arm64_kfence_can_set_direct_map(void) { return false; }

#endif /* CONFIG_KFENCE */

arch/arm64/include/asm/percpu.h

+11 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ __percpu_##name##_case_##sz(void *ptr, unsigned long val) \ 
	"	stxr" #sfx "\t%w[loop], %" #w "[tmp], %[ptr]\n"		\

	"	cbnz	%w[loop], 1b",					\

	/* LSE atomics */						\

		#op_lse "\t%" #w "[val], %[ptr]\n"			\

		#op_lse "\t%" #w "[val], %" #w "[tmp], %[ptr]\n"	\

		__nops(3))						\

	: [loop] "=&r" (loop), [tmp] "=&r" (tmp),			\

	  [ptr] "+Q"(*(u##sz *)ptr)					\
@@ -124,9 +124,16 @@ PERCPU_RW_OPS(8) 
PERCPU_RW_OPS(16)

PERCPU_RW_OPS(32)

PERCPU_RW_OPS(64)

PERCPU_OP(add, add, stadd)

PERCPU_OP(andnot, bic, stclr)

PERCPU_OP(or, orr, stset)



/*

 * Use value-returning atomics for CPU-local ops as they are more likely

 * to execute "near" to the CPU (e.g. in L1$).

 *

 * https://lore.kernel.org/r/e7d539ed-ced0-4b96-8ecd-048a5b803b85@paulmck-laptop

 */

PERCPU_OP(add, add, ldadd)

PERCPU_OP(andnot, bic, ldclr)

PERCPU_OP(or, orr, ldset)

PERCPU_RET_OP(add, add, ldadd)



#undef PERCPU_RW_OPS

arch/arm64/include/asm/scs.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ enum { 
	EDYNSCS_INVALID_CFA_OPCODE		= 4,

};



int __pi_scs_patch(const u8 eh_frame[], int size);

int __pi_scs_patch(const u8 eh_frame[], int size, bool skip_dry_run);



#endif /* __ASSEMBLY __ */

arch/arm64/include/asm/spectre.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ void spectre_bhb_patch_wa3(struct alt_instr *alt, 
			   __le32 *origptr, __le32 *updptr, int nr_inst);

void spectre_bhb_patch_clearbhb(struct alt_instr *alt,

				__le32 *origptr, __le32 *updptr, int nr_inst);

void spectre_print_disabled_mitigations(void);



#endif	/* __ASSEMBLY__ */

#endif	/* __ASM_SPECTRE_H */