Commit 5be413a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 fixes from Heiko Carstens:

 - Add various missing READ_ONCE() to cmpxchg() loops prevent the
   compiler from potentially generating incorrect code. This includes a
   rather large change to the s390 specific hardware sampling code and
   its current use of cmpxchg_double().

   Do the fix now to get it out of the way of Peter Zijlstra's
   cmpxchg128() work, and have something that can be backported. The
   added new code includes a private 128 bit cmpxchg variant which will
   be removed again after Peter's rework is available. Also note that
   this 128 bit cmpxchg variant is used to implement 128 bit
   READ_ONCE(), while strictly speaking it wouldn't be necessary, and
   _READ_ONCE() should also be sufficient; even though it isn't obvious
   for all converted locations that this is the case. Therefore use this
   implementation for for the sake of clarity and consistency for now.

 - Fix ipl report address handling to avoid kdump failures/hangs.

 - Fix misuse of #(el)if in kernel decompressor.

 - Define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36,
   caused by the recently changed discard behaviour.

 - Make sure _edata and _end symbols are always page aligned.

 - The current header guard DEBUG_H in one of the s390 specific header
   files is too generic and conflicts with the ath9k wireless driver.
   Add an _ASM_S390_ prefix to the guard to make it unique.

 - Update defconfigs.

* tag 's390-6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: update defconfigs
  KVM: s390: interrupt: use READ_ONCE() before cmpxchg()
  s390/percpu: add READ_ONCE() to arch_this_cpu_to_op_simple()
  s390/cpum_sf: add READ_ONCE() semantics to compare and swap loops
  s390/kexec: fix ipl report address for kdump
  s390: fix -Wundef warning for CONFIG_KERNEL_ZSTD
  s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36
  s390: expicitly align _edata and _end symbols on page boundary
  s390/debug: add _ASM_S390_ prefix to header guard
parents bad8c4a8 1ecf7bd9

arch/s390/boot/decompressor.c

+2 −2
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
#define memmove memmove

#define memzero(s, n) memset((s), 0, (n))



#ifdef CONFIG_KERNEL_BZIP2

#if defined(CONFIG_KERNEL_BZIP2)

#define BOOT_HEAP_SIZE	0x400000

#elif CONFIG_KERNEL_ZSTD

#elif defined(CONFIG_KERNEL_ZSTD)

#define BOOT_HEAP_SIZE	0x30000

#else

#define BOOT_HEAP_SIZE	0x10000

arch/s390/configs/debug_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ CONFIG_NFT_CT=m 
CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_OBJREF=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m
@@ -569,6 +568,7 @@ CONFIG_INPUT_EVDEV=y 
# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_LEGACY_PTY_COUNT=0

# CONFIG_LEGACY_TIOCSTI is not set

CONFIG_VIRTIO_CONSOLE=m

CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_HANGCHECK_TIMER=m
@@ -660,6 +660,7 @@ CONFIG_CONFIGFS_FS=m 
CONFIG_ECRYPT_FS=m

CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y

CONFIG_SQUASHFS_XATTR=y

CONFIG_SQUASHFS_LZ4=y

CONFIG_SQUASHFS_LZO=y
@@ -705,6 +706,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y 
CONFIG_SECURITY_LANDLOCK=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

CONFIG_INTEGRITY_PLATFORM_KEYRING=y

CONFIG_IMA=y

CONFIG_IMA_DEFAULT_HASH_SHA256=y

CONFIG_IMA_WRITE_POLICY=y
@@ -781,6 +783,7 @@ CONFIG_ZCRYPT=m 
CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_SYSTEM_BLACKLIST_KEYRING=y

CONFIG_CORDIC=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
@@ -848,7 +851,6 @@ CONFIG_PREEMPT_TRACER=y 
CONFIG_SCHED_TRACER=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_BPF_KPROBE_OVERRIDE=y

CONFIG_HIST_TRIGGERS=y

CONFIG_FTRACE_STARTUP_TEST=y

# CONFIG_EVENT_TRACE_STARTUP_TEST is not set
@@ -870,7 +872,6 @@ CONFIG_FAIL_MAKE_REQUEST=y 
CONFIG_FAIL_IO_TIMEOUT=y

CONFIG_FAIL_FUTEX=y

CONFIG_FAULT_INJECTION_DEBUG_FS=y

CONFIG_FAIL_FUNCTION=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_LKDTM=m

CONFIG_TEST_MIN_HEAP=y

arch/s390/configs/defconfig

+4 −2
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ CONFIG_NFT_CT=m 
CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_OBJREF=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m
@@ -559,6 +558,7 @@ CONFIG_INPUT_EVDEV=y 
# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_LEGACY_PTY_COUNT=0

# CONFIG_LEGACY_TIOCSTI is not set

CONFIG_VIRTIO_CONSOLE=m

CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_HANGCHECK_TIMER=m
@@ -645,6 +645,7 @@ CONFIG_CONFIGFS_FS=m 
CONFIG_ECRYPT_FS=m

CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y

CONFIG_SQUASHFS_XATTR=y

CONFIG_SQUASHFS_LZ4=y

CONFIG_SQUASHFS_LZO=y
@@ -688,6 +689,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y 
CONFIG_SECURITY_LANDLOCK=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

CONFIG_INTEGRITY_PLATFORM_KEYRING=y

CONFIG_IMA=y

CONFIG_IMA_DEFAULT_HASH_SHA256=y

CONFIG_IMA_WRITE_POLICY=y
@@ -766,6 +768,7 @@ CONFIG_ZCRYPT=m 
CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_SYSTEM_BLACKLIST_KEYRING=y

CONFIG_CORDIC=m

CONFIG_PRIME_NUMBERS=m

CONFIG_CRYPTO_LIB_CURVE25519=m
@@ -798,7 +801,6 @@ CONFIG_STACK_TRACER=y 
CONFIG_SCHED_TRACER=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_BPF_KPROBE_OVERRIDE=y

CONFIG_HIST_TRIGGERS=y

CONFIG_SAMPLES=y

CONFIG_SAMPLE_TRACE_PRINTK=m

arch/s390/configs/zfcpdump_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ CONFIG_TUNE_ZEC12=y 
# CONFIG_COMPAT is not set

CONFIG_NR_CPUS=2

CONFIG_HZ_100=y

# CONFIG_RELOCATABLE is not set

# CONFIG_CHSC_SCH is not set

# CONFIG_SCM_BUS is not set

CONFIG_CRASH_DUMP=y
@@ -50,6 +49,7 @@ CONFIG_ZFCP=y 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_LEGACY_TIOCSTI is not set

# CONFIG_HVC_IUCV is not set

# CONFIG_HW_RANDOM_S390 is not set

# CONFIG_HMC_DRV is not set

arch/s390/include/asm/cpu_mf.h

+15 −16
Original line number Diff line number Diff line
@@ -131,8 +131,7 @@ struct hws_combined_entry { 
	struct hws_diag_entry	diag;	/* Diagnostic-sampling data entry */

} __packed;



struct hws_trailer_entry {

	union {

union hws_trailer_header {

	struct {

		unsigned int f:1;	/* 0 - Block Full Indicator   */

		unsigned int a:1;	/* 1 - Alert request control  */
@@ -140,10 +139,13 @@ struct hws_trailer_entry { 
		unsigned int :29;	/* 3 - 31: Reserved	      */

		unsigned int bsdes:16;	/* 32-47: size of basic SDE   */

		unsigned int dsdes:16;	/* 48-63: size of diagnostic SDE */

		unsigned long long overflow; /* 64 - Overflow Count   */

	};

		unsigned long long flags;	/* 0 - 63: All indicators     */

	__uint128_t val;

};

	unsigned long long overflow;	 /* 64 - sample Overflow count	      */



struct hws_trailer_entry {

	union hws_trailer_header header; /* 0 - 15 Flags + Overflow Count     */

	unsigned char timestamp[16];	 /* 16 - 31 timestamp		      */

	unsigned long long reserved1;	 /* 32 -Reserved		      */

	unsigned long long reserved2;	 /*				      */
@@ -290,14 +292,11 @@ static inline unsigned long sample_rate_to_freq(struct hws_qsi_info_block *qsi, 
	return USEC_PER_SEC * qsi->cpu_speed / rate;

}



#define SDB_TE_ALERT_REQ_MASK	0x4000000000000000UL

#define SDB_TE_BUFFER_FULL_MASK 0x8000000000000000UL



/* Return TOD timestamp contained in an trailer entry */

static inline unsigned long long trailer_timestamp(struct hws_trailer_entry *te)

{

	/* TOD in STCKE format */

	if (te->t)

	if (te->header.t)

		return *((unsigned long long *) &te->timestamp[1]);



	/* TOD in STCK format */