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

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

Pull s390 fixes from Heiko Carstens:

 - Use correct locking in zPCI event code to avoid deadlock

 - Get rid of irqs_registered flag in zpci_dev structure and restore IRQ
   unconditionally for zPCI devices. This fixes sit uations where the
   flag was not correctly updated

 - Fix potential memory leak kernel page table dumper code

 - Disable (revert) ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP for s390 again.

   The optimized hugetlb vmemmap code modifies kernel page tables in a
   way which does not work on s390 and leads to reproducible kernel
   crashes due to stale TLB entries. This needs to be addressed with
   some larger changes. For now simply disable the feature

 - Update defconfigs

* tag 's390-6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: Disable ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP
  s390/mm: Fix memory leak in add_marker() when kvrealloc() fails
  s390/pci: Restore IRQ unconditionally for the zPCI device
  s390: Update defconfigs
  s390/pci: Avoid deadlock between PCI error recovery and mlx5 crdump
parents b909d773 64e2f60f

arch/s390/Kconfig

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

	select ARCH_WANT_KERNEL_PMD_MKWRITE

	select ARCH_WANT_LD_ORPHAN_WARN

	select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP

	select ARCH_WANTS_THP_SWAP

	select BUILDTIME_TABLE_SORT

	select CLONE_BACKWARDS2

arch/s390/configs/debug_defconfig

+9 −5
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ CONFIG_SLUB_STATS=y 
CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_PERSISTENT_HUGE_ZERO_FOLIO=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CMA_DEBUGFS=y

CONFIG_CMA_SYSFS=y
@@ -123,12 +124,12 @@ CONFIG_TLS_DEVICE=y 
CONFIG_TLS_TOE=y

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_DIBS=y

CONFIG_DIBS_LO=y

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_DIBS=y

CONFIG_DIBS_LO=y

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -472,6 +473,7 @@ CONFIG_SCSI_DH_EMC=m 
CONFIG_SCSI_DH_ALUA=m

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LLBITMAP=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_CLUSTER=m
@@ -654,9 +656,12 @@ CONFIG_JFS_POSIX_ACL=y 
CONFIG_JFS_SECURITY=y

CONFIG_JFS_STATISTICS=y

CONFIG_XFS_FS=y

CONFIG_XFS_SUPPORT_V4=y

CONFIG_XFS_SUPPORT_ASCII_CI=y

CONFIG_XFS_QUOTA=y

CONFIG_XFS_POSIX_ACL=y

CONFIG_XFS_RT=y

# CONFIG_XFS_ONLINE_SCRUB is not set

CONFIG_XFS_DEBUG=y

CONFIG_GFS2_FS=m

CONFIG_GFS2_FS_LOCKING_DLM=y
@@ -666,7 +671,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y 
CONFIG_BTRFS_DEBUG=y

CONFIG_BTRFS_ASSERT=y

CONFIG_NILFS2_FS=m

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_VERITY=y

arch/s390/configs/defconfig

+9 −5
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ CONFIG_SLAB_BUCKETS=y 
CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_PERSISTENT_HUGE_ZERO_FOLIO=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CMA_SYSFS=y

CONFIG_CMA_AREAS=7
@@ -114,12 +115,12 @@ CONFIG_TLS_DEVICE=y 
CONFIG_TLS_TOE=y

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_DIBS=y

CONFIG_DIBS_LO=y

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_DIBS=y

CONFIG_DIBS_LO=y

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -462,6 +463,7 @@ CONFIG_SCSI_DH_EMC=m 
CONFIG_SCSI_DH_ALUA=m

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LLBITMAP=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_CLUSTER=m
@@ -644,16 +646,18 @@ CONFIG_JFS_POSIX_ACL=y 
CONFIG_JFS_SECURITY=y

CONFIG_JFS_STATISTICS=y

CONFIG_XFS_FS=y

CONFIG_XFS_SUPPORT_V4=y

CONFIG_XFS_SUPPORT_ASCII_CI=y

CONFIG_XFS_QUOTA=y

CONFIG_XFS_POSIX_ACL=y

CONFIG_XFS_RT=y

# CONFIG_XFS_ONLINE_SCRUB is not set

CONFIG_GFS2_FS=m

CONFIG_GFS2_FS_LOCKING_DLM=y

CONFIG_OCFS2_FS=m

CONFIG_BTRFS_FS=y

CONFIG_BTRFS_FS_POSIX_ACL=y

CONFIG_NILFS2_FS=m

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_VERITY=y

arch/s390/configs/zfcpdump_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ CONFIG_NET=y 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_SAFE=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_DCSSBLK is not set

# CONFIG_DASD is not set

CONFIG_ENCLOSURE_SERVICES=y

CONFIG_SCSI=y

arch/s390/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ struct zpci_dev { 
	u8		has_resources	: 1;

	u8		is_physfn	: 1;

	u8		util_str_avail	: 1;

	u8		irqs_registered	: 1;

	u8		tid_avail	: 1;

	u8		rtr_avail	: 1; /* Relaxed translation allowed */

	unsigned int	devfn;		/* DEVFN part of the RID*/