From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: jolsa@kernel.org, oleg@redhat.com, andrii@kernel.org,
linux-kernel@vger.kernel.org, alx@kernel.org,
eyal.birger@gmail.com, kees@kernel.org, bpf@vger.kernel.org,
linux-trace-kernel@vger.kernel.org, x86@kernel.org,
songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com,
haoluo@google.com, rostedt@goodmis.org, alan.maguire@oracle.com,
David.Laight@ACULAB.COM, thomas@t-8ch.de, mingo@kernel.org,
rick.p.edgecombe@intel.com
Subject: Re: [PATCH 6/6] uprobes/x86: Add SLS mitigation to the trampolines
Date: Wed, 10 Sep 2025 10:05:38 +0900 [thread overview]
Message-ID: <20250910100538.9289cc4adfa34d616bc59f39@kernel.org> (raw)
In-Reply-To: <20250821123657.277506098@infradead.org>
On Thu, 21 Aug 2025 14:28:28 +0200
Peter Zijlstra <peterz@infradead.org> wrote:
> It is trivial; no reason not to.
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Looks good to me :)
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
> ---
> arch/x86/kernel/uprobes.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> --- a/arch/x86/kernel/uprobes.c
> +++ b/arch/x86/kernel/uprobes.c
> @@ -336,6 +336,7 @@ asm (
> * call ret.
> */
> "ret\n"
> + "int3\n"
> ".global uretprobe_trampoline_end\n"
> "uretprobe_trampoline_end:\n"
> ".popsection\n"
> @@ -891,6 +892,7 @@ asm (
> "pop %r11\n"
> "pop %rcx\n"
> "ret\n"
> + "int3\n"
> ".balign " __stringify(PAGE_SIZE) "\n"
> ".popsection\n"
> );
>
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
next prev parent reply other threads:[~2025-09-10 1:05 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-21 12:28 [PATCH 0/6] uprobes/x86: Cleanups and fixes Peter Zijlstra
2025-08-21 12:28 ` [PATCH 1/6] uprobes/x86: Add struct uretprobe_syscall_args Peter Zijlstra
2025-08-21 12:28 ` [PATCH 2/6] uprobes/x86: Optimize is_optimize() Peter Zijlstra
2025-08-26 5:51 ` David Laight
2025-08-26 8:18 ` Peter Zijlstra
2025-08-27 19:32 ` David Laight
2025-08-26 8:25 ` Jiri Olsa
2025-08-26 8:33 ` Jiri Olsa
2025-08-21 12:28 ` [PATCH 3/6] uprobes/x86: Accept more NOP forms Peter Zijlstra
2025-08-21 12:28 ` [PATCH 4/6] uprobes/x86: Fix uprobe syscall vs shadow stack Peter Zijlstra
2025-08-21 18:26 ` Edgecombe, Rick P
2025-08-21 12:28 ` [PATCH 5/6] uprobes/x86: Make asm style consistent Peter Zijlstra
2025-08-21 12:28 ` [PATCH 6/6] uprobes/x86: Add SLS mitigation to the trampolines Peter Zijlstra
2025-09-10 1:05 ` Masami Hiramatsu [this message]
2025-08-21 14:18 ` [PATCH 0/6] uprobes/x86: Cleanups and fixes Jiri Olsa
2025-08-21 18:27 ` Edgecombe, Rick P
2025-08-21 19:52 ` Jiri Olsa
2025-08-21 19:57 ` Edgecombe, Rick P
2025-08-22 8:42 ` Jiri Olsa
2025-08-22 18:05 ` Andrii Nakryiko
2025-09-09 12:48 ` Jiri Olsa
2025-09-09 15:20 ` Andrii Nakryiko
2025-09-09 16:39 ` Jiri Olsa
2025-09-09 16:44 ` Andrii Nakryiko
2025-08-22 15:51 ` Oleg Nesterov
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=20250910100538.9289cc4adfa34d616bc59f39@kernel.org \
--to=mhiramat@kernel.org \
--cc=David.Laight@ACULAB.COM \
--cc=alan.maguire@oracle.com \
--cc=alx@kernel.org \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=eyal.birger@gmail.com \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rick.p.edgecombe@intel.com \
--cc=rostedt@goodmis.org \
--cc=songliubraving@fb.com \
--cc=thomas@t-8ch.de \
--cc=x86@kernel.org \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).