Commit 1bf5c892 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 fixes from Alexander Gordeev:

 - Fix virtual vs physical address confusion in Storage Class Memory
   (SCM) block device driver.

 - Fix saving and restoring of FPU kernel context, which could lead to
   corruption of vector registers 8-15

 - Update defconfigs

* tag 's390-6.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: update defconfigs
  s390/vx: fix save/restore of fpu kernel context
  s390/scm: fix virtual vs physical address confusion
parents 87c71dd6 3d940bb1

arch/s390/configs/debug_defconfig

+5 −4
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ CONFIG_KEXEC_FILE=y 
CONFIG_KEXEC_SIG=y

CONFIG_CRASH_DUMP=y

CONFIG_LIVEPATCH=y

CONFIG_MARCH_ZEC12=y

CONFIG_TUNE_ZEC12=y

CONFIG_MARCH_Z13=y

CONFIG_NR_CPUS=512

CONFIG_NUMA=y

CONFIG_HZ_100=y
@@ -76,7 +75,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_MODULE_SIG_SHA256=y

CONFIG_BLK_DEV_THROTTLING=y

CONFIG_BLK_WBT=y

CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -93,6 +91,7 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_SLUB_STATS=y

# CONFIG_COMPAT_BRK is not set
@@ -619,6 +618,9 @@ CONFIG_BTRFS_FS_POSIX_ACL=y 
CONFIG_BTRFS_DEBUG=y

CONFIG_BTRFS_ASSERT=y

CONFIG_NILFS2_FS=m

CONFIG_BCACHEFS_FS=y

CONFIG_BCACHEFS_QUOTA=y

CONFIG_BCACHEFS_POSIX_ACL=y

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y
@@ -691,7 +693,6 @@ CONFIG_PERSISTENT_KEYRINGS=y 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_SECURITY_SELINUX=y

arch/s390/configs/defconfig

+5 −4
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ CONFIG_KEXEC_FILE=y 
CONFIG_KEXEC_SIG=y

CONFIG_CRASH_DUMP=y

CONFIG_LIVEPATCH=y

CONFIG_MARCH_ZEC12=y

CONFIG_TUNE_ZEC12=y

CONFIG_MARCH_Z13=y

CONFIG_NR_CPUS=512

CONFIG_NUMA=y

CONFIG_HZ_100=y
@@ -71,7 +70,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_MODULE_SIG_SHA256=y

CONFIG_BLK_DEV_THROTTLING=y

CONFIG_BLK_WBT=y

CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -88,6 +86,7 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y

CONFIG_ZSMALLOC_STAT=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MEMORY_HOTPLUG=y
@@ -605,6 +604,9 @@ CONFIG_OCFS2_FS=m 
CONFIG_BTRFS_FS=y

CONFIG_BTRFS_FS_POSIX_ACL=y

CONFIG_NILFS2_FS=m

CONFIG_BCACHEFS_FS=m

CONFIG_BCACHEFS_QUOTA=y

CONFIG_BCACHEFS_POSIX_ACL=y

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y
@@ -677,7 +679,6 @@ CONFIG_PERSISTENT_KEYRINGS=y 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_LOCKDOWN_LSM=y

arch/s390/configs/zfcpdump_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ CONFIG_BPF_SYSCALL=y 
CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_CRASH_DUMP=y

CONFIG_MARCH_ZEC12=y

CONFIG_TUNE_ZEC12=y

CONFIG_MARCH_Z13=y

# CONFIG_COMPAT is not set

CONFIG_NR_CPUS=2

CONFIG_HZ_100=y

arch/s390/include/asm/fpu/api.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static inline int test_fp_ctl(u32 fpc) 
#define KERNEL_VXR_HIGH		(KERNEL_VXR_V16V23|KERNEL_VXR_V24V31)



#define KERNEL_VXR		(KERNEL_VXR_LOW|KERNEL_VXR_HIGH)

#define KERNEL_FPR		(KERNEL_FPC|KERNEL_VXR_V0V7)

#define KERNEL_FPR		(KERNEL_FPC|KERNEL_VXR_LOW)



struct kernel_fpu;

drivers/s390/block/scm_blk.c

+4 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/blk-mq.h>

#include <linux/slab.h>

#include <linux/list.h>

#include <linux/io.h>

#include <asm/eadm.h>

#include "scm_blk.h"
@@ -130,7 +131,7 @@ static void scm_request_done(struct scm_request *scmrq) 


	for (i = 0; i < nr_requests_per_io && scmrq->request[i]; i++) {

		msb = &scmrq->aob->msb[i];

		aidaw = msb->data_addr;

		aidaw = (u64)phys_to_virt(msb->data_addr);



		if ((msb->flags & MSB_FLAG_IDA) && aidaw &&

		    IS_ALIGNED(aidaw, PAGE_SIZE))
@@ -195,12 +196,12 @@ static int scm_request_prepare(struct scm_request *scmrq) 
	msb->scm_addr = scmdev->address + ((u64) blk_rq_pos(req) << 9);

	msb->oc = (rq_data_dir(req) == READ) ? MSB_OC_READ : MSB_OC_WRITE;

	msb->flags |= MSB_FLAG_IDA;

	msb->data_addr = (u64) aidaw;

	msb->data_addr = (u64)virt_to_phys(aidaw);



	rq_for_each_segment(bv, req, iter) {

		WARN_ON(bv.bv_offset);

		msb->blk_count += bv.bv_len >> 12;

		aidaw->data_addr = (u64) page_address(bv.bv_page);

		aidaw->data_addr = virt_to_phys(page_address(bv.bv_page));

		aidaw++;

	}