s390 patches for 3.15-rc2
Subsystems (3)
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:
An update to the oops output with additional information about the crash. The renameat2 system call is enabled. Two patches in regard to the PTR_ERR_OR_ZERO cleanup. And a bunch of bug fixes.
Duan Jiong (2):
s390/sclp: replace PTR_RET with PTR_ERR_OR_ZERO s390/sclp_cmd: replace PTR_RET with PTR_ERR_OR_ZERO
Heiko Carstens (7):
s390/smp: fix smp_stop_cpu() for !CONFIG_SMP
s390/mm: print control registers and page table walk on crash
s390: show_registers() should not map user space addresses to kernel symbols
s390: wire up sys_renameat2
s390: add 31 bit warning message
s390/uaccess: fix possible register corruption in strnlen_user_srst() s390/compat: fix typo
Martin Schwidefsky (1):
s390: fix control register update
Peter Oberparleiter (1):
s390/sclp_vt220: Fix kernel panic due to early terminal input
arch/s390/include/asm/sigp.h | 19 +++++ arch/s390/include/asm/smp.h | 13 +++- arch/s390/include/uapi/asm/unistd.h | 3 +- arch/s390/kernel/compat_wrapper.c | 3 +- arch/s390/kernel/dumpstack.c | 8 +- arch/s390/kernel/ptrace.c | 2 +- arch/s390/kernel/setup.c | 32 ++++++++ arch/s390/kernel/smp.c | 15 ---- arch/s390/kernel/syscalls.S | 1 + arch/s390/lib/uaccess.c | 5 +- arch/s390/mm/fault.c | 140 +++++++++++++++++++++++++++++++++-- drivers/s390/char/sclp.c | 2 +- drivers/s390/char/sclp_cmd.c | 2 +- drivers/s390/char/sclp_vt220.c | 14 +++- 14 files changed, 223 insertions(+), 36 deletions(-)
arch/s390/include/asm/sigp.h +19 -0
@@ -31,4 +31,23 @@#define SIGP_STATUS_INCORRECT_STATE 0x00000200UL#define SIGP_STATUS_NOT_RUNNING 0x00000400UL +#ifndef __ASSEMBLY__ + +static inline int __pcpu_sigp (u16 addr,u8 order,u32 parm,u32 *status) +{ + register unsigned int reg1 asm ("1") = parm; +int cc; + + asmvolatile ( +" sigp %1,%2,0(%3)\n" +" ipm %0\n" +" srl %0,28\n" + :"=d" (cc),"+d" (reg1) :"d" (addr),"a" (order) :"cc" ); +if (status && cc ==1 ) + *status = reg1; +return cc; +} + +#endif /* __ASSEMBLY__ */ +#endif /* __S390_ASM_SIGP_H */
arch/s390/include/asm/smp.h +12 -1
@@ -7,6 +7,8 @@#ifndef __ASM_SMP_H#define __ASM_SMP_H +#include <asm/sigp.h> +#ifdef CONFIG_SMP #include <asm/lowcore.h>
@@ -50,9 +52,18 @@ static inline int smp_store_status(int cpu) { return 0; }static inline int smp_vcpu_scheduled (int cpu) {return 1 ; }static inline void smp_yield_cpu (int cpu) { }static inline void smp_yield (void ) { } -static inline void smp_stop_cpu (void ) { }static inline void smp_fill_possible_mask (void ) { } +static inline void smp_stop_cpu (void ) +{ +u16 pcpu =stap (); + +for (;;) { +__pcpu_sigp (pcpu,SIGP_STOP ,0 ,NULL ); +cpu_relax (); + } +} +#endif /* CONFIG_SMP */ #ifdef CONFIG_HOTPLUG_CPU
arch/s390/include/uapi/asm/unistd.h +2 -1
@@ -282,7 +282,8 @@#define __NR_finit_module 344#define __NR_sched_setattr 345#define __NR_sched_getattr 346 -#define NR_syscalls 345 +#define __NR_renameat2 347 +#define NR_syscalls 348/* * There are some system calls that are not present on 64 bit, some
arch/s390/kernel/compat_wrapper.c +2 -1
@@ -1,5 +1,5 @@/* -* Compat sytem call wrappers. +* Compat system call wrappers. * * Copyright IBM Corp. 2014 */
@@ -213,3 +213,4 @@ COMPAT_SYSCALL_WRAP5(kcmp, pid_t, pid1, pid_t, pid2, int, type, unsigned long, i COMPAT_SYSCALL_WRAP3(finit_module, int, fd, const char __user *, uargs, int, flags); COMPAT_SYSCALL_WRAP3(sched_setattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, flags); COMPAT_SYSCALL_WRAP4(sched_getattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, size, unsigned int, flags); +COMPAT_SYSCALL_WRAP5(renameat2, int, olddfd, const char __user *, oldname, int, newdfd, const char __user *, newname, unsigned int, flags);
arch/s390/kernel/dumpstack.c +4 -4
@@ -144,10 +144,10 @@ void show_registers(struct pt_regs *regs)char *mode; mode =user_mode (regs) ?"User" :"Krnl" ; -printk ("%s PSW : %p %p (%pSR)\n" , - mode, (void *) regs->psw.mask, - (void *) regs->psw.addr, - (void *) regs->psw.addr); +printk ("%s PSW : %p %p" , mode, (void *)regs->psw.mask, (void *)regs->psw.addr); +if (!user_mode (regs)) +printk (" (%pSR)" , (void *)regs->psw.addr); +printk ("\n" ); printk(" R:%x T:%x IO:%x EX:%x Key:%x M:%x W:%x " "P:%x AS:%x CC:%x PM:%x", mask_bits(regs, PSW_MASK_PER), mask_bits(regs, PSW_MASK_DAT), mask_bits(regs, PSW_MASK_IO),
arch/s390/kernel/ptrace.c +1 -1
@@ -64,7 +64,7 @@ void update_cr_regs(struct task_struct *task)if (task->thread.per_flags &PER_FLAG_NO_TE ) cr_new &= ~(1UL <<55 );if (cr_new != cr) -__ctl_load (cr,0 ,0 ); +__ctl_load (cr_new,0 ,0 );/* Set or clear transaction execution TDC bits 62 and 63. */ __ctl_store (cr,2 ,2 ); cr_new = cr & ~3UL ;
arch/s390/kernel/setup.c +32 -0
@@ -1027,3 +1027,35 @@ void __init setup_arch(char **cmdline_p)/* Setup zfcpdump support */ setup_zfcpdump (); } + +#ifdef CONFIG_32BIT +static int no_removal_warning__initdata ; + +static int __init parse_no_removal_warning (char *str) +{ + no_removal_warning =1 ; +return 0 ; +} +__setup ("no_removal_warning" , parse_no_removal_warning); + +static int __init removal_warning (void ) +{ +if (no_removal_warning) +return 0 ; +printk (KERN_ALERT "\n\n" ); +printk (KERN_CONT "Warning - you are using a 31 bit kernel!\n\n" ); +printk (KERN_CONT "We plan to remove 31 bit kernel support from the kernel sources in March 2015.\n" ); +printk (KERN_CONT "Currently we assume that nobody is using the 31 bit kernel on old 31 bit\n" ); +printk (KERN_CONT "hardware anymore. If you think that the code should not be removed and also\n" ); +printk (KERN_CONT "future versions of the Linux kernel should be able to run in 31 bit mode\n" ); +printk (KERN_CONT "please let us know. Please write to:\n" ); +printk (KERN_CONT "[email protected] (mail address) and/or\n" ); +printk (KERN_CONT "[email protected] (mailing list).\n\n" ); +printk (KERN_CONT "Thank you!\n\n" ); +printk (KERN_CONT "If this kernel runs on a 64 bit machine you may consider using a 64 bit kernel.\n" ); +printk (KERN_CONT "This message can be disabled with the \"no_removal_warning\" kernel parameter.\n" ); +schedule_timeout_uninterruptible (300 *HZ ); +return 0 ; +} +early_initcall (removal_warning); +#endif
arch/s390/kernel/smp.c +0 -15
@@ -82,21 +82,6 @@ DEFINE_MUTEX(smp_cpu_state_mutex);/* * Signal processor helper functions. */ -static inline int __pcpu_sigp (u16 addr,u8 order,u32 parm,u32 *status) -{ - register unsigned int reg1 asm ("1") = parm; -int cc; - - asmvolatile ( -" sigp %1,%2,0(%3)\n" -" ipm %0\n" -" srl %0,28\n" - :"=d" (cc),"+d" (reg1) :"d" (addr),"a" (order) :"cc" ); -if (status && cc ==1 ) - *status = reg1; -return cc; -} -static inline int __pcpu_sigp_relax (u16 addr,u8 order,u32 parm,u32 *status) {int cc;
arch/s390/kernel/syscalls.S +1 -0
@@ -355,3 +355,4 @@ SYSCALL(sys_kcmp,sys_kcmp,compat_sys_kcmp) SYSCALL(sys_finit_module,sys_finit_module,compat_sys_finit_module) SYSCALL(sys_sched_setattr,sys_sched_setattr,compat_sys_sched_setattr) /* 345 */ SYSCALL(sys_sched_getattr,sys_sched_getattr,compat_sys_sched_getattr) +SYSCALL(sys_renameat2,sys_renameat2,compat_sys_renameat2)
arch/s390/lib/uaccess.c +2 -3
@@ -338,9 +338,6 @@ static inline unsigned long strnlen_user_srst(const char __user *src, register unsigned long reg0 asm("0") = 0;unsigned long tmp1, tmp2; -if (unlikely (!size)) -return 0 ; -update_primary_asce (current); asmvolatile (" la %2,0(%1)\n" " la %3,0(%0,%1)\n"
@@ -359,6 +356,8 @@ static inline unsigned long strnlen_user_srst(const char __user *src,unsigned long __strnlen_user (const char __user *src,unsigned long size) { +if (unlikely (!size)) +return 0 ;update_primary_asce (current);return strnlen_user_srst (src, size); }
arch/s390/mm/fault.c +135 -5
160 lines not on this page · raw message
drivers/s390/char/sclp.c +1 -1
@@ -1252,7 +1252,7 @@ static __init int sclp_initcall(void)return rc; sclp_pdev =platform_device_register_simple ("sclp" ,-1 ,NULL ,0 ); - rc =PTR_RET (sclp_pdev); + rc =PTR_ERR_OR_ZERO (sclp_pdev);if (rc) goto fail_platform_driver_unregister;
drivers/s390/char/sclp_cmd.c +1 -1
@@ -515,7 +515,7 @@ static int __init sclp_detect_standby_memory(void)if (rc) goto out; sclp_pdev =platform_device_register_simple ("sclp_mem" ,-1 ,NULL ,0 ); - rc =PTR_RET (sclp_pdev); + rc =PTR_ERR_OR_ZERO (sclp_pdev);if (rc) goto out_driver;sclp_add_standby_memory ();
drivers/s390/char/sclp_vt220.c +11 -3
@@ -97,13 +97,16 @@ static void sclp_vt220_pm_event_fn(struct sclp_register *reg,static int __sclp_vt220_emit (struct sclp_vt220_request *request);static void sclp_vt220_emit_current (void ); -/* Registration structure for our interest in SCLP event buffers */ +/* Registration structure for SCLP output event buffers */ static struct sclp_register sclp_vt220_register = { .send_mask =EVTYP_VT220MSG_MASK , + .pm_event_fn = sclp_vt220_pm_event_fn, +}; + +/* Registration structure for SCLP input event buffers */ +static struct sclp_register sclp_vt220_register_input = { .receive_mask =EVTYP_VT220MSG_MASK , - .state_change_fn =NULL , .receiver_fn = sclp_vt220_receiver_fn, - .pm_event_fn = sclp_vt220_pm_event_fn, };
@@ -715,9 +718,14 @@ static int __init sclp_vt220_tty_init(void) rc =tty_register_driver (driver);if (rc) goto out_init; + rc =sclp_register (&sclp_vt220_register_input); +if (rc) + goto out_reg; sclp_vt220_driver = driver;return 0 ; +out_reg: +tty_unregister_driver (driver); out_init:__sclp_vt220_cleanup (); out_driver: