[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <175256879751.406.17891984296859286442.tip-bot2@tip-bot2>
Date: Tue, 15 Jul 2025 08:39:57 -0000
From: "tip-bot2 for Ard Biesheuvel" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Randy Dunlap <rdunlap@...radead.org>, Ard Biesheuvel <ardb@...nel.org>,
"Borislav Petkov (AMD)" <bp@...en8.de>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: x86/urgent] x86/sev: Work around broken noinstr on GCC
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 6b995d01683feae619aa3263d18a6aa19bface16
Gitweb: https://git.kernel.org/tip/6b995d01683feae619aa3263d18a6aa19bface16
Author: Ard Biesheuvel <ardb@...nel.org>
AuthorDate: Mon, 14 Jul 2025 09:34:03 +02:00
Committer: Borislav Petkov (AMD) <bp@...en8.de>
CommitterDate: Tue, 15 Jul 2025 10:12:25 +02:00
x86/sev: Work around broken noinstr on GCC
Forcibly disable KCSAN for the sev-nmi.c source file, which only
contains functions annotated as 'noinstr' but is emitted with calls to
KCSAN instrumentation nonetheless. E.g.,
vmlinux.o: error: objtool: __sev_es_nmi_complete+0x58: call to __kcsan_check_access() leaves .noinstr.text section
make[2]: *** [/usr/local/google/home/ardb/linux/scripts/Makefile.vmlinux_o:72: vmlinux.o] Error 1
Fixes: a3cbbb4717e1 ("x86/boot: Move SEV startup code into startup/")
Reported-by: Randy Dunlap <rdunlap@...radead.org>
Signed-off-by: Ard Biesheuvel <ardb@...nel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
Acked-by: Randy Dunlap <rdunlap@...radead.org>
Tested-by: Randy Dunlap <rdunlap@...radead.org>
Link: https://lore.kernel.org/20250714073402.4107091-2-ardb+git@google.com
---
arch/x86/coco/sev/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/coco/sev/Makefile b/arch/x86/coco/sev/Makefile
index db3255b..342d79f 100644
--- a/arch/x86/coco/sev/Makefile
+++ b/arch/x86/coco/sev/Makefile
@@ -5,5 +5,6 @@ obj-y += core.o sev-nmi.o vc-handle.o
# Clang 14 and older may fail to respect __no_sanitize_undefined when inlining
UBSAN_SANITIZE_sev-nmi.o := n
-# GCC may fail to respect __no_sanitize_address when inlining
+# GCC may fail to respect __no_sanitize_address or __no_kcsan when inlining
KASAN_SANITIZE_sev-nmi.o := n
+KCSAN_SANITIZE_sev-nmi.o := n
Powered by blists - more mailing lists