Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbd88cd4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Martin Schwidefsky:
 "Among the traditional bug fixes and cleanups are some improvements:

   - A tool to generated the facility lists, generating the bit fields
     by hand has been a source of bugs in the past

   - The spinlock loop is reordered to avoid bursts of hypervisor calls

   - Add support for the open-for-business interface to the service
     element

   - The get_cpu call is added to the vdso

   - A set of tracepoints is defined for the common I/O layer

   - The deprecated sclp_cpi module is removed

   - Update default configuration"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (56 commits)
  s390/sclp: fix possible control register corruption
  s390: fix normalization bug in exception table sorting
  s390/configs: update default configurations
  s390/vdso: optimize getcpu system call
  s390: drop smp_mb in vdso_init
  s390: rename struct _lowcore to struct lowcore
  s390/mem_detect: use unsigned longs
  s390/ptrace: get rid of long longs in psw_bits
  s390/sysinfo: add missing SYSIB 1.2.2 multithreading fields
  s390: get rid of CONFIG_SCHED_MC and CONFIG_SCHED_BOOK
  s390/Kconfig: remove pointless 64 bit dependencies
  s390/dasd: fix failfast for disconnected devices
  s390/con3270: testing return kzalloc retval
  s390/hmcdrv: constify hmcdrv_ftp_ops structs
  s390/cio: add NULL test
  s390/cio: Change I/O instructions from inline to normal functions
  s390/cio: Introduce common I/O layer tracepoints
  s390/cio: Consolidate inline assemblies and related data definitions
  s390/cio: Fix incorrect xsch opcode specification
  s390/cio: Remove unused inline assemblies
  ...
parents 928b3f12 c2ab7282

Documentation/s390/zfcpdump.txt

+9 −13
Original line number Original line Diff line number Diff line
@@ -15,19 +15,15 @@ the s390-tools package) to make the device bootable. The operator of a Linux 
system can then trigger a SCSI dump by booting the SCSI disk, where zfcpdump

system can then trigger a SCSI dump by booting the SCSI disk, where zfcpdump

resides on.

resides on.





The kernel part of zfcpdump is implemented as a debugfs file under "zcore/mem",

The user space dump tool accesses the memory of the crashed system by means

which exports memory and registers of the crashed Linux in an s390

of the /proc/vmcore interface. This interface exports the crashed system's

standalone dump format. It can be used in the same way as e.g. /dev/mem. The

memory and registers in ELF core dump format. To access the memory which has

dump format defines a 4K header followed by plain uncompressed memory. The

been saved by the hardware SCLP requests will be created at the time the data

register sets are stored in the prefix pages of the respective CPUs. To build a

is needed by /proc/vmcore. The tail part of the crashed systems memory which

dump enabled kernel with the zcore driver, the kernel config option

has not been stashed by hardware can just be copied from real memory.

CONFIG_CRASH_DUMP has to be set. When reading from "zcore/mem", the part of



memory, which has been saved by hardware is read by the driver via the SCLP

To build a dump enabled kernel the kernel config option CONFIG_CRASH_DUMP

hardware interface. The second part is just copied from the non overwritten real

has to be set.

memory.



Since kernel version 3.12 also the /proc/vmcore file can also be used to access

the dump.





To get a valid zfcpdump kernel configuration use "make zfcpdump_defconfig".

To get a valid zfcpdump kernel configuration use "make zfcpdump_defconfig".

arch/s390/Kconfig

+5 −6
Original line number Original line Diff line number Diff line
@@ -166,8 +166,7 @@ config SCHED_OMIT_FRAME_POINTER 




config PGTABLE_LEVELS

config PGTABLE_LEVELS

	int

	int

	default 4 if 64BIT

	default 4

	default 2





source "init/Kconfig"

source "init/Kconfig"
@@ -390,9 +389,6 @@ config HOTPLUG_CPU 
	  can be controlled through /sys/devices/system/cpu/cpu#.

	  can be controlled through /sys/devices/system/cpu/cpu#.

	  Say N if you want to disable CPU hotplug.

	  Say N if you want to disable CPU hotplug.





config SCHED_SMT

	def_bool n



# Some NUMA nodes have memory ranges that span

# Some NUMA nodes have memory ranges that span

# other nodes.	Even though a pfn is valid and

# other nodes.	Even though a pfn is valid and

