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

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

Pull s390 fixes from Heiko Carstens:

 - fix various user space visible copy_to_user() instances which return
   the number of bytes left to copy instead of -EFAULT

 - make TMPFS_INODE64 available again for s390 and alpha, now that both
   architectures have been switched to 64-bit ino_t (see commit
   96c0a6a7: "s390,alpha: switch to 64-bit ino_t")

 - make sure to release a shared hypervisor resource within the zcore
   device driver also on restart and power down; also remove unneeded
   surrounding debugfs_create return value checks

 - for the new hardware counter set device driver rename the uapi header
   file to be a bit more generic; also remove 60 second read limit which
   is not really necessary and without the limit the interface can be
   easier tested

 - some small cleanups, the largest being to convert all long long in
   our time and idle code to longs

 - update defconfigs

* tag 's390-5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: remove IBM_PARTITION and CONFIGFS_FS from zfcpdump defconfig
  s390: update defconfigs
  s390,alpha: make TMPFS_INODE64 available again
  s390/cio: return -EFAULT if copy_to_user() fails
  s390/tty3270: avoid comma separated statements
  s390/cpumf: remove unneeded semicolon
  s390/crypto: return -EFAULT if copy_to_user() fails
  s390/cio: return -EFAULT if copy_to_user() fails
  s390/cpumf: rename header file to hwctrset.h
  s390/zcore: release dump save area on restart or power down
  s390/zcore: no need to check return value of debugfs_create functions
  s390/cpumf: remove 60 seconds read limit
  s390/topology: remove always false if check
  s390/time,idle: get rid of unsigned long long
parents 9b1ea29b 78c7ccca

arch/s390/configs/debug_defconfig

+3 −13
Original line number Diff line number Diff line
@@ -275,9 +275,9 @@ CONFIG_IP_VS_DH=m 
CONFIG_IP_VS_SH=m

CONFIG_IP_VS_SED=m

CONFIG_IP_VS_NQ=m

CONFIG_IP_VS_TWOS=m

CONFIG_IP_VS_FTP=m

CONFIG_IP_VS_PE_SIP=m

CONFIG_NF_TABLES_IPV4=y

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y

CONFIG_IP_NF_IPTABLES=m
@@ -298,7 +298,6 @@ CONFIG_IP_NF_SECURITY=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_TABLES_IPV6=y

CONFIG_NFT_FIB_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m
@@ -481,7 +480,6 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_AQUANTIA is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_AURORA is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_CADENCE is not set
@@ -581,7 +579,6 @@ 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
@@ -635,6 +632,7 @@ CONFIG_NTFS_RW=y 
CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_TMPFS_INODE64=y

CONFIG_HUGETLBFS=y

CONFIG_CONFIGFS_FS=m

CONFIG_ECRYPT_FS=m
@@ -714,12 +712,8 @@ 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_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m
@@ -731,7 +725,6 @@ CONFIG_CRYPTO_CAST6=m 
CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m
@@ -796,12 +789,9 @@ CONFIG_DEBUG_OBJECTS_RCU_HEAD=y 
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y

CONFIG_SLUB_DEBUG_ON=y

CONFIG_SLUB_STATS=y

CONFIG_DEBUG_KMEMLEAK=y

CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_VM_VMACACHE=y

CONFIG_DEBUG_VM_RB=y

CONFIG_DEBUG_VM_PGFLAGS=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
@@ -838,6 +828,7 @@ CONFIG_BPF_KPROBE_OVERRIDE=y 
CONFIG_HIST_TRIGGERS=y

CONFIG_FTRACE_STARTUP_TEST=y

# CONFIG_EVENT_TRACE_STARTUP_TEST is not set

CONFIG_DEBUG_ENTRY=y

CONFIG_NOTIFIER_ERROR_INJECTION=m

CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m

CONFIG_FAULT_INJECTION=y
@@ -861,4 +852,3 @@ CONFIG_PERCPU_TEST=m 
CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BITOPS=m

CONFIG_TEST_BPF=m
 
CONFIG_DEBUG_ENTRY=y

arch/s390/configs/defconfig

+2 −9
Original line number Diff line number Diff line
@@ -266,9 +266,9 @@ CONFIG_IP_VS_DH=m 
CONFIG_IP_VS_SH=m

CONFIG_IP_VS_SED=m

CONFIG_IP_VS_NQ=m

CONFIG_IP_VS_TWOS=m

CONFIG_IP_VS_FTP=m

CONFIG_IP_VS_PE_SIP=m

CONFIG_NF_TABLES_IPV4=y

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y

CONFIG_IP_NF_IPTABLES=m
@@ -289,7 +289,6 @@ CONFIG_IP_NF_SECURITY=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_TABLES_IPV6=y

CONFIG_NFT_FIB_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m
@@ -473,7 +472,6 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_AQUANTIA is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_AURORA is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_CADENCE is not set
@@ -573,7 +571,6 @@ 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
@@ -623,6 +620,7 @@ CONFIG_NTFS_RW=y 
CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_TMPFS_INODE64=y

CONFIG_HUGETLBFS=y

CONFIG_CONFIGFS_FS=m

