Commit 98884281 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm64 fixes from Catalin Marinas:

 - ZONE_DMA32 initialisation fix when memblocks fall entirely within the
   first GB (used by ZONE_DMA in 5.5 for Raspberry Pi 4).

 - Couple of ftrace fixes following the FTRACE_WITH_REGS patchset.

 - access_ok() fix for the Tagged Address ABI when called from from a
   kernel thread (asynchronous I/O): the kthread does not have the TIF
   flags of the mm owner, so untag the user address unconditionally.

 - KVM compute_layout() called before the alternatives code patching.

 - Minor clean-ups.

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: entry: refine comment of stack overflow check
  arm64: ftrace: fix ifdeffery
  arm64: KVM: Invoke compute_layout() before alternatives are applied
  arm64: Validate tagged addresses in access_ok() called from kernel threads
  arm64: mm: Fix column alignment for UXN in kernel_page_tables
  arm64: insn: consistently handle exit text
  arm64: mm: Fix initialisation of DMA zones on non-NUMA systems
parents 76f6777c de858040

arch/arm64/include/asm/kvm_mmu.h

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


void kvm_update_va_mask(struct alt_instr *alt,

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

void kvm_compute_layout(void);



static inline unsigned long __kern_hyp_va(unsigned long v)

{

arch/arm64/include/asm/sections.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ extern char __hyp_text_start[], __hyp_text_end[]; 
extern char __idmap_text_start[], __idmap_text_end[];

extern char __initdata_begin[], __initdata_end[];

extern char __inittext_begin[], __inittext_end[];

extern char __exittext_begin[], __exittext_end[];

extern char __irqentry_text_start[], __irqentry_text_end[];

extern char __mmuoff_data_start[], __mmuoff_data_end[];

extern char __entry_tramp_text_start[], __entry_tramp_text_end[];

arch/arm64/include/asm/uaccess.h

+6 −1
Original line number Diff line number Diff line
@@ -62,8 +62,13 @@ static inline unsigned long __range_ok(const void __user *addr, unsigned long si 
{

	unsigned long ret, limit = current_thread_info()->addr_limit;



	/*

	 * Asynchronous I/O running in a kernel thread does not have the

	 * TIF_TAGGED_ADDR flag of the process owning the mm, so always untag

	 * the user address before checking.

	 */

	if (IS_ENABLED(CONFIG_ARM64_TAGGED_ADDR_ABI) &&

	    test_thread_flag(TIF_TAGGED_ADDR))

	    (current->flags & PF_KTHREAD || test_thread_flag(TIF_TAGGED_ADDR)))

		addr = untagged_addr(addr);



	__chk_user_ptr(addr);

arch/arm64/kernel/entry-ftrace.S

+1 −2
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ ENTRY(ftrace_graph_caller) 
	bl	prepare_ftrace_return

	b	ftrace_common_return

ENDPROC(ftrace_graph_caller)

#else

#endif



#else /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */
@@ -287,6 +286,7 @@ GLOBAL(ftrace_graph_call) // ftrace_graph_caller(); 


	mcount_exit

ENDPROC(ftrace_caller)

#endif /* CONFIG_DYNAMIC_FTRACE */



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

/*
@@ -307,7 +307,6 @@ ENTRY(ftrace_graph_caller) 
	mcount_exit

ENDPROC(ftrace_graph_caller)

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

#endif /* CONFIG_DYNAMIC_FTRACE */

#endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */



ENTRY(ftrace_stub)

arch/arm64/kernel/entry.S

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ alternative_else_nop_endif 
#ifdef CONFIG_VMAP_STACK

	/*

	 * Test whether the SP has overflowed, without corrupting a GPR.

	 * Task and IRQ stacks are aligned to (1 << THREAD_SHIFT).

	 * Task and IRQ stacks are aligned so that SP & (1 << THREAD_SHIFT)

	 * should always be zero.

	 */

	add	sp, sp, x0			// sp' = sp + x0

	sub	x0, sp, x0			// x0' = sp' - x0 = (sp + x0) - x0 = sp