lkml.org 
[lkml]   [2021]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2 14/14] bpf,x86: Respect X86_FEATURE_RETPOLINE*
On Wed, Oct 20, 2021 at 01:09:51PM +0200, Peter Zijlstra wrote:
> > - RETPOLINE_RCX_BPF_JIT();
> > + emit_indirect_jump(&prog, 1 /* rcx */, ip + (prog - start));
> >
> > /* out: */
> > *pprog = prog;
>
> Alexei; could the above not be further improved with something like the
> below?

sorry for delay. I was traveling last week
and Daniel is on PTO this week.

> Despite several hours trying and Song helping, I can't seem to run
> anything bpf, that stuff is cursed. So I've no idea if the below
> actually works, but it seems reasonable.

It's certainly delicate.

> @@ -446,25 +440,8 @@ static void emit_bpf_tail_call_indirect(
> {
> int tcc_off = -4 - round_up(stack_depth, 8);
> u8 *prog = *pprog, *start = *pprog;
> - int pop_bytes = 0;
> - int off1 = 42;
> - int off2 = 31;
> - int off3 = 9;
> -
> - /* count the additional bytes used for popping callee regs from stack
> - * that need to be taken into account for each of the offsets that
> - * are used for bailing out of the tail call
> - */
> - pop_bytes = get_pop_bytes(callee_regs_used);
> - off1 += pop_bytes;
> - off2 += pop_bytes;
> - off3 += pop_bytes;
> -
> - if (stack_depth) {
> - off1 += 7;
> - off2 += 7;
> - off3 += 7;
> - }
> + static int out_label = -1;

Interesting idea!
All insn emits trying to do the right thing from the start.
Here the logic assumes that there will be at least two passes over image.
I think that is correct, but we never had such assumption.
A comment is certainly must have.
The race is possible too. Not sure whether READ_ONCE/WRITE_ONCE
are really warranted though. Might be overkill.

Nice that Josh's test_verifier is passing, but it doesn't provide
a ton of coverage. test_progs has a lot more.
Once you have a git branch with all the changes I can give it a go.
Also you can rely on our BPF CI.
Just cc your patchset to bpf@vger and add [PATCH bpf-next] to a subject.
In patchwork there will be "bpf/vmtest-bpf-next" link that
builds kernel, selftests and runs everything.
It's pretty much the same as selftests/bpf/vmtest.sh, but with the latest
clang nightly and other deps like pahole.

\
 
 \ /
  Last update: 2021-10-21 02:06    [W:0.217 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site