Revert "bpf: Fix ORC unwinding in non-JIT BPF code"
Subsystems (4)
RFC PATCH 1/1 Revert "bpf: Fix ORC unwinding in non-JIT BPF code"
Apparently this was a bit premature, at least I still get this warning with gcc-8.1:
kernel/bpf/core.o: warning: objtool: ___bpf_prog_run()+0x44d2: sibling call from callable instruction with modified stack frame
This reverts commit b22cf36c189f31883ad0238a69ccf82aa1f3b16b.
--- kernel/bpf/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/core.c +2 -1
@@ -1299,7 +1299,7 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, u64 *stack) {#define BPF_INSN_2_LBL (x, y) [BPF_##x | BPF_##y] = &&x##_##y#define BPF_INSN_3_LBL (x, y, z) [BPF_##x | BPF_##y | BPF_##z] = &&x##_##y##_##z - static const void * const jumptable[256] __annotate_jump_table = { +static const void *jumptable[256 ] = { [0 ...255 ] = &&default_label,/* Now overwrite non-defaults ... */ BPF_INSN_MAP (BPF_INSN_2_LBL ,BPF_INSN_3_LBL ),
@@ -1558,6 +1558,7 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, u64 *stack)BUG_ON (1 );return 0 ; } +STACK_FRAME_NON_STANDARD (___bpf_prog_run);/* jump table */ #define PROG_NAME (stack_size) __bpf_prog_run##stack_size#define DEFINE_BPF_PROG_RUN (stack_size) \
Signature · 1 line
2.20.0
Quoted 8 lines · Arnd Bergmann
Apparently this was a bit premature, at least I still get this warning with gcc-8.1:
kernel/bpf/core.o: warning: objtool: ___bpf_prog_run()+0x44d2: sibling call from callable instruction with modified stack frameThis reverts commit
b22cf36c189f31883ad0238a69ccf82aa1f3b16b.Signed-off-by Arnd Bergmann <[email protected]>
Yes, I have been working on a fix.
The impact is that ORC unwinding is broken in this function for CONFIG_RETPOLINE=n.
I don't think we want to revert this patch though, because that will broaden the impact to the CONFIG_RETPOLINE=y case. Anyway I hope to have fixes soon.
Signature · 1 line
Josh
Quoted 11 lines · Josh Poimboeuf
Quoted 8 lines · Arnd Bergmann
Apparently this was a bit premature, at least I still get this warning with gcc-8.1:
kernel/bpf/core.o: warning: objtool: ___bpf_prog_run()+0x44d2: sibling call from callable instruction with modified stack frameThis reverts commit
b22cf36c189f31883ad0238a69ccf82aa1f3b16b.Signed-off-by Arnd Bergmann <[email protected]>
Quoted 8 lines
Yes, I have been working on a fix.
The impact is that ORC unwinding is broken in this function for
CONFIG_RETPOLINE=n.I don't think we want to revert this patch though, because that will broaden the impact to the
CONFIG_RETPOLINE=ycase. Anyway I hope to have fixes soon.
Ok, sounds good. Thanks,
Arnd