This is a note to let you know that I've just added the patch titled
workqueue: wq_watchdog_touch is always called with valid CPU
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
workqueue-wq_watchdog_touch-is-always-called-with-va.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 9bfd56f733c482ad9add3f19675667ad83435943
Author: Nicholas Piggin <npiggin@xxxxxxxxx>
Date: Tue Jun 25 21:42:44 2024 +1000
workqueue: wq_watchdog_touch is always called with valid CPU
[ Upstream commit 18e24deb1cc92f2068ce7434a94233741fbd7771 ]
Warn in the case it is called with cpu == -1. This does not appear
to happen anywhere.
Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
Reviewed-by: Paul E. McKenney <paulmck@xxxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index d5f30b610217..f7975a8f665f 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -5937,6 +5937,8 @@ notrace void wq_watchdog_touch(int cpu)
{
if (cpu >= 0)
per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies;
+ else
+ WARN_ONCE(1, "%s should be called with valid CPU", __func__);
wq_watchdog_touched = jiffies;
}
