iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: Do not enable IRQs for ct_user_exit

Browse Source 
[ Upstream commit 9034f62515 ]

For el0_dbg and el0_error, DAIF bits get explicitly cleared before
calling ct_user_exit.

When context tracking is disabled, DAIF gets set (almost) immediately
after. When context tracking is enabled, among the first things done
is disabling IRQs.

What is actually needed is:
- PSR.D = 0 so the system can be debugged (should be already the case)
- PSR.A = 0 so async error can be handled during context tracking

Do not clear PSR.I in those two locations.

Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: James Morse <james.morse@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Julien Thierry <julien.thierry@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Julien Thierry
2019-06-11 10:38:06 +01:00
committed by Greg Kroah-Hartman
parent 010bfbc934
commit 723ba79384
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/kernel/entry.S
View File

@ -824,7 +824,7 @@ el0_dbg:
mov x1, x25 mov x1, x25
mov x2, sp mov x2, sp
bl do_debug_exception bl do_debug_exception
enable_daif enable_da_f
ct_user_exit ct_user_exit
b ret_to_user b ret_to_user
el0_inv: el0_inv:
@ -876,7 +876,7 @@ el0_error_naked:
enable_dbg enable_dbg
mov x0, sp mov x0, sp
bl do_serror bl do_serror
enable_daif enable_da_f
ct_user_exit ct_user_exit
b ret_to_user b ret_to_user
ENDPROC(el0_error) ENDPROC(el0_error)