diff options
| author |   Alexander Gordeev <agordeev@linux.ibm.com> | 2021-06-22 19:06:18 +0200 |
|---|---|---|
| committer |   Vasily Gorbik <gor@linux.ibm.com> | 2021-07-05 12:44:23 +0200 |
| commit | e2c13d64200bff0aa3964017cfabb0bc47691022 (patch) | |
| tree | 14896c2fd3c0de46f144373658a3e4de4bc31773 /arch/s390/kernel/entry.S | |
| parent | s390/entry.S: factor out SIEEXIT macro (diff) | |
| download | linux-dev-e2c13d64200bff0aa3964017cfabb0bc47691022.tar.xz linux-dev-e2c13d64200bff0aa3964017cfabb0bc47691022.zip | |
s390/mcck: optimize user mode check in case of !CONFIG_KVM
In case of the !CONFIG_KVM use "jz" instead of "jnz" when
detecting user mode and get rid of unnecessary jump as result.
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Reviewed-by: Christia Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/kernel/entry.S')
| -rw-r--r-- | arch/s390/kernel/entry.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 3287cb0d89ad..ff715cc2b77b 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -555,15 +555,17 @@ ENTRY(mcck_int_handler) jno .Lmcck_panic 4: ssm __LC_PGM_NEW_PSW # turn dat on, keep irqs off tmhh %r8,0x0001 # interrupting from user ? - jnz .Lmcck_user #if IS_ENABLED(CONFIG_KVM) + jnz .Lmcck_user OUTSIDE %r9,.Lsie_gmap,.Lsie_done,.Lmcck_stack OUTSIDE %r9,.Lsie_entry,.Lsie_skip,5f oi __LC_CPU_FLAGS+7, _CIF_MCCK_GUEST 5: BPENTER __SF_SIE_FLAGS(%r15),(_TIF_ISOLATE_BP|_TIF_ISOLATE_BP_GUEST) SIEEXIT -#endif j .Lmcck_stack +#else + jz .Lmcck_stack +#endif .Lmcck_user: BPENTER __TI_flags(%r12),_TIF_ISOLATE_BP .Lmcck_stack: |