Please pull git390 'for-linus' branch
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
arch/s390/Kconfig | 3 ++ arch/s390/defconfig | 57 +++++++++++++++++++++++++++++-------- arch/s390/kernel/compat_wrapper.S | 7 +++++ arch/s390/kernel/head31.S | 8 +++-- arch/s390/kernel/head64.S | 12 ++++---- arch/s390/kernel/setup.c | 55 ++++++++---------------------------- arch/s390/kernel/signal.c | 17 +++++------ arch/s390/kernel/syscalls.S | 2 + arch/s390/mm/init.c | 45 ++++++++++------------------- drivers/s390/cio/device_fsm.c | 2 + drivers/s390/cio/device_ops.c | 14 ++++++--- drivers/s390/cio/device_pgid.c | 8 +++++ drivers/s390/crypto/ap_bus.c | 23 ++++++++------- include/asm-s390/io.h | 5 --- include/asm-s390/page.h | 1 + include/asm-s390/pgalloc.h | 2 + include/asm-s390/pgtable.h | 18 ++++++------ include/asm-s390/spinlock.h | 4 +-- include/asm-s390/unistd.h | 4 ++- 19 files changed, 151 insertions(+), 136 deletions(-)
Cornelia Huck:
[S390] Add timeouts during sense PGID, path verification and disband PGID.
Heiko Carstens:
[S390] Wire up sys_getcpu system call.
[S390] Remove crept in whitespace from head*.S again. [S390] Have s390 use add_active_range() and free_area_init_nodes. [S390] Remove open-coded mem_map usage.
Martin Schwidefsky:
[S390] update default configuration
[S390] user-copy optimization fallout.
[S390] incorrect placement of include.
Peter Oberparleiter:
[S390] cio: add timeout handler for internal operations. [S390] cio: improve unit check handling for internal operations
Ralph Wuerthner:
[S390] zcrypt device registration/unregistration race.
arch/s390/Kconfig +3 -0
@@ -233,6 +233,9 @@ config WARN_STACK_SIZE This allows you to specify the maximum frame size a function may have without the compiler complaining about it. +config ARCH_POPULATES_NODE_MAP + def_bool y + source "mm/Kconfig" comment "I/O subsystem configuration"
arch/s390/defconfig +45 -12
242 lines not on this page · raw message
arch/s390/kernel/compat_wrapper.S +7 -0
@@ -1658,3 +1658,10 @@ compat_sys_vmsplice_wrapper: llgfr %r4,%r4 # unsigned int llgfr %r5,%r5 # unsigned int jg compat_sys_vmsplice + + .globl sys_getcpu_wrapper +sys_getcpu_wrapper: + llgtr %r2,%r2 # unsigned * + llgtr %r3,%r3 # unsigned * + llgtr %r4,%r4 # struct getcpu_cache * + jg sys_tee
arch/s390/kernel/head31.S +4 -4
@@ -258,10 +258,10 @@ # # find out if the diag 0x9c is available # mvc __LC_PGM_NEW_PSW(8),.Lpcdiag9c-.LPG1(%r13) - stap __LC_CPUID+4 # store cpu address - lh %r1,__LC_CPUID+4 - diag %r1,0,0x9c # test diag 0x9c - oi 2(%r12),1 # set diag9c flag + stap __LC_CPUID+4 # store cpu address + lh %r1,__LC_CPUID+4 + diag %r1,0,0x9c # test diag 0x9c + oi 2(%r12),1 # set diag9c flag .Lchkdiag9c: lpsw .Lentry-.LPG1(13) # jump to _stext in primary-space,
arch/s390/kernel/head64.S +6 -6
@@ -253,12 +253,12 @@ # # # find out if the diag 0x9c is available # - la %r1,0f-.LPG1(%r13) # set program check address - stg %r1,__LC_PGM_NEW_PSW+8 - stap __LC_CPUID+4 # store cpu address - lh %r1,__LC_CPUID+4 - diag %r1,0,0x9c # test diag 0x9c - oi 6(%r12),1 # set diag9c flag + la %r1,0f-.LPG1(%r13) # set program check address + stg %r1,__LC_PGM_NEW_PSW+8 + stap __LC_CPUID+4 # store cpu address + lh %r1,__LC_CPUID+4 + diag %r1,0,0x9c # test diag 0x9c + oi 6(%r12),1 # set diag9c flag 0: #
arch/s390/kernel/setup.c +13 -42
94 lines not on this page · raw message
arch/s390/kernel/signal.c +7 -10
@@ -113,17 +113,15 @@ sys_sigaltstack(const stack_t __user *us/* Returns non-zero on fault. */ static int save_sigregs (struct pt_regs *regs,_sigregs __user *sregs) { -unsigned long old_mask = regs->psw.mask;_sigregs user_sregs;save_access_regs (current->thread.acrs);/* Copy a 'clean' PSW mask to the user to avoid leaking information about whether PER is currently on. */ - regs->psw.mask =PSW_MASK_MERGE (PSW_USER_BITS , regs->psw.mask); -memcpy (&user_sregs.regs.psw, ®s->psw,sizeof (sregs->regs.psw) + -sizeof (sregs->regs.gprs)); - regs->psw.mask = old_mask; + user_sregs.regs.psw.mask =PSW_MASK_MERGE (PSW_USER_BITS , regs->psw.mask); + user_sregs.regs.psw.addr = regs->psw.addr; +memcpy (&user_sregs.regs.gprs, ®s->gprs,sizeof (sregs->regs.gprs));memcpy (&user_sregs.regs.acrs, current->thread.acrs,sizeof (sregs->regs.acrs));/*
@@ -139,7 +137,6 @@ static int save_sigregs(struct pt_regs */* Returns positive number on error */ static int restore_sigregs (struct pt_regs *regs,_sigregs __user *sregs) { -unsigned long old_mask = regs->psw.mask;int err;_sigregs user_sregs;
@@ -147,12 +144,12 @@ static int restore_sigregs(struct pt_regcurrent_thread_info ()->restart_block.fn = do_no_restart_syscall; err =__copy_from_user (&user_sregs, sregs,sizeof (_sigregs)); - regs->psw.mask =PSW_MASK_MERGE (old_mask, regs->psw.mask); - regs->psw.addr |=PSW_ADDR_AMODE ;if (err)return err; -memcpy (®s->psw, &user_sregs.regs.psw,sizeof (sregs->regs.psw) + -sizeof (sregs->regs.gprs)); + regs->psw.mask =PSW_MASK_MERGE (regs->psw.mask, + user_sregs.regs.psw.mask); + regs->psw.addr =PSW_ADDR_AMODE | user_sregs.regs.psw.addr; +memcpy (®s->gprs, &user_sregs.regs.gprs,sizeof (sregs->regs.gprs));memcpy (¤t->thread.acrs, &user_sregs.regs.acrs,sizeof (sregs->regs.acrs));restore_access_regs (current->thread.acrs);
arch/s390/kernel/syscalls.S +2 -0
@@ -318,3 +318,5 @@ SYSCALL(sys_splice,sys_splice,sys_splice SYSCALL(sys_sync_file_range,sys_sync_file_range,sys_sync_file_range_wrapper) SYSCALL(sys_tee,sys_tee,sys_tee_wrapper) SYSCALL(sys_vmsplice,sys_vmsplice,compat_sys_vmsplice_wrapper) +NI_SYSCALL /* 310 sys_move_pages */ +SYSCALL(sys_getcpu,sys_getcpu,sys_getcpu_wrapper)
arch/s390/mm/init.c +16 -29
99 lines not on this page · raw message
drivers/s390/cio/device_fsm.c +2 -0
@@ -349,6 +349,8 @@ ccw_device_done(struct ccw_device *cdev, sch =to_subchannel (cdev->dev.parent); +ccw_device_set_timeout (cdev,0 ); +if (state !=DEV_STATE_ONLINE )cio_disable_subchannel (sch);
drivers/s390/cio/device_ops.c +10 -4
@@ -216,6 +216,9 @@ ccw_device_call_handler(struct ccw_devic (stctl & SCSW_STCTL_PRIM_STATUS)))return 0 ; +/* Clear pending timers for device driver initiated I/O. */ +if (ending_status) +ccw_device_set_timeout (cdev,0 );/* * Now we are ready to call the device driver interrupt handler. */
@@ -285,10 +288,10 @@ ccw_device_wake_up(struct ccw_device *cdif (cdev->private->flags.doverify || cdev->private->state ==DEV_STATE_VERIFY ) cdev->private->intparm = -EAGAIN ; -if ((irb->scsw.dstat &DEV_STAT_UNIT_CHECK ) && - !(irb->ecw[0 ] & - (SNS0_CMD_REJECT |SNS0_INTERVENTION_REQ ))) - cdev->private->intparm = -EAGAIN ; +else if ((irb->scsw.dstat &DEV_STAT_UNIT_CHECK ) && + !(irb->ecw[0 ] & + (SNS0_CMD_REJECT |SNS0_INTERVENTION_REQ ))) + cdev->private->intparm = -EAGAIN ;else if ((irb->scsw.dstat &DEV_STAT_ATTENTION ) && (irb->scsw.dstat &DEV_STAT_DEV_END ) && (irb->scsw.dstat &DEV_STAT_UNIT_EXCEP ))
@@ -309,7 +312,10 @@ __ccw_device_retry_loop(struct ccw_devic sch =to_subchannel (cdev->dev.parent); do { + ccw_device_set_timeout(cdev, 60 * HZ); ret = cio_start (sch, ccw, lpm); + if (ret != 0) + ccw_device_set_timeout(cdev, 0); if (ret == -EBUSY) { /* Try again later. */ spin_unlock_irq(&sch->lock);
drivers/s390/cio/device_pgid.c +8 -0
@@ -96,6 +96,9 @@ ccw_device_sense_pgid_start(struct ccw_d {int ret; +/* Set a timeout of 60s */ +ccw_device_set_timeout (cdev,60 *HZ ); + cdev->private->state =DEV_STATE_SENSE_PGID ; cdev->private->imask =0x80 ; cdev->private->iretry =5 ;
@@ -480,6 +483,8 @@ ccw_device_verify_start(struct ccw_devicccw_device_verify_done (cdev, -ENODEV );return ; } +/* After 60s path verification is considered to have failed. */ +ccw_device_set_timeout (cdev,60 *HZ );__ccw_device_verify_start (cdev); }
@@ -554,6 +559,9 @@ ccw_device_disband_irq(struct ccw_devicevoid ccw_device_disband_start (struct ccw_device *cdev) { +/* After 60s disbanding is considered to have failed. */ +ccw_device_set_timeout (cdev,60 *HZ ); + cdev->private->flags.pgid_single =0 ; cdev->private->iretry =5 ; cdev->private->imask =0x80 ;
drivers/s390/crypto/ap_bus.c +12 -11
@@ -449,8 +449,6 @@ static int ap_device_probe(struct device ap_dev->drv = ap_drv; rc = ap_drv->probe ? ap_drv->probe (ap_dev) : -ENODEV ; -if (rc) - ap_dev->unregistered =1 ;return rc; }
@@ -487,14 +485,7 @@ static int ap_device_remove(struct devicstruct ap_device *ap_dev =to_ap_dev (dev);struct ap_driver *ap_drv = ap_dev->drv; -spin_lock_bh (&ap_dev->lock); -__ap_flush_queue (ap_dev); -/** -* set ->unregistered to 1 while holding the lock. This prevents -* new messages to be put on the queue from now on. -*/ - ap_dev->unregistered =1 ; -spin_unlock_bh (&ap_dev->lock); +ap_flush_queue (ap_dev);if (ap_drv->remove) ap_drv->remove (ap_dev);return 0 ;
@@ -763,6 +754,7 @@ static void ap_scan_bus(void *data)break ; ap_dev->qid = qid; ap_dev->queue_depth = queue_depth; + ap_dev->unregistered =1 ;spin_lock_init (&ap_dev->lock);INIT_LIST_HEAD (&ap_dev->pendingq);INIT_LIST_HEAD (&ap_dev->requestq);
@@ -784,7 +776,12 @@ static void ap_scan_bus(void *data)/* Add device attributes. */ rc =sysfs_create_group (&ap_dev->device.kobj, &ap_dev_attr_group); -if (rc) +if (!rc) { +spin_lock_bh (&ap_dev->lock); + ap_dev->unregistered =0 ; +spin_unlock_bh (&ap_dev->lock); + } +else device_unregister (&ap_dev->device); } }
@@ -970,6 +967,8 @@ void ap_queue_message(struct ap_device * rc =__ap_queue_message (ap_dev, ap_msg);if (!rc)wake_up (&ap_poll_wait); +if (rc == -ENODEV ) + ap_dev->unregistered =1 ; }else { ap_dev->drv->receive (ap_dev, ap_msg,ERR_PTR (-ENODEV )); rc =0 ;
@@ -1028,6 +1027,8 @@ static int __ap_poll_all(struct device *spin_lock (&ap_dev->lock);if (!ap_dev->unregistered) { rc =ap_poll_queue (to_ap_dev (dev), (unsigned long *) data); +if (rc) + ap_dev->unregistered =1 ; }else rc =0 ;spin_unlock (&ap_dev->lock);
include/asm-s390/io.h +0 -5
@@ -45,11 +45,6 @@ static inline void * phys_to_virt(unsignreturn __io_virt (address); } -/* -* Change "struct page" to physical address. -*/ -#define page_to_phys (page) ((page - mem_map) << PAGE_SHIFT) -extern void *__ioremap (unsigned long offset,unsigned long size,unsigned long flags);static inline void *ioremap (unsigned long offset,unsigned long size)
include/asm-s390/page.h +1 -0
@@ -137,6 +137,7 @@ #define PAGE_OFFSET 0x0UL#define __pa (x) (unsigned long)(x)#define __va (x) (void *)(unsigned long)(x)#define virt_to_page (kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) +#define page_to_phys (page) (page_to_pfn(page) << PAGE_SHIFT)#define pfn_valid (pfn) ((pfn) < max_mapnr)#define virt_addr_valid (kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
include/asm-s390/pgalloc.h +1 -1
@@ -116,7 +116,7 @@ #endif /* __s390x__ */static inline void pmd_populate (struct mm_struct *mm,pmd_t *pmd,struct page *page) { -pmd_populate_kernel (mm, pmd, (pte_t *)((page-mem_map) <<PAGE_SHIFT )); +pmd_populate_kernel (mm, pmd, (pte_t *)page_to_phys (page)); }/*
include/asm-s390/pgtable.h +9 -9
@@ -599,7 +599,7 @@ #define ptep_set_access_flags(__vma, __a*/ static inline int page_test_and_clear_dirty (struct page *page) { -unsigned long physpage =__pa ((page - mem_map) <<PAGE_SHIFT ); +unsigned long physpage =page_to_phys (page);int skey =page_get_storage_key (physpage);if (skey & _PAGE_CHANGED)
@@ -612,13 +612,13 @@ static inline int page_test_and_clear_di*/ static inline int page_test_and_clear_young (struct page *page) { -unsigned long physpage =__pa ((page - mem_map) <<PAGE_SHIFT ); +unsigned long physpage =page_to_phys (page);int ccode; - asmvolatile ( -"rrbe 0,%1\n" -"ipm %0\n" -"srl %0,28\n" + asmvolatile ( +" rrbe 0,%1\n" +" ipm %0\n" +" srl %0,28\n" :"=d" (ccode) :"a" (physpage) :"cc" );return ccode &2 ; }
@@ -636,7 +636,7 @@ static inline pte_t mk_pte_phys(unsignedstatic inline pte_t mk_pte (struct page *page,pgprot_t pgprot) { -unsigned long physpage =__pa ((page - mem_map) <<PAGE_SHIFT ); +unsigned long physpage =page_to_phys (page);return mk_pte_phys (physpage, pgprot); }
@@ -664,11 +664,11 @@ #define pte_page(x) pfn_to_page(pte_pfn(#define pmd_page_vaddr (pmd) (pmd_val(pmd) & PAGE_MASK) -#define pmd_page (pmd) (mem_map+(pmd_val(pmd) >> PAGE_SHIFT)) +#define pmd_page (pmd) pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)#define pgd_page_vaddr (pgd) (pgd_val(pgd) & PAGE_MASK) -#define pgd_page (pgd) (mem_map+(pgd_val(pgd) >> PAGE_SHIFT)) +#define pgd_page (pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)/* to find an entry in a page-table-directory */ #define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
include/asm-s390/spinlock.h +2 -2
@@ -11,10 +11,10 @@#ifndef __ASM_SPINLOCK_H#define __ASM_SPINLOCK_H -#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >2 ) -#include <linux/smp.h> +#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >2 ) +static inline int _raw_compare_and_swap (volatile unsigned int *lock,unsigned int old,unsigned int new)
include/asm-s390/unistd.h +3 -1
@@ -247,8 +247,10 @@ #define __NR_splice 306#define __NR_sync_file_range 307#define __NR_tee 308#define __NR_vmsplice 309 +/* Number 310 is reserved for new sys_move_pages */ +#define __NR_getcpu 311 -#define NR_syscalls 310 +#define NR_syscalls 312/* * There are some system calls that are not present on 64 bit, some