x86/ibt: Fix some spurious ENDBR instances
Peter Zijlstra
maintainerPATCH 2/2 x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*()
In reply to Peter ZijlstraCommit cb855971d717 ("x86/putuser: Provide room for padding") changed __put_user_nocheck_*() into proper functions but failed to note that SYM_FUNC_START() already provides ENDBR, rendering the explicit ENDBR superfluous.
--- arch/x86/lib/putuser.S | 4 ---- 1 file changed, 4 deletions(-)
arch/x86/lib/putuser.S +0 -4
@@ -56,7 +56,6 @@ SYM_FUNC_END(__put_user_1) EXPORT_SYMBOL(__put_user_1) SYM_FUNC_START(__put_user_nocheck_1) - ENDBR ASM_STAC 2: movb %al,(%_ASM_CX) xor %ecx,%ecx
@@ -76,7 +75,6 @@ SYM_FUNC_END(__put_user_2) EXPORT_SYMBOL(__put_user_2) SYM_FUNC_START(__put_user_nocheck_2) - ENDBR ASM_STAC 4: movw %ax,(%_ASM_CX) xor %ecx,%ecx
@@ -96,7 +94,6 @@ SYM_FUNC_END(__put_user_4) EXPORT_SYMBOL(__put_user_4) SYM_FUNC_START(__put_user_nocheck_4) - ENDBR ASM_STAC 6: movl %eax,(%_ASM_CX) xor %ecx,%ecx
@@ -119,7 +116,6 @@ SYM_FUNC_END(__put_user_8) EXPORT_SYMBOL(__put_user_8) SYM_FUNC_START(__put_user_nocheck_8) - ENDBR ASM_STAC 9: mov %_ASM_AX,(%_ASM_CX) #ifdef CONFIG_X86_32
Peter Zijlstra
maintainercover x86/ibt: Fix some spurious ENDBR instances
Hi,
David was staring at assembly output and noticed a few spurious ENDBR instructions.
Peter Zijlstra
maintainerPATCH 1/2 x86/ibt: Suppress spurious ENDBR
It was reported that under certain circumstances GCC emits ENDBR instructions for _THIS_IP_ usage. Specifically, when it appears at the start of a basic block -- but not elsewhere.
Since _THIS_IP_ is never used for control flow, these ENDBR instructions are completely superfluous. Override the _THIS_IP_ definition for x86_64 to avoid this.
Less ENDBR instructions is better.
--- arch/x86/include/asm/linkage.h | 8 ++++++++ include/linux/instruction_pointer.h | 5 +++++ 2 files changed, 13 insertions(+)
arch/x86/include/asm/linkage.h +8 -0
@@ -8,6 +8,14 @@#undef notrace#define notrace __attribute__((no_instrument_function)) +#ifdef CONFIG_64BIT +/* +* The generic version tends to create spurious ENDBR instructions under +* certain conditions. +*/ +#define _THIS_IP_ ({ unsigned long __here; asm ("lea 0(%%rip), %0" : "=r" (__here)); __here; }) +#endif +#ifdef CONFIG_X86_32 #define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))#endif /* CONFIG_X86_32 */
include/linux/instruction_pointer.h +5 -0
@@ -2,7 +2,12 @@#ifndef _LINUX_INSTRUCTION_POINTER_H#define _LINUX_INSTRUCTION_POINTER_H +#include <asm/linkage.h> +#define _RET_IP_ (unsigned long)__builtin_return_address(0) + +#ifndef _THIS_IP_#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) +#endif #endif /* _LINUX_INSTRUCTION_POINTER_H */
Quoted 5 lines · Peter Zijlstra
Hi,
David was staring at assembly output and noticed a few spurious ENDBR instructions.
Peter Zijlstra
maintainerRe: [PATCH 2/2] x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*()
In reply to Peter ZijlstraQuoted 4 lines · Peter Zijlstra
Commit
cb855971d717("x86/putuser: Provide room for padding") changed __put_user_nocheck_*() into proper functions but failed to note thatSYM_FUNC_START()already provides ENDBR, rendering the explicit ENDBR superfluous.
The below objtool thing reliably detects this pattern:
vmlinux.o: warning: objtool: __put_user_nocheck_1+0x4: duplicate ENDBR vmlinux.o: warning: objtool: __put_user_nocheck_2+0x4: duplicate ENDBR vmlinux.o: warning: objtool: __put_user_nocheck_4+0x4: duplicate ENDBR vmlinux.o: warning: objtool: __put_user_nocheck_8+0x4: duplicate ENDBR
--- tools/objtool/check.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-)
tools/objtool/check.c +23 -4
@@ -4254,13 +4254,30 @@ static bool noendbr_range(struct objtool_file *file, struct instruction *insn)return insn->offset == sym->offset + sym->len; } -static int validate_ibt_insn (struct objtool_file *file,struct instruction *insn) +static int validate_ibt_insn (struct objtool_file *file, +struct instruction *insn, +struct instruction *prev) {struct instruction *dest;struct reloc *reloc;unsigned long off;int warnings =0 ; +if (prev && prev->sym && prev->sym == insn->sym && + prev->type ==INSN_ENDBR && insn->type ==INSN_ENDBR ) { +/* +* ___bpf_prog_run() is a maze of 'label as value' and +* 'computed goto' and GCC gets confused and emits back-to-back +* ENDBR due to failing to merge two labels. +* +* Don't warn about this until GCC is fixed or verbose. +*/ +if (strcmp (insn->sym->name,"___bpf_prog_run" ) !=0 || opts.verbose) { +WARN_INSN (insn,"duplicate ENDBR" ); + warnings++; + } + } +/* * Looking for function pointer load relocations. Ignore * direct/indirect branches:
@@ -4382,11 +4399,13 @@ static int validate_ibt(struct objtool_file *file) {struct section *sec;struct reloc *reloc; -struct instruction *insn; +struct instruction *insn, *prev =NULL ;int warnings =0 ; -for_each_insn (file, insn) - warnings +=validate_ibt_insn (file, insn); +for_each_insn (file, insn) { + warnings +=validate_ibt_insn (file, insn, prev); + prev = insn; + }for_each_sec (file, sec) {
[tip: x86/urgent] x86/ibt: Suppress spurious ENDBR
In reply to Peter ZijlstraThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 70524a25365bab3dfe968691aa436fff765a8dde Gitweb: https://git.kernel.org/tip/70524a25365bab3dfe968691aa436fff765a8dde Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 02 Aug 2023 12:55:46 +02:00 Committer: root <[email protected]> CommitterDate: Tue, 12 Sep 2023 12:40:28 +02:00
x86/ibt: Suppress spurious ENDBR
It was reported that under certain circumstances GCC emits ENDBR instructions for _THIS_IP_ usage. Specifically, when it appears at the start of a basic block -- but not elsewhere.
Since _THIS_IP_ is never used for control flow, these ENDBR instructions are completely superfluous. Override the _THIS_IP_ definition for x86_64 to avoid this.
Less ENDBR instructions is better.
--- arch/x86/include/asm/linkage.h | 8 ++++++++ include/linux/instruction_pointer.h | 5 +++++ 2 files changed, 13 insertions(+)
arch/x86/include/asm/linkage.h +8 -0
@@ -8,6 +8,14 @@#undef notrace#define notrace __attribute__((no_instrument_function)) +#ifdef CONFIG_64BIT +/* +* The generic version tends to create spurious ENDBR instructions under +* certain conditions. +*/ +#define _THIS_IP_ ({ unsigned long __here; asm ("lea 0(%%rip), %0" : "=r" (__here)); __here; }) +#endif +#ifdef CONFIG_X86_32 #define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))#endif /* CONFIG_X86_32 */
include/linux/instruction_pointer.h +5 -0
@@ -2,7 +2,12 @@#ifndef _LINUX_INSTRUCTION_POINTER_H#define _LINUX_INSTRUCTION_POINTER_H +#include <asm/linkage.h> +#define _RET_IP_ (unsigned long)__builtin_return_address(0) + +#ifndef _THIS_IP_#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) +#endif #endif /* _LINUX_INSTRUCTION_POINTER_H */
[tip: x86/urgent] x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*()
In reply to Peter ZijlstraThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 1666863f28d7c490fa62ed5d1dfb1ba31453dc98 Gitweb: https://git.kernel.org/tip/1666863f28d7c490fa62ed5d1dfb1ba31453dc98 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 02 Aug 2023 12:55:47 +02:00 Committer: root <[email protected]> CommitterDate: Tue, 12 Sep 2023 12:40:28 +02:00
x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*()
Commit cb855971d717 ("x86/putuser: Provide room for padding") changed __put_user_nocheck_*() into proper functions but failed to note that SYM_FUNC_START() already provides ENDBR, rendering the explicit ENDBR superfluous.
--- arch/x86/lib/putuser.S | 4 ---- 1 file changed, 4 deletions(-)
arch/x86/lib/putuser.S +0 -4
@@ -56,7 +56,6 @@ SYM_FUNC_END(__put_user_1) EXPORT_SYMBOL(__put_user_1) SYM_FUNC_START(__put_user_nocheck_1) - ENDBR ASM_STAC 2: movb %al,(%_ASM_CX) xor %ecx,%ecx
@@ -76,7 +75,6 @@ SYM_FUNC_END(__put_user_2) EXPORT_SYMBOL(__put_user_2) SYM_FUNC_START(__put_user_nocheck_2) - ENDBR ASM_STAC 4: movw %ax,(%_ASM_CX) xor %ecx,%ecx
@@ -96,7 +94,6 @@ SYM_FUNC_END(__put_user_4) EXPORT_SYMBOL(__put_user_4) SYM_FUNC_START(__put_user_nocheck_4) - ENDBR ASM_STAC 6: movl %eax,(%_ASM_CX) xor %ecx,%ecx
@@ -119,7 +116,6 @@ SYM_FUNC_END(__put_user_8) EXPORT_SYMBOL(__put_user_8) SYM_FUNC_START(__put_user_nocheck_8) - ENDBR ASM_STAC 9: mov %_ASM_AX,(%_ASM_CX) #ifdef CONFIG_X86_32
[tip: x86/urgent] x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*()
In reply to Peter ZijlstraThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 7575e5a35267983dcbeb1e0d3a49d21ae3cf0b82 Gitweb: https://git.kernel.org/tip/7575e5a35267983dcbeb1e0d3a49d21ae3cf0b82 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 02 Aug 2023 12:55:47 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 12 Sep 2023 17:51:24 +02:00
x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*()
Commit cb855971d717 ("x86/putuser: Provide room for padding") changed __put_user_nocheck_*() into proper functions but failed to note that SYM_FUNC_START() already provides ENDBR, rendering the explicit ENDBR superfluous.
--- arch/x86/lib/putuser.S | 4 ---- 1 file changed, 4 deletions(-)
arch/x86/lib/putuser.S +0 -4
@@ -56,7 +56,6 @@ SYM_FUNC_END(__put_user_1) EXPORT_SYMBOL(__put_user_1) SYM_FUNC_START(__put_user_nocheck_1) - ENDBR ASM_STAC 2: movb %al,(%_ASM_CX) xor %ecx,%ecx
@@ -76,7 +75,6 @@ SYM_FUNC_END(__put_user_2) EXPORT_SYMBOL(__put_user_2) SYM_FUNC_START(__put_user_nocheck_2) - ENDBR ASM_STAC 4: movw %ax,(%_ASM_CX) xor %ecx,%ecx
@@ -96,7 +94,6 @@ SYM_FUNC_END(__put_user_4) EXPORT_SYMBOL(__put_user_4) SYM_FUNC_START(__put_user_nocheck_4) - ENDBR ASM_STAC 6: movl %eax,(%_ASM_CX) xor %ecx,%ecx
@@ -119,7 +116,6 @@ SYM_FUNC_END(__put_user_8) EXPORT_SYMBOL(__put_user_8) SYM_FUNC_START(__put_user_nocheck_8) - ENDBR ASM_STAC 9: mov %_ASM_AX,(%_ASM_CX) #ifdef CONFIG_X86_32
[tip: x86/urgent] x86/ibt: Suppress spurious ENDBR
In reply to Peter ZijlstraThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 25e73b7e3f72a25aa30cbb2eecb49036e0acf066 Gitweb: https://git.kernel.org/tip/25e73b7e3f72a25aa30cbb2eecb49036e0acf066 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 02 Aug 2023 12:55:46 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 12 Sep 2023 17:50:53 +02:00
x86/ibt: Suppress spurious ENDBR
It was reported that under certain circumstances GCC emits ENDBR instructions for _THIS_IP_ usage. Specifically, when it appears at the start of a basic block -- but not elsewhere.
Since _THIS_IP_ is never used for control flow, these ENDBR instructions are completely superfluous. Override the _THIS_IP_ definition for x86_64 to avoid this.
Less ENDBR instructions is better.
--- arch/x86/include/asm/linkage.h | 8 ++++++++ include/linux/instruction_pointer.h | 5 +++++ 2 files changed, 13 insertions(+)
arch/x86/include/asm/linkage.h +8 -0
@@ -8,6 +8,14 @@#undef notrace#define notrace __attribute__((no_instrument_function)) +#ifdef CONFIG_64BIT +/* +* The generic version tends to create spurious ENDBR instructions under +* certain conditions. +*/ +#define _THIS_IP_ ({ unsigned long __here; asm ("lea 0(%%rip), %0" : "=r" (__here)); __here; }) +#endif +#ifdef CONFIG_X86_32 #define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))#endif /* CONFIG_X86_32 */
include/linux/instruction_pointer.h +5 -0
@@ -2,7 +2,12 @@#ifndef _LINUX_INSTRUCTION_POINTER_H#define _LINUX_INSTRUCTION_POINTER_H +#include <asm/linkage.h> +#define _RET_IP_ (unsigned long)__builtin_return_address(0) + +#ifndef _THIS_IP_#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) +#endif #endif /* _LINUX_INSTRUCTION_POINTER_H */