]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'x86-fgraph-bpf-fix-orc-stack-unwind-from-return-probe'
authorAlexei Starovoitov <ast@kernel.org>
Thu, 6 Nov 2025 01:05:19 +0000 (17:05 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 6 Nov 2025 01:14:42 +0000 (17:14 -0800)
Jiri Olsa says:

====================
x86/fgraph,bpf: Fix ORC stack unwind from return probe

sending fix for ORC stack unwind issue reported in here [1], where
the ORC unwinder won't go pass the return_to_handler function and
we get no stacktrace.

Sending fix for that together with unrelated stacktrace fix (patch 1),
so the attached test can work properly.

It's based on:
  https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
  probes/for-next

v1: https://lore.kernel.org/bpf/20251027131354.1984006-1-jolsa@kernel.org/
v2: https://lore.kernel.org/bpf/20251103220924.36371-3-jolsa@kernel.org/

v3 changes:
- fix assert condition in test

thanks,
jirka

[1] https://lore.kernel.org/bpf/aObSyt3qOnS_BMcy@krava/
====================

Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Link: https://patch.msgid.link/20251104215405.168643-1-jolsa@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

Trivial merge