Content-Type: multipart/mixed; boundary="===============6972286884235293951==" MIME-Version: 1.0 From: Greg Kroah-Hartman To: lkp@lists.01.org Subject: [PATCH 4.9 88/93] x86/kasan: Fix boot with KASAN=y and PROFILE_ANNOTATED_BRANCHES=y Date: Mon, 20 Mar 2017 18:52:03 +0100 Message-ID: <20170320174741.064969312@linuxfoundation.org> In-Reply-To: <20170320174735.243147498@linuxfoundation.org> List-Id: --===============6972286884235293951== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andrey Ryabinin commit be3606ff739d1c1be36389f8737c577ad87e1f57 upstream. The kernel doesn't boot with both PROFILE_ANNOTATED_BRANCHES=3Dy and KASAN= =3Dy 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 Signed-off-by: Andrey Ryabinin Cc: kasan-dev(a)googlegroups.com Cc: Alexander Potapenko Cc: Andrew Morton Cc: lkp(a)01.org Cc: Dmitry Vyukov Link: http://lkml.kernel.org/r/20170313163337.1704-1-aryabinin(a)virtuozzo.= com Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/head64.c | 1 + arch/x86/mm/kasan_init_64.c | 1 + 2 files changed, 2 insertions(+) --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -4,6 +4,7 @@ * Copyright (C) 2000 Andrea Arcangeli SuSE */ = +#define DISABLE_BRANCH_PROFILING #include #include #include --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -1,3 +1,4 @@ +#define DISABLE_BRANCH_PROFILING #define pr_fmt(fmt) "kasan: " fmt #include #include --===============6972286884235293951==--