From: Jiri Olsa <jolsa@kernel.org>
To: Oleg Nesterov <oleg@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
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@fomichev.me>, Hao Luo <haoluo@google.com>,
Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Subject: [PATCHv9 bpf-next 02/13] bpf: Force uprobe bpf program to always return 0
Date: Fri, 8 Nov 2024 14:45:33 +0100 [thread overview]
Message-ID: <20241108134544.480660-3-jolsa@kernel.org> (raw)
In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org>
As suggested by Andrii make uprobe multi bpf programs to always return 0,
so they can't force uprobe removal.
Keeping the int return type for uprobe_prog_run, because it will be used
in following session changes.
Fixes: 89ae89f53d20 ("bpf: Add multi uprobe link")
Suggested-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
kernel/trace/bpf_trace.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 88fd628850ca..db9e2792b42b 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -3229,7 +3229,6 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe,
struct bpf_prog *prog = link->link.prog;
bool sleepable = prog->sleepable;
struct bpf_run_ctx *old_run_ctx;
- int err = 0;
if (link->task && !same_thread_group(current, link->task))
return 0;
@@ -3242,7 +3241,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe,
migrate_disable();
old_run_ctx = bpf_set_run_ctx(&run_ctx.run_ctx);
- err = bpf_prog_run(link->link.prog, regs);
+ bpf_prog_run(link->link.prog, regs);
bpf_reset_run_ctx(old_run_ctx);
migrate_enable();
@@ -3251,7 +3250,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe,
rcu_read_unlock_trace();
else
rcu_read_unlock();
- return err;
+ return 0;
}
static bool
--
2.47.0
next prev parent reply other threads:[~2024-11-08 13:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-08 13:45 [PATCHv9 bpf-next 00/13] bpf: Add uprobe session support Jiri Olsa
2024-11-08 13:45 ` [PATCHv9 bpf-next 01/13] bpf: Allow return values 0 and 1 for kprobe session Jiri Olsa
2024-11-08 13:45 ` Jiri Olsa [this message]
2024-11-08 13:45 ` [PATCHv9 bpf-next 03/13] bpf: Add support for uprobe multi session attach Jiri Olsa
2024-11-08 13:45 ` [PATCHv9 bpf-next 04/13] bpf: Add support for uprobe multi session context Jiri Olsa
2024-11-08 13:45 ` [PATCHv9 bpf-next 05/13] libbpf: Add support for uprobe multi session attach Jiri Olsa
2024-11-15 3:59 ` Andrii Nakryiko
2024-11-08 13:45 ` [PATCHv9 bpf-next 06/13] selftests/bpf: Add uprobe session test Jiri Olsa
2024-11-08 13:45 ` [PATCHv9 bpf-next 07/13] selftests/bpf: Add uprobe session cookie test Jiri Olsa
2024-11-08 13:45 ` [PATCHv9 bpf-next 08/13] selftests/bpf: Add uprobe session recursive test Jiri Olsa
2024-11-08 13:45 ` [PATCHv9 bpf-next 09/13] selftests/bpf: Add uprobe session verifier test for return value Jiri Olsa
2024-11-08 13:45 ` [PATCHv9 bpf-next 10/13] selftests/bpf: Add kprobe " Jiri Olsa
2024-11-08 13:45 ` [PATCHv9 bpf-next 11/13] selftests/bpf: Add uprobe session single consumer test Jiri Olsa
2024-11-08 13:45 ` [PATCHv9 bpf-next 12/13] selftests/bpf: Add uprobe sessions to " Jiri Olsa
2024-11-08 13:45 ` [PATCHv9 bpf-next 13/13] selftests/bpf: Add threads " Jiri Olsa
2024-11-08 18:40 ` [PATCHv9 bpf-next 00/13] bpf: Add uprobe session support 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=20241108134544.480660-3-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=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sdf@fomichev.me \
--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 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).