The following commit has been merged into the x86/sev branch of tip:
Commit-ID: a7e7185ccd2acc4360e2cde688027cd1ecf10d93
Gitweb: https://git.kernel.org/tip/a7e7185ccd2acc4360e2cde688027cd1ecf10d93
Author: Borislav Petkov (AMD) <bp@xxxxxxxxx>
AuthorDate: Sat, 22 Jun 2024 11:31:02 +02:00
Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx>
CommitterDate: Sat, 22 Jun 2024 13:20:35 +02:00
x86/sev: Move the instrumentation exclusion bits too
Commit in fixes moved the sev*.c compilation units to coco/ - the guest
confidential computing location - where they belong but forgot the
instrumentation exclusion build directives.
Move them too.
Fixes: 06685975c209 ("x86/sev: Move SEV compilation units")
Closes: https://lore.kernel.org/oe-kbuild-all/202406220748.hG3qlmDx-lkp@xxxxxxxxx
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
---
arch/x86/coco/sev/Makefile | 8 ++++++++
arch/x86/kernel/Makefile | 4 ----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/x86/coco/sev/Makefile b/arch/x86/coco/sev/Makefile
index b89ba3f..5f72e92 100644
--- a/arch/x86/coco/sev/Makefile
+++ b/arch/x86/coco/sev/Makefile
@@ -1,3 +1,11 @@
# SPDX-License-Identifier: GPL-2.0
obj-y += core.o
+
+ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_core.o = -pg
+endif
+
+KASAN_SANITIZE_core.o := n
+KMSAN_SANITIZE_core.o := n
+KCOV_INSTRUMENT_core.o := n
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index b22ceb9..a847180 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -17,7 +17,6 @@ CFLAGS_REMOVE_ftrace.o = -pg
CFLAGS_REMOVE_early_printk.o = -pg
CFLAGS_REMOVE_head64.o = -pg
CFLAGS_REMOVE_head32.o = -pg
-CFLAGS_REMOVE_sev.o = -pg
CFLAGS_REMOVE_rethook.o = -pg
endif
@@ -26,19 +25,16 @@ KASAN_SANITIZE_dumpstack.o := n
KASAN_SANITIZE_dumpstack_$(BITS).o := n
KASAN_SANITIZE_stacktrace.o := n
KASAN_SANITIZE_paravirt.o := n
-KASAN_SANITIZE_sev.o := n
# With some compiler versions the generated code results in boot hangs, caused
# by several compilation units. To be safe, disable all instrumentation.
KCSAN_SANITIZE := n
KMSAN_SANITIZE_head$(BITS).o := n
KMSAN_SANITIZE_nmi.o := n
-KMSAN_SANITIZE_sev.o := n
# If instrumentation of the following files is enabled, boot hangs during
# first second.
KCOV_INSTRUMENT_head$(BITS).o := n
-KCOV_INSTRUMENT_sev.o := n
CFLAGS_irq.o := -I $(src)/../include/asm/trace
|