From 24c41942a442ade625c0533e22750e16c27b8502 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 20 Jun 2023 17:09:21 +0000 Subject: [PATCH] Revert "workqueue: Fix hung time report of worker pools" This reverts commit 647781347af925268434c5dc99b04f7077de8e8e which is commit 335a42ebb0ca8ee9997a1731aaaae6dcd704c113 upstream. It breaks the Android kernel abi, so revert it. If it needs to come back later, it can do so in an abi-safe way. Bug: 161946584 Change-Id: I702fcb45a1147789f1ff78ed07500162e8632d5f Signed-off-by: Greg Kroah-Hartman --- kernel/workqueue.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index c830ac463a15..3afe533cf3e9 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4833,19 +4833,16 @@ void show_workqueue_state(void) for_each_pool(pool, pi) { struct worker *worker; bool first = true; - unsigned long hung = 0; raw_spin_lock_irqsave(&pool->lock, flags); if (pool->nr_workers == pool->nr_idle) goto next_pool; - /* How long the first pending work is waiting for a worker. */ - if (!list_empty(&pool->worklist)) - hung = jiffies_to_msecs(jiffies - pool->watchdog_ts) / 1000; - pr_info("pool %d:", pool->id); pr_cont_pool_info(pool); - pr_cont(" hung=%lus workers=%d", hung, pool->nr_workers); + pr_cont(" hung=%us workers=%d", + jiffies_to_msecs(jiffies - pool->watchdog_ts) / 1000, + pool->nr_workers); if (pool->manager) pr_cont(" manager: %d", task_pid_nr(pool->manager->task));