From: Mark Brown <broonie@kernel•org>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Alexei Starovoitov <ast@kernel•org>, Jiri Olsa <jolsa@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: Thu, 25 Sep 2025 15:05:59 +0100 [thread overview]
Message-ID: <aNVMR5rjA2geHNLn@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1369 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/events/uprobes.c
between commit:
4363264111e12 ("uprobe: Do not emulate/sstep original instruction when ip is changed")
from the bpf-next tree and commit:
ba2bfc97b4629 ("uprobes/x86: Add support to optimize uprobes")
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.
diff --cc kernel/events/uprobes.c
index c2ff256dd6419,996a81080d563..0000000000000
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@@ -2741,13 -2765,9 +2765,16 @@@ static void handle_swbp(struct pt_regs
handler_chain(uprobe, regs);
+ /*
+ * If user decided to take execution elsewhere, it makes little sense
+ * to execute the original instruction, so let's skip it.
+ */
+ 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;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-25 14:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-25 14:05 Mark Brown [this message]
2025-09-25 14:34 ` linux-next: manual merge of the tip tree with the bpf-next tree Alexei Starovoitov
-- strict thread matches above, loose matches on Subject: below --
2025-11-05 2:31 Stephen Rothwell
2025-12-03 2:35 ` Stephen Rothwell
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=aNVMR5rjA2geHNLn@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=jolsa@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)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