From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>
Cc: 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>,
Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCHv7 bpf-next 06/28] bpf: Add bpf_get_func_ip helper support for uprobe link
Date: Wed, 9 Aug 2023 10:34:18 +0200 [thread overview]
Message-ID: <20230809083440.3209381-7-jolsa@kernel.org> (raw)
In-Reply-To: <20230809083440.3209381-1-jolsa@kernel.org>
Adding support for bpf_get_func_ip helper being called from
ebpf program attached by uprobe_multi link.
It returns the ip of the uprobe.
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
kernel/trace/bpf_trace.c | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index e45aebed62f5..a7264b2c17ad 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -88,6 +88,7 @@ static u64 bpf_kprobe_multi_cookie(struct bpf_run_ctx *ctx);
static u64 bpf_kprobe_multi_entry_ip(struct bpf_run_ctx *ctx);
static u64 bpf_uprobe_multi_cookie(struct bpf_run_ctx *ctx);
+static u64 bpf_uprobe_multi_entry_ip(struct bpf_run_ctx *ctx);
/**
* trace_call_bpf - invoke BPF program
@@ -1106,6 +1107,18 @@ static const struct bpf_func_proto bpf_get_attach_cookie_proto_kmulti = {
.arg1_type = ARG_PTR_TO_CTX,
};
+BPF_CALL_1(bpf_get_func_ip_uprobe_multi, struct pt_regs *, regs)
+{
+ return bpf_uprobe_multi_entry_ip(current->bpf_ctx);
+}
+
+static const struct bpf_func_proto bpf_get_func_ip_proto_uprobe_multi = {
+ .func = bpf_get_func_ip_uprobe_multi,
+ .gpl_only = false,
+ .ret_type = RET_INTEGER,
+ .arg1_type = ARG_PTR_TO_CTX,
+};
+
BPF_CALL_1(bpf_get_attach_cookie_uprobe_multi, struct pt_regs *, regs)
{
return bpf_uprobe_multi_cookie(current->bpf_ctx);
@@ -1560,9 +1573,11 @@ kprobe_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
return &bpf_override_return_proto;
#endif
case BPF_FUNC_get_func_ip:
- return prog->expected_attach_type == BPF_TRACE_KPROBE_MULTI ?
- &bpf_get_func_ip_proto_kprobe_multi :
- &bpf_get_func_ip_proto_kprobe;
+ if (prog->expected_attach_type == BPF_TRACE_KPROBE_MULTI)
+ return &bpf_get_func_ip_proto_kprobe_multi;
+ if (prog->expected_attach_type == BPF_TRACE_UPROBE_MULTI)
+ return &bpf_get_func_ip_proto_uprobe_multi;
+ return &bpf_get_func_ip_proto_kprobe;
case BPF_FUNC_get_attach_cookie:
if (prog->expected_attach_type == BPF_TRACE_KPROBE_MULTI)
return &bpf_get_attach_cookie_proto_kmulti;
@@ -3113,6 +3128,14 @@ uprobe_multi_link_ret_handler(struct uprobe_consumer *con, unsigned long func, s
return uprobe_prog_run(uprobe, func, regs);
}
+static u64 bpf_uprobe_multi_entry_ip(struct bpf_run_ctx *ctx)
+{
+ struct bpf_uprobe_multi_run_ctx *run_ctx;
+
+ run_ctx = container_of(current->bpf_ctx, struct bpf_uprobe_multi_run_ctx, run_ctx);
+ return run_ctx->entry_ip;
+}
+
static u64 bpf_uprobe_multi_cookie(struct bpf_run_ctx *ctx)
{
struct bpf_uprobe_multi_run_ctx *run_ctx;
@@ -3272,4 +3295,8 @@ static u64 bpf_uprobe_multi_cookie(struct bpf_run_ctx *ctx)
{
return 0;
}
+static u64 bpf_uprobe_multi_entry_ip(struct bpf_run_ctx *ctx)
+{
+ return 0;
+}
#endif /* CONFIG_UPROBES */
--
2.41.0
next prev parent reply other threads:[~2023-08-09 8:35 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 8:34 [PATCHv7 bpf-next 00/28] bpf: Add multi uprobe link Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 01/28] bpf: Switch BPF_F_KPROBE_MULTI_RETURN macro to enum Jiri Olsa
2023-08-09 16:06 ` Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 02/28] bpf: Add attach_type checks under bpf_prog_attach_check_attach_type Jiri Olsa
2023-08-09 16:11 ` Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 03/28] bpf: Add multi uprobe link Jiri Olsa
2023-08-09 16:29 ` Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 04/28] bpf: Add cookies support for uprobe_multi link Jiri Olsa
2023-08-09 16:39 ` Yonghong Song
2023-08-11 13:19 ` Jiri Olsa
2023-08-11 16:45 ` Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 05/28] bpf: Add pid filter " Jiri Olsa
2023-08-09 16:45 ` Yonghong Song
2023-08-09 8:34 ` Jiri Olsa [this message]
2023-08-09 16:48 ` [PATCHv7 bpf-next 06/28] bpf: Add bpf_get_func_ip helper support for uprobe link Yonghong Song
2023-08-09 8:34 ` [PATCHv7 bpf-next 07/28] libbpf: Add uprobe_multi attach type and link names Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 08/28] libbpf: Move elf_find_func_offset* functions to elf object Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 09/28] libbpf: Add elf_open/elf_close functions Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 10/28] libbpf: Add elf symbol iterator Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 11/28] libbpf: Add elf_resolve_syms_offsets function Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 12/28] libbpf: Add elf_resolve_pattern_offsets function Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 13/28] libbpf: Add bpf_link_create support for multi uprobes Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 14/28] libbpf: Add bpf_program__attach_uprobe_multi function Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 15/28] libbpf: Add support for u[ret]probe.multi[.s] program sections Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 16/28] libbpf: Add uprobe multi link detection Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 17/28] libbpf: Add uprobe multi link support to bpf_program__attach_usdt Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 18/28] selftests/bpf: Move get_time_ns to testing_helpers.h Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 19/28] selftests/bpf: Add uprobe_multi skel test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 20/28] selftests/bpf: Add uprobe_multi api test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 21/28] selftests/bpf: Add uprobe_multi link test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 22/28] selftests/bpf: Add uprobe_multi test program Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 23/28] selftests/bpf: Add uprobe_multi bench test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 24/28] selftests/bpf: Add uprobe_multi usdt test code Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 25/28] selftests/bpf: Add uprobe_multi usdt bench test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 26/28] selftests/bpf: Add uprobe_multi cookie test Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 27/28] selftests/bpf: Add uprobe_multi pid filter tests Jiri Olsa
2023-08-09 8:34 ` [PATCHv7 bpf-next 28/28] selftests/bpf: Add extra link to uprobe_multi tests Jiri Olsa
2023-08-21 23:00 ` [PATCHv7 bpf-next 00/28] bpf: Add multi uprobe link patchwork-bot+netdevbpf
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=20230809083440.3209381-7-jolsa@kernel.org \
--to=jolsa@kernel.org \
--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=laoar.shao@gmail.com \
--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.