CONFIG_ECRYPT_FS=m
@@ -703,12 +701,8 @@ 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_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m
@@ -720,7 +714,6 @@ CONFIG_CRYPTO_CAST6=m 
CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

arch/s390/configs/zfcpdump_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ CONFIG_CRASH_DUMP=y 
# CONFIG_SECCOMP is not set

# CONFIG_GCC_PLUGINS is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_COMPACTION is not set

# CONFIG_MIGRATION is not set
@@ -61,11 +60,9 @@ CONFIG_RAW_DRIVER=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

CONFIG_CONFIGFS_FS=y

# CONFIG_MISC_FILESYSTEMS is not set

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_LSM="yama,loadpin,safesetid,integrity"

arch/s390/include/asm/idle.h

+6 −6
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 


struct s390_idle_data {

	seqcount_t seqcount;

	unsigned long long idle_count;

	unsigned long long idle_time;

	unsigned long long clock_idle_enter;

	unsigned long long clock_idle_exit;

	unsigned long long timer_idle_enter;

	unsigned long long timer_idle_exit;

	unsigned long idle_count;

	unsigned long idle_time;

	unsigned long clock_idle_enter;

	unsigned long clock_idle_exit;

	unsigned long timer_idle_enter;

	unsigned long timer_idle_exit;

	unsigned long mt_cycles_enter[8];

};

arch/s390/include/asm/timex.h

+18 −18
Original line number Diff line number Diff line
@@ -98,10 +98,10 @@ extern unsigned char ptff_function_mask[16]; 


/* Query TOD offset result */

struct ptff_qto {

	unsigned long long physical_clock;

	unsigned long long tod_offset;

	unsigned long long logical_tod_offset;

	unsigned long long tod_epoch_difference;

	unsigned long physical_clock;

	unsigned long tod_offset;

	unsigned long logical_tod_offset;

	unsigned long tod_epoch_difference;

} __packed;



static inline int ptff_query(unsigned int nr)
@@ -151,9 +151,9 @@ struct ptff_qui { 
	rc;								\

})



static inline unsigned long long local_tick_disable(void)

static inline unsigned long local_tick_disable(void)

{

	unsigned long long old;

	unsigned long old;



	old = S390_lowcore.clock_comparator;

	S390_lowcore.clock_comparator = clock_comparator_max;
@@ -161,7 +161,7 @@ static inline unsigned long long local_tick_disable(void) 
	return old;

}



static inline void local_tick_enable(unsigned long long comp)

static inline void local_tick_enable(unsigned long comp)

{

	S390_lowcore.clock_comparator = comp;

	set_clock_comparator(S390_lowcore.clock_comparator);
@@ -169,9 +169,9 @@ static inline void local_tick_enable(unsigned long long comp) 


#define CLOCK_TICK_RATE		1193180 /* Underlying HZ */



typedef unsigned long long cycles_t;

typedef unsigned long cycles_t;



static inline unsigned long long get_tod_clock(void)

static inline unsigned long get_tod_clock(void)

{

	union tod_clock clk;
@@ -179,10 +179,10 @@ static inline unsigned long long get_tod_clock(void) 
	return clk.tod;

}



static inline unsigned long long get_tod_clock_fast(void)

static inline unsigned long get_tod_clock_fast(void)

{

#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES

	unsigned long long clk;

	unsigned long clk;



	asm volatile("stckf %0" : "=Q" (clk) : : "cc");

	return clk;
@@ -208,9 +208,9 @@ extern union tod_clock tod_clock_base; 
 * Therefore preemption must be disabled, otherwise the returned

 * value is not guaranteed to be monotonic.

 */

static inline unsigned long long get_tod_clock_monotonic(void)

static inline unsigned long get_tod_clock_monotonic(void)

{

	unsigned long long tod;

	unsigned long tod;



	preempt_disable_notrace();

	tod = get_tod_clock() - tod_clock_base.tod;
@@ -237,7 +237,7 @@ static inline unsigned long long get_tod_clock_monotonic(void) 
 * -> ns = (th * 125) + ((tl * 125) >> 9);

 *

 */

static inline unsigned long long tod_to_ns(unsigned long long todval)

static inline unsigned long tod_to_ns(unsigned long todval)

{

	return ((todval >> 9) * 125) + (((todval & 0x1ff) * 125) >> 9);

}
@@ -249,10 +249,10 @@ static inline unsigned long long tod_to_ns(unsigned long long todval) 
 *

 * Returns: true if a is later than b

 */

static inline int tod_after(unsigned long long a, unsigned long long b)

static inline int tod_after(unsigned long a, unsigned long b)

{

	if (MACHINE_HAS_SCC)

		return (long long) a > (long long) b;

		return (long) a > (long) b;

	return a > b;

}
@@ -263,10 +263,10 @@ static inline int tod_after(unsigned long long a, unsigned long long b) 
 *

 * Returns: true if a is later than b

 */

static inline int tod_after_eq(unsigned long long a, unsigned long long b)

static inline int tod_after_eq(unsigned long a, unsigned long b)

{

	if (MACHINE_HAS_SCC)

		return (long long) a >= (long long) b;

		return (long) a >= (long) b;

	return a >= b;

}