tracing: Fix potential deadlock in cpu hotplug with osnoise

[ Upstream commit 1f9885732248d22f788e4992c739a98c88ab8a55 ]

The following sequence may leads deadlock in cpu hotplug:

    task1        task2        task3
    -----        -----        -----

 mutex_lock(&interface_lock)

            [CPU GOING OFFLINE]

            cpus_write_lock();
            osnoise_cpu_die();
              kthread_stop(task3);
                wait_for_completion();

                      osnoise_sleep();
                        mutex_lock(&interface_lock);

 cpus_read_lock();

 [DEAD LOCK]

Fix by swap the order of cpus_read_lock() and mutex_lock(&interface_lock).

Cc: stable@vger.kernel.org
Cc: <mathieu.desnoyers@efficios.com>
Cc: <zhang.run@zte.com.cn>
Cc: <yang.tao172@zte.com.cn>
Cc: <ran.xiaokai@zte.com.cn>
Fixes: bce29ac9ce0bb ("trace: Add osnoise tracer")
Link: https://patch.msgid.link/20260326141953414bVSj33dAYktqp9Oiyizq8@zte.com.cn
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Luo Haiyang <luo.haiyang@zte.com.cn>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
[ adapted guard() macros to lock/unlock calls ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
index e5929cb3840f4ca51a72508976fc395f48649d31..676d9a3e65cde625ed35dd8944afffe070e5c0b7 100644 (file)
--- a/kernel/trace/trace_osnoise.c
+++ b/kernel/trace/trace_osnoise.c
@@ -1809,8 +1809,8 @@ static void osnoise_hotplug_workfn(struct work_struct *dummy)
        if (!osnoise_has_registered_instances())
                goto out_unlock_trace;
 
-       mutex_lock(&interface_lock);
        cpus_read_lock();
+       mutex_lock(&interface_lock);
 
        if (!cpu_online(cpu))
                goto out_unlock;
@@ -1820,8 +1820,8 @@ static void osnoise_hotplug_workfn(struct work_struct *dummy)
        start_kthread(cpu);
 
 out_unlock:
-       cpus_read_unlock();
        mutex_unlock(&interface_lock);
+       cpus_read_unlock();
 out_unlock_trace:
        mutex_unlock(&trace_types_lock);
 }
@@ -1950,16 +1950,16 @@ osnoise_cpus_write(struct file *filp, const char __user *ubuf, size_t count,
        if (running)
                stop_per_cpu_kthreads();
 
-       mutex_lock(&interface_lock);
        /*
         * osnoise_cpumask is read by CPU hotplug operations.
         */
        cpus_read_lock();
+       mutex_lock(&interface_lock);
 
        cpumask_copy(&osnoise_cpumask, osnoise_cpumask_new);
 
-       cpus_read_unlock();
        mutex_unlock(&interface_lock);
+       cpus_read_unlock();
 
        if (running)
                start_per_cpu_kthreads();