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

Merge tag 's390-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull more s390 updates from Heiko Carstens:

 - add support for system call stack randomization

 - handle stale PCI deconfiguration events

 - couple of defconfig updates

 - some fixes and cleanups

* tag 's390-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: fix detection of vector enhancements facility 1 vs. vector packed decimal facility
  s390/entry: add support for syscall stack randomization
  s390/configs: change CONFIG_VIRTIO_CONSOLE to "m"
  s390/cio: remove invalid condition on IO_SCH_UNREG
  s390/cpumf: remove call to perf_event_update_userpage
  s390/cpumf: move counter set size calculation to common place
  s390/cpumf: beautify if-then-else indentation
  s390/configs: enable CONFIG_PCI_IOV
  s390/pci: handle stale deconfiguration events
  s390/pci: rename zpci_configure_device()
parents a2de4bbd b2081086

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ config S390 
	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_KASAN

	select HAVE_ARCH_KASAN_VMALLOC

	select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_SOFT_DIRTY

	select HAVE_ARCH_TRACEHOOK

arch/s390/configs/debug_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ CONFIG_CGROUP_NET_PRIO=y 
CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m

CONFIG_PCI=y

CONFIG_PCI_IOV=y

# CONFIG_PCIEASPM is not set

CONFIG_PCI_DEBUG=y

CONFIG_HOTPLUG_PCI=y
@@ -548,7 +549,7 @@ CONFIG_INPUT_EVDEV=y 
# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_LEGACY_PTY_COUNT=0

CONFIG_VIRTIO_CONSOLE=y

CONFIG_VIRTIO_CONSOLE=m

CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_RAW_DRIVER=m

CONFIG_HANGCHECK_TIMER=m

arch/s390/configs/defconfig

+2 −1
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ CONFIG_CGROUP_NET_PRIO=y 
CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m

CONFIG_PCI=y

CONFIG_PCI_IOV=y

# CONFIG_PCIEASPM is not set

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_S390=y
@@ -540,7 +541,7 @@ CONFIG_INPUT_EVDEV=y 
# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_LEGACY_PTY_COUNT=0

CONFIG_VIRTIO_CONSOLE=y

CONFIG_VIRTIO_CONSOLE=m

CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_RAW_DRIVER=m

CONFIG_HANGCHECK_TIMER=m

arch/s390/include/asm/cpu_mcf.h

+2 −0
Original line number Diff line number Diff line
@@ -123,4 +123,6 @@ static inline int stccm_avail(void) 
	return test_facility(142);

}



size_t cpum_cf_ctrset_size(enum cpumf_ctr_set ctrset,

			   struct cpumf_ctr_info *info);

#endif /* _ASM_S390_CPU_MCF_H */

arch/s390/include/asm/entry-common.h

+10 −0
Original line number Diff line number Diff line
@@ -4,9 +4,11 @@ 


#include <linux/sched.h>

#include <linux/audit.h>

#include <linux/randomize_kstack.h>

#include <linux/tracehook.h>

#include <linux/processor.h>

#include <linux/uaccess.h>

#include <asm/timex.h>

#include <asm/fpu/api.h>



#define ARCH_EXIT_TO_USER_MODE_WORK (_TIF_GUARDED_STORAGE | _TIF_PER_TRAP)
@@ -48,6 +50,14 @@ static __always_inline void arch_exit_to_user_mode(void) 


#define arch_exit_to_user_mode arch_exit_to_user_mode



static inline void arch_exit_to_user_mode_prepare(struct pt_regs *regs,

						  unsigned long ti_work)

{

	choose_random_kstack_offset(get_tod_clock_fast() & 0xff);

}



#define arch_exit_to_user_mode_prepare arch_exit_to_user_mode_prepare



static inline bool on_thread_stack(void)

{

	return !(((unsigned long)(current->stack) ^ current_stack_pointer()) & ~(THREAD_SIZE - 1));