Commit 7eb36254 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Vasily Gorbik:

 - Fix loading of modules with lots of relocations and add a regression
   test for it.

 - Fix machine check handling for vector validity and guarded storage
   validity failures in KVM guests.

 - Fix hypervisor performance data to include z/VM guests with access
   control group set.

 - Fix z900 build problem in uaccess code.

 - Update defconfigs.

* tag 's390-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/hypfs: include z/VM guests with access control group set
  s390: update defconfigs
  s390/module: test loading modules with a lot of relocations
  s390/module: fix loading modules with a lot of relocations
  s390/uaccess: fix compile error
  s390/nmi: handle vector validity failures for KVM guests
  s390/nmi: handle guarded storage validity failures for KVM guests
parents 8157f470 663d34c8

arch/s390/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -945,6 +945,9 @@ config S390_GUEST 


endmenu



config S390_MODULES_SANITY_TEST_HELPERS

	def_bool n



menu "Selftests"



config S390_UNWIND_SELFTEST
@@ -971,4 +974,16 @@ config S390_KPROBES_SANITY_TEST 


	  Say N if you are unsure.



config S390_MODULES_SANITY_TEST

	def_tristate n

	depends on KUNIT

	default KUNIT_ALL_TESTS

	prompt "Enable s390 specific modules tests"

	select S390_MODULES_SANITY_TEST_HELPERS

	help

	  This option enables an s390 specific modules test. This option is

	  not useful for distributions or general kernels, but only for

	  kernel developers working on architecture code.



	  Say N if you are unsure.

endmenu

arch/s390/configs/debug_defconfig

+10 −10
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ CONFIG_APPLDATA_BASE=y 
CONFIG_KVM=m

CONFIG_S390_UNWIND_SELFTEST=m

CONFIG_S390_KPROBES_SANITY_TEST=m

CONFIG_S390_MODULES_SANITY_TEST=m

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

CONFIG_STATIC_KEYS_SELFTEST=y
@@ -96,7 +97,6 @@ CONFIG_MEMORY_HOTPLUG=y 
CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_FRONTSWAP=y

CONFIG_CMA_DEBUG=y

CONFIG_CMA_DEBUGFS=y

CONFIG_CMA_SYSFS=y
@@ -109,6 +109,7 @@ CONFIG_DEFERRED_STRUCT_PAGE_INIT=y 
CONFIG_IDLE_PAGE_TRACKING=y

CONFIG_PERCPU_STATS=y

CONFIG_GUP_TEST=y

CONFIG_ANON_VMA_NAME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=m
@@ -116,7 +117,6 @@ CONFIG_UNIX=y 
CONFIG_UNIX_DIAG=m

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_NET_SWITCHDEV=y

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_INET=y
@@ -185,7 +185,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m 
CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_INET=y

CONFIG_NFT_CT=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_NAT=m
@@ -391,6 +390,7 @@ CONFIG_OPENVSWITCH=m 
CONFIG_VSOCKETS=m

CONFIG_VIRTIO_VSOCKETS=m

CONFIG_NETLINK_DIAG=m

CONFIG_NET_SWITCHDEV=y

CONFIG_CGROUP_NET_PRIO=y

CONFIG_NET_PKTGEN=m

CONFIG_PCI=y
@@ -400,6 +400,7 @@ CONFIG_PCI_IOV=y 
CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_S390=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_SAFE=y

CONFIG_CONNECTOR=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=m
@@ -501,6 +502,7 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_DEC is not set

# CONFIG_NET_VENDOR_DLINK is not set

# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_ENGLEDER is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_GOOGLE is not set

# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -511,7 +513,6 @@ CONFIG_NLMON=m 
CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m

CONFIG_MLX5_CORE_EN=y

CONFIG_MLX5_ESWITCH=y

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -542,6 +543,7 @@ CONFIG_MLX5_ESWITCH=y 
# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_TEHUTI is not set

# CONFIG_NET_VENDOR_TI is not set

# CONFIG_NET_VENDOR_VERTEXCOM is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_NET_VENDOR_XILINX is not set
@@ -592,6 +594,7 @@ CONFIG_VIRTIO_BALLOON=m 
CONFIG_VIRTIO_INPUT=y

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

# CONFIG_SURFACE_PLATFORMS is not set

CONFIG_S390_CCW_IOMMU=y

CONFIG_S390_AP_IOMMU=y

CONFIG_EXT4_FS=y
@@ -756,9 +759,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=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
@@ -774,6 +774,8 @@ CONFIG_CRYPTO_GHASH_S390=m 
CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_CORDIC=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

CONFIG_CRC32_SELFTEST=y

CONFIG_CRC4=m

CONFIG_CRC7=m
@@ -807,7 +809,6 @@ CONFIG_SLUB_DEBUG_ON=y 
CONFIG_SLUB_STATS=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_VM_VMACACHE=y

CONFIG_DEBUG_VM_PGFLAGS=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
@@ -819,12 +820,11 @@ 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_LOCKDEP=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_LOCKING_API_SELFTESTS=y

