Merge tag 's390-5.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_WATCH_QUEUE=y

CONFIG_AUDIT=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NUMA_BALANCING=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_USER_NS=y

CONFIG_CHECKPOINT_RESTORE=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_BPF_LSM=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_VFIO_CCW=m

CONFIG_VFIO_AP=m

CONFIG_CRASH_DUMP=y

CONFIG_HIBERNATION=y

CONFIG_PM_DEBUG=y

CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y

CONFIG_CMM=m

CONFIG_APPLDATA_BASE=y

CONFIG_KVM=m

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

CONFIG_S390_UNWIND_SELFTEST=y

CONFIG_OPROFILE=m

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

CONFIG_BLK_WBT=y

CONFIG_BLK_CGROUP_IOLATENCY=y

CONFIG_BLK_CGROUP_IOCOST=y

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_BSD_DISKLABEL=y

CONFIG_CMA_DEBUGFS=y

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZSWAP=y

CONFIG_ZBUD=m

CONFIG_ZSMALLOC=m

CONFIG_ZSMALLOC_STAT=y

CONFIG_DEFERRED_STRUCT_PAGE_INIT=y

CONFIG_NET_IPVTI=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_ESPINTCP=y

CONFIG_INET_IPCOMP=m

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_ESPINTCP=y

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_MIP6=m

CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_IPV6_RPL_LWTUNNEL=y

CONFIG_MPTCP=y

CONFIG_NETFILTER=y

CONFIG_BRIDGE_NETFILTER=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_L2TP_IP=m

CONFIG_L2TP_ETH=m

CONFIG_BRIDGE=m

CONFIG_BRIDGE_MRP=y

CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_FQ_CODEL=m

CONFIG_NET_SCH_INGRESS=m

CONFIG_NET_SCH_PLUG=m

CONFIG_NET_SCH_ETS=m

CONFIG_NET_CLS_BASIC=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_ACT_SIMP=m

CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_NET_ACT_GATE=m

CONFIG_DNS_RESOLVER=y

CONFIG_OPENVSWITCH=m

CONFIG_VSOCKETS=m

CONFIG_NET_PKTGEN=m

# CONFIG_NET_DROP_MONITOR is not set

CONFIG_PCI=y

# CONFIG_PCIEASPM is not set

CONFIG_PCI_DEBUG=y

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_S390=y

CONFIG_DM_MULTIPATH=m

CONFIG_DM_MULTIPATH_QL=m

CONFIG_DM_MULTIPATH_ST=m

CONFIG_DM_MULTIPATH_HST=m

CONFIG_DM_DELAY=m

CONFIG_DM_UEVENT=y

CONFIG_DM_FLAKEY=m

CONFIG_IFB=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_VXLAN=m

CONFIG_BAREUDP=m

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_VIRTIO_NET=m

CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m

CONFIG_MLX5_CORE_EN=y

# CONFIG_MLXFW is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set

# CONFIG_NET_VENDOR_TI is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_NET_VENDOR_XILINX is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m

CONFIG_VIRTIO_PCI=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_INPUT=y

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

CONFIG_S390_CCW_IOMMU=y

CONFIG_S390_AP_IOMMU=y

CONFIG_EXT4_FS=y

CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_NTFS_FS=m

CONFIG_NTFS_RW=y

CONFIG_PROC_KCORE=y

CONFIG_DLM=m

CONFIG_UNICODE=y

CONFIG_PERSISTENT_KEYRINGS=y

CONFIG_BIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_SEQIV=y

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_STATS=y

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_PANIC_ON_OOPS=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_WQ_WATCHDOG=y

CONFIG_TEST_LOCKUP=m

CONFIG_DEBUG_TIMEKEEPING=y

CONFIG_PROVE_LOCKING=y

CONFIG_LOCK_STAT=y

CONFIG_DEBUG_CREDENTIALS=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_CPU_STALL_TIMEOUT=300

# CONFIG_RCU_TRACE is not set

CONFIG_LATENCYTOP=y

CONFIG_BOOTTIME_TRACING=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_STACK_TRACER=y

CONFIG_IRQSOFF_TRACER=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_LKDTM=m

CONFIG_TEST_LIST_SORT=y

CONFIG_TEST_MIN_HEAP=y

CONFIG_TEST_SORT=y

CONFIG_KPROBES_SANITY_TEST=y

CONFIG_RBTREE_TEST=y

CONFIG_INTERVAL_TREE_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BITOPS=m

CONFIG_TEST_BPF=m

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_WATCH_QUEUE=y

CONFIG_AUDIT=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NUMA_BALANCING=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_USER_NS=y

CONFIG_CHECKPOINT_RESTORE=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_BPF_LSM=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_TUNE_ZEC12=y

CONFIG_NR_CPUS=512

CONFIG_NUMA=y

# CONFIG_NUMA_EMU is not set

CONFIG_HZ_100=y

CONFIG_KEXEC_FILE=y

CONFIG_KEXEC_SIG=y

CONFIG_VFIO_CCW=m

CONFIG_VFIO_AP=m

