x86/kasan: Fix boot with KASAN=y and PROFILE_ANNOTATED_BRANCHES=y
authorAndrey Ryabinin <aryabinin@virtuozzo.com>
Mon, 13 Mar 2017 16:33:37 +0000 (19:33 +0300)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 13 Mar 2017 23:00:55 +0000 (00:00 +0100)
commitbe3606ff739d1c1be36389f8737c577ad87e1f57
tree10d00f5ac10fe7e5c5a697d44f38548bdfbd1862
parent859bb6d59066b96341020e0991f191631cabe59d
x86/kasan: Fix boot with KASAN=y and PROFILE_ANNOTATED_BRANCHES=y

The kernel doesn't boot with both PROFILE_ANNOTATED_BRANCHES=y and KASAN=y
options selected. With branch profiling enabled we end up calling
ftrace_likely_update() before kasan_early_init(). ftrace_likely_update() is
built with KASAN instrumentation, so calling it before kasan has been
initialized leads to crash.

Use DISABLE_BRANCH_PROFILING define to make sure that we don't call
ftrace_likely_update() from early code before kasan_early_init().

Fixes: ef7f0d6a6ca8 ("x86_64: add KASan support")
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: kasan-dev@googlegroups.com
Cc: Alexander Potapenko <glider@google.com>
Cc: stable@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: lkp@01.org
Cc: Dmitry Vyukov <dvyukov@google.com>
Link: http://lkml.kernel.org/r/20170313163337.1704-1-aryabinin@virtuozzo.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/head64.c
arch/x86/mm/kasan_init_64.c