extable: Make init_kernel_text() global

jpoimboe · ingomolnar · commit 9fbcc57aa164 · 2018-02-21T16:54:06.000+01:00
Convert init_kernel_text() to a global function and use it in a few places instead of manually comparing _sinittext and _einittext. Note that kallsyms.h has a very similar function called is_kernel_inittext(), but its end check is inclusive. I'm not sure whether that's intentional behavior, so I didn't touch it. Suggested-by: Jason Baron <jbaron@akamai.com> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Acked-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Cc: Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/4335d02be8d45ca7d265d2f174251d0b7ee6c5fd.1519051220.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c
@@ -5,7 +5,6 @@
 #include <asm/unwind.h>
 #include <asm/orc_types.h>
 #include <asm/orc_lookup.h>
-#include <asm/sections.h>
 
 #define orc_warn(fmt, ...) \
 	printk_deferred_once(KERN_WARNING pr_fmt("WARNING: " fmt), ##__VA_ARGS__)
@@ -148,7 +147,7 @@ static struct orc_entry *orc_find(unsigned long ip)
 	}
 
 	/* vmlinux .init slow lookup: */
-	if (ip >= (unsigned long)_sinittext && ip < (unsigned long)_einittext)
+	if (init_kernel_text(ip))
 		return __orc_find(__start_orc_unwind_ip, __start_orc_unwind,
 				  __stop_orc_unwind_ip - __start_orc_unwind_ip, ip);
 
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
@@ -472,6 +472,7 @@ extern bool parse_option_str(const char *str, const char *option);
 extern char *next_arg(char *args, char **param, char **val);
 
 extern int core_kernel_text(unsigned long addr);
+extern int init_kernel_text(unsigned long addr);
 extern int core_kernel_data(unsigned long addr);
 extern int __kernel_text_address(unsigned long addr);
 extern int kernel_text_address(unsigned long addr);
diff --git a/kernel/extable.c b/kernel/extable.c
@@ -64,7 +64,7 @@ const struct exception_table_entry *search_exception_tables(unsigned long addr)
 	return e;
 }
 
-static inline int init_kernel_text(unsigned long addr)
+int init_kernel_text(unsigned long addr)
 {
 	if (addr >= (unsigned long)_sinittext &&
 	    addr < (unsigned long)_einittext)
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
@@ -16,7 +16,6 @@
 #include <linux/jump_label_ratelimit.h>
 #include <linux/bug.h>
 #include <linux/cpu.h>
-#include <asm/sections.h>
 
 #ifdef HAVE_JUMP_LABEL
 
@@ -429,8 +428,7 @@ void __init jump_label_invalidate_init(void)
 	struct jump_entry *iter;
 
 	for (iter = iter_start; iter < iter_stop; iter++) {
-		if (iter->code >= (unsigned long)_sinittext &&
-		    iter->code < (unsigned long)_einittext)
+		if (init_kernel_text(iter->code))
 			iter->code = 0;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ const struct exception_table_entry *search_exception_tables(unsigned long addr)`
`64`	`64`	`return e;`
`65`	`65`	`}`
`66`	`66`
`67`		`-static inline int init_kernel_text(unsigned long addr)`
	`67`	`+int init_kernel_text(unsigned long addr)`
`68`	`68`	`{`
`69`	`69`	`if (addr >= (unsigned long)_sinittext &&`
`70`	`70`	`addr < (unsigned long)_einittext)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`#include <linux/jump_label_ratelimit.h>`
`17`	`17`	`#include <linux/bug.h>`
`18`	`18`	`#include <linux/cpu.h>`
`19`		`-#include <asm/sections.h>`
`20`	`19`
`21`	`20`	`#ifdef HAVE_JUMP_LABEL`
`22`	`21`
`@@ -429,8 +428,7 @@ void __init jump_label_invalidate_init(void)`
`429`	`428`	`struct jump_entry *iter;`
`430`	`429`
`431`	`430`	`for (iter = iter_start; iter < iter_stop; iter++) {`
`432`		`- if (iter->code >= (unsigned long)_sinittext &&`
`433`		`- iter->code < (unsigned long)_einittext)`
	`431`	`+ if (init_kernel_text(iter->code))`
`434`	`432`	`iter->code = 0;`
`435`	`433`	`}`
`436`	`434`	`}`