hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICG4XI -------------------------------- Kernel_{entry, exit} fast mode should only skip some alternative step but not any register. Fix it directly, moves all register touch outside fast mode. Fixes: cf5f2d9ff017 ("arm64: Faster SVC exception handler with xcall") Signed-off-by: Yipeng Zou <zouyipeng@huawei.com> --- arch/arm64/kernel/entry.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index bd43e39d35c0..117be8a7d529 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -238,14 +238,14 @@ alternative_cb_end * Ensure MDSCR_EL1.SS is clear, since we can unmask debug exceptions * when scheduling. */ - .if \fast_mode == std ldr x19, [tsk, #TSK_TI_FLAGS] + .if \fast_mode == std disable_step_tsk x19, x20 .endif /* Check for asynchronous tag check faults in user space */ - .if \fast_mode == std ldr x0, [tsk, THREAD_SCTLR_USER] + .if \fast_mode == std check_mte_async_tcf x22, x23, x0 .endif @@ -288,11 +288,11 @@ alternative_if ARM64_MTE isb b 1f alternative_else_nop_endif + .endif alternative_if ARM64_HAS_ADDRESS_AUTH isb alternative_else_nop_endif 1: - .endif scs_load_current .else @@ -409,8 +409,8 @@ alternative_else_nop_endif scs_save tsk /* Ignore asynchronous tag check faults in the uaccess routines */ - .if \fast_mode == std ldr x0, [tsk, THREAD_SCTLR_USER] + .if \fast_mode == std clear_mte_async_tcf x0 .endif -- 2.34.1