* [PATCH] uprobe: Move arch_uprobe_optimize right after handlers execution
@ 2025-10-01 13:24 Jiri Olsa
2025-10-01 16:39 ` Andrii Nakryiko
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Jiri Olsa @ 2025-10-01 13:24 UTC (permalink / raw)
To: Oleg Nesterov, Peter Zijlstra, Andrii Nakryiko
Cc: Linus Torvalds, bpf, linux-kernel, linux-trace-kernel, x86,
Song Liu, Yonghong Song, John Fastabend, Hao Luo, Steven Rostedt,
Masami Hiramatsu, Alan Maguire, David Laight,
Thomas Weißschuh, Ingo Molnar, Jann Horn, Alejandro Colomar
It's less confusing to optimize uprobe right after handlers execution
and before we do the check for changed ip register to avoid situations
where changed ip register would skip uprobe optimization.
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
kernel/events/uprobes.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 5dcf927310fd..c14ec27b976d 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -2765,6 +2765,9 @@ static void handle_swbp(struct pt_regs *regs)
handler_chain(uprobe, regs);
+ /* Try to optimize after first hit. */
+ arch_uprobe_optimize(&uprobe->arch, bp_vaddr);
+
/*
* If user decided to take execution elsewhere, it makes little sense
* to execute the original instruction, so let's skip it.
@@ -2772,9 +2775,6 @@ static void handle_swbp(struct pt_regs *regs)
if (instruction_pointer(regs) != bp_vaddr)
goto out;
- /* Try to optimize after first hit. */
- arch_uprobe_optimize(&uprobe->arch, bp_vaddr);
-
if (arch_uprobe_skip_sstep(&uprobe->arch, regs))
goto out;
--
2.51.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] uprobe: Move arch_uprobe_optimize right after handlers execution
2025-10-01 13:24 [PATCH] uprobe: Move arch_uprobe_optimize right after handlers execution Jiri Olsa
@ 2025-10-01 16:39 ` Andrii Nakryiko
2025-10-01 23:20 ` Masami Hiramatsu
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Andrii Nakryiko @ 2025-10-01 16:39 UTC (permalink / raw)
To: Jiri Olsa
Cc: Oleg Nesterov, Peter Zijlstra, Andrii Nakryiko, Linus Torvalds,
bpf, linux-kernel, linux-trace-kernel, x86, Song Liu,
Yonghong Song, John Fastabend, Hao Luo, Steven Rostedt,
Masami Hiramatsu, Alan Maguire, David Laight,
Thomas Weißschuh, Ingo Molnar, Jann Horn, Alejandro Colomar
On Wed, Oct 1, 2025 at 6:25 AM Jiri Olsa <jolsa@kernel.org> wrote:
>
> It's less confusing to optimize uprobe right after handlers execution
> and before we do the check for changed ip register to avoid situations
> where changed ip register would skip uprobe optimization.
>
> Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> kernel/events/uprobes.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
makes sense
Acked-by: Andrii Nakryiko <andrii@kernel.org>
> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
> index 5dcf927310fd..c14ec27b976d 100644
> --- a/kernel/events/uprobes.c
> +++ b/kernel/events/uprobes.c
> @@ -2765,6 +2765,9 @@ static void handle_swbp(struct pt_regs *regs)
>
> handler_chain(uprobe, regs);
>
> + /* Try to optimize after first hit. */
> + arch_uprobe_optimize(&uprobe->arch, bp_vaddr);
> +
> /*
> * If user decided to take execution elsewhere, it makes little sense
> * to execute the original instruction, so let's skip it.
> @@ -2772,9 +2775,6 @@ static void handle_swbp(struct pt_regs *regs)
> if (instruction_pointer(regs) != bp_vaddr)
> goto out;
>
> - /* Try to optimize after first hit. */
> - arch_uprobe_optimize(&uprobe->arch, bp_vaddr);
> -
> if (arch_uprobe_skip_sstep(&uprobe->arch, regs))
> goto out;
>
> --
> 2.51.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] uprobe: Move arch_uprobe_optimize right after handlers execution
2025-10-01 13:24 [PATCH] uprobe: Move arch_uprobe_optimize right after handlers execution Jiri Olsa
2025-10-01 16:39 ` Andrii Nakryiko
@ 2025-10-01 23:20 ` Masami Hiramatsu
2025-10-03 11:48 ` Oleg Nesterov
2025-10-14 8:42 ` [tip: perf/urgent] " tip-bot2 for Jiri Olsa
3 siblings, 0 replies; 5+ messages in thread
From: Masami Hiramatsu @ 2025-10-01 23:20 UTC (permalink / raw)
To: Jiri Olsa
Cc: Oleg Nesterov, Peter Zijlstra, Andrii Nakryiko, Linus Torvalds,
bpf, linux-kernel, linux-trace-kernel, x86, Song Liu,
Yonghong Song, John Fastabend, Hao Luo, Steven Rostedt,
Masami Hiramatsu, Alan Maguire, David Laight,
Thomas Weißschuh, Ingo Molnar, Jann Horn, Alejandro Colomar
On Wed, 1 Oct 2025 15:24:49 +0200
Jiri Olsa <jolsa@kernel.org> wrote:
> It's less confusing to optimize uprobe right after handlers execution
> and before we do the check for changed ip register to avoid situations
> where changed ip register would skip uprobe optimization.
>
> Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Looks good to me.
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Thanks,
> ---
> kernel/events/uprobes.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
> index 5dcf927310fd..c14ec27b976d 100644
> --- a/kernel/events/uprobes.c
> +++ b/kernel/events/uprobes.c
> @@ -2765,6 +2765,9 @@ static void handle_swbp(struct pt_regs *regs)
>
> handler_chain(uprobe, regs);
>
> + /* Try to optimize after first hit. */
> + arch_uprobe_optimize(&uprobe->arch, bp_vaddr);
> +
> /*
> * If user decided to take execution elsewhere, it makes little sense
> * to execute the original instruction, so let's skip it.
> @@ -2772,9 +2775,6 @@ static void handle_swbp(struct pt_regs *regs)
> if (instruction_pointer(regs) != bp_vaddr)
> goto out;
>
> - /* Try to optimize after first hit. */
> - arch_uprobe_optimize(&uprobe->arch, bp_vaddr);
> -
> if (arch_uprobe_skip_sstep(&uprobe->arch, regs))
> goto out;
>
> --
> 2.51.0
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] uprobe: Move arch_uprobe_optimize right after handlers execution
2025-10-01 13:24 [PATCH] uprobe: Move arch_uprobe_optimize right after handlers execution Jiri Olsa
2025-10-01 16:39 ` Andrii Nakryiko
2025-10-01 23:20 ` Masami Hiramatsu
@ 2025-10-03 11:48 ` Oleg Nesterov
2025-10-14 8:42 ` [tip: perf/urgent] " tip-bot2 for Jiri Olsa
3 siblings, 0 replies; 5+ messages in thread
From: Oleg Nesterov @ 2025-10-03 11:48 UTC (permalink / raw)
To: Jiri Olsa
Cc: Peter Zijlstra, Andrii Nakryiko, Linus Torvalds, bpf,
linux-kernel, linux-trace-kernel, x86, Song Liu, Yonghong Song,
John Fastabend, Hao Luo, Steven Rostedt, Masami Hiramatsu,
Alan Maguire, David Laight, Thomas Weißschuh, Ingo Molnar,
Jann Horn, Alejandro Colomar
On 10/01, Jiri Olsa wrote:
>
> --- a/kernel/events/uprobes.c
> +++ b/kernel/events/uprobes.c
> @@ -2765,6 +2765,9 @@ static void handle_swbp(struct pt_regs *regs)
>
> handler_chain(uprobe, regs);
>
> + /* Try to optimize after first hit. */
> + arch_uprobe_optimize(&uprobe->arch, bp_vaddr);
> +
> /*
> * If user decided to take execution elsewhere, it makes little sense
> * to execute the original instruction, so let's skip it.
> @@ -2772,9 +2775,6 @@ static void handle_swbp(struct pt_regs *regs)
> if (instruction_pointer(regs) != bp_vaddr)
> goto out;
>
> - /* Try to optimize after first hit. */
> - arch_uprobe_optimize(&uprobe->arch, bp_vaddr);
> -
> if (arch_uprobe_skip_sstep(&uprobe->arch, regs))
> goto out;
Acked-by: Oleg Nesterov <oleg@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip: perf/urgent] uprobe: Move arch_uprobe_optimize right after handlers execution
2025-10-01 13:24 [PATCH] uprobe: Move arch_uprobe_optimize right after handlers execution Jiri Olsa
` (2 preceding siblings ...)
2025-10-03 11:48 ` Oleg Nesterov
@ 2025-10-14 8:42 ` tip-bot2 for Jiri Olsa
3 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Jiri Olsa @ 2025-10-14 8:42 UTC (permalink / raw)
To: linux-tip-commits
Cc: Linus Torvalds, Jiri Olsa, Peter Zijlstra (Intel),
Masami Hiramatsu (Google), Andrii Nakryiko, Oleg Nesterov, x86,
linux-kernel
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 62685ab071de7c39499212bff19f1b5bc0148bc7
Gitweb: https://git.kernel.org/tip/62685ab071de7c39499212bff19f1b5bc0148bc7
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 01 Oct 2025 15:24:49 +02:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 14 Oct 2025 10:38:09 +02:00
uprobe: Move arch_uprobe_optimize right after handlers execution
It's less confusing to optimize uprobe right after handlers execution
and before we do the check for changed ip register to avoid situations
where changed ip register would skip uprobe optimization.
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/events/uprobes.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 8709c69..f11ceb8 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -2765,6 +2765,9 @@ static void handle_swbp(struct pt_regs *regs)
handler_chain(uprobe, regs);
+ /* Try to optimize after first hit. */
+ arch_uprobe_optimize(&uprobe->arch, bp_vaddr);
+
/*
* If user decided to take execution elsewhere, it makes little sense
* to execute the original instruction, so let's skip it.
@@ -2772,9 +2775,6 @@ static void handle_swbp(struct pt_regs *regs)
if (instruction_pointer(regs) != bp_vaddr)
goto out;
- /* Try to optimize after first hit. */
- arch_uprobe_optimize(&uprobe->arch, bp_vaddr);
-
if (arch_uprobe_skip_sstep(&uprobe->arch, regs))
goto out;
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-10-14 8:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-01 13:24 [PATCH] uprobe: Move arch_uprobe_optimize right after handlers execution Jiri Olsa
2025-10-01 16:39 ` Andrii Nakryiko
2025-10-01 23:20 ` Masami Hiramatsu
2025-10-03 11:48 ` Oleg Nesterov
2025-10-14 8:42 ` [tip: perf/urgent] " tip-bot2 for Jiri Olsa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox