Commit 9783cadf authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Wen Zhiwei
Browse files

workqueue: wq_watchdog_touch is always called with valid CPU 

stable inclusion
from stable-v6.6.51
commit 5ff0a441419576b8694a2b19c4a689f5c04095e5
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYRVR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5ff0a441419576b8694a2b19c4a689f5c04095e5



--------------------------------

[ Upstream commit 18e24deb1cc92f2068ce7434a94233741fbd7771 ]

Warn in the case it is called with cpu == -1. This does not appear
to happen anywhere.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Reviewed-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 3116e0dc

kernel/workqueue.c

+2 −0
Original line number Diff line number Diff line
@@ -6482,6 +6482,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;

}