From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932839AbcHJSIg (ORCPT ); Wed, 10 Aug 2016 14:08:36 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56404 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932629AbcHJSIc (ORCPT ); Wed, 10 Aug 2016 14:08:32 -0400 Date: Wed, 10 Aug 2016 11:07:27 -0700 From: tip-bot for Alexander Potapenko Message-ID: Cc: luto@kernel.org, bp@alien8.de, dvlasenk@redhat.com, brgerst@gmail.com, jpoimboe@redhat.com, hpa@zytor.com, peterz@infradead.org, dvyukov@google.com, torvalds@linux-foundation.org, tglx@linutronix.de, glider@google.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: luto@kernel.org, brgerst@gmail.com, bp@alien8.de, dvlasenk@redhat.com, jpoimboe@redhat.com, peterz@infradead.org, dvyukov@google.com, hpa@zytor.com, glider@google.com, tglx@linutronix.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <1468575763-144889-1-git-send-email-glider@google.com> References: <1468575763-144889-1-git-send-email-glider@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86, kasan, ftrace: Put APIC interrupt handlers into .irqentry.text Git-Commit-ID: 469f00231278da68062a809306df0bac95a27507 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 469f00231278da68062a809306df0bac95a27507 Gitweb: http://git.kernel.org/tip/469f00231278da68062a809306df0bac95a27507 Author: Alexander Potapenko AuthorDate: Fri, 15 Jul 2016 11:42:43 +0200 Committer: Ingo Molnar CommitDate: Wed, 10 Aug 2016 14:19:33 +0200 x86, kasan, ftrace: Put APIC interrupt handlers into .irqentry.text Dmitry Vyukov has reported unexpected KASAN stackdepot growth: https://github.com/google/kasan/issues/36 ... which is caused by the APIC handlers not being present in .irqentry.text: When building with CONFIG_FUNCTION_GRAPH_TRACER=y or CONFIG_KASAN=y, put the APIC interrupt handlers into the .irqentry.text section. This is needed because both KASAN and function graph tracer use __irqentry_text_start and __irqentry_text_end to determine whether a function is an IRQ entry point. Reported-by: Dmitry Vyukov Signed-off-by: Alexander Potapenko Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: aryabinin@virtuozzo.com Cc: kasan-dev@googlegroups.com Cc: kcc@google.com Cc: rostedt@goodmis.org Link: http://lkml.kernel.org/r/1468575763-144889-1-git-send-email-glider@google.com [ Minor edits. ] Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64.S | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index b846875..9f85827 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -601,9 +601,20 @@ apicinterrupt3 \num trace(\sym) smp_trace(\sym) .endm #endif +/* Make sure APIC interrupt handlers end up in the irqentry section: */ +#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN) +# define PUSH_SECTION_IRQENTRY .pushsection .irqentry.text, "ax" +# define POP_SECTION_IRQENTRY .popsection +#else +# define PUSH_SECTION_IRQENTRY +# define POP_SECTION_IRQENTRY +#endif + .macro apicinterrupt num sym do_sym +PUSH_SECTION_IRQENTRY apicinterrupt3 \num \sym \do_sym trace_apicinterrupt \num \sym +POP_SECTION_IRQENTRY .endm #ifdef CONFIG_SMP