From: 王擎 <wangqing@vivo.com>
To: pmladek@suse.com
Cc: Tejun Heo <tj@kernel.org>, Lai Jiangshan <jiangshanlai@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
"Guilherme G. Piccoli" <gpiccoli@canonical.com>,
Andrey Ignatov <rdna@fb.com>, Vlastimil Babka <vbabka@suse.cz>,
Santosh Sivaraj <santosh@fossix.org>,
linux-kernel@vger.kernel.org
Subject: Re:[PATCH V3,RESEND] workqueue/watchdog: Make unbound workqueues aware of touch_softlockup_watchdog()
Date: Sat, 27 Mar 2021 10:38:32 +0800 (GMT+08:00) [thread overview]
Message-ID: <ADMAxQB0Dp4HbUwKbHMPiKq8.3.1616812712398.Hmail.wangqing@vivo.com> (raw)
In-Reply-To: <1616586031-31809-1-git-send-email-wangqing@vivo.com>
>V3:
>- Modify the commit message clearly according to Petr's suggestion.
>
>Signed-off-by: Wang Qing <wangqing@vivo.com>
>---
> kernel/watchdog.c | 5 +++--
> kernel/workqueue.c | 17 ++++++-----------
> 2 files changed, 9 insertions(+), 13 deletions(-)
>
>diff --git a/kernel/watchdog.c b/kernel/watchdog.c
>index 7110906..107bc38
>--- a/kernel/watchdog.c
>+++ b/kernel/watchdog.c
>@@ -278,9 +278,10 @@ void touch_all_softlockup_watchdogs(void)
> * update as well, the only side effect might be a cycle delay for
> * the softlockup check.
> */
>- for_each_cpu(cpu, &watchdog_allowed_mask)
>+ for_each_cpu(cpu, &watchdog_allowed_mask) {
> per_cpu(watchdog_touch_ts, cpu) = SOFTLOCKUP_RESET;
>- wq_watchdog_touch(-1);
>+ wq_watchdog_touch(cpu);
>+ }
> }
>
> void touch_softlockup_watchdog_sync(void)
>diff --git a/kernel/workqueue.c b/kernel/workqueue.c
>index 0d150da..be08295
>--- a/kernel/workqueue.c
>+++ b/kernel/workqueue.c
>@@ -5787,22 +5787,17 @@ static void wq_watchdog_timer_fn(struct timer_list *unused)
> continue;
>
> /* get the latest of pool and touched timestamps */
>+ if (pool->cpu >= 0)
>+ touched = READ_ONCE(per_cpu(wq_watchdog_touched_cpu, pool->cpu));
>+ else
>+ touched = READ_ONCE(wq_watchdog_touched);
> pool_ts = READ_ONCE(pool->watchdog_ts);
>- touched = READ_ONCE(wq_watchdog_touched);
>
> if (time_after(pool_ts, touched))
> ts = pool_ts;
> else
> ts = touched;
>
>- if (pool->cpu >= 0) {
>- unsigned long cpu_touched =
>- READ_ONCE(per_cpu(wq_watchdog_touched_cpu,
>- pool->cpu));
>- if (time_after(cpu_touched, ts))
>- ts = cpu_touched;
>- }
>-
> /* did we stall? */
> if (time_after(jiffies, ts + thresh)) {
> lockup_detected = true;
>@@ -5826,8 +5821,8 @@ notrace void wq_watchdog_touch(int cpu)
> {
> if (cpu >= 0)
> per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies;
>- else
>- wq_watchdog_touched = jiffies;
>+
>+ wq_watchdog_touched = jiffies;
> }
>
> static void wq_watchdog_set_thresh(unsigned long thresh)
>--
>2.7.4
>
Hi Petr:
Can you give a reviewed tag, or pick it up to workqueue tree?
Thanks,
Qing
next prev parent reply other threads:[~2021-03-27 2:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 11:40 [PATCH V3,RESEND] workqueue/watchdog: Make unbound workqueues aware of touch_softlockup_watchdog() Wang Qing
2021-03-27 2:38 ` 王擎 [this message]
2021-04-04 17:27 ` Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ADMAxQB0Dp4HbUwKbHMPiKq8.3.1616812712398.Hmail.wangqing@vivo.com \
--to=wangqing@vivo.com \
--cc=akpm@linux-foundation.org \
--cc=gpiccoli@canonical.com \
--cc=jiangshanlai@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rdna@fb.com \
--cc=santosh@fossix.org \
--cc=tj@kernel.org \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).