1 files changed, 82 insertions, 29 deletions

diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index d61967e2eab0..7a0fd426ca92 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -9,8 +9,8 @@
  *               Heiko Carstens <heiko.carstens@de.ibm.com>
  */
 
-#include <linux/linkage.h>
 #include <linux/init.h>
+#include <linux/linkage.h>
 #include <asm/cache.h>
 #include <asm/errno.h>
 #include <asm/ptrace.h>
@@ -56,15 +56,28 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
                  _TIF_MCCK_PENDING)
 _TIF_SYSCALL = (_TIF_SYSCALL_TRACE>>8 | _TIF_SYSCALL_AUDIT>>8 | \
                 _TIF_SECCOMP>>8 | _TIF_SYSCALL_TRACEPOINT>>8)
+_TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING)
 
 #define BASED(name) name-system_call(%r13)
 
+        .macro SPP newpp
+#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
+        tm      __LC_MACHINE_FLAGS+6,0x20       # MACHINE_FLAG_SPP
+        jz      .+8
+        .insn   s,0xb2800000,\newpp
+#endif
+        .endm
+
         .macro  HANDLE_SIE_INTERCEPT
 #if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
-        lg      %r3,__LC_SIE_HOOK
-        ltgr    %r3,%r3
+        tm      __TI_flags+6(%r12),_TIF_SIE>>8
         jz      0f
-        basr    %r14,%r3
+        SPP     __LC_CMF_HPP                    # set host id
+        clc     SP_PSW+8(8,%r15),BASED(.Lsie_loop)
+        jl      0f
+        clc     SP_PSW+8(8,%r15),BASED(.Lsie_done)
+        jhe     0f
+        mvc     SP_PSW+8(8,%r15),BASED(.Lsie_loop)
 0:
 #endif
         .endm