# between a node's start and end pfns, it may not

# between a node's start and end pfns, it may not
@@ -403,7 +399,7 @@ config NODES_SPAN_OTHER_NODES 




config NUMA

config NUMA

	bool "NUMA support"

	bool "NUMA support"

	depends on SMP && 64BIT && SCHED_TOPOLOGY

	depends on SMP && SCHED_TOPOLOGY

	default n

	default n

	help

	help

	  Enable NUMA support

	  Enable NUMA support
@@ -463,6 +459,9 @@ config EMU_SIZE 




endmenu

endmenu





config SCHED_SMT

	def_bool n



config SCHED_MC

config SCHED_MC

	def_bool n

	def_bool n

arch/s390/Makefile

+9 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,7 @@ drivers-y += drivers/s390/ 
drivers-$(CONFIG_OPROFILE)	+= arch/s390/oprofile/

drivers-$(CONFIG_OPROFILE)	+= arch/s390/oprofile/





boot		:= arch/s390/boot

boot		:= arch/s390/boot

tools		:= arch/s390/tools





all: image bzImage

all: image bzImage
@@ -124,9 +125,17 @@ vdso_install: 




archclean:

archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=$(tools)



archprepare:

	$(Q)$(MAKE) $(build)=$(tools) include/generated/facilities.h





# Don't use tabs in echo arguments

# Don't use tabs in echo arguments

define archhelp

define archhelp

  echo  '* image           - Kernel image for IPL ($(boot)/image)'

  echo  '* image           - Kernel image for IPL ($(boot)/image)'

  echo	'* bzImage         - Compressed kernel image for IPL ($(boot)/bzImage)'

  echo	'* bzImage         - Compressed kernel image for IPL ($(boot)/bzImage)'

  echo	'  install         - Install kernel using'

  echo	'                    (your) ~/bin/$(INSTALLKERNEL) or'

  echo	'                    (distribution) /sbin/$(INSTALLKERNEL) or'

  echo	'                    install to $$(INSTALL_PATH)'

endef
 
endef

arch/s390/configs/default_defconfig

+12 −15
Original line number Original line Diff line number Diff line
@@ -10,28 +10,35 @@ CONFIG_TASKSTATS=y 
CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NUMA_BALANCING=y

CONFIG_NUMA_BALANCING=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_CGROUP_HUGETLB=y

CONFIG_CGROUP_PERF=y

CONFIG_CGROUP_PERF=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_CGROUP=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

CONFIG_OPROFILE=m

CONFIG_KPROBES=y

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

CONFIG_JUMP_LABEL=y

CONFIG_STATIC_KEYS_SELFTEST=y

CONFIG_MODULES=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_UNLOAD=y
@@ -64,7 +71,6 @@ CONFIG_HOTPLUG_PCI=y 
CONFIG_HOTPLUG_PCI_S390=y

CONFIG_HOTPLUG_PCI_S390=y

CONFIG_CHSC_SCH=y

CONFIG_CHSC_SCH=y

CONFIG_CRASH_DUMP=y

CONFIG_CRASH_DUMP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_BINFMT_MISC=m

CONFIG_HIBERNATION=y

CONFIG_HIBERNATION=y

CONFIG_NET=y

CONFIG_NET=y
@@ -106,7 +112,6 @@ CONFIG_TCP_CONG_LP=m 
CONFIG_TCP_CONG_VENO=m

CONFIG_TCP_CONG_VENO=m

CONFIG_TCP_CONG_YEAH=m

CONFIG_TCP_CONG_YEAH=m

CONFIG_TCP_CONG_ILLINOIS=m

CONFIG_TCP_CONG_ILLINOIS=m

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_ESP=m
@@ -457,19 +462,9 @@ CONFIG_INFINIBAND=m 
CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_BALLOON=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_JBD_DEBUG=y

CONFIG_JBD2_DEBUG=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y

CONFIG_JFS_POSIX_ACL=y
@@ -490,7 +485,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y 
CONFIG_QFMT_V1=m

CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m

CONFIG_QFMT_V2=m

CONFIG_AUTOFS4_FS=m

CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_CUSE=m

CONFIG_FSCACHE=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m

CONFIG_CACHEFILES=m
@@ -542,10 +537,11 @@ CONFIG_DLM=m 
CONFIG_PRINTK_TIME=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO=y

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_FRAME_WARN=1024

