Skip to contentSkip to conversation

x86,bpf: Avoid IBT objtool warning

PATCH Applied Peter Zijlstra 3 participants 5 messages Apr 5, 2022 – Apr 7, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86,bpf: Avoid IBT objtool warning

Clang can inline emit_indirect_jump() and then folds constants, which results in:

  | vmlinux.o: warning: objtool: emit_bpf_dispatcher()+0x6a4: relocation to !ENDBR: .text.__x86.indirect_thunk+0x40
  | vmlinux.o: warning: objtool: emit_bpf_dispatcher()+0x67d: relocation to !ENDBR: .text.__x86.indirect_thunk+0x40
  | vmlinux.o: warning: objtool: emit_bpf_tail_call_indirect()+0x386: relocation to !ENDBR: .text.__x86.indirect_thunk+0x20
  | vmlinux.o: warning: objtool: emit_bpf_tail_call_indirect()+0x35d: relocation to !ENDBR: .text.__x86.indirect_thunk+0x20

Suppress the optimization such that it must emit a code reference to the __x86_indirect_thunk_array[] base.

---
 arch/x86/net/bpf_jit_comp.c |    1 +
 1 file changed, 1 insertion(+)
arch/x86/net/bpf_jit_comp.c +1 -0
@@ -412,6 +412,7 @@ static void emit_indirect_jump(u8 **ppro
 		EMIT_LFENCE();
 		EMIT2(0xFF, 0xE0 + reg);
 	} else if (cpu_feature_enabled(X86_FEATURE_RETPOLINE)) {
+		OPTIMIZER_HIDE_VAR(reg);
 		emit_jump(&prog, &__x86_indirect_thunk_array[reg], ip);
 	} else
 #endif
#1 lore raw
Quoted 21 lines · Peter Zijlstra

Clang can inline emit_indirect_jump() and then folds constants, which results in:

  | vmlinux.o: warning: objtool: emit_bpf_dispatcher()+0x6a4: relocation to !ENDBR: .text.__x86.indirect_thunk+0x40
  | vmlinux.o: warning: objtool: emit_bpf_dispatcher()+0x67d: relocation to !ENDBR: .text.__x86.indirect_thunk+0x40
  | vmlinux.o: warning: objtool: emit_bpf_tail_call_indirect()+0x386: relocation to !ENDBR: .text.__x86.indirect_thunk+0x20
  | vmlinux.o: warning: objtool: emit_bpf_tail_call_indirect()+0x35d: relocation to !ENDBR: .text.__x86.indirect_thunk+0x20

Suppress the optimization such that it must emit a code reference to the __x86_indirect_thunk_array[] base.

---
 arch/x86/net/bpf_jit_comp.c |    1 +
 1 file changed, 1 insertion(+)

