From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C80673F7867; Tue, 31 Mar 2026 16:54:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774976088; cv=none; b=cXdeWkovE+oo5kMsxJ03tbfPmoj1H12St0baE9zywf23HHKSM/vhc4kSldOccnfeXjGrG+XjVP3bxDzTWkZ1AVzGKWcQxNHyXoPrgccf9EdDZg35J5HmS3p/XqxwHgl48plrV+hkN4DkXfLBME9bIWISSKiXAUobMw/C1zP2ImY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774976088; c=relaxed/simple; bh=uX3QyrEvvl/5orLfEsRJNZ8lrgdI9gR3Ds5C+OjVKvk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h6CS5y9jqTQ9xXeYU3zw5ll6Zvai+iKkDf0/nBNwa5PVlJvEGfHpR9qxUsQmZFAbmVJP/ODiNTJ+Iu794F6xzZlQ4hymOk7VwcUObFk0bbc6WDIAZcajd6HJx3e5Ke8jCxYnlssLjAyyLYjvdPx73BvlcAMx5mJgf75iwcofWjI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=L58J7AC1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="L58J7AC1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D4A6C19423; Tue, 31 Mar 2026 16:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774976088; bh=uX3QyrEvvl/5orLfEsRJNZ8lrgdI9gR3Ds5C+OjVKvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L58J7AC1G06Md6pb53ys6jUjQ+92RSs+ZqR1vu1gqTyqf+RPz7EBx+Dao3omUJbHK 9PGhBVrxluGL8aZywylTIlVPqlvWjeiwlKXCGfrnGTYiIugmnVx+z2f8abXWR2yb6K 4mtCc4WAr/NNidoRezO/8izAMnngxAIETZBiBEdQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, mathieu.desnoyers@efficios.com, zhang.run@zte.com.cn, yang.tao172@zte.com.cn, ran.xiaokai@zte.com.cn, "Masami Hiramatsu (Google)" , Luo Haiyang , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 6.12 202/244] tracing: Fix potential deadlock in cpu hotplug with osnoise Date: Tue, 31 Mar 2026 18:22:32 +0200 Message-ID: <20260331161749.210871669@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331161741.651718120@linuxfoundation.org> References: <20260331161741.651718120@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luo Haiyang [ 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: Cc: Cc: Cc: Fixes: bce29ac9ce0bb ("trace: Add osnoise tracer") Link: https://patch.msgid.link/20260326141953414bVSj33dAYktqp9Oiyizq8@zte.com.cn Reviewed-by: Masami Hiramatsu (Google) Signed-off-by: Luo Haiyang Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace_osnoise.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/kernel/trace/trace_osnoise.c +++ b/kernel/trace/trace_osnoise.c @@ -2104,8 +2104,8 @@ static void osnoise_hotplug_workfn(struc if (!osnoise_has_registered_instances()) return; - guard(mutex)(&interface_lock); guard(cpus_read_lock)(); + guard(mutex)(&interface_lock); if (!cpu_online(cpu)) return; @@ -2268,11 +2268,11 @@ static ssize_t osnoise_options_write(str if (running) stop_per_cpu_kthreads(); - mutex_lock(&interface_lock); /* * avoid CPU hotplug operations that might read options. */ cpus_read_lock(); + mutex_lock(&interface_lock); retval = cnt; @@ -2288,8 +2288,8 @@ static ssize_t osnoise_options_write(str clear_bit(option, &osnoise_options); } - cpus_read_unlock(); mutex_unlock(&interface_lock); + cpus_read_unlock(); if (running) start_per_cpu_kthreads(); @@ -2375,16 +2375,16 @@ osnoise_cpus_write(struct file *filp, co 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();