s390 patches for 4.15-rc3
Subsystems (13)
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:
* Three more patches in regard to the SPDX license tags. The missing tags for the files in arch/s390/kvm will be merged via the KVM tree. With that all s390 related files should have their SPDX tags.
* A patch to get rid of 'struct timespec' in the DASD driver.
* Bug fixes.
Arnd Bergmann (1):
s390/dasd: remove 'struct timespec' usage
Heiko Carstens (3):
s390: always save and restore all registers on context switch s390/mm: fix off-by-one bug in 5-level page table handling
s390: fix compat system call table
Julian Wiedmann (2):
s390/qdio: consider ERROR buffers for inbound-full condition s390/qdio: restrict target-full handling to IQDIO
Martin Schwidefsky (2):
s390: add a few more SPDX identifiers
s390: Remove redudant license text
Michael S. Tsirkin (1):
s390/virtio: add BSD license to virtio-ccw
Stefan Haberland (1):
s390/dasd: prevent prefix I/O error
arch/s390/Kbuild | 1 + arch/s390/appldata/Makefile | 1 + arch/s390/boot/compressed/vmlinux.scr | 1 + arch/s390/crypto/sha1_s390.c | 7 +------ arch/s390/hypfs/Makefile | 1 + arch/s390/include/asm/Kbuild | 1 + arch/s390/include/asm/alternative.h | 1 + arch/s390/include/asm/ap.h | 5 +---- arch/s390/include/asm/bugs.h | 1 + arch/s390/include/asm/segment.h | 1 + arch/s390/include/asm/switch_to.h | 27 +++++++++++++-------------- arch/s390/include/asm/vga.h | 1 + arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/perf_regs.h | 1 + arch/s390/include/uapi/asm/sthyi.h | 1 + arch/s390/include/uapi/asm/virtio-ccw.h | 2 +- arch/s390/include/uapi/asm/vmcp.h | 1 + arch/s390/kernel/alternative.c | 1 + arch/s390/kernel/perf_regs.c | 1 + arch/s390/kernel/syscalls.S | 6 +++--- arch/s390/kernel/vdso64/note.S | 1 + arch/s390/mm/pgalloc.c | 2 -- arch/s390/net/Makefile | 1 + arch/s390/numa/Makefile | 1 + arch/s390/pci/Makefile | 1 + arch/s390/tools/gen_opcode_table.c | 1 + drivers/s390/Makefile | 1 + drivers/s390/block/Kconfig | 1 + drivers/s390/block/dasd.c | 10 +++++----- drivers/s390/block/dasd_eckd.c | 16 ++++++++++------ drivers/s390/block/dasd_int.h | 2 +- drivers/s390/char/Kconfig | 1 + drivers/s390/char/defkeymap.map | 1 + drivers/s390/cio/blacklist.h | 1 + drivers/s390/cio/qdio_main.c | 7 ++++--- drivers/s390/net/Kconfig | 1 + drivers/s390/scsi/Makefile | 1 + 37 files changed, 66 insertions(+), 45 deletions(-)
arch/s390/Kbuild +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 obj-y += kernel/ obj-y += mm/ obj-$(CONFIG_KVM) += kvm/
arch/s390/appldata/Makefile +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the Linux - z/VM Monitor Stream. #
arch/s390/boot/compressed/vmlinux.scr +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ SECTIONS { .rodata.compressed : {
arch/s390/crypto/sha1_s390.c +1 -6
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cryptographic API. *
@@ -16,12 +17,6 @@* Copyright (c) Alan Smithee. * Copyright (c) Andrew McDonald <[email protected]> * Copyright (c) Jean-Francois Dive <[email protected]> -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) -* any later version. -* */ #include <crypto/internal/hash.h> #include <linux/init.h>
arch/s390/hypfs/Makefile +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the linux hypfs filesystem routines. #
arch/s390/include/asm/Kbuild +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 generic-y += asm-offsets.h generic-y += cacheflush.h generic-y += clkdev.h
arch/s390/include/asm/alternative.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_S390_ALTERNATIVE_H#define _ASM_S390_ALTERNATIVE_H
arch/s390/include/asm/ap.h +1 -4
@@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Adjunct processor (AP) interfaces * * Copyright IBM Corp. 2017 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Tony Krowiak <[email protected]> * Martin Schwidefsky <[email protected]> * Harald Freudenberger <[email protected]>
arch/s390/include/asm/bugs.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * S390 version * Copyright IBM Corp. 1999
arch/s390/include/asm/segment.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_SEGMENT_H#define _ASM_SEGMENT_H
arch/s390/include/asm/switch_to.h +13 -14
@@ -30,21 +30,20 @@ static inline void restore_access_regs(unsigned int *acrs) asmvolatile ("lam 0,15,%0" : :"Q" (*(acrstype *)acrs)); } -#define switch_to (prev,next,last) do { \ - if (prev->mm) { \ - save_fpu_regs(); \ - save_access_regs(&prev->thread.acrs[0]); \ - save_ri_cb(prev->thread.ri_cb); \ - save_gs_cb(prev->thread.gs_cb); \ - } \ +#define switch_to (prev, next, last) do { \ +/* save_fpu_regs() sets the CIF_FPU flag, which enforces \ +* a restore of the floating point / vector registers as \ +* soon as the next task returns to user space \ +*/ \ +save_fpu_regs (); \ + save_access_regs(&prev->thread.acrs[0]); \ + save_ri_cb(prev->thread.ri_cb); \ + save_gs_cb(prev->thread.gs_cb); \update_cr_regs (next); \ - if (next->mm) { \ - set_cpu_flag(CIF_FPU); \ - restore_access_regs(&next->thread.acrs[0]); \ - restore_ri_cb(next->thread.ri_cb, prev->thread.ri_cb); \ - restore_gs_cb(next->thread.gs_cb); \ - } \ - prev = __switch_to(prev,next); \ + restore_access_regs(&next->thread.acrs[0]); \ + restore_ri_cb(next->thread.ri_cb, prev->thread.ri_cb); \ + restore_gs_cb(next->thread.gs_cb); \ + prev =__switch_to (prev, next); \ } while (0)#endif /* __ASM_SWITCH_TO_H */
arch/s390/include/asm/vga.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_S390_VGA_H#define _ASM_S390_VGA_H
arch/s390/include/uapi/asm/Kbuild +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm
arch/s390/include/uapi/asm/perf_regs.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _ASM_S390_PERF_REGS_H#define _ASM_S390_PERF_REGS_H
arch/s390/include/uapi/asm/sthyi.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI_ASM_STHYI_H#define _UAPI_ASM_STHYI_H
arch/s390/include/uapi/asm/virtio-ccw.h +1 -1
@@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * Definitions for virtio-ccw devices. *
arch/s390/include/uapi/asm/vmcp.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright IBM Corp. 2004, 2005 * Interface implementation for communication with the z/VM control program
arch/s390/kernel/alternative.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/module.h> #include <asm/alternative.h> #include <asm/facility.h>
arch/s390/kernel/perf_regs.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/perf_event.h> #include <linux/perf_regs.h> #include <linux/kernel.h>
arch/s390/kernel/syscalls.S +3 -3
@@ -370,10 +370,10 @@ SYSCALL(sys_recvmmsg,compat_sys_recvmmsg) SYSCALL(sys_sendmmsg,compat_sys_sendmmsg) SYSCALL(sys_socket,sys_socket) SYSCALL(sys_socketpair,compat_sys_socketpair) /* 360 */ -SYSCALL(sys_bind,sys_bind) -SYSCALL(sys_connect,sys_connect) +SYSCALL(sys_bind,compat_sys_bind) +SYSCALL(sys_connect,compat_sys_connect) SYSCALL(sys_listen,sys_listen) -SYSCALL(sys_accept4,sys_accept4) +SYSCALL(sys_accept4,compat_sys_accept4) SYSCALL(sys_getsockopt,compat_sys_getsockopt) /* 365 */ SYSCALL(sys_setsockopt,compat_sys_setsockopt) SYSCALL(sys_getsockname,compat_sys_getsockname)
arch/s390/kernel/vdso64/note.S +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text. * Here we can supply some information useful to userland.
arch/s390/mm/pgalloc.c +0 -2
@@ -83,8 +83,6 @@ int crst_table_upgrade(struct mm_struct *mm, unsigned long end)/* upgrade should only happen from 3 to 4, 3 to 5, or 4 to 5 levels */ VM_BUG_ON (mm->context.asce_limit < _REGION2_SIZE); -if (end >=TASK_SIZE_MAX ) -return -ENOMEM ; rc =0 ; notify =0 ;while (mm->context.asce_limit < end) {
arch/s390/net/Makefile +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Arch-specific network modules #
arch/s390/numa/Makefile +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 obj-y += numa.o obj-y += toptree.o obj-$(CONFIG_NUMA_EMU) += mode_emu.o
arch/s390/pci/Makefile +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the s390 PCI subsystem. #
arch/s390/tools/gen_opcode_table.c +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Generate opcode table initializers for the in-kernel disassembler. *
drivers/s390/Makefile +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the S/390 specific device drivers #
drivers/s390/block/Kconfig +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 comment "S/390 block device drivers" depends on S390 && BLOCK
drivers/s390/block/dasd.c +5 -5
@@ -759,7 +759,7 @@ static void dasd_profile_end_add_data(struct dasd_profile_info *data,/* in case of an overflow, reset the whole profile */ if (data->dasd_io_reqs ==UINT_MAX ) {memset (data,0 ,sizeof (*data)); -getnstimeofday (&data->starttod); +ktime_get_real_ts64 (&data->starttod); } data->dasd_io_reqs++; data->dasd_io_sects += sectors;
@@ -894,7 +894,7 @@ void dasd_profile_reset(struct dasd_profile *profile)return ; }memset (data,0 ,sizeof (*data)); -getnstimeofday (&data->starttod); +ktime_get_real_ts64 (&data->starttod);spin_unlock_bh (&profile->lock); }
@@ -911,7 +911,7 @@ int dasd_profile_on(struct dasd_profile *profile)kfree (data);return 0 ; } -getnstimeofday (&data->starttod); +ktime_get_real_ts64 (&data->starttod); profile->data = data;spin_unlock_bh (&profile->lock);return 0 ;
@@ -995,8 +995,8 @@ static void dasd_stats_array(struct seq_file *m, unsigned int *array)static void dasd_stats_seq_print (struct seq_file *m,struct dasd_profile_info *data) { -seq_printf (m,"start_time %ld.%09ld\n" , - data->starttod.tv_sec, data->starttod.tv_nsec); +seq_printf (m,"start_time %lld.%09ld\n" , + (s64 )data->starttod.tv_sec, data->starttod.tv_nsec);seq_printf (m,"total_requests %u\n" , data->dasd_io_reqs);seq_printf (m,"total_sectors %u\n" , data->dasd_io_sects);seq_printf (m,"total_pav %u\n" , data->dasd_io_alias);
drivers/s390/block/dasd_eckd.c +10 -6
@@ -531,10 +531,12 @@ static int prefix_LRE(struct ccw1 *ccw, struct PFX_eckd_data *pfxdata, pfxdata->validity.define_extent =1 ;/* private uid is kept up to date, conf_data may be outdated */ -if (startpriv->uid.type !=UA_BASE_DEVICE ) { +if (startpriv->uid.type ==UA_BASE_PAV_ALIAS ) pfxdata->validity.verify_base =1 ; -if (startpriv->uid.type ==UA_HYPER_PAV_ALIAS ) - pfxdata->validity.hyper_pav =1 ; + +if (startpriv->uid.type ==UA_HYPER_PAV_ALIAS ) { + pfxdata->validity.verify_base =1 ; + pfxdata->validity.hyper_pav =1 ; } rc =define_extent (NULL , dedata, trk, totrk, cmd, basedev, blksize);
@@ -3415,10 +3417,12 @@ static int prepare_itcw(struct itcw *itcw, pfxdata.validity.define_extent =1 ;/* private uid is kept up to date, conf_data may be outdated */ -if (startpriv->uid.type !=UA_BASE_DEVICE ) { +if (startpriv->uid.type ==UA_BASE_PAV_ALIAS ) + pfxdata.validity.verify_base =1 ; + +if (startpriv->uid.type ==UA_HYPER_PAV_ALIAS ) { pfxdata.validity.verify_base =1 ; -if (startpriv->uid.type ==UA_HYPER_PAV_ALIAS ) - pfxdata.validity.hyper_pav =1 ; + pfxdata.validity.hyper_pav =1 ; }switch (cmd) {
drivers/s390/block/dasd_int.h +1 -1
@@ -441,7 +441,7 @@ struct dasd_profile_info {unsigned int dasd_io_nr_req[32 ];/* hist. of # of requests in chanq */ /* new data */ -struct timespec starttod;/* time of start or last reset */ +struct timespec64 starttod;/* time of start or last reset */ unsigned int dasd_io_alias;/* requests using an alias */ unsigned int dasd_io_tpm;/* requests using transport mode */ unsigned int dasd_read_reqs;/* total number of read requests */
drivers/s390/char/Kconfig +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 comment "S/390 character device drivers" depends on S390
drivers/s390/char/defkeymap.map +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # Default keymap for 3270 (ebcdic codepage 037). keymaps 0-1,4-5
drivers/s390/cio/blacklist.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef S390_BLACKLIST_H #define S390_BLACKLIST_H
drivers/s390/cio/qdio_main.c +4 -3
@@ -431,8 +431,8 @@ static void process_buffer_error(struct qdio_q *q, int count) q->qdio_error =QDIO_ERROR_SLSB_STATE ;/* special handling for no target buffer empty */ -if ((!q->is_input_q && - (q->sbal[q->first_to_check]->element[15 ].sflags) ==0x10 )) { +if (queue_type (q) ==QDIO_IQDIO_QFMT && !q->is_input_q && + q->sbal[q->first_to_check]->element[15 ].sflags ==0x10 ) {qperf_inc (q, target_full);DBF_DEV_EVENT (DBF_INFO , q->irq_ptr,"OUTFULL FTC:%02x" , q->first_to_check);
@@ -536,7 +536,8 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)case SLSB_P_INPUT_ERROR :process_buffer_error (q, count); q->first_to_check =add_buf (q->first_to_check, count); -atomic_sub (count, &q->nr_buf_used); +if (atomic_sub_return (count, &q->nr_buf_used) ==0 ) +qperf_inc (q, inbound_queue_full);if (q->irq_ptr->perf_stat_enabled)account_sbals_error (q, count);break ;
drivers/s390/net/Kconfig +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 menu "S/390 network device drivers" depends on NETDEVICES && S390
drivers/s390/scsi/Makefile +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the S/390 specific device drivers #