From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Andrii Nakryiko <andrii@kernel•org>
Cc: Arnaud Lecomte <contact@arnaud-lcm•com>,
bpf <bpf@vger•kernel.org>, Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the tip tree with the bpf-next tree
Date: Wed, 5 Nov 2025 13:31:59 +1100 [thread overview]
Message-ID: <20251105133159.6303b1ee@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2043 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/bpf/stackmap.c
between commit:
e17d62fedd10 ("bpf: Refactor stack map trace depth calculation into helper function")
from the bpf-next tree and commit:
c69993ecdd4d ("perf: Support deferred user unwind")
from the tip 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.
--
Cheers,
Stephen Rothwell
diff --cc kernel/bpf/stackmap.c
index 2365541c81dd,8f1dacaf01fe..000000000000
--- a/kernel/bpf/stackmap.c
+++ b/kernel/bpf/stackmap.c
@@@ -333,9 -310,12 +333,9 @@@ BPF_CALL_3(bpf_get_stackid, struct pt_r
BPF_F_FAST_STACK_CMP | BPF_F_REUSE_STACKID)))
return -EINVAL;
- max_depth += skip;
- if (max_depth > sysctl_perf_event_max_stack)
- max_depth = sysctl_perf_event_max_stack;
-
+ max_depth = stack_map_calculate_max_depth(map->value_size, elem_size, flags);
trace = get_perf_callchain(regs, kernel, user, max_depth,
- false, false);
+ false, false, 0);
if (unlikely(!trace))
/* couldn't fetch the stack trace */
@@@ -463,15 -446,13 +463,15 @@@ static long __bpf_get_stack(struct pt_r
if (may_fault)
rcu_read_lock(); /* need RCU for perf's callchain below */
- if (trace_in)
+ if (trace_in) {
trace = trace_in;
- else if (kernel && task)
+ trace->nr = min_t(u32, trace->nr, max_depth);
+ } else if (kernel && task) {
trace = get_callchain_entry_for_task(task, max_depth);
- else
+ } else {
trace = get_perf_callchain(regs, kernel, user, max_depth,
- crosstask, false);
+ crosstask, false, 0);
+ }
if (unlikely(!trace) || trace->nr < skip) {
if (may_fault)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-05 2:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-05 2:31 Stephen Rothwell [this message]
2025-12-03 2:35 ` linux-next: manual merge of the tip tree with the bpf-next tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-09-25 14:05 Mark Brown
2025-09-25 14:34 ` Alexei Starovoitov
2025-09-12 2:40 Stephen Rothwell
2025-09-12 17:55 ` Alexei Starovoitov
2025-09-12 20:47 ` Jiri Olsa
2022-10-27 0:07 Stephen Rothwell
2018-05-07 2:09 Stephen Rothwell
2018-05-07 4:10 ` Stephen Rothwell
2018-05-07 8:15 ` Daniel Borkmann
2018-06-06 4:41 ` 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=20251105133159.6303b1ee@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrii@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=contact@arnaud-lcm$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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