From: Jiri Olsa <olsajiri@gmail.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
bpf@vger.kernel.org, Martin KaFai Lau <kafai@fb.com>,
Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
"Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
Martynas Pumputis <m@lambda.lt>
Subject: Re: [PATCHv3 bpf-next 3/6] bpf: Use given function address for trampoline ip arg
Date: Fri, 9 Sep 2022 13:40:49 +0200 [thread overview]
Message-ID: <YxsmQbYzfIND27Ix@krava> (raw)
In-Reply-To: <Yxsj7KUhVYYxJ1l9@hirez.programming.kicks-ass.net>
On Fri, Sep 09, 2022 at 01:30:52PM +0200, Peter Zijlstra wrote:
> On Fri, Sep 09, 2022 at 12:12:42PM +0200, Jiri Olsa wrote:
> > Using function address given at the generation time as the trampoline
> > ip argument. This way we get directly the function address that we
> > need, so we don't need to:
> > - read the ip from the stack
> > - subtract X86_PATCH_SIZE
> > - subtract ENDBR_INSN_SIZE if CONFIG_X86_KERNEL_IBT is enabled
> > which is not even implemented yet ;-)
> >
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> > arch/x86/net/bpf_jit_comp.c | 9 ++++-----
> > 1 file changed, 4 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
> > index ae89f4143eb4..1047686cc545 100644
> > --- a/arch/x86/net/bpf_jit_comp.c
> > +++ b/arch/x86/net/bpf_jit_comp.c
> > @@ -2039,13 +2039,14 @@ static int invoke_bpf_mod_ret(const struct btf_func_model *m, u8 **pprog,
> > int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, void *image_end,
> > const struct btf_func_model *m, u32 flags,
> > struct bpf_tramp_links *tlinks,
> > - void *orig_call)
> > + void *func_addr)
> > {
> > int ret, i, nr_args = m->nr_args, extra_nregs = 0;
> > int regs_off, ip_off, args_off, stack_size = nr_args * 8, run_ctx_off;
> > struct bpf_tramp_links *fentry = &tlinks[BPF_TRAMP_FENTRY];
> > struct bpf_tramp_links *fexit = &tlinks[BPF_TRAMP_FEXIT];
> > struct bpf_tramp_links *fmod_ret = &tlinks[BPF_TRAMP_MODIFY_RETURN];
> > + void *orig_call = func_addr;
> > u8 **branches = NULL;
> > u8 *prog;
> > bool save_ret;
> > @@ -2126,12 +2127,10 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, void *i
> >
> > if (flags & BPF_TRAMP_F_IP_ARG) {
> > /* Store IP address of the traced function:
> > - * mov rax, QWORD PTR [rbp + 8]
> > - * sub rax, X86_PATCH_SIZE
> > + * mov rax, func_addr
>
> Shouldn't that be: movabs? Regular mov can't do 64bit immediates.
right, will change
jirka
>
> Also curse Intel syntax, this is bloody unreadable.
>
> > * mov QWORD PTR [rbp - ip_off], rax
> > */
> > - emit_ldx(&prog, BPF_DW, BPF_REG_0, BPF_REG_FP, 8);
> > - EMIT4(0x48, 0x83, 0xe8, X86_PATCH_SIZE);
> > + emit_mov_imm64(&prog, BPF_REG_0, (long) func_addr >> 32, (u32) (long) func_addr);
> > emit_stx(&prog, BPF_DW, BPF_REG_FP, BPF_REG_0, -ip_off);
> > }
> >
> > --
> > 2.37.3
> >
next prev parent reply other threads:[~2022-09-09 11:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 10:12 [PATCHv3 bpf-next 0/6] bpf: Fixes for CONFIG_X86_KERNEL_IBT Jiri Olsa
2022-09-09 10:12 ` [PATCHv3 bpf-next 1/6] kprobes: Add new KPROBE_FLAG_ON_FUNC_ENTRY kprobe flag Jiri Olsa
2022-09-09 10:12 ` [PATCHv3 bpf-next 2/6] ftrace: Keep the resolved addr in kallsyms_callback Jiri Olsa
2022-09-09 10:12 ` [PATCHv3 bpf-next 3/6] bpf: Use given function address for trampoline ip arg Jiri Olsa
2022-09-09 11:30 ` Peter Zijlstra
2022-09-09 11:40 ` Jiri Olsa [this message]
2022-09-09 10:12 ` [PATCHv3 bpf-next 4/6] bpf: Adjust kprobe_multi entry_ip for CONFIG_X86_KERNEL_IBT Jiri Olsa
2022-09-09 11:49 ` Peter Zijlstra
2022-09-09 12:25 ` Jiri Olsa
2022-09-09 10:12 ` [PATCHv3 bpf-next 5/6] bpf: Return value in kprobe get_func_ip only for entry address Jiri Olsa
2022-09-09 11:57 ` Peter Zijlstra
2022-09-09 10:12 ` [PATCHv3 bpf-next 6/6] selftests/bpf: Fix get_func_ip offset test for CONFIG_X86_KERNEL_IBT Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YxsmQbYzfIND27Ix@krava \
--to=olsajiri@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=m@lambda.lt \
--cc=mhiramat@kernel.org \
--cc=peterz@infradead.org \
--cc=sdf@google.com \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.