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

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

Pull s390 fixes from Alexander Gordeev:

 - Add check whether the required facilities are installed before using
   the s390-specific ChaCha20 implementation

 - Key blobs for s390 protected key interface IOCTLs commands
   PKEY_VERIFYKEY2 and PKEY_VERIFYKEY3 may contain clear key material.
   Zeroize copies of these keys in kernel memory after creating
   protected keys

 - Set CONFIG_INIT_STACK_NONE=y in defconfigs to avoid extra overhead of
   initializing all stack variables by default

 - Make sure that when a new channel-path is enabled all subchannels are
   evaluated: with and without any devices connected on it

 - When SMT thread CPUs are added to CPU topology masks the nr_cpu_ids
   limit is not checked and could be exceeded. Respect the nr_cpu_ids
   limit and avoid a warning when CONFIG_DEBUG_PER_CPU_MAPS is set

 - The pointer to IPL Parameter Information Block is stored in the
   absolute lowcore as a virtual address. Save it as the physical
   address for later use by dump tools

 - Fix a Queued Direct I/O (QDIO) problem on z/VM guests using QIOASSIST
   with dedicated (pass through) QDIO-based devices such as FCP, real
   OSA or HiperSockets

 - s390's struct statfs and struct statfs64 contain padding, which
   field-by-field copying does not set. Initialize the respective
   structures with zeros before filling them and copying to userspace

 - Grow s390 compat_statfs64, statfs and statfs64 structures f_spare
   array member to cover padding and simplify things

 - Remove obsolete SCHED_BOOK and SCHED_DRAWER configs

 - Remove unneeded S390_CCW_IOMMU and S390_AP_IOM configs

* tag 's390-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/iommu: get rid of S390_CCW_IOMMU and S390_AP_IOMMU
  s390/Kconfig: remove obsolete configs SCHED_{BOOK,DRAWER}
  s390/uapi: cover statfs padding by growing f_spare
  statfs: enforce statfs[64] structure initialization
  s390/qdio: fix do_sqbs() inline assembly constraint
  s390/ipl: fix IPIB virtual vs physical address confusion
  s390/topology: honour nr_cpu_ids when adding CPUs
  s390/cio: include subchannels without devices also for evaluation
  s390/defconfigs: set CONFIG_INIT_STACK_NONE=y
  s390/pkey: zeroize key blobs
  s390/crypto: use vector instructions only if available for ChaCha20
parents 4ffd96c9 0f1cbf94

Documentation/s390/vfio-ap.rst

+0 −1
Original line number Diff line number Diff line
@@ -551,7 +551,6 @@ These are the steps: 
   * IOMMU_SUPPORT

   * S390

   * ZCRYPT

   * S390_AP_IOMMU

   * VFIO

   * KVM

arch/s390/Kconfig

+1 −10
Original line number Diff line number Diff line
@@ -469,19 +469,11 @@ config SCHED_SMT 
config SCHED_MC

	def_bool n



config SCHED_BOOK

	def_bool n



config SCHED_DRAWER

	def_bool n



config SCHED_TOPOLOGY

	def_bool y

	prompt "Topology scheduler support"

	select SCHED_SMT

	select SCHED_MC

	select SCHED_BOOK

	select SCHED_DRAWER

	help

	  Topology scheduler support improves the CPU scheduler's decision

	  making when dealing with machines that have multi-threading,
@@ -716,7 +708,6 @@ config EADM_SCH 
config VFIO_CCW

	def_tristate n

	prompt "Support for VFIO-CCW subchannels"

	depends on S390_CCW_IOMMU

	depends on VFIO

	select VFIO_MDEV

	help
@@ -728,7 +719,7 @@ config VFIO_CCW 
config VFIO_AP

	def_tristate n

	prompt "VFIO support for AP devices"

	depends on S390_AP_IOMMU && KVM

	depends on KVM

	depends on VFIO

	depends on ZCRYPT

	select VFIO_MDEV

arch/s390/configs/debug_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -591,8 +591,6 @@ 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_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y
@@ -703,6 +701,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y 
CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"

CONFIG_INIT_STACK_NONE=y

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_PCRYPT=m

arch/s390/configs/defconfig

+1 −2
Original line number Diff line number Diff line
@@ -580,8 +580,6 @@ 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_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y
@@ -686,6 +684,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y 
CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"

CONFIG_INIT_STACK_NONE=y

CONFIG_CRYPTO_FIPS=y

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

arch/s390/configs/zfcpdump_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ CONFIG_ZFCP=y 
# CONFIG_MISC_FILESYSTEMS is not set

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_LSM="yama,loadpin,safesetid,integrity"

CONFIG_INIT_STACK_NONE=y

# CONFIG_ZLIB_DFLTCC is not set

CONFIG_XZ_DEC_MICROLZMA=y

CONFIG_PRINTK_TIME=y