@@ -206,8 +219,7 @@ _TIF_SYSCALL = (_TIF_SYSCALL_TRACE>>8 | _TIF_SYSCALL_AUDIT>>8 | \
  * Returns:
  *  gpr2 = prev
  */
-        .globl  __switch_to
-__switch_to:
+ENTRY(__switch_to)
         lg      %r4,__THREAD_info(%r2)          # get thread_info of prev
         lg      %r5,__THREAD_info(%r3)          # get thread_info of next
         tm      __TI_flags+7(%r4),_TIF_MCCK_PENDING # machine check pending?
@@ -232,8 +244,7 @@ __critical_start:
  * are executed with interrupts enabled.
  */
 
-        .globl  system_call
-system_call:
+ENTRY(system_call)
         stpt    __LC_SYNC_ENTER_TIMER
 sysc_saveall:
         SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
@@ -395,8 +406,7 @@ sysc_tracenogo:
 #
 # a new process exits the kernel with ret_from_fork
 #
-        .globl  ret_from_fork
-ret_from_fork:
+ENTRY(ret_from_fork)
         lg      %r13,__LC_SVC_NEW_PSW+8
         lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
         tm      SP_PSW+1(%r15),0x01     # forking a kernel thread ?
@@ -411,8 +421,7 @@ ret_from_fork:
 # kernel_execve function needs to deal with pt_regs that is not
 # at the usual place
 #
-        .globl  kernel_execve
-kernel_execve:
+ENTRY(kernel_execve)
         stmg    %r12,%r15,96(%r15)
         lgr     %r14,%r15
         aghi    %r15,-SP_SIZE
@@ -442,8 +451,7 @@ kernel_execve:
  * Program check handler routine
  */
 
-        .globl  pgm_check_handler
-pgm_check_handler:
+ENTRY(pgm_check_handler)
 /*
  * First we need to check for a special case:
  * Single stepping an instruction that disables the PER event mask will
@@ -465,6 +473,7 @@ pgm_check_handler:
         xc      SP_ILC(4,%r15),SP_ILC(%r15)
         mvc     SP_PSW(16,%r15),__LC_PGM_OLD_PSW
         lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
+        HANDLE_SIE_INTERCEPT
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
         jz      pgm_no_vtime
         UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
@@ -472,7 +481,6 @@ pgm_check_handler:
         mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
         LAST_BREAK
 pgm_no_vtime:
-        HANDLE_SIE_INTERCEPT
         stg     %r11,SP_ARGS(%r15)
         lgf     %r3,__LC_PGM_ILC        # load program interruption code
         lg      %r4,__LC_TRANS_EXC_CODE
@@ -507,6 +515,7 @@ pgm_per_std:
         CREATE_STACK_FRAME __LC_SAVE_AREA
         mvc     SP_PSW(16,%r15),__LC_PGM_OLD_PSW
         lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
+        HANDLE_SIE_INTERCEPT
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
         jz      pgm_no_vtime2
         UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
@@ -514,7 +523,6 @@ pgm_per_std:
         mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
         LAST_BREAK
 pgm_no_vtime2:
-        HANDLE_SIE_INTERCEPT
         lg      %r1,__TI_task(%r12)
         tm      SP_PSW+1(%r15),0x01     # kernel per event ?
         jz      kernel_per
@@ -571,14 +579,14 @@ kernel_per:
 /*
  * IO interrupt handler routine
  */
-        .globl io_int_handler
-io_int_handler:
+ENTRY(io_int_handler)
         stck    __LC_INT_CLOCK
         stpt    __LC_ASYNC_ENTER_TIMER
         SAVE_ALL_ASYNC __LC_IO_OLD_PSW,__LC_SAVE_AREA+40
         CREATE_STACK_FRAME __LC_SAVE_AREA+40
         mvc     SP_PSW(16,%r15),0(%r12) # move user PSW to stack
         lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
+        HANDLE_SIE_INTERCEPT
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
         jz      io_no_vtime
         UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER
@@ -586,7 +594,6 @@ io_int_handler:
         mvc     __LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER
         LAST_BREAK
 io_no_vtime:
-        HANDLE_SIE_INTERCEPT
         TRACE_IRQS_OFF
         la      %r2,SP_PTREGS(%r15)     # address of register-save area
         brasl   %r14,do_IRQ             # call standard irq handler
@@ -706,14 +713,14 @@ io_notify_resume:
 /*
  * External interrupt handler routine
  */
-        .globl  ext_int_handler
-ext_int_handler:
+ENTRY(ext_int_handler)
         stck    __LC_INT_CLOCK
         stpt    __LC_ASYNC_ENTER_TIMER
         SAVE_ALL_ASYNC __LC_EXT_OLD_PSW,__LC_SAVE_AREA+40
         CREATE_STACK_FRAME __LC_SAVE_AREA+40
         mvc     SP_PSW(16,%r15),0(%r12) # move user PSW to stack
         lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
+        HANDLE_SIE_INTERCEPT
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
         jz      ext_no_vtime
         UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER
@@ -721,7 +728,6 @@ ext_int_handler:
         mvc     __LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER
         LAST_BREAK
 ext_no_vtime:
-        HANDLE_SIE_INTERCEPT
         TRACE_IRQS_OFF
         lghi    %r1,4096
         la      %r2,SP_PTREGS(%r15)     # address of register-save area
@@ -736,8 +742,7 @@ __critical_end:
 /*
  * Machine check handler routines
  */
-        .globl mcck_int_handler
-mcck_int_handler:
+ENTRY(mcck_int_handler)
         stck    __LC_MCCK_CLOCK
         la      %r1,4095                # revalidate r1
         spt     __LC_CPU_TIMER_SAVE_AREA-4095(%r1)      # revalidate cpu timer
@@ -785,6 +790,7 @@ mcck_int_main:
         lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
         tm      __LC_MCCK_CODE+2,0x08   # mwp of old psw valid?
         jno     mcck_no_vtime           # no -> no timer update
+        HANDLE_SIE_INTERCEPT
         tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
         jz      mcck_no_vtime
         UPDATE_VTIME __LC_EXIT_TIMER,__LC_MCCK_ENTER_TIMER,__LC_USER_TIMER
@@ -804,7 +810,6 @@ mcck_no_vtime:
         stosm   __SF_EMPTY(%r15),0x04   # turn dat on
         tm      __TI_flags+7(%r12),_TIF_MCCK_PENDING
         jno     mcck_return
-        HANDLE_SIE_INTERCEPT
         TRACE_IRQS_OFF
         brasl   %r14,s390_handle_mcck
         TRACE_IRQS_ON
@@ -823,8 +828,7 @@ mcck_done:
  */
 #ifdef CONFIG_SMP
         __CPUINIT
-        .globl restart_int_handler
-restart_int_handler:
+ENTRY(restart_int_handler)
         basr    %r1,0
 restart_base:
         spt     restart_vtime-restart_base(%r1)
@@ -851,8 +855,7 @@ restart_vtime:
 /*
  * If we do not run with SMP enabled, let the new CPU crash ...
  */
-        .globl restart_int_handler
-restart_int_handler:
+ENTRY(restart_int_handler)
         basr    %r1,0
 restart_base:
         lpswe   restart_crash-restart_base(%r1)
@@ -1036,6 +1039,56 @@ cleanup_io_restore_insn:
 .Lcritical_end:
                 .quad   __critical_end
 
+#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
+/*
+ * sie64a calling convention:
+ * %r2 pointer to sie control block
+ * %r3 guest register save area
+ */
+ENTRY(sie64a)
+        stmg    %r6,%r14,__SF_GPRS(%r15)        # save kernel registers
+        stg     %r2,__SF_EMPTY(%r15)            # save control block pointer
+        stg     %r3,__SF_EMPTY+8(%r15)          # save guest register save area
+        lmg     %r0,%r13,0(%r3)                 # load guest gprs 0-13
+        lg      %r14,__LC_THREAD_INFO           # pointer thread_info struct
+        oi      __TI_flags+6(%r14),_TIF_SIE>>8
+sie_loop:
+        lg      %r14,__LC_THREAD_INFO           # pointer thread_info struct
+        tm      __TI_flags+7(%r14),_TIF_EXIT_SIE
+        jnz     sie_exit
+        lg      %r14,__SF_EMPTY(%r15)           # get control block pointer
+        SPP     __SF_EMPTY(%r15)                # set guest id
+        sie     0(%r14)
+sie_done:
+        SPP     __LC_CMF_HPP                    # set host id
+        lg      %r14,__LC_THREAD_INFO           # pointer thread_info struct
+sie_exit:
+        ni      __TI_flags+6(%r14),255-(_TIF_SIE>>8)
+        lg      %r14,__SF_EMPTY+8(%r15)         # load guest register save area
+        stmg    %r0,%r13,0(%r14)                # save guest gprs 0-13
+        lmg     %r6,%r14,__SF_GPRS(%r15)        # restore kernel registers
+        lghi    %r2,0
+        br      %r14
+sie_fault:
+        lg      %r14,__LC_THREAD_INFO           # pointer thread_info struct
+        ni      __TI_flags+6(%r14),255-(_TIF_SIE>>8)
+        lg      %r14,__SF_EMPTY+8(%r15)         # load guest register save area
+        stmg    %r0,%r13,0(%r14)                # save guest gprs 0-13
+        lmg     %r6,%r14,__SF_GPRS(%r15)        # restore kernel registers
+        lghi    %r2,-EFAULT
+        br      %r14
+
+        .align  8
+.Lsie_loop:
+        .quad   sie_loop
+.Lsie_done:
+        .quad   sie_done
+
+        .section __ex_table,"a"
+        .quad   sie_loop,sie_fault
+        .previous
+#endif
+
                 .section .rodata, "a"
 #define SYSCALL(esa,esame,emu)  .long esame
         .globl  sys_call_table