s390 patches for 3.13-rc2
Subsystems (2)
Hi Linus,
please pull from the 'for-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
to receive the following updates:
One performance improvement and a few bug fixes. Two of the fixes deal with the clock related problems we have seen on recent kernels.
Heiko Carstens (2):
s390/mm: optimize copy_page
s390/uaccess: add missing page table walk range check
Hendrik Brueckner (1):
s390/signal: always restore saved runtime instrumentation psw bit
Martin Schwidefsky (3):
s390/time,vdso: convert to the new update_vsyscall interface s390,time: revert direct ktime path for s390 clockevent device s390/mm: handle asce-type exceptions as normal page fault
Stefan Weinhuber (1):
s390/dasd: validate request size before building CCW/TCW request
arch/s390/Kconfig | 2 +- arch/s390/include/asm/page.h | 38 +++++++++---------------- arch/s390/include/asm/vdso.h | 5 ++-- arch/s390/kernel/asm-offsets.c | 3 +- arch/s390/kernel/compat_signal.c | 2 +- arch/s390/kernel/pgm_check.S | 2 +- arch/s390/kernel/signal.c | 2 +- arch/s390/kernel/time.c | 46 +++++++++++++++---------------- arch/s390/kernel/vdso32/clock_gettime.S | 30 ++++++++++---------- arch/s390/kernel/vdso32/gettimeofday.S | 9 +++--- arch/s390/kernel/vdso64/clock_gettime.S | 22 ++++++++------- arch/s390/kernel/vdso64/gettimeofday.S | 9 +++--- arch/s390/lib/uaccess_pt.c | 3 ++ drivers/s390/block/dasd_eckd.c | 2 ++ 14 files changed, 87 insertions(+), 88 deletions(-)
arch/s390/Kconfig +1 -1
@@ -101,7 +101,7 @@ config S390 select GENERIC_CPU_DEVICES if !SMP select GENERIC_FIND_FIRST_BIT select GENERIC_SMP_IDLE_THREAD - select GENERIC_TIME_VSYSCALL_OLD + select GENERIC_TIME_VSYSCALL select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_ARCH_JUMP_LABEL if !MARCH_G5 select HAVE_ARCH_SECCOMP_FILTER
arch/s390/include/asm/page.h +13 -25
@@ -48,33 +48,21 @@ static inline void clear_page(void *page) : "memory", "cc"); } +/* +* copy_page uses the mvcl instruction with 0xb0 padding byte in order to +* bypass caches when copying a page. Especially when copying huge pages +* this keeps L1 and L2 data caches alive. +*/ static inline void copy_page (void *to,void *from) { -if (MACHINE_HAS_MVPG ) { - register unsigned long reg0 asm ("0") = 0; - asmvolatile ( -" mvpg %0,%1" - : :"a" (to),"a" (from),"d" (reg0) - :"memory" ,"cc" ); - }else - asmvolatile ( -" mvc 0(256,%0),0(%1)\n" -" mvc 256(256,%0),256(%1)\n" -" mvc 512(256,%0),512(%1)\n" -" mvc 768(256,%0),768(%1)\n" -" mvc 1024(256,%0),1024(%1)\n" -" mvc 1280(256,%0),1280(%1)\n" -" mvc 1536(256,%0),1536(%1)\n" -" mvc 1792(256,%0),1792(%1)\n" -" mvc 2048(256,%0),2048(%1)\n" -" mvc 2304(256,%0),2304(%1)\n" -" mvc 2560(256,%0),2560(%1)\n" -" mvc 2816(256,%0),2816(%1)\n" -" mvc 3072(256,%0),3072(%1)\n" -" mvc 3328(256,%0),3328(%1)\n" -" mvc 3584(256,%0),3584(%1)\n" -" mvc 3840(256,%0),3840(%1)\n" - : :"a" (to),"a" (from) :"memory" ); + register void *reg2 asm ("2") = to; + register unsigned long reg3 asm ("3") = 0x1000; + register void *reg4 asm ("4") = from; + register unsigned long reg5 asm ("5") = 0xb0001000; + asmvolatile ( +" mvcl 2,4" + :"+d" (reg2),"+d" (reg3),"+d" (reg4),"+d" (reg5) + : :"memory" ,"cc" ); }#define clear_user_page (page, vaddr, pg) clear_page(page)
arch/s390/include/asm/vdso.h +3 -2
@@ -26,8 +26,9 @@ struct vdso_data {__u64 wtom_clock_nsec;/* 0x28 */ __u32 tz_minuteswest;/* Minutes west of Greenwich 0x30 */ __u32 tz_dsttime;/* Type of dst correction 0x34 */ -__u32 ectg_available; -__u32 ntp_mult;/* NTP adjusted multiplier 0x3C */ +__u32 ectg_available;/* ECTG instruction present 0x38 */ +__u32 tk_mult;/* Mult. used for xtime_nsec 0x3c */ +__u32 tk_shift;/* Shift used for xtime_nsec 0x40 */ };struct vdso_per_cpu_data {
arch/s390/kernel/asm-offsets.c +2 -1
@@ -65,7 +65,8 @@ int main(void)DEFINE (__VDSO_WTOM_NSEC, offsetof(struct vdso_data , wtom_clock_nsec));DEFINE (__VDSO_TIMEZONE, offsetof(struct vdso_data , tz_minuteswest));DEFINE (__VDSO_ECTG_OK, offsetof(struct vdso_data , ectg_available)); -DEFINE (__VDSO_NTP_MULT, offsetof(struct vdso_data , ntp_mult)); +DEFINE (__VDSO_TK_MULT, offsetof(struct vdso_data , tk_mult)); +DEFINE (__VDSO_TK_SHIFT, offsetof(struct vdso_data , tk_shift));DEFINE (__VDSO_ECTG_BASE, offsetof(struct vdso_per_cpu_data , ectg_timer_base));DEFINE (__VDSO_ECTG_USER, offsetof(struct vdso_per_cpu_data , ectg_user_time));/* constants used by the vdso */
arch/s390/kernel/compat_signal.c +1 -1
@@ -194,7 +194,7 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs)return -EINVAL ;/* Use regs->psw.mask instead of PSW_USER_BITS to preserve PER bit. */ - regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER ) | + regs->psw.mask = (regs->psw.mask & ~(PSW_MASK_USER |PSW_MASK_RI )) | (__u64)(user_sregs.regs.psw.mask &PSW32_MASK_USER ) <<32 | (__u64)(user_sregs.regs.psw.mask &PSW32_MASK_RI ) <<32 | (__u64)(user_sregs.regs.psw.addr &PSW32_ADDR_AMODE );
arch/s390/kernel/pgm_check.S +1 -1
@@ -78,7 +78,7 @@ PGM_CHECK_DEFAULT /* 34 */ PGM_CHECK_DEFAULT /* 35 */ PGM_CHECK_DEFAULT /* 36 */ PGM_CHECK_DEFAULT /* 37 */ -PGM_CHECK_DEFAULT /* 38 */ +PGM_CHECK_64BIT(do_dat_exception) /* 38 */ PGM_CHECK_64BIT(do_dat_exception) /* 39 */ PGM_CHECK_64BIT(do_dat_exception) /* 3a */ PGM_CHECK_64BIT(do_dat_exception) /* 3b */
arch/s390/kernel/signal.c +1 -1
@@ -94,7 +94,7 @@ static int restore_sigregs(struct pt_regs *regs, _sigregs __user *sregs)return -EINVAL ;/* Use regs->psw.mask instead of PSW_USER_BITS to preserve PER bit. */ - regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER ) | + regs->psw.mask = (regs->psw.mask & ~(PSW_MASK_USER |PSW_MASK_RI )) | (user_sregs.regs.psw.mask & (PSW_MASK_USER |PSW_MASK_RI ));/* Check for invalid user address space control. */ if ((regs->psw.mask &PSW_MASK_ASC ) ==PSW_ASC_HOME )
arch/s390/kernel/time.c +22 -24
78 lines not on this page · raw message
arch/s390/kernel/vdso32/clock_gettime.S +16 -14
@@ -38,25 +38,26 @@ __kernel_clock_gettime: sl %r1,__VDSO_XTIME_STAMP+4(%r5) brc 3,2f ahi %r0,-1 -2: ms %r0,__VDSO_NTP_MULT(%r5) /* cyc2ns(clock,cycle_delta) */ +2: ms %r0,__VDSO_TK_MULT(%r5) /* * tk->mult */ lr %r2,%r0 - l %r0,__VDSO_NTP_MULT(%r5) + l %r0,__VDSO_TK_MULT(%r5) ltr %r1,%r1 mr %r0,%r0 jnm 3f - a %r0,__VDSO_NTP_MULT(%r5) + a %r0,__VDSO_TK_MULT(%r5) 3: alr %r0,%r2 - srdl %r0,12 - al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */ + al %r0,__VDSO_XTIME_NSEC(%r5) /* + tk->xtime_nsec */ al %r1,__VDSO_XTIME_NSEC+4(%r5) brc 12,4f ahi %r0,1 -4: l %r2,__VDSO_XTIME_SEC+4(%r5) - al %r0,__VDSO_WTOM_NSEC(%r5) /* + wall_to_monotonic */ +4: al %r0,__VDSO_WTOM_NSEC(%r5) /* + wall_to_monotonic.nsec */ al %r1,__VDSO_WTOM_NSEC+4(%r5) brc 12,5f ahi %r0,1 -5: al %r2,__VDSO_WTOM_SEC+4(%r5) +5: l %r2,__VDSO_TK_SHIFT(%r5) /* Timekeeper shift */ + srdl %r0,0(%r2) /* >> tk->shift */ + l %r2,__VDSO_XTIME_SEC+4(%r5) + al %r2,__VDSO_WTOM_SEC+4(%r5) cl %r4,__VDSO_UPD_COUNT+4(%r5) /* check update counter */ jne 1b basr %r5,0
@@ -86,20 +87,21 @@ __kernel_clock_gettime: sl %r1,__VDSO_XTIME_STAMP+4(%r5) brc 3,12f ahi %r0,-1 -12: ms %r0,__VDSO_NTP_MULT(%r5) /* cyc2ns(clock,cycle_delta) */ +12: ms %r0,__VDSO_TK_MULT(%r5) /* * tk->mult */ lr %r2,%r0 - l %r0,__VDSO_NTP_MULT(%r5) + l %r0,__VDSO_TK_MULT(%r5) ltr %r1,%r1 mr %r0,%r0 jnm 13f - a %r0,__VDSO_NTP_MULT(%r5) + a %r0,__VDSO_TK_MULT(%r5) 13: alr %r0,%r2 - srdl %r0,12 - al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */ + al %r0,__VDSO_XTIME_NSEC(%r5) /* + tk->xtime_nsec */ al %r1,__VDSO_XTIME_NSEC+4(%r5) brc 12,14f ahi %r0,1 -14: l %r2,__VDSO_XTIME_SEC+4(%r5) +14: l %r2,__VDSO_TK_SHIFT(%r5) /* Timekeeper shift */ + srdl %r0,0(%r2) /* >> tk->shift */ + l %r2,__VDSO_XTIME_SEC+4(%r5) cl %r4,__VDSO_UPD_COUNT+4(%r5) /* check update counter */ jne 11b basr %r5,0
arch/s390/kernel/vdso32/gettimeofday.S +5 -4
@@ -35,15 +35,14 @@ __kernel_gettimeofday: sl %r1,__VDSO_XTIME_STAMP+4(%r5) brc 3,3f ahi %r0,-1 -3: ms %r0,__VDSO_NTP_MULT(%r5) /* cyc2ns(clock,cycle_delta) */ +3: ms %r0,__VDSO_TK_MULT(%r5) /* * tk->mult */ st %r0,24(%r15) - l %r0,__VDSO_NTP_MULT(%r5) + l %r0,__VDSO_TK_MULT(%r5) ltr %r1,%r1 mr %r0,%r0 jnm 4f - a %r0,__VDSO_NTP_MULT(%r5) + a %r0,__VDSO_TK_MULT(%r5) 4: al %r0,24(%r15) - srdl %r0,12 al %r0,__VDSO_XTIME_NSEC(%r5) /* + xtime */ al %r1,__VDSO_XTIME_NSEC+4(%r5) brc 12,5f
@@ -51,6 +50,8 @@ __kernel_gettimeofday: 5: mvc 24(4,%r15),__VDSO_XTIME_SEC+4(%r5) cl %r4,__VDSO_UPD_COUNT+4(%r5) /* check update counter */ jne 1b + l %r4,__VDSO_TK_SHIFT(%r5) /* Timekeeper shift */ + srdl %r0,0(%r4) /* >> tk->shift */ l %r4,24(%r15) /* get tv_sec from stack */ basr %r5,0 6: ltr %r0,%r0
arch/s390/kernel/vdso64/clock_gettime.S +12 -10
@@ -34,14 +34,15 @@ __kernel_clock_gettime: tmll %r4,0x0001 /* pending update ? loop */ jnz 0b stck 48(%r15) /* Store TOD clock */ + lgf %r2,__VDSO_TK_SHIFT(%r5) /* Timekeeper shift */ + lg %r0,__VDSO_XTIME_SEC(%r5) /* tk->xtime_sec */ + alg %r0,__VDSO_WTOM_SEC(%r5) /* + wall_to_monotonic.sec */ lg %r1,48(%r15) sg %r1,__VDSO_XTIME_STAMP(%r5) /* TOD - cycle_last */ - msgf %r1,__VDSO_NTP_MULT(%r5) /* * NTP adjustment */ - srlg %r1,%r1,12 /* cyc2ns(clock,cycle_delta) */ - alg %r1,__VDSO_XTIME_NSEC(%r5) /* + xtime */ - lg %r0,__VDSO_XTIME_SEC(%r5) - alg %r1,__VDSO_WTOM_NSEC(%r5) /* + wall_to_monotonic */ - alg %r0,__VDSO_WTOM_SEC(%r5) + msgf %r1,__VDSO_TK_MULT(%r5) /* * tk->mult */ + alg %r1,__VDSO_XTIME_NSEC(%r5) /* + tk->xtime_nsec */ + alg %r1,__VDSO_WTOM_NSEC(%r5) /* + wall_to_monotonic.nsec */ + srlg %r1,%r1,0(%r2) /* >> tk->shift */ clg %r4,__VDSO_UPD_COUNT(%r5) /* check update counter */ jne 0b larl %r5,13f
@@ -62,12 +63,13 @@ __kernel_clock_gettime: tmll %r4,0x0001 /* pending update ? loop */ jnz 5b stck 48(%r15) /* Store TOD clock */ + lgf %r2,__VDSO_TK_SHIFT(%r5) /* Timekeeper shift */ lg %r1,48(%r15) sg %r1,__VDSO_XTIME_STAMP(%r5) /* TOD - cycle_last */ - msgf %r1,__VDSO_NTP_MULT(%r5) /* * NTP adjustment */ - srlg %r1,%r1,12 /* cyc2ns(clock,cycle_delta) */ - alg %r1,__VDSO_XTIME_NSEC(%r5) /* + xtime */ - lg %r0,__VDSO_XTIME_SEC(%r5) + msgf %r1,__VDSO_TK_MULT(%r5) /* * tk->mult */ + alg %r1,__VDSO_XTIME_NSEC(%r5) /* + tk->xtime_nsec */ + srlg %r1,%r1,0(%r2) /* >> tk->shift */ + lg %r0,__VDSO_XTIME_SEC(%r5) /* tk->xtime_sec */ clg %r4,__VDSO_UPD_COUNT(%r5) /* check update counter */ jne 5b larl %r5,13f
arch/s390/kernel/vdso64/gettimeofday.S +5 -4
@@ -31,12 +31,13 @@ __kernel_gettimeofday: stck 48(%r15) /* Store TOD clock */ lg %r1,48(%r15) sg %r1,__VDSO_XTIME_STAMP(%r5) /* TOD - cycle_last */ - msgf %r1,__VDSO_NTP_MULT(%r5) /* * NTP adjustment */ - srlg %r1,%r1,12 /* cyc2ns(clock,cycle_delta) */ - alg %r1,__VDSO_XTIME_NSEC(%r5) /* + xtime.tv_nsec */ - lg %r0,__VDSO_XTIME_SEC(%r5) /* xtime.tv_sec */ + msgf %r1,__VDSO_TK_MULT(%r5) /* * tk->mult */ + alg %r1,__VDSO_XTIME_NSEC(%r5) /* + tk->xtime_nsec */ + lg %r0,__VDSO_XTIME_SEC(%r5) /* tk->xtime_sec */ clg %r4,__VDSO_UPD_COUNT(%r5) /* check update counter */ jne 0b + lgf %r5,__VDSO_TK_SHIFT(%r5) /* Timekeeper shift */ + srlg %r1,%r1,0(%r5) /* >> tk->shift */ larl %r5,5f 2: clg %r1,0(%r5) jl 3f
arch/s390/lib/uaccess_pt.c +3 -0
@@ -78,11 +78,14 @@ static size_t copy_in_kernel(size_t count, void __user *to,* contains the (negative) exception code. */ #ifdef CONFIG_64BIT +static unsigned long follow_table (struct mm_struct *mm,unsigned long address,int write) {unsigned long *table = (unsigned long *)__pa (mm->pgd); +if (unlikely (address > mm->context.asce_limit -1 )) +return -0x38UL ;switch (mm->context.asce_bits & _ASCE_TYPE_MASK) {case _ASCE_TYPE_REGION1: table = table + ((address >>53 ) &0x7ff );
drivers/s390/block/dasd_eckd.c +2 -0
@@ -3224,6 +3224,8 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev, fcx_multitrack = private->features.feature[40 ] &0x20 ; data_size =blk_rq_bytes (req); +if (data_size % blksize) +return ERR_PTR (-EINVAL );/* tpm write request add CBC data on each track boundary */ if (rq_data_dir (req) ==WRITE ) data_size += (last_trk - first_trk) *4 ;