From: Mark Brown <broonie@kernel•org>
To: Steven Rostedt <rostedt@goodmis•org>,
Masami Hiramatsu <mhiramat@kernel•org>
Cc: Alexei Starovoitov <ast@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Puranjay Mohan <puranjay@kernel•org>
Subject: linux-next: manual merge of the ftrace tree with the bpf-next tree
Date: Mon, 2 Feb 2026 14:30:14 +0000 [thread overview]
Message-ID: <aYC09rYDOvkNNOaA@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1492 bytes --]
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in:
kernel/trace/bpf_trace.c
between commit:
93f0d09697613 ("bpf: move recursion detection logic to helpers")
from the bpf-next tree and commit:
f7d327654b886 ("bpf: Have __bpf_trace_run() use rcu_read_lock_dont_migrate()")
from the ftrace tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc kernel/trace/bpf_trace.c
index f7baeb8278cac,abbf0177ad20b..0000000000000
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@@ -2076,8 -2062,8 +2076,8 @@@ void __bpf_trace_run(struct bpf_raw_tp_
struct bpf_run_ctx *old_run_ctx;
struct bpf_trace_run_ctx run_ctx;
- cant_sleep();
+ rcu_read_lock_dont_migrate();
- if (unlikely(this_cpu_inc_return(*(prog->active)) != 1)) {
+ if (unlikely(!bpf_prog_get_recursion_context(prog))) {
bpf_prog_inc_misses_counter(prog);
goto out;
}
@@@ -2090,8 -2075,8 +2089,8 @@@
bpf_reset_run_ctx(old_run_ctx);
out:
- this_cpu_dec(*(prog->active));
+ bpf_prog_put_recursion_context(prog);
+ rcu_read_unlock_migrate();
}
#define UNPACK(...) __VA_ARGS__
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-02-02 14:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-02 14:30 Mark Brown [this message]
2026-02-02 16:20 ` linux-next: manual merge of the ftrace tree with the bpf-next tree Steven Rostedt
2026-02-02 16:42 ` Alexei Starovoitov
2026-02-02 17:04 ` Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2025-11-30 22:33 Stephen Rothwell
2021-04-20 4:14 Stephen Rothwell
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=aYC09rYDOvkNNOaA@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=puranjay@kernel$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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