Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcfa5fe3 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Paul Lawrence
Browse files

BACKPORT: irq: Make the irqentry text section unconditional 



Generate irqentry and softirqentry text sections without
any Kconfig dependencies. This will add extra sections, but
there should be no performace impact.

Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: David S . Miller <davem@davemloft.net>
Cc: Francis Deslauriers <francis.deslauriers@efficios.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: linux-arch@vger.kernel.org
Cc: linux-cris-kernel@axis.com
Cc: mathieu.desnoyers@efficios.com
Link: http://lkml.kernel.org/r/150172789110.27216.3955739126693102122.stgit@devbox


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>

Bug: 64145065
(cherry-picked from 229a71860547ec856b156179a9c6bef2de426f66)
Change-Id: I8f10ad59f16d637834a9dcacebdf087a028e995d
Signed-off-by: default avatarPaul Lawrence <paullawrence@google.com>
parent 5249dcc4

arch/arm/include/asm/traps.h

+0 −7
Original line number Diff line number Diff line
@@ -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)

{

arch/arm64/include/asm/traps.h

+0 −7
Original line number Diff line number Diff line
@@ -34,7 +34,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[];
@@ -43,12 +42,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)

{

arch/x86/entry/entry_64.S

+2 −7
Original line number Diff line number Diff line
@@ -673,13 +673,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



.macro apicinterrupt num sym do_sym

PUSH_SECTION_IRQENTRY

include/asm-generic/sections.h

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,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[];
@@ -35,6 +37,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[];

include/asm-generic/vmlinux.lds.h

+0 −8
Original line number Diff line number Diff line
@@ -465,25 +465,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)