Skip to content

Commit 9ff4cfb

Browse files
Carsten OtteMartin Schwidefsky
authored andcommitted
[S390] kvm-390: Let kernel exit SIE instruction on work
From: Christian Borntraeger <[email protected]> This patch fixes the sie exit on interrupts. The low level interrupt handler returns to the PSW address in pt_regs and not to the PSW address in the lowcore. Without this fix a cpu bound guest might never leave guest state since the host interrupt handler would blindly return to the SIE instruction, even on need_resched and friends. Cc: [email protected] Signed-off-by: Carsten Otte <[email protected]> Signed-off-by: Christian Borntraeger <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
1 parent c7a29e5 commit 9ff4cfb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/s390/kvm/sie64a.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ sie_irq_handler:
4848
tm __TI_flags+7(%r2),_TIF_EXIT_SIE
4949
jz 0f
5050
larl %r2,sie_exit # work pending, leave sie
51-
stg %r2,__LC_RETURN_PSW+8
51+
stg %r2,SPI_PSW+8(0,%r15)
5252
br %r14
5353
0: larl %r2,sie_reenter # re-enter with guest id
54-
stg %r2,__LC_RETURN_PSW+8
54+
stg %r2,SPI_PSW+8(0,%r15)
5555
1: br %r14
5656

5757
/*

0 commit comments

Comments
 (0)