[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-67bb8e999e0aeac285d22f0e53c856b9df5282c6@git.kernel.org>
Date: Wed, 11 Oct 2017 11:15:54 -0700
From: tip-bot for Tom Lendacky <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: bp@...en8.de, linux-kernel@...r.kernel.org,
thomas.lendacky@....com, tglx@...utronix.de, lkp@...org,
hpa@...or.com, torvalds@...ux-foundation.org, bp@...e.de,
peterz@...radead.org, mingo@...nel.org
Subject: [tip:x86/urgent] x86/mm: Disable various instrumentations of
mm/mem_encrypt.c and mm/tlb.c
Commit-ID: 67bb8e999e0aeac285d22f0e53c856b9df5282c6
Gitweb: https://git.kernel.org/tip/67bb8e999e0aeac285d22f0e53c856b9df5282c6
Author: Tom Lendacky <thomas.lendacky@....com>
AuthorDate: Tue, 10 Oct 2017 14:45:04 -0500
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 11 Oct 2017 17:22:59 +0200
x86/mm: Disable various instrumentations of mm/mem_encrypt.c and mm/tlb.c
Some routines in mem_encrypt.c are called very early in the boot process,
e.g. sme_enable(). When CONFIG_KCOV=y is defined the resulting code added
to sme_enable() (and others) for KCOV instrumentation results in a kernel
crash. Disable the KCOV instrumentation for mem_encrypt.c by adding
KCOV_INSTRUMENT_mem_encrypt.o := n to arch/x86/mm/Makefile.
In order to avoid other possible early boot issues, model mem_encrypt.c
after head64.c in regards to tools. In addition to disabling KCOV as
stated above and a previous patch that disables branch profiling, also
remove the "-pg" CFLAG if CONFIG_FUNCTION_TRACER is enabled and set
KASAN_SANITIZE to "n", each of which are done on a file basis.
Reported-by: kernel test robot <lkp@...org>
Signed-off-by: Tom Lendacky <thomas.lendacky@....com>
Reviewed-by: Borislav Petkov <bp@...e.de>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/20171010194504.18887.38053.stgit@tlendack-t1.amdoffice.net
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/mm/Makefile | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 72bf8c0..e1f0958 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -1,5 +1,12 @@
-# Kernel does not boot with instrumentation of tlb.c.
-KCOV_INSTRUMENT_tlb.o := n
+# Kernel does not boot with instrumentation of tlb.c and mem_encrypt.c
+KCOV_INSTRUMENT_tlb.o := n
+KCOV_INSTRUMENT_mem_encrypt.o := n
+
+KASAN_SANITIZE_mem_encrypt.o := n
+
+ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_mem_encrypt.o = -pg
+endif
obj-y := init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
pat.o pgtable.o physaddr.o setup_nx.o tlb.o
Powered by blists - more mailing lists