Commit 8301ae82 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

Merge branch 'for-next/entry-s-to-c' into for-next/core 

Move the synchronous exception paths from entry.S into a C file to
improve the code readability.

* for-next/entry-s-to-c:
  arm64: entry-common: don't touch daif before bp-hardening
  arm64: Remove asmlinkage from updated functions
  arm64: entry: convert el0_sync to C
  arm64: entry: convert el1_sync to C
  arm64: add local_daif_inherit()
  arm64: Add prototypes for functions called by entry.S
  arm64: remove __exception annotations
parents 346f6a46 bfe29874

arch/arm64/include/asm/asm-uaccess.h

+0 −9
Original line number Diff line number Diff line
@@ -74,13 +74,4 @@ alternative_if ARM64_ALT_PAN_NOT_UAO 
	SET_PSTATE_PAN(0)

alternative_else_nop_endif

	.endm



/*

 * Remove the address tag from a virtual address, if present.

 */

	.macro	untagged_addr, dst, addr

	sbfx	\dst, \addr, #0, #56

	and	\dst, \dst, \addr

	.endm



#endif

arch/arm64/include/asm/daifflags.h

+16 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <asm/arch_gicv3.h>

#include <asm/cpufeature.h>

#include <asm/ptrace.h>



#define DAIF_PROCCTX		0

#define DAIF_PROCCTX_NOIRQ	PSR_I_BIT
@@ -109,4 +110,19 @@ static inline void local_daif_restore(unsigned long flags) 
		trace_hardirqs_off();

}



/*

 * Called by synchronous exception handlers to restore the DAIF bits that were

 * modified by taking an exception.

 */

static inline void local_daif_inherit(struct pt_regs *regs)

{

	unsigned long flags = regs->pstate & DAIF_MASK;



	/*

	 * We can't use local_daif_restore(regs->pstate) here as

	 * system_has_prio_mask_debugging() won't restore the I bit if it can

	 * use the pmr instead.

	 */

	write_sysreg(flags, daif);

}

#endif

arch/arm64/include/asm/exception.h

+20 −2
Original line number Diff line number Diff line
@@ -8,14 +8,15 @@ 
#define __ASM_EXCEPTION_H



#include <asm/esr.h>

#include <asm/kprobes.h>

#include <asm/ptrace.h>



#include <linux/interrupt.h>



#define __exception	__attribute__((section(".exception.text")))

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

#define __exception_irq_entry	__irq_entry

#else

#define __exception_irq_entry	__exception

#define __exception_irq_entry	__kprobes

#endif



static inline u32 disr_to_esr(u64 disr)
@@ -31,5 +32,22 @@ static inline u32 disr_to_esr(u64 disr) 
}



asmlinkage void enter_from_user_mode(void);

void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);

void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);

void do_undefinstr(struct pt_regs *regs);

asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr);

void do_debug_exception(unsigned long addr_if_watchpoint, unsigned int esr,

			struct pt_regs *regs);

void do_fpsimd_acc(unsigned int esr, struct pt_regs *regs);

void do_sve_acc(unsigned int esr, struct pt_regs *regs);

void do_fpsimd_exc(unsigned int esr, struct pt_regs *regs);

void do_sysinstr(unsigned int esr, struct pt_regs *regs);

void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);

void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr);

void do_cp15instr(unsigned int esr, struct pt_regs *regs);

void el0_svc_handler(struct pt_regs *regs);

void el0_svc_compat_handler(struct pt_regs *regs);

void do_el0_ia_bp_hardening(unsigned long addr,  unsigned int esr,

			    struct pt_regs *regs);



#endif	/* __ASM_EXCEPTION_H */

arch/arm64/include/asm/processor.h

+14 −0
Original line number Diff line number Diff line
@@ -26,10 +26,12 @@ 
#include <linux/init.h>

#include <linux/stddef.h>

#include <linux/string.h>

#include <linux/thread_info.h>



#include <asm/alternative.h>

#include <asm/cpufeature.h>

#include <asm/hw_breakpoint.h>

#include <asm/kasan.h>

#include <asm/lse.h>

#include <asm/pgtable-hwdef.h>

#include <asm/pointer_auth.h>
@@ -214,6 +216,18 @@ static inline void start_thread(struct pt_regs *regs, unsigned long pc, 
	regs->sp = sp;

}



static inline bool is_ttbr0_addr(unsigned long addr)

{

	/* entry assembly clears tags for TTBR0 addrs */

	return addr < TASK_SIZE;

}



static inline bool is_ttbr1_addr(unsigned long addr)

{

	/* TTBR1 addresses may have a tag if KASAN_SW_TAGS is in use */

	return arch_kasan_reset_tag(addr) >= PAGE_OFFSET;

}



#ifdef CONFIG_COMPAT

static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc,

				       unsigned long sp)

arch/arm64/include/asm/traps.h

+0 −10
Original line number Diff line number Diff line
@@ -42,16 +42,6 @@ static inline int __in_irqentry_text(unsigned long ptr) 
	       ptr < (unsigned long)&__irqentry_text_end;

}



static inline int in_exception_text(unsigned long ptr)

{

	int in;



	in = ptr >= (unsigned long)&__exception_text_start &&

	     ptr < (unsigned long)&__exception_text_end;



	return in ? : __in_irqentry_text(ptr);

}



static inline int in_entry_text(unsigned long ptr)

{

	return ptr >= (unsigned long)&__entry_text_start &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE