Subject: Re: [tip:x86/urgent] x86/kasan: Fix boot with KASAN=y and
 PROFILE_ANNOTATED_BRANCHES=y
To: Alexander Potapenko <glider@google.com>,
        "H. Peter Anvin" <hpa@zytor.com>, Thomas Gleixner <tglx@linutronix.de>,
        Dmitriy Vyukov <dvyukov@google.com>,
        LKML <linux-kernel@vger.kernel.org>,
        kbuild test robot <fengguang.wu@intel.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Ingo Molnar <mingo@kernel.org>
References: <20170313163337.1704-1-aryabinin@virtuozzo.com>
 <tip-be3606ff739d1c1be36389f8737c577ad87e1f57@git.kernel.org>
 <CAG_fn=VgW2m8KLb49Xp8LerXKwMZTuUW67wc0mpTo7_86=TyWg@mail.gmail.com>
CC: <linux-tip-commits@vger.kernel.org>
From: Andrey Ryabinin <aryabinin@virtuozzo.com>
Message-ID: <c97b497b-4647-9566-499b-6ae83f0af426@virtuozzo.com>
Date: Tue, 14 Mar 2017 17:59:39 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.7.0
MIME-Version: 1.0
In-Reply-To: <CAG_fn=VgW2m8KLb49Xp8LerXKwMZTuUW67wc0mpTo7_86=TyWg@mail.gmail.com>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2017 14:58:25.7367 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB2060
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1403
Lines: 26

On 03/14/2017 05:09 PM, Alexander Potapenko wrote:
> On Tue, Mar 14, 2017 at 12:03 AM, tip-bot for Andrey Ryabinin
> <tipbot@zytor.com> wrote:
>> Commit-ID:  be3606ff739d1c1be36389f8737c577ad87e1f57
>> Gitweb:     http://git.kernel.org/tip/be3606ff739d1c1be36389f8737c577ad87e1f57
>> Author:     Andrey Ryabinin <aryabinin@virtuozzo.com>
>> AuthorDate: Mon, 13 Mar 2017 19:33:37 +0300
>> Committer:  Thomas Gleixner <tglx@linutronix.de>
>> CommitDate: Tue, 14 Mar 2017 00:00:55 +0100
>>
>> 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().
> Won't it suffice to disable instrumentation of ftrace_likely_update() and alike?

Not just ftrace_likely_update(), but also all functions that ftrace_likely_update() might call.
That would suffice, but it would be unreasonable way to fix this, given that we can just
ftrace_likely_update() call.
Plus we don't have any sane way to disable instrumentation per-function.