Commit 1874cb13 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Vasily Gorbik
Browse files

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: c929500d ("s390/nmi: s390: New low level handling for machine check happening in guest")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 5bcbe328

arch/s390/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ ENDPROC(stack_overflow) 
	slgr	%r9,%r13

	lghi	%r13,.Lsie_skip - .Lsie_entry

	clgr	%r9,%r13

	jh	.Lcleanup_sie_int

	jhe	.Lcleanup_sie_int

	oi	__LC_CPU_FLAGS+7, _CIF_MCCK_GUEST

.Lcleanup_sie_int:

	BPENTER	__SF_SIE_FLAGS(%r15),(_TIF_ISOLATE_BP|_TIF_ISOLATE_BP_GUEST)