CONFIG_CRASH_DUMP=y

CONFIG_HIBERNATION=y

CONFIG_PM_DEBUG=y

CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y

CONFIG_CMM=m

CONFIG_APPLDATA_BASE=y

CONFIG_KVM=m

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

CONFIG_S390_UNWIND_SELFTEST=m

CONFIG_OPROFILE=m

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

CONFIG_BLK_WBT=y

CONFIG_BLK_CGROUP_IOLATENCY=y

CONFIG_BLK_CGROUP_IOCOST=y

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_BSD_DISKLABEL=y

CONFIG_FRONTSWAP=y

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZSWAP=y

CONFIG_ZBUD=m

CONFIG_ZSMALLOC=m

CONFIG_ZSMALLOC_STAT=y

CONFIG_DEFERRED_STRUCT_PAGE_INIT=y

CONFIG_NET_IPVTI=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_ESPINTCP=y

CONFIG_INET_IPCOMP=m

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_ESPINTCP=y

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_MIP6=m

CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_IPV6_RPL_LWTUNNEL=y

CONFIG_MPTCP=y

CONFIG_NETFILTER=y

CONFIG_BRIDGE_NETFILTER=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_L2TP_IP=m

CONFIG_L2TP_ETH=m

CONFIG_BRIDGE=m

CONFIG_BRIDGE_MRP=y

CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_FQ_CODEL=m

CONFIG_NET_SCH_INGRESS=m

CONFIG_NET_SCH_PLUG=m

CONFIG_NET_SCH_ETS=m

CONFIG_NET_CLS_BASIC=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_ACT_SIMP=m

CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_NET_ACT_GATE=m

CONFIG_DNS_RESOLVER=y

CONFIG_OPENVSWITCH=m

CONFIG_VSOCKETS=m

CONFIG_NET_PKTGEN=m

# CONFIG_NET_DROP_MONITOR is not set

CONFIG_PCI=y

# CONFIG_PCIEASPM is not set

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_S390=y

CONFIG_UEVENT_HELPER=y

CONFIG_DM_MULTIPATH=m

CONFIG_DM_MULTIPATH_QL=m

CONFIG_DM_MULTIPATH_ST=m

CONFIG_DM_MULTIPATH_HST=m

CONFIG_DM_DELAY=m

CONFIG_DM_UEVENT=y

CONFIG_DM_FLAKEY=m

CONFIG_IFB=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_VXLAN=m

CONFIG_BAREUDP=m

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_VIRTIO_NET=m

CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m

CONFIG_MLX5_CORE_EN=y

# CONFIG_MLXFW is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set

# CONFIG_NET_VENDOR_TI is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_NET_VENDOR_XILINX is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m

CONFIG_VIRTIO_PCI=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_INPUT=y

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

CONFIG_S390_CCW_IOMMU=y

CONFIG_S390_AP_IOMMU=y

CONFIG_EXT4_FS=y

CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_NTFS_FS=m

CONFIG_NTFS_RW=y

CONFIG_PROC_KCORE=y

CONFIG_DLM=m

CONFIG_UNICODE=y

CONFIG_PERSISTENT_KEYRINGS=y

CONFIG_BIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_SEQIV=y

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_STATS=y

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CORDIC=m

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC4=m

CONFIG_CRC7=m

CONFIG_CRC8=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_TEST_LOCKUP=m

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_LATENCYTOP=y

CONFIG_BOOTTIME_TRACING=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_STACK_TRACER=y

CONFIG_SCHED_TRACER=y

# CONFIG_BOUNCE is not set

CONFIG_NET=y

# CONFIG_IUCV is not set

# CONFIG_ETHTOOL_NETLINK is not set

CONFIG_DEVTMPFS=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_BLK_DEV_XPRAM is not set

# CONFIG_MONWRITER is not set

# CONFIG_S390_VMUR is not set

# CONFIG_HID is not set

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

# CONFIG_MISC_FILESYSTEMS is not set

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_LSM="yama,loadpin,safesetid,integrity"

# CONFIG_ZLIB_DFLTCC is not set

CONFIG_PRINTK_TIME=y

# CONFIG_SYMBOLIC_ERRNAME is not set

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

	return err;

}

static bool is_callchain_event(struct perf_event *event)

{

	u64 sample_type = event->attr.sample_type;

	return sample_type & (PERF_SAMPLE_CALLCHAIN | PERF_SAMPLE_REGS_USER |

			      PERF_SAMPLE_STACK_USER);

}

static int cpumsf_pmu_event_init(struct perf_event *event)

{

	int err;

	/* No support for taken branch sampling */

	if (has_branch_stack(event))

	/* No support for callchain, stacks and registers */

	if (has_branch_stack(event) || is_callchain_event(event))

		return -EOPNOTSUPP;

	switch (event->attr.type) {

	if (IS_ENABLED(CONFIG_EXPOLINE_AUTO))

		nospec_auto_detect();

	jump_label_init();

	parse_early_param();

#ifdef CONFIG_CRASH_DUMP

	/* Deactivate elfcorehdr= kernel parameter */