From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751872AbdG1N7Z (ORCPT ); Fri, 28 Jul 2017 09:59:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:36086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751628AbdG1N7X (ORCPT ); Fri, 28 Jul 2017 09:59:23 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9BB8022B5D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mhiramat@kernel.org Date: Fri, 28 Jul 2017 22:59:19 +0900 From: Masami Hiramatsu To: Masami Hiramatsu Cc: Ingo Molnar , Thomas Gleixner , Francis Deslauriers , mathieu.desnoyers@efficios.com, Ingo Molnar , "H . Peter Anvin" , x86@kernel.org, Ananth N Mavinakayanahalli , Anil S Keshavamurthy , "David S . Miller" , linux-kernel@vger.kernel.org Subject: Re: [PATCH -tip v6 1/2] irq: Make irqentry text section unconditional Message-Id: <20170728225919.92529a3e8a7aeafc22912028@kernel.org> In-Reply-To: <150124468372.6501.3884857653765901200.stgit@devbox> References: <150124468372.6501.3884857653765901200.stgit@devbox> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 28 Jul 2017 21:24:54 +0900 Masami Hiramatsu wrote: > Generate irqentry and softirqentry text sections without > any configs. This will add above extra sections, but > no performace impact. > > Signed-off-by: Masami Hiramatsu > Suggested-by: Ingo Molnar > --- > arch/arm/include/asm/traps.h | 7 ------- > arch/arm64/include/asm/traps.h | 7 ------- > arch/x86/entry/entry_64.S | 9 ++------- > include/asm-generic/sections.h | 4 ++++ > include/asm-generic/vmlinux.lds.h | 8 -------- > include/linux/interrupt.h | 14 +------------- > 6 files changed, 7 insertions(+), 42 deletions(-) Oops, I forgot to fix x86 unwind code. I'll update this to fix in_entry_code() unconditional. Thanks, > > diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h > index f555bb3664dc..683d9230984a 100644 > --- a/arch/arm/include/asm/traps.h > +++ b/arch/arm/include/asm/traps.h > @@ -18,7 +18,6 @@ struct undef_hook { > void register_undef_hook(struct undef_hook *hook); > void unregister_undef_hook(struct undef_hook *hook); > > -#ifdef CONFIG_FUNCTION_GRAPH_TRACER > static inline int __in_irqentry_text(unsigned long ptr) > { > extern char __irqentry_text_start[]; > @@ -27,12 +26,6 @@ static inline int __in_irqentry_text(unsigned long ptr) > return ptr >= (unsigned long)&__irqentry_text_start && > ptr < (unsigned long)&__irqentry_text_end; > } > -#else > -static inline int __in_irqentry_text(unsigned long ptr) > -{ > - return 0; > -} > -#endif > > static inline int in_exception_text(unsigned long ptr) > { > diff --git a/arch/arm64/include/asm/traps.h b/arch/arm64/include/asm/traps.h > index 02e9035b0685..47a9066f7c86 100644 > --- a/arch/arm64/include/asm/traps.h > +++ b/arch/arm64/include/asm/traps.h > @@ -37,18 +37,11 @@ void unregister_undef_hook(struct undef_hook *hook); > > void arm64_notify_segfault(struct pt_regs *regs, unsigned long addr); > > -#ifdef CONFIG_FUNCTION_GRAPH_TRACER > static inline int __in_irqentry_text(unsigned long ptr) > { > return ptr >= (unsigned long)&__irqentry_text_start && > ptr < (unsigned long)&__irqentry_text_end; > } > -#else > -static inline int __in_irqentry_text(unsigned long ptr) > -{ > - return 0; > -} > -#endif > > static inline int in_exception_text(unsigned long ptr) > { > diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S > index aa58155187c5..5e41396efbbf 100644 > --- a/arch/x86/entry/entry_64.S > +++ b/arch/x86/entry/entry_64.S > @@ -766,13 +766,8 @@ apicinterrupt3 \num trace(\sym) smp_trace(\sym) > #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 > +#define PUSH_SECTION_IRQENTRY .pushsection .irqentry.text, "ax" > +#define POP_SECTION_IRQENTRY .popsection > > .macro apicinterrupt num sym do_sym > PUSH_SECTION_IRQENTRY > diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h > index 532372c6cf15..e5da44eddd2f 100644 > --- a/include/asm-generic/sections.h > +++ b/include/asm-generic/sections.h > @@ -27,6 +27,8 @@ > * __kprobes_text_start, __kprobes_text_end > * __entry_text_start, __entry_text_end > * __ctors_start, __ctors_end > + * __irqentry_text_start, __irqentry_text_end > + * __softirqentry_text_start, __softirqentry_text_end > */ > extern char _text[], _stext[], _etext[]; > extern char _data[], _sdata[], _edata[]; > @@ -39,6 +41,8 @@ extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[]; > extern char __kprobes_text_start[], __kprobes_text_end[]; > extern char __entry_text_start[], __entry_text_end[]; > extern char __start_rodata[], __end_rodata[]; > +extern char __irqentry_text_start[], __irqentry_text_end[]; > +extern char __softirqentry_text_start[], __softirqentry_text_end[]; > > /* Start and end of .ctors section - used for constructor calls. */ > extern char __ctors_start[], __ctors_end[]; > diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h > index fffc9bdae025..438b014c192f 100644 > --- a/include/asm-generic/vmlinux.lds.h > +++ b/include/asm-generic/vmlinux.lds.h > @@ -483,25 +483,17 @@ > *(.entry.text) \ > VMLINUX_SYMBOL(__entry_text_end) = .; > > -#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN) > #define IRQENTRY_TEXT \ > ALIGN_FUNCTION(); \ > VMLINUX_SYMBOL(__irqentry_text_start) = .; \ > *(.irqentry.text) \ > VMLINUX_SYMBOL(__irqentry_text_end) = .; > -#else > -#define IRQENTRY_TEXT > -#endif > > -#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN) > #define SOFTIRQENTRY_TEXT \ > ALIGN_FUNCTION(); \ > VMLINUX_SYMBOL(__softirqentry_text_start) = .; \ > *(.softirqentry.text) \ > VMLINUX_SYMBOL(__softirqentry_text_end) = .; > -#else > -#define SOFTIRQENTRY_TEXT > -#endif > > /* Section used for early init (in .S files) */ > #define HEAD_TEXT *(.head.text) > diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h > index a2fddddb0d60..59ba11661b6e 100644 > --- a/include/linux/interrupt.h > +++ b/include/linux/interrupt.h > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > > /* > * These correspond to the IORESOURCE_IRQ_* defines in > @@ -726,7 +727,6 @@ extern int early_irq_init(void); > extern int arch_probe_nr_irqs(void); > extern int arch_early_irq_init(void); > > -#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN) > /* > * We want to know which function is an entrypoint of a hardirq or a softirq. > */ > @@ -734,16 +734,4 @@ extern int arch_early_irq_init(void); > #define __softirq_entry \ > __attribute__((__section__(".softirqentry.text"))) > > -/* Limits of hardirq entrypoints */ > -extern char __irqentry_text_start[]; > -extern char __irqentry_text_end[]; > -/* Limits of softirq entrypoints */ > -extern char __softirqentry_text_start[]; > -extern char __softirqentry_text_end[]; > - > -#else > -#define __irq_entry > -#define __softirq_entry > -#endif > - > #endif > -- Masami Hiramatsu