__module_text_address() can be invoked within a RCU section, there is no
requirement to have preemption disabled.

Replace the preempt_disable() section around __module_text_address()
with RCU.

Cc: Huacai Chen <chenhua...@kernel.org>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: Masami Hiramatsu <mhira...@kernel.org>
Cc: Steven Rostedt <rost...@goodmis.org>
Cc: WANG Xuerui <ker...@xen0n.name>
Cc: linux-trace-kernel@vger.kernel.org
Cc: loonga...@lists.linux.dev
Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de>
---
 arch/loongarch/kernel/ftrace_dyn.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/loongarch/kernel/ftrace_dyn.c 
b/arch/loongarch/kernel/ftrace_dyn.c
index 18056229e22e4..5e0d870935542 100644
--- a/arch/loongarch/kernel/ftrace_dyn.c
+++ b/arch/loongarch/kernel/ftrace_dyn.c
@@ -85,14 +85,13 @@ static bool ftrace_find_callable_addr(struct dyn_ftrace 
*rec, struct module *mod
         * dealing with an out-of-range condition, we can assume it
         * is due to a module being loaded far away from the kernel.
         *
-        * NOTE: __module_text_address() must be called with preemption
-        * disabled, but we can rely on ftrace_lock to ensure that 'mod'
+        * NOTE: __module_text_address() must be called within a RCU read
+        * section, but we can rely on ftrace_lock to ensure that 'mod'
         * retains its validity throughout the remainder of this code.
         */
        if (!mod) {
-               preempt_disable();
+               guard(rcu)();
                mod = __module_text_address(pc);
-               preempt_enable();
        }
 
        if (WARN_ON(!mod))
-- 
2.45.2


Reply via email to