From: Jiri Olsa <jolsa@redhat.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>
Cc: Steven Rostedt <srostedt@vmware.com>,
netdev@vger.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>
Subject: [RFC bpf-next v5 00/29] bpf: Add batch support for attaching trampolines
Date: Thu, 18 Nov 2021 12:24:26 +0100 [thread overview]
Message-ID: <20211118112455.475349-1-jolsa@kernel.org> (raw)
hi,
sending new version of batch attach support, previous post is in
here [1].
As discussed in previous post adding this version is adding generic
approach to attach program to multiple functions, meaning you are
now able to attach multiple trampolines on top of each other with
no limitations, which was not possible in previous version.
v5 changes:
- ftrace new direct batch api got merged, so it's not longer
part of this patchset (thanks Steven!), adding just few small
related fixes
- added code that allows attach trampolines on top of each other
as per previous version comments
- fixed btf__find_by_glob_kind as per Andrii's comments
- added new selftest to check on the trampoline's splitting
- added in bpf_arg/bpf_ret_value helpers with tests
I'm not completely sure about the approach, because it was quite
difficult to debug/finalize, but I can't think of anything better
for now.. so sending this as RFC ;)
Also available at:
https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
bpf/batch
thanks,
jirka
[1] https://lore.kernel.org/bpf/20210826193922.66204-1-jolsa@kernel.org/
Cc: Steven Rostedt <srostedt@vmware.com>
---
Jiri Olsa (29):
ftrace: Use direct_ops hash in unregister_ftrace_direct
ftrace: Add cleanup to unregister_ftrace_direct_multi
ftrace: Add ftrace_set_filter_ips function
bpf: Factor bpf_check_attach_target function
bpf: Add bpf_check_attach_model function
bpf: Add bpf_arg/bpf_ret_value helpers for tracing programs
bpf, x64: Allow to use caller address from stack
bpf: Keep active attached trampoline in bpf_prog
bpf: Add support to load multi func tracing program
bpf: Add bpf_trampoline_id object
bpf: Add addr to bpf_trampoline_id object
bpf: Add struct bpf_tramp_node layer
bpf: Add bpf_tramp_attach layer for trampoline attachment
bpf: Add support to store multiple ids in bpf_tramp_id object
bpf: Add support to store multiple addrs in bpf_tramp_id object
bpf: Add bpf_tramp_id_single function
bpf: Resolve id in bpf_tramp_id_single
bpf: Add refcount_t to struct bpf_tramp_id
bpf: Add support to attach trampolines with multiple IDs
bpf: Add support for tracing multi link
libbpf: Add btf__find_by_glob_kind function
libbpf: Add support to link multi func tracing program
selftests/bpf: Add bpf_arg/bpf_ret_value test
selftests/bpf: Add fentry multi func test
selftests/bpf: Add fexit multi func test
selftests/bpf: Add fentry/fexit multi func test
selftests/bpf: Add mixed multi func test
selftests/bpf: Add ret_mod multi func test
selftests/bpf: Add attach multi func test
arch/x86/net/bpf_jit_comp.c | 31 ++-
include/linux/bpf.h | 76 +++++--
include/linux/bpf_verifier.h | 23 +--
include/linux/ftrace.h | 3 +
include/uapi/linux/bpf.h | 26 +++
kernel/bpf/core.c | 4 +-
kernel/bpf/syscall.c | 379 +++++++++++++++++++++++++++++++----
kernel/bpf/trampoline.c | 926 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
kernel/bpf/verifier.c | 173 +++++++++++++---
kernel/kallsyms.c | 2 +-
kernel/trace/bpf_trace.c | 38 +++-
kernel/trace/ftrace.c | 61 +++++-
tools/include/uapi/linux/bpf.h | 26 +++
tools/lib/bpf/bpf.c | 7 +
tools/lib/bpf/bpf.h | 6 +-
tools/lib/bpf/btf.c | 77 ++++++++
tools/lib/bpf/btf.h | 3 +
tools/lib/bpf/libbpf.c | 66 +++++++
tools/testing/selftests/bpf/Makefile | 10 +-
tools/testing/selftests/bpf/prog_tests/args_test.c | 34 ++++
tools/testing/selftests/bpf/prog_tests/modify_return.c | 114 ++++++++++-
tools/testing/selftests/bpf/prog_tests/multi_attach_test.c | 176 +++++++++++++++++
tools/testing/selftests/bpf/prog_tests/multi_fentry_fexit_test.c | 32 +++
tools/testing/selftests/bpf/prog_tests/multi_fentry_test.c | 30 +++
tools/testing/selftests/bpf/prog_tests/multi_fexit_test.c | 31 +++
tools/testing/selftests/bpf/prog_tests/multi_mixed_test.c | 34 ++++
tools/testing/selftests/bpf/progs/args_test.c | 30 +++
tools/testing/selftests/bpf/progs/multi_attach.c | 105 ++++++++++
tools/testing/selftests/bpf/progs/multi_check.c | 86 ++++++++
tools/testing/selftests/bpf/progs/multi_fentry.c | 17 ++
tools/testing/selftests/bpf/progs/multi_fentry_fexit.c | 28 +++
tools/testing/selftests/bpf/progs/multi_fexit.c | 20 ++
tools/testing/selftests/bpf/progs/multi_mixed.c | 43 ++++
tools/testing/selftests/bpf/progs/multi_modify_return.c | 17 ++
34 files changed, 2539 insertions(+), 195 deletions(-)
create mode 100644 tools/testing/selftests/bpf/prog_tests/args_test.c
create mode 100644 tools/testing/selftests/bpf/prog_tests/multi_attach_test.c
create mode 100644 tools/testing/selftests/bpf/prog_tests/multi_fentry_fexit_test.c
create mode 100644 tools/testing/selftests/bpf/prog_tests/multi_fentry_test.c
create mode 100644 tools/testing/selftests/bpf/prog_tests/multi_fexit_test.c
create mode 100644 tools/testing/selftests/bpf/prog_tests/multi_mixed_test.c
create mode 100644 tools/testing/selftests/bpf/progs/args_test.c
create mode 100644 tools/testing/selftests/bpf/progs/multi_attach.c
create mode 100644 tools/testing/selftests/bpf/progs/multi_check.c
create mode 100644 tools/testing/selftests/bpf/progs/multi_fentry.c
create mode 100644 tools/testing/selftests/bpf/progs/multi_fentry_fexit.c
create mode 100644 tools/testing/selftests/bpf/progs/multi_fexit.c
create mode 100644 tools/testing/selftests/bpf/progs/multi_mixed.c
create mode 100644 tools/testing/selftests/bpf/progs/multi_modify_return.c
next reply other threads:[~2021-11-18 11:25 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 11:24 Jiri Olsa [this message]
2021-11-18 11:24 ` [PATCH bpf-next 01/29] ftrace: Use direct_ops hash in unregister_ftrace_direct Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 02/29] ftrace: Add cleanup to unregister_ftrace_direct_multi Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 03/29] ftrace: Add ftrace_set_filter_ips function Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 04/29] bpf: Factor bpf_check_attach_target function Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 05/29] bpf: Add bpf_check_attach_model function Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 06/29] bpf: Add bpf_arg/bpf_ret_value helpers for tracing programs Jiri Olsa
2021-11-24 21:43 ` Andrii Nakryiko
2021-11-25 16:14 ` Alexei Starovoitov
2021-11-28 18:07 ` Jiri Olsa
2021-11-28 18:06 ` Jiri Olsa
2021-12-01 7:13 ` Andrii Nakryiko
2021-12-01 17:37 ` Alexei Starovoitov
2021-12-01 17:59 ` Andrii Nakryiko
2021-12-01 20:36 ` Alexei Starovoitov
2021-12-01 21:16 ` Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 07/29] bpf, x64: Allow to use caller address from stack Jiri Olsa
2021-11-19 4:14 ` Alexei Starovoitov
2021-11-19 21:46 ` Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 08/29] bpf: Keep active attached trampoline in bpf_prog Jiri Olsa
2021-11-24 21:48 ` Andrii Nakryiko
2021-11-28 17:24 ` Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 09/29] bpf: Add support to load multi func tracing program Jiri Olsa
2021-11-19 4:11 ` Alexei Starovoitov
2021-11-22 20:15 ` Jiri Olsa
2021-11-24 21:51 ` Andrii Nakryiko
2021-11-28 17:41 ` Jiri Olsa
2021-12-01 7:17 ` Andrii Nakryiko
2021-12-01 21:20 ` Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 10/29] bpf: Add bpf_trampoline_id object Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 11/29] bpf: Add addr to " Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 12/29] bpf: Add struct bpf_tramp_node layer Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 13/29] bpf: Add bpf_tramp_attach layer for trampoline attachment Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 14/29] bpf: Add support to store multiple ids in bpf_tramp_id object Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 15/29] bpf: Add support to store multiple addrs " Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 16/29] bpf: Add bpf_tramp_id_single function Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 17/29] bpf: Resolve id in bpf_tramp_id_single Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 18/29] bpf: Add refcount_t to struct bpf_tramp_id Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 19/29] bpf: Add support to attach trampolines with multiple IDs Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 20/29] bpf: Add support for tracing multi link Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 21/29] libbpf: Add btf__find_by_glob_kind function Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 22/29] libbpf: Add support to link multi func tracing program Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 23/29] selftests/bpf: Add bpf_arg/bpf_ret_value test Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 24/29] selftests/bpf: Add fentry multi func test Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 25/29] selftests/bpf: Add fexit " Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 26/29] selftests/bpf: Add fentry/fexit " Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 27/29] selftests/bpf: Add mixed " Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 28/29] selftests/bpf: Add ret_mod " Jiri Olsa
2021-11-18 11:24 ` [PATCH bpf-next 29/29] selftests/bpf: Add attach " 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=20211118112455.475349-1-jolsa@kernel.org \
--to=jolsa@redhat.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=srostedt@vmware.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).