CONFIG_FRAME_WARN=1024

CONFIG_READABLE_ASM=y

CONFIG_READABLE_ASM=y

CONFIG_UNUSED_SYMBOLS=y

CONFIG_UNUSED_SYMBOLS=y

CONFIG_HEADERS_CHECK=y

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_DEBUG_OBJECTS=y

CONFIG_DEBUG_OBJECTS=y
@@ -588,6 +584,7 @@ CONFIG_FAILSLAB=y 
CONFIG_FAIL_PAGE_ALLOC=y

CONFIG_FAIL_PAGE_ALLOC=y

CONFIG_FAIL_MAKE_REQUEST=y

CONFIG_FAIL_MAKE_REQUEST=y

CONFIG_FAIL_IO_TIMEOUT=y

CONFIG_FAIL_IO_TIMEOUT=y

CONFIG_FAIL_FUTEX=y

CONFIG_FAULT_INJECTION_DEBUG_FS=y

CONFIG_FAULT_INJECTION_DEBUG_FS=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_LATENCYTOP=y

CONFIG_LATENCYTOP=y

arch/s390/configs/gcov_defconfig

+10 −14
Original line number Original line Diff line number Diff line
@@ -10,21 +10,27 @@ CONFIG_TASKSTATS=y 
CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NUMA_BALANCING=y

CONFIG_NUMA_BALANCING=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_CGROUP_HUGETLB=y

CONFIG_CGROUP_PERF=y

CONFIG_CGROUP_PERF=y

CONFIG_BLK_CGROUP=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

CONFIG_OPROFILE=m
@@ -61,7 +67,6 @@ CONFIG_HOTPLUG_PCI=y 
CONFIG_HOTPLUG_PCI_S390=y

CONFIG_HOTPLUG_PCI_S390=y

CONFIG_CHSC_SCH=y

CONFIG_CHSC_SCH=y

CONFIG_CRASH_DUMP=y

CONFIG_CRASH_DUMP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_BINFMT_MISC=m

CONFIG_HIBERNATION=y

CONFIG_HIBERNATION=y

CONFIG_NET=y

CONFIG_NET=y
@@ -103,7 +108,6 @@ CONFIG_TCP_CONG_LP=m 
CONFIG_TCP_CONG_VENO=m

CONFIG_TCP_CONG_VENO=m

CONFIG_TCP_CONG_YEAH=m

CONFIG_TCP_CONG_YEAH=m

CONFIG_TCP_CONG_ILLINOIS=m

CONFIG_TCP_CONG_ILLINOIS=m

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_ESP=m
@@ -453,19 +457,9 @@ CONFIG_INFINIBAND=m 
CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_BALLOON=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_JBD_DEBUG=y

CONFIG_JBD2_DEBUG=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y

CONFIG_JFS_POSIX_ACL=y
@@ -485,7 +479,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y 
CONFIG_QFMT_V1=m

CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m

CONFIG_QFMT_V2=m

CONFIG_AUTOFS4_FS=m

CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_CUSE=m

CONFIG_FSCACHE=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m

CONFIG_CACHEFILES=m
@@ -550,6 +544,7 @@ CONFIG_NOTIFIER_ERROR_INJECTION=m 
CONFIG_CPU_NOTIFIER_ERROR_INJECT=m

CONFIG_CPU_NOTIFIER_ERROR_INJECT=m

CONFIG_PM_NOTIFIER_ERROR_INJECT=m

CONFIG_PM_NOTIFIER_ERROR_INJECT=m

CONFIG_LATENCYTOP=y

CONFIG_LATENCYTOP=y

CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_BLK_DEV_IO_TRACE=y

# CONFIG_KPROBE_EVENT is not set

# CONFIG_KPROBE_EVENT is not set

CONFIG_LKDTM=m

CONFIG_LKDTM=m
@@ -557,6 +552,7 @@ CONFIG_RBTREE_TEST=m 
CONFIG_INTERVAL_TREE_TEST=m

CONFIG_INTERVAL_TREE_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BPF=m

# CONFIG_STRICT_DEVMEM is not set

# CONFIG_STRICT_DEVMEM is not set

CONFIG_S390_PTDUMP=y

CONFIG_S390_PTDUMP=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_ENCRYPTED_KEYS=m