leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/mcck: cleanup use of cleanup_sie_mcck

Browse Source 
cleanup_sie_mcck label is called from a single location only
and thus does not need to be a subroutine. Move the labelled
code to the caller - by doing that the SIE critical section
checks appear next to each other and the SIE cleanup becomes
bit more readable.

Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
Alexander Gordeev 2021-05-17 08:18:13 +02:00 committed by Vasily Gorbik
parent 3bd6958136
commit 20232b18e5
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/s390/kernel/entry.S
View File

@ -214,7 +214,7 @@ ENTRY(sie64a)
# are some corner cases (e.g. runtime instrumentation) where ILC is unpredictable. # are some corner cases (e.g. runtime instrumentation) where ILC is unpredictable.
# Other instructions between sie64a and .Lsie_done should not cause program # Other instructions between sie64a and .Lsie_done should not cause program
# interrupts. So lets use 3 nops as a landing pad for all possible rewinds. # interrupts. So lets use 3 nops as a landing pad for all possible rewinds.
# See also .Lcleanup_sie_mcck/.Lcleanup_sie_int # See also .Lcleanup_sie
.Lrewind_pad6: .Lrewind_pad6:
nopr 7 nopr 7
.Lrewind_pad4: .Lrewind_pad4:
@ -399,7 +399,7 @@ ENTRY(\name)
lghi %r13,.Lsie_done - .Lsie_gmap lghi %r13,.Lsie_done - .Lsie_gmap
clgr %r14,%r13 clgr %r14,%r13
jhe 0f jhe 0f
brasl %r14,.Lcleanup_sie_int brasl %r14,.Lcleanup_sie
#endif #endif
0: CHECK_STACK __LC_SAVE_AREA_ASYNC 0: CHECK_STACK __LC_SAVE_AREA_ASYNC
aghi %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE) aghi %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
@ -547,7 +547,13 @@ ENTRY(mcck_int_handler)
lghi %r13,.Lsie_done - .Lsie_gmap lghi %r13,.Lsie_done - .Lsie_gmap
clgr %r14,%r13 clgr %r14,%r13
jhe .Lmcck_stack jhe .Lmcck_stack
brasl %r14,.Lcleanup_sie_mcck larl %r13,.Lsie_entry
slgr %r9,%r13
lghi %r13,.Lsie_skip - .Lsie_entry
clgr %r9,%r13
jhe 5f
oi __LC_CPU_FLAGS+7, _CIF_MCCK_GUEST
5: brasl %r14,.Lcleanup_sie
#endif #endif
j .Lmcck_stack j .Lmcck_stack
.Lmcck_user: .Lmcck_user:
@ -649,21 +655,13 @@ ENDPROC(stack_overflow)
#endif #endif
#if IS_ENABLED(CONFIG_KVM) #if IS_ENABLED(CONFIG_KVM)
.Lcleanup_sie_mcck: .Lcleanup_sie:
larl %r13,.Lsie_entry
slgr %r9,%r13
lghi %r13,.Lsie_skip - .Lsie_entry
clgr %r9,%r13
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) BPENTER __SF_SIE_FLAGS(%r15),(_TIF_ISOLATE_BP|_TIF_ISOLATE_BP_GUEST)
lg %r9,__SF_SIE_CONTROL(%r15) # get control block pointer lg %r9,__SF_SIE_CONTROL(%r15) # get control block pointer
ni __SIE_PROG0C+3(%r9),0xfe # no longer in SIE ni __SIE_PROG0C+3(%r9),0xfe # no longer in SIE
lctlg %c1,%c1,__LC_KERNEL_ASCE lctlg %c1,%c1,__LC_KERNEL_ASCE
larl %r9,sie_exit # skip forward to sie_exit larl %r9,sie_exit # skip forward to sie_exit
BR_EX %r14,%r13 BR_EX %r14,%r13
#endif #endif
.section .rodata, "a" .section .rodata, "a"
#define SYSCALL(esame,emu) .quad __s390x_ ## esame #define SYSCALL(esame,emu) .quad __s390x_ ## esame