arch/x86/net/bpf_jit_comp.c static void emit_indirect_jump(u8 **ppro · line 418

Quoted 7 lines
arch/x86/net/bpf_jit_comp.c +1 -0
@@ -412,6 +412,7 @@ static void emit_indirect_jump(u8 **ppro
                EMIT_LFENCE();
                EMIT2(0xFF, 0xE0 + reg);
        } else if (cpu_feature_enabled(X86_FEATURE_RETPOLINE)) {
+               OPTIMIZER_HIDE_VAR(reg);
                emit_jump(&prog, &__x86_indirect_thunk_array[reg], ip);
        } else
 #endif

Looks good. Please cc bpf@vger and all bpf maintainers in the future. We can take it through the bpf tree if you prefer.

#2 lore raw
Quoted 19 lines · Alexei Starovoitov
Quoted 18 lines · Peter Zijlstra

Clang can inline emit_indirect_jump() and then folds constants, which results in:

  | vmlinux.o: warning: objtool: emit_bpf_dispatcher()+0x6a4: relocation to !ENDBR: .text.__x86.indirect_thunk+0x40
  | vmlinux.o: warning: objtool: emit_bpf_dispatcher()+0x67d: relocation to !ENDBR: .text.__x86.indirect_thunk+0x40
  | vmlinux.o: warning: objtool: emit_bpf_tail_call_indirect()+0x386: relocation to !ENDBR: .text.__x86.indirect_thunk+0x20
  | vmlinux.o: warning: objtool: emit_bpf_tail_call_indirect()+0x35d: relocation to !ENDBR: .text.__x86.indirect_thunk+0x20

Suppress the optimization such that it must emit a code reference to the __x86_indirect_thunk_array[] base.

---
 arch/x86/net/bpf_jit_comp.c |    1 +
 1 file changed, 1 insertion(+)
Quoted 12 lines

arch/x86/net/bpf_jit_comp.c static void emit_indirect_jump(u8 **ppro · line 418

Quoted 10 lines
arch/x86/net/bpf_jit_comp.c +1 -0
@@ -412,6 +412,7 @@ static void emit_indirect_jump(u8 **ppro
                EMIT_LFENCE();
                EMIT2(0xFF, 0xE0 + reg);
        } else if (cpu_feature_enabled(X86_FEATURE_RETPOLINE)) {
+               OPTIMIZER_HIDE_VAR(reg);
                emit_jump(&prog, &__x86_indirect_thunk_array[reg], ip);
        } else
 #endif

Looks good. Please cc bpf@vger and all bpf maintainers in the future.

Oh right, I'll go add an alias for that.

Quoted 1 line

We can take it through the bpf tree if you prefer.

I'll take it through the x86/urgent tree if you don't mind.

#3 lore raw
Quoted 34 lines · Peter Zijlstra
Quoted 19 lines · Alexei Starovoitov
Quoted 18 lines · Peter Zijlstra

Clang can inline emit_indirect_jump() and then folds constants, which results in:

  | vmlinux.o: warning: objtool: emit_bpf_dispatcher()+0x6a4: relocation to !ENDBR: .text.__x86.indirect_thunk+0x40
  | vmlinux.o: warning: objtool: emit_bpf_dispatcher()+0x67d: relocation to !ENDBR: .text.__x86.indirect_thunk+0x40
  | vmlinux.o: warning: objtool: emit_bpf_tail_call_indirect()+0x386: relocation to !ENDBR: .text.__x86.indirect_thunk+0x20
  | vmlinux.o: warning: objtool: emit_bpf_tail_call_indirect()+0x35d: relocation to !ENDBR: .text.__x86.indirect_thunk+0x20

Suppress the optimization such that it must emit a code reference to the __x86_indirect_thunk_array[] base.

---
 arch/x86/net/bpf_jit_comp.c |    1 +
 1 file changed, 1 insertion(+)
Quoted 12 lines

arch/x86/net/bpf_jit_comp.c static void emit_indirect_jump(u8 **ppro · line 418

Quoted 10 lines
arch/x86/net/bpf_jit_comp.c +1 -0
@@ -412,6 +412,7 @@ static void emit_indirect_jump(u8 **ppro
                EMIT_LFENCE();
                EMIT2(0xFF, 0xE0 + reg);
        } else if (cpu_feature_enabled(X86_FEATURE_RETPOLINE)) {
+               OPTIMIZER_HIDE_VAR(reg);
                emit_jump(&prog, &__x86_indirect_thunk_array[reg], ip);
        } else
 #endif

Looks good. Please cc bpf@vger and all bpf maintainers in the future.

Quoted 5 lines

Oh right, I'll go add an alias for that.

Quoted 1 line

We can take it through the bpf tree if you prefer.

I'll take it through the x86/urgent tree if you don't mind.

Sure. Then pls add:

merge bot Applied
#4 lore raw
In reply to Peter Zijlstra
The 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:     be8a096521ca1a252bf078b347f96ce94582612e
Gitweb:        https://git.kernel.org/tip/be8a096521ca1a252bf078b347f96ce94582612e
Author:        Peter Zijlstra <[email protected]>
AuthorDate:    Mon, 28 Mar 2022 13:13:41 +02:00
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Thu, 07 Apr 2022 11:27:02 +02:00

x86,bpf: Avoid IBT objtool warning

Clang can inline emit_indirect_jump() and then folds constants, which results in:

  | vmlinux.o: warning: objtool: emit_bpf_dispatcher()+0x6a4: relocation to !ENDBR: .text.__x86.indirect_thunk+0x40
  | vmlinux.o: warning: objtool: emit_bpf_dispatcher()+0x67d: relocation to !ENDBR: .text.__x86.indirect_thunk+0x40
  | vmlinux.o: warning: objtool: emit_bpf_tail_call_indirect()+0x386: relocation to !ENDBR: .text.__x86.indirect_thunk+0x20
  | vmlinux.o: warning: objtool: emit_bpf_tail_call_indirect()+0x35d: relocation to !ENDBR: .text.__x86.indirect_thunk+0x20

Suppress the optimization such that it must emit a code reference to the __x86_indirect_thunk_array[] base.

---
 arch/x86/net/bpf_jit_comp.c | 1 +
 1 file changed, 1 insertion(+)
arch/x86/net/bpf_jit_comp.c +1 -0
index 8fe35ed..16b6efa 100644
@@ -412,6 +412,7 @@ static void emit_indirect_jump(u8 **pprog, int reg, u8 *ip)
 		EMIT_LFENCE();
 		EMIT2(0xFF, 0xE0 + reg);
 	} else if (cpu_feature_enabled(X86_FEATURE_RETPOLINE)) {
+		OPTIMIZER_HIDE_VAR(reg);
 		emit_jump(&prog, &__x86_indirect_thunk_array[reg], ip);
 	} else
 #endif