Commit 7df73a00 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/entry' into for-next/core 

* for-next/entry:
  arm/syscalls: mark syscall invocation as likely in invoke_syscall
  arm64: entry: Switch to generic IRQ entry
  arm64: entry: Move arm64_preempt_schedule_irq() into __exit_to_kernel_mode()
  arm64: entry: Refactor preempt_schedule_irq() check code
  entry: Add arch_irqentry_exit_need_resched() for arm64
  arm64: entry: Use preempt_count() and need_resched() helper
  arm64: entry: Rework arm64_preempt_schedule_irq()
  arm64: entry: Refactor the entry and exit for exceptions from EL1
  arm64: ptrace: Replace interrupts_enabled() with regs_irqs_disabled()
parents e0669b95 da9e5c04

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ config ARM64 
	select GENERIC_EARLY_IOREMAP

	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_IOREMAP

	select GENERIC_IRQ_ENTRY

	select GENERIC_IRQ_IPI

	select GENERIC_IRQ_KEXEC_CLEAR_VM_FORWARD

	select GENERIC_IRQ_PROBE

arch/arm64/include/asm/daifflags.h

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static inline void local_daif_inherit(struct pt_regs *regs) 
{

	unsigned long flags = regs->pstate & DAIF_MASK;



	if (interrupts_enabled(regs))

	if (!regs_irqs_disabled(regs))

		trace_hardirqs_on();



	if (system_uses_irq_prio_masking())

arch/arm64/include/asm/entry-common.h

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef _ASM_ARM64_ENTRY_COMMON_H

#define _ASM_ARM64_ENTRY_COMMON_H



#include <linux/thread_info.h>



#include <asm/cpufeature.h>

#include <asm/daifflags.h>

#include <asm/fpsimd.h>

#include <asm/mte.h>

#include <asm/stacktrace.h>



#define ARCH_EXIT_TO_USER_MODE_WORK (_TIF_MTE_ASYNC_FAULT | _TIF_FOREIGN_FPSTATE)



static __always_inline void arch_exit_to_user_mode_work(struct pt_regs *regs,

							unsigned long ti_work)

{

	if (ti_work & _TIF_MTE_ASYNC_FAULT) {

		clear_thread_flag(TIF_MTE_ASYNC_FAULT);

		send_sig_fault(SIGSEGV, SEGV_MTEAERR, (void __user *)NULL, current);

	}



	if (ti_work & _TIF_FOREIGN_FPSTATE)

		fpsimd_restore_current_state();

}



#define arch_exit_to_user_mode_work arch_exit_to_user_mode_work



static inline bool arch_irqentry_exit_need_resched(void)

{

	/*

	 * DAIF.DA are cleared at the start of IRQ/FIQ handling, and when GIC

	 * priority masking is used the GIC irqchip driver will clear DAIF.IF

	 * using gic_arch_enable_irqs() for normal IRQs. If anything is set in

	 * DAIF we must have handled an NMI, so skip preemption.

	 */

	if (system_uses_irq_prio_masking() && read_sysreg(daif))

		return false;



	/*

	 * Preempting a task from an IRQ means we leave copies of PSTATE

	 * on the stack. cpufeature's enable calls may modify PSTATE, but

	 * resuming one of these preempted tasks would undo those changes.

	 *

	 * Only allow a task to be preempted once cpufeatures have been

	 * enabled.

	 */

	if (!system_capabilities_finalized())

		return false;



	return true;

}



#define arch_irqentry_exit_need_resched arch_irqentry_exit_need_resched



#endif /* _ASM_ARM64_ENTRY_COMMON_H */

arch/arm64/include/asm/exception.h

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ void do_el1_fpac(struct pt_regs *regs, unsigned long esr); 
void do_el0_mops(struct pt_regs *regs, unsigned long esr);

void do_el1_mops(struct pt_regs *regs, unsigned long esr);

void do_serror(struct pt_regs *regs, unsigned long esr);

void do_signal(struct pt_regs *regs);



void __noreturn panic_bad_stack(struct pt_regs *regs, unsigned long esr, unsigned long far);

#endif	/* __ASM_EXCEPTION_H */

arch/arm64/include/asm/preempt.h

+0 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef __ASM_PREEMPT_H

#define __ASM_PREEMPT_H



#include <linux/jump_label.h>

#include <linux/thread_info.h>



#define PREEMPT_NEED_RESCHED	BIT(32)
@@ -87,7 +86,6 @@ void preempt_schedule_notrace(void); 


#ifdef CONFIG_PREEMPT_DYNAMIC



DECLARE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched);

void dynamic_preempt_schedule(void);

#define __preempt_schedule()		dynamic_preempt_schedule()

void dynamic_preempt_schedule_notrace(void);