From: Ze Gao <zegao2021@gmail.com>
To: Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>,
Alexander Gordeev <agordeev@linux.ibm.com>,
Alexei Starovoitov <ast@kernel.org>,
Borislav Petkov <bp@alien8.de>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Heiko Carstens <hca@linux.ibm.com>,
"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Sven Schnelle <svens@linux.ibm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Vasily Gorbik <gor@linux.ibm.com>,
x86@kernel.org, linux-kernel@vger.kernel.org,
linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org,
linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org,
Conor Dooley <conor@kernel.org>, Jiri Olsa <jolsa@kernel.org>,
Yonghong Song <yhs@fb.com>, Ze Gao <zegao@tencent.com>,
stable@vger.kernel.org
Subject: [PATCH v2 1/4] rethook: use preempt_{disable, enable}_notrace in rethook_trampoline_handler
Date: Tue, 16 May 2023 15:18:27 +0800 [thread overview]
Message-ID: <20230516071830.8190-2-zegao@tencent.com> (raw)
In-Reply-To: <20230516071830.8190-1-zegao@tencent.com>
This patch replaces preempt_{disable, enable} with its corresponding
notrace version in rethook_trampoline_handler so no worries about stack
recursion or overflow introduced by preempt_count_{add, sub} under
fprobe + rethook context.
Fixes: 54ecbe6f1ed5 ("rethook: Add a generic return hook")
Signed-off-by: Ze Gao <zegao@tencent.com>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: <stable@vger.kernel.org>
---
kernel/trace/rethook.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/rethook.c b/kernel/trace/rethook.c
index 32c3dfdb4d6a..60f6cb2b486b 100644
--- a/kernel/trace/rethook.c
+++ b/kernel/trace/rethook.c
@@ -288,7 +288,7 @@ unsigned long rethook_trampoline_handler(struct pt_regs *regs,
* These loops must be protected from rethook_free_rcu() because those
* are accessing 'rhn->rethook'.
*/
- preempt_disable();
+ preempt_disable_notrace();
/*
* Run the handler on the shadow stack. Do not unlink the list here because
@@ -321,7 +321,7 @@ unsigned long rethook_trampoline_handler(struct pt_regs *regs,
first = first->next;
rethook_recycle(rhn);
}
- preempt_enable();
+ preempt_enable_notrace();
return correct_ret_addr;
}
--
2.40.1
next prev parent reply other threads:[~2023-05-16 7:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-16 7:18 [PATCH v2 0/4] Make fprobe + rethook immune to recursion Ze Gao
2023-05-16 7:18 ` Ze Gao [this message]
2023-05-16 7:18 ` [PATCH v2 2/4] fprobe: make fprobe_kprobe_handler recursion free Ze Gao
2023-05-16 9:15 ` Peter Zijlstra
2023-05-16 9:35 ` Ze Gao
2023-05-16 9:18 ` Peter Zijlstra
2023-05-16 9:47 ` Ze Gao
2023-05-16 9:51 ` Ze Gao
2023-05-16 16:03 ` Masami Hiramatsu
2023-05-17 1:54 ` Ze Gao
2023-05-17 2:54 ` Masami Hiramatsu
2023-05-17 3:10 ` Ze Gao
2023-05-17 3:25 ` Steven Rostedt
2023-05-17 3:51 ` Masami Hiramatsu
2023-05-17 4:51 ` Ze Gao
2023-05-16 7:18 ` [PATCH v2 3/4] fprobe: add recursion detection in fprobe_exit_handler Ze Gao
2023-05-16 7:18 ` [PATCH v2 4/4] rehook, fprobe: do not trace rethook related functions Ze Gao
2023-05-16 14:20 ` Steven Rostedt
2023-05-17 2:00 ` Ze Gao
2023-05-16 16:05 ` Masami Hiramatsu
2023-05-16 21:42 ` [PATCH v2 0/4] Make fprobe + rethook immune to recursion Jiri Olsa
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=20230516071830.8190-2-zegao@tencent.com \
--to=zegao2021@gmail.com \
--cc=agordeev@linux.ibm.com \
--cc=aou@eecs.berkeley.edu \
--cc=ast@kernel.org \
--cc=borntraeger@linux.ibm.com \
--cc=bp@alien8.de \
--cc=bpf@vger.kernel.org \
--cc=conor@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=rostedt@goodmis.org \
--cc=stable@vger.kernel.org \
--cc=svens@linux.ibm.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yhs@fb.com \
--cc=zegao@tencent.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).