renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code

ARM: KVM: clear exclusive monitor on all exception returns

Browse Source 
Make sure we clear the exclusive monitor on all exception returns,
which otherwise could lead to lock corruptions.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
This commit is contained in:
Marc Zyngier 2013-06-21 13:08:48 +01:00 committed by Christoffer Dall
parent 479c5ae2f8
commit 22cfbb6d73
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/kvm/interrupts.S
View File

@ -292,6 +292,7 @@ THUMB( orr r2, r2, #PSR_T_BIT )
ldr r2, =BSYM(panic) ldr r2, =BSYM(panic)
msr ELR_hyp, r2 msr ELR_hyp, r2
ldr r0, =\panic_str ldr r0, =\panic_str
clrex @ Clear exclusive monitor
eret eret
.endm .endm
@ -441,6 +442,7 @@ guest_trap:
4: pop {r0, r1} @ Failed translation, return to guest 4: pop {r0, r1} @ Failed translation, return to guest
mcrr p15, 0, r0, r1, c7 @ PAR mcrr p15, 0, r0, r1, c7 @ PAR
clrex
pop {r0, r1, r2} pop {r0, r1, r2}
eret eret
@ -467,6 +469,7 @@ switch_to_guest_vfp:
pop {r3-r7} pop {r3-r7}
pop {r0-r2} pop {r0-r2}
clrex
eret eret
#endif #endif