* [PATCH] s390: remove useless preempt_(dis/en)able calls in ftrace code
@ 2021-12-08 16:27 Wander Lairson Costa
2021-12-08 18:44 ` Heiko Carstens
0 siblings, 1 reply; 2+ messages in thread
From: Wander Lairson Costa @ 2021-12-08 16:27 UTC (permalink / raw)
To: Steven Rostedt, Ingo Molnar, Heiko Carstens, Vasily Gorbik,
Christian Borntraeger, Alexander Gordeev, open list:S390,
open list
Cc: Wander Lairson Costa
Commit ce5e48036c9e("ftrace: disable preemption when recursion locked")
moved the preempt disabling/enabling code to
ftrace_test_recursion_trylock() and ftrace_test_recursion_unlock(), and
cleaned up all direct calls in the ftrace code. But it left s390 behind.
Signed-off-by: Wander Lairson Costa <wander@redhat.com>
---
arch/s390/kernel/ftrace.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index 5510c7d10ddc..21d62d8b6b9a 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -290,7 +290,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
return;
regs = ftrace_get_regs(fregs);
- preempt_disable_notrace();
p = get_kprobe((kprobe_opcode_t *)ip);
if (unlikely(!p) || kprobe_disabled(p))
goto out;
@@ -318,7 +317,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
}
__this_cpu_write(current_kprobe, NULL);
out:
- preempt_enable_notrace();
ftrace_test_recursion_unlock(bit);
}
NOKPROBE_SYMBOL(kprobe_ftrace_handler);
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] s390: remove useless preempt_(dis/en)able calls in ftrace code
2021-12-08 16:27 [PATCH] s390: remove useless preempt_(dis/en)able calls in ftrace code Wander Lairson Costa
@ 2021-12-08 18:44 ` Heiko Carstens
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Carstens @ 2021-12-08 18:44 UTC (permalink / raw)
To: Wander Lairson Costa
Cc: Steven Rostedt, Ingo Molnar, Vasily Gorbik,
Christian Borntraeger, Alexander Gordeev, open list:S390,
open list
On Wed, Dec 08, 2021 at 01:27:19PM -0300, Wander Lairson Costa wrote:
> Commit ce5e48036c9e("ftrace: disable preemption when recursion locked")
> moved the preempt disabling/enabling code to
> ftrace_test_recursion_trylock() and ftrace_test_recursion_unlock(), and
> cleaned up all direct calls in the ftrace code. But it left s390 behind.
>
> Signed-off-by: Wander Lairson Costa <wander@redhat.com>
> ---
> arch/s390/kernel/ftrace.c | 2 --
> 1 file changed, 2 deletions(-)
Thanks, but I applied already this one:
https://lore.kernel.org/r/20211208151503.1510381-1-jmarchan@redhat.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-08 18:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-08 16:27 [PATCH] s390: remove useless preempt_(dis/en)able calls in ftrace code Wander Lairson Costa
2021-12-08 18:44 ` Heiko Carstens
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).