Skip to content

Commit 1874cb1

Browse files
Alexander GordeevVasily Gorbik
authored andcommitted
s390/mcck: fix invalid KVM guest condition check
Wrong condition check is used to decide if a machine check hit while in KVM guest. As result of this check the instruction following the SIE critical section might be considered as still in KVM guest and _CIF_MCCK_GUEST CPU flag mistakenly set as result. Fixes: c929500 ("s390/nmi: s390: New low level handling for machine check happening in guest") Cc: <[email protected]> Signed-off-by: Alexander Gordeev <[email protected]> Reviewed-by: Christian Borntraeger <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 5bcbe32 commit 1874cb1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/s390/kernel/entry.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ ENDPROC(stack_overflow)
653653
slgr %r9,%r13
654654
lghi %r13,.Lsie_skip - .Lsie_entry
655655
clgr %r9,%r13
656-
jh .Lcleanup_sie_int
656+
jhe .Lcleanup_sie_int
657657
oi __LC_CPU_FLAGS+7, _CIF_MCCK_GUEST
658658
.Lcleanup_sie_int:
659659
BPENTER __SF_SIE_FLAGS(%r15),(_TIF_ISOLATE_BP|_TIF_ISOLATE_BP_GUEST)

0 commit comments

Comments
 (0)