CONFIG_DEBUG_IRQFLAGS=y

CONFIG_DEBUG_SG=y

CONFIG_DEBUG_NOTIFIERS=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

arch/s390/configs/defconfig

+9 −7
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ CONFIG_APPLDATA_BASE=y 
CONFIG_KVM=m

CONFIG_S390_UNWIND_SELFTEST=m

CONFIG_S390_KPROBES_SANITY_TEST=m

CONFIG_S390_MODULES_SANITY_TEST=m

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

# CONFIG_GCC_PLUGINS is not set
@@ -91,7 +92,6 @@ CONFIG_MEMORY_HOTPLUG=y 
CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_FRONTSWAP=y

CONFIG_CMA_SYSFS=y

CONFIG_CMA_AREAS=7

CONFIG_MEM_SOFT_DIRTY=y
@@ -101,6 +101,7 @@ CONFIG_ZSMALLOC_STAT=y 
CONFIG_DEFERRED_STRUCT_PAGE_INIT=y

CONFIG_IDLE_PAGE_TRACKING=y

CONFIG_PERCPU_STATS=y

CONFIG_ANON_VMA_NAME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=m
@@ -108,7 +109,6 @@ CONFIG_UNIX=y 
CONFIG_UNIX_DIAG=m

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_NET_SWITCHDEV=y

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_INET=y
@@ -177,7 +177,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m 
CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_INET=y

CONFIG_NFT_CT=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_NAT=m
@@ -382,6 +381,7 @@ CONFIG_OPENVSWITCH=m 
CONFIG_VSOCKETS=m

CONFIG_VIRTIO_VSOCKETS=m

CONFIG_NETLINK_DIAG=m

CONFIG_NET_SWITCHDEV=y

CONFIG_CGROUP_NET_PRIO=y

CONFIG_NET_PKTGEN=m

CONFIG_PCI=y
@@ -391,6 +391,7 @@ CONFIG_HOTPLUG_PCI=y 
CONFIG_HOTPLUG_PCI_S390=y

CONFIG_UEVENT_HELPER=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_SAFE=y

CONFIG_CONNECTOR=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=m
@@ -492,6 +493,7 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_DEC is not set

# CONFIG_NET_VENDOR_DLINK is not set

# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_ENGLEDER is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_GOOGLE is not set

# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -502,7 +504,6 @@ CONFIG_NLMON=m 
CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m

CONFIG_MLX5_CORE_EN=y

CONFIG_MLX5_ESWITCH=y

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -533,6 +534,7 @@ CONFIG_MLX5_ESWITCH=y 
# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_TEHUTI is not set

# CONFIG_NET_VENDOR_TI is not set

# CONFIG_NET_VENDOR_VERTEXCOM is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_NET_VENDOR_XILINX is not set
@@ -582,6 +584,7 @@ CONFIG_VIRTIO_BALLOON=m 
CONFIG_VIRTIO_INPUT=y

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

# CONFIG_SURFACE_PLATFORMS is not set

CONFIG_S390_CCW_IOMMU=y

CONFIG_S390_AP_IOMMU=y

CONFIG_EXT4_FS=y
@@ -743,9 +746,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=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
@@ -762,6 +762,8 @@ CONFIG_CRYPTO_CRC32_S390=y 
CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_CORDIC=m

CONFIG_PRIME_NUMBERS=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

CONFIG_CRC4=m

CONFIG_CRC7=m

CONFIG_CRC8=m

arch/s390/configs/zfcpdump_defconfig

+3 −0
Original line number Diff line number Diff line 
# CONFIG_SWAP is not set

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BPF_SYSCALL=y

# CONFIG_CPU_ISOLATION is not set

# CONFIG_UTS_NS is not set

# CONFIG_TIME_NS is not set
@@ -34,6 +35,7 @@ CONFIG_NET=y 
# CONFIG_PCPU_DEV_REFCNT is not set

# CONFIG_ETHTOOL_NETLINK is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_SAFE=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_DCSSBLK is not set

# CONFIG_DASD is not set
@@ -58,6 +60,7 @@ CONFIG_ZFCP=y 
# CONFIG_HID is not set

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_SURFACE_PLATFORMS is not set

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

arch/s390/hypfs/hypfs_vm.c

+4 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


static char local_guest[] = "        ";

static char all_guests[] = "*       ";

static char *all_groups = all_guests;

static char *guest_query;



struct diag2fc_data {
@@ -62,10 +63,11 @@ static int diag2fc(int size, char* query, void *addr) 


	memcpy(parm_list.userid, query, NAME_LEN);

	ASCEBC(parm_list.userid, NAME_LEN);

	memcpy(parm_list.aci_grp, all_groups, NAME_LEN);

	ASCEBC(parm_list.aci_grp, NAME_LEN);

	parm_list.addr = (unsigned long)addr;

	parm_list.size = size;

	parm_list.fmt = 0x02;

	memset(parm_list.aci_grp, 0x40, NAME_LEN);

	rc = -1;



	diag_stat_inc(DIAG_STAT_X2FC);