From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40881469854 for ; Fri, 11 Sep 2026 12:19:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789129191; cv=none; b=fyhRUo3/syrFj7waXtPsPiUEigprgJc+X1pXb1PJMP2T1lXLVjnndxzKOUSL/qCOtVKEsKXcuxcTZ3xYMEpZVwoTGq43tRKv2BR40D38QrXJlUSKaow5jX0zQSYgKkGTFByaXnbCqsoCsN8tXZfseLn4HxRxaGLzseu4cTQJRU8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789129191; c=relaxed/simple; bh=CMe7KOLS0JzTZ5ctEzggHdTJnBYRQ7ZCQmTV+D/ZIzM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gNeTLFqSv6D7h9GsA7a/8sFVzoHSm+xvQT6h+CBM+khC0lJGDiRsDXLZoGpLG6IahRGw9rBCzdNt9XbNPTcUEM9WMrIyYG2fbiqPfD1msUWdyPMfMV/3eYcAtjOPK6OH4Jgsxtyd1hwywhaB31k0MRvxLG8t8z3qykcP60xx91E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bdvfillK; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bdvfillK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FA741F00898; Fri, 11 Sep 2026 12:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789129179; bh=aLMWpPwlb7+DyMUiFUzST6+OouabaVYQzl/Xs7gPz40=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bdvfillKeptdYI/OiXGCmmUxlaD9malqTRmwjyOAsk5uSd6rfQqpb4jphjPQP+9HF pjStHsNVn2hvScFXIZ53StcRry6xsLGa2qKDCAs+iYaHYXeW2+LTF0H6Qdirg6kEbo xR10bKQ6lG/qEboCkMpMVgWvF5ux2/wx3Zvn9/OP3cN2ozoLPHuFnQBNmpYE5U6Umk OqQNTH3rWR3Ohb+hSxN+ln0gON+GE8RIwz/tT3+ZlwtQCcDdjMcnBdMsY4viULwJkY ZeSjfkxStOYCjzjCQka3JMp+5+W6TTOHckiR1F/F5FYfVBC1Q4BuX6iVNDAESCp0lf j4S25BeCgwq5w== From: Sasha Levin To: stable@vger.kernel.org Cc: Thomas Huth , Heiko Carstens , Alexander Gordeev , Sasha Levin Subject: [PATCH 5.15.y 1/2] s390: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Date: Fri, 11 Sep 2026 08:19:36 -0400 Message-ID: <20260911121937.514719-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026090945-sporting-book-8561@gregkh> References: <2026090945-sporting-book-8561@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Thomas Huth [ Upstream commit 42398caf16c955251a2dab86f797b76adeb99899 ] While the GCC and Clang compilers already define __ASSEMBLER__ automatically when compiling assembler code, __ASSEMBLY__ is a macro that only gets defined by the Makefiles in the kernel. This is bad since macros starting with two underscores are names that are reserved by the C language. It can also be very confusing for the developers when switching between userspace and kernelspace coding, or when dealing with uapi headers that rather should use __ASSEMBLER__ instead. So let's now standardize on the __ASSEMBLER__ macro that is provided by the compilers. This is a completely mechanical patch (done with a simple "sed -i" statement), with some manual fixups done later while rebasing the patch. Signed-off-by: Thomas Huth Acked-by: Heiko Carstens Link: https://lore.kernel.org/r/20250611140046.137739-3-thuth@redhat.com Signed-off-by: Alexander Gordeev Stable dependency adaptation for 546dde823a36d7283dcf46127c2f3d093443860f: Keep only the nmi.h guard conversion from the upstream patch. The other header conversions do not prepare the machine-check fix; several headers and the newer lowcore/alternative infrastructure are absent in 6.6. Provide get_lowcore() as a macro alias for &S390_lowcore, retaining the fixed-address lowcore semantics of this branch without adding a function. Use that spelling for the three backup accesses and match upstream's failing-storage-address assignment layout. Also zero-initialize the local IRQ structure in kvm_s390_reinject_machine_check() to match the target's context. These changes let the unmodified target patch apply cleanly. The CK filtering and reinjection changes remain in the target commit. [ sashal: Reduced backport -- upstream 42398caf16c95 touches 33 file(s), this backport carries 4. Not backported here: arch/s390/boot/boot.h arch/s390/include/asm/alternative.h arch/s390/include/asm/asm-const.h arch/s390/include/asm/cpu.h arch/s390/include/asm/cpu_mf-insn.h arch/s390/include/asm/ctlreg.h arch/s390/include/asm/dwarf.h arch/s390/include/asm/extmem.h ... and 23 more This note is generated from the file lists only; see the resolution record for the reasoning. ] Stable-dep-of: 546dde823a36 ("KVM: s390: Fix memory corruption by not reinjecting CK machine checks") Signed-off-by: Sasha Levin --- arch/s390/include/asm/lowcore.h | 3 +++ arch/s390/include/asm/nmi.h | 4 ++-- arch/s390/kernel/nmi.c | 7 +++---- arch/s390/kvm/interrupt.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h index 11213c8bfca56..298722b0259f4 100644 --- a/arch/s390/include/asm/lowcore.h +++ b/arch/s390/include/asm/lowcore.h @@ -200,6 +200,9 @@ struct lowcore { #define S390_lowcore (*((struct lowcore *) 0)) +/* Lowcore has a fixed address on this kernel. */ +#define get_lowcore() (&S390_lowcore) + extern struct lowcore *lowcore_ptr[]; static inline void set_prefix(__u32 address) diff --git a/arch/s390/include/asm/nmi.h b/arch/s390/include/asm/nmi.h index 2db45d7e68aa7..d0adaae8f3499 100644 --- a/arch/s390/include/asm/nmi.h +++ b/arch/s390/include/asm/nmi.h @@ -34,7 +34,7 @@ #define MCCK_CODE_FC_VALID BIT(63 - 43) #define MCCK_CODE_CPU_TIMER_VALID BIT(63 - 46) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ union mci { unsigned long val; @@ -106,5 +106,5 @@ void s390_handle_mcck(void); void __s390_handle_mcck(void); int s390_do_machine_check(struct pt_regs *regs); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _ASM_S390_NMI_H */ diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c index d4f071e73a0a6..911e1be5f8cda 100644 --- a/arch/s390/kernel/nmi.c +++ b/arch/s390/kernel/nmi.c @@ -377,11 +377,10 @@ static void notrace s390_backup_mcck_info(struct pt_regs *regs) sie_page = container_of(sie_block, struct sie_page, sie_block); mcck_backup = &sie_page->mcck_info; - mcck_backup->mcic = S390_lowcore.mcck_interruption_code & + mcck_backup->mcic = get_lowcore()->mcck_interruption_code & ~(MCCK_CODE_CP | MCCK_CODE_EXT_DAMAGE); - mcck_backup->ext_damage_code = S390_lowcore.external_damage_code; - mcck_backup->failing_storage_address - = S390_lowcore.failing_storage_address; + mcck_backup->ext_damage_code = get_lowcore()->external_damage_code; + mcck_backup->failing_storage_address = get_lowcore()->failing_storage_address; } NOKPROBE_SYMBOL(s390_backup_mcck_info); diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index ca7d09f098092..7207390bd849e 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -2857,7 +2857,7 @@ void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu, struct mcck_volatile_info *mcck_info) { struct kvm_s390_interrupt_info inti; - struct kvm_s390_irq irq; + struct kvm_s390_irq irq = {}; struct kvm_s390_mchk_info *mchk; union mci mci; __u64 cr14 = 0; /* upper bits are not used */ -- 2.53.0