Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-04 04:04:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

objtool: Rename "VMLINUX_VALIDATION" -> "NOINSTR_VALIDATION"

Browse Source 
CONFIG_VMLINUX_VALIDATION is just the validation of the "noinstr" rules.
That name is a misnomer, because now objtool actually does vmlinux
validation for other reasons.

Rename CONFIG_VMLINUX_VALIDATION to CONFIG_NOINSTR_VALIDATION.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Link: https://lkml.kernel.org/r/173f07e2d6d1afc0874aed975a61783207c6a531.1650300597.git.jpoimboe@redhat.com
This commit is contained in:
Josh Poimboeuf 2022-04-18 09:50:41 -07:00 committed by Peter Zijlstra
parent 22102f4559
commit 0f620cefd7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/instrumentation.h
View File

@ -2,7 +2,7 @@
#ifndef __LINUX_INSTRUMENTATION_H #ifndef __LINUX_INSTRUMENTATION_H
#define __LINUX_INSTRUMENTATION_H #define __LINUX_INSTRUMENTATION_H
#ifdef CONFIG_VMLINUX_VALIDATION #ifdef CONFIG_NOINSTR_VALIDATION
#include <linux/stringify.h> #include <linux/stringify.h>
@ -53,9 +53,9 @@
".popsection\n\t" : : "i" (c)); \ ".popsection\n\t" : : "i" (c)); \
}) })
#define instrumentation_end() __instrumentation_end(__COUNTER__) #define instrumentation_end() __instrumentation_end(__COUNTER__)
#else /* !CONFIG_VMLINUX_VALIDATION */ #else /* !CONFIG_NOINSTR_VALIDATION */
# define instrumentation_begin() do { } while(0) # define instrumentation_begin() do { } while(0)
# define instrumentation_end() do { } while(0) # define instrumentation_end() do { } while(0)
#endif /* CONFIG_VMLINUX_VALIDATION */ #endif /* CONFIG_NOINSTR_VALIDATION */
#endif /* __LINUX_INSTRUMENTATION_H */ #endif /* __LINUX_INSTRUMENTATION_H */

2
lib/Kconfig.debug
View File

@ -500,7 +500,7 @@ config STACK_VALIDATION
For more information, see For more information, see
tools/objtool/Documentation/stack-validation.txt. tools/objtool/Documentation/stack-validation.txt.
config VMLINUX_VALIDATION config NOINSTR_VALIDATION
bool bool
depends on HAVE_OBJTOOL && DEBUG_ENTRY depends on HAVE_OBJTOOL && DEBUG_ENTRY
select OBJTOOL select OBJTOOL

2
scripts/link-vmlinux.sh
View File

@ -160,7 +160,7 @@ objtool_link()
objtoolopt="${objtoolopt} --lto" objtoolopt="${objtoolopt} --lto"
fi fi
if is_enabled CONFIG_VMLINUX_VALIDATION; then if is_enabled CONFIG_NOINSTR_VALIDATION; then
objtoolopt="${objtoolopt} --noinstr" objtoolopt="${objtoolopt} --noinstr"
fi fi