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 84DB922D4DC for ; Sun, 29 Mar 2026 07:18:56 +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=1774768736; cv=none; b=iHFXRFWkIVwKcjTz06zqDnOlK+tAGkZ1sZ3Pe0M9FVSLYRqd5tDG5QxVdMK8jjfmQkZRNuwsJfwb/YpfofGdCWQT2yH7iMI6yZtTlB21uD6mNql47nCHHtX1htVev5b8n69yDGlN8NCnt4QJ5PxjNxNPVGad/wj3ik/2ljawnrQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774768736; c=relaxed/simple; bh=mpwIPKHyLKhIR2QLx/k5j+JQ7mmdFG8jyeIuM6siKfo=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=ZtBQIVtrBOrz57XO8EFuwKwU/KluJG20XLciOmdFXzqMCtjuZpbQVizBp/6DqbHmWdAdXE+JdwroiQMV9GN5goWtCBlYr/0/WC1ltXNvBM5eKHTbxoAnd8pw4Q52uFVH6TwwOoRoBjCVrCLtUrZva/3Jtixe/mGvnqKqJm/xS6E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=srSnxB8v; 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="srSnxB8v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 935F4C116C6; Sun, 29 Mar 2026 07:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774768736; bh=mpwIPKHyLKhIR2QLx/k5j+JQ7mmdFG8jyeIuM6siKfo=; h=Subject:To:Cc:From:Date:From; b=srSnxB8vgABM7Wavl++//n5LwvTuT7J8hjISl4hA2+n904PvOvNY+uRUTp54Ztppw Df+Bgo9GYIM/NzyFm9D3naa/Y/gBKVXVw7GaoeSZWkioxP3njqLCwGx8tTN+bZxktq 7SvT2iMmXrvXHNqNjyXuAzdsaeUYnxY0zs7GljNM= Subject: FAILED: patch "[PATCH] tracing: Fix potential deadlock in cpu hotplug with osnoise" failed to apply to 6.12-stable tree To: luo.haiyang@zte.com.cn,mathieu.desnoyers@efficios.com,mhiramat@kernel.org,ran.xiaokai@zte.com.cn,rostedt@goodmis.org,yang.tao172@zte.com.cn,zhang.run@zte.com.cn Cc: From: Date: Sun, 29 Mar 2026 09:18:52 +0200 Message-ID: <2026032952-shredding-snorkel-3530@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.12-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y git checkout FETCH_HEAD git cherry-pick -x 1f9885732248d22f788e4992c739a98c88ab8a55 # git commit -s git send-email --to '' --in-reply-to '2026032952-shredding-snorkel-3530@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 1f9885732248d22f788e4992c739a98c88ab8a55 Mon Sep 17 00:00:00 2001 From: Luo Haiyang Date: Thu, 26 Mar 2026 14:19:53 +0800 Subject: [PATCH] tracing: Fix potential deadlock in cpu hotplug with osnoise 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) diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c index dee610e465b9..be6cf0bb3c03 100644 --- a/kernel/trace/trace_osnoise.c +++ b/kernel/trace/trace_osnoise.c @@ -2073,8 +2073,8 @@ static void osnoise_hotplug_workfn(struct work_struct *dummy) if (!osnoise_has_registered_instances()) return; - guard(mutex)(&interface_lock); guard(cpus_read_lock)(); + guard(mutex)(&interface_lock); if (!cpu_online(cpu)) return; @@ -2237,11 +2237,11 @@ static ssize_t osnoise_options_write(struct file *filp, const char __user *ubuf, 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; @@ -2257,8 +2257,8 @@ static ssize_t osnoise_options_write(struct file *filp, const char __user *ubuf, clear_bit(option, &osnoise_options); } - cpus_read_unlock(); mutex_unlock(&interface_lock); + cpus_read_unlock(); if (running) start_per_cpu_kthreads(); @@ -2345,16 +2345,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();