From patchwork Tue Jun 29 02:34:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12348909 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3395C11F64 for ; Tue, 29 Jun 2021 02:34:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 51E3661CCA for ; Tue, 29 Jun 2021 02:34:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51E3661CCA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A71128D0088; Mon, 28 Jun 2021 22:34:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A209F8D0072; Mon, 28 Jun 2021 22:34:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C1A38D0088; Mon, 28 Jun 2021 22:34:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0006.hostedemail.com [216.40.44.6]) by kanga.kvack.org (Postfix) with ESMTP id 60A6A8D0072 for ; Mon, 28 Jun 2021 22:34:19 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 5DA7B1D61E for ; Tue, 29 Jun 2021 02:34:19 +0000 (UTC) X-FDA: 78305192238.04.C9776C1 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf08.hostedemail.com (Postfix) with ESMTP id 1501A8019357 for ; Tue, 29 Jun 2021 02:34:18 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id D437361CEF; Tue, 29 Jun 2021 02:34:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1624934058; bh=rswmDrldNMshx/np3nZiROCT/xMNhSjNCzNa/qghuwo=; h=Date:From:To:Subject:In-Reply-To:From; b=w+BNx4u0SP5/XLmUF2Alu75rLrEDc3JbU7zbdNBqvS/vnqfF6CcRhOwJZdditw5SZ wHX1vLvc+PeILPo45BMuz9JyQ8hapAhac2ej+EjXdDaz8RVwrtopReegoBInw4Pk0K D6MkGFeT4DRvev4R/jgBZpOaKI6WMs7EJTJcvthc= Date: Mon, 28 Jun 2021 19:34:17 -0700 From: Andrew Morton To: akpm@linux-foundation.org, corbet@lwn.net, gpiccoli@canonical.com, joe@perches.com, keescook@chromium.org, linux-mm@kvack.org, mchehab+huawei@kernel.org, mm-commits@vger.kernel.org, pmladek@suse.com, qais.yousef@arm.com, rdunlap@infradead.org, santosh@fossix.org, steve@sk2.org, torvalds@linux-foundation.org, vbabka@suse.cz, wangqing@vivo.com Subject: [patch 019/192] kernel: watchdog: modify the explanation related to watchdog thread Message-ID: <20210629023417.9KCC9Dwv4%akpm@linux-foundation.org> In-Reply-To: <20210628193256.008961950a714730751c1423@linux-foundation.org> User-Agent: s-nail v14.8.16 Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=w+BNx4u0; spf=pass (imf08.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Stat-Signature: n8zby13tpx6oqytbfsg3xxtfzynfw59g X-Rspamd-Queue-Id: 1501A8019357 X-Rspamd-Server: rspam06 X-HE-Tag: 1624934058-689111 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Wang Qing Subject: kernel: watchdog: modify the explanation related to watchdog thread The watchdog thread has been replaced by cpu_stop_work, modify the explanation related. Link: https://lkml.kernel.org/r/1619687073-24686-2-git-send-email-wangqing@vivo.com Signed-off-by: Wang Qing Reviewed-by: Petr Mladek Cc: Jonathan Corbet Cc: Mauro Carvalho Chehab Cc: Joe Perches Cc: Stephen Kitt Cc: Kees Cook Cc: Randy Dunlap Cc: "Guilherme G. Piccoli" Cc: Qais Yousef Cc: Santosh Sivaraj Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- kernel/watchdog.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) --- a/kernel/watchdog.c~kernel-watchdog-modify-the-explanation-related-to-watchdog-thread +++ a/kernel/watchdog.c @@ -92,7 +92,7 @@ __setup("nmi_watchdog=", hardlockup_pani * own hardlockup detector. * * watchdog_nmi_enable/disable can be implemented to start and stop when - * softlockup watchdog threads start and stop. The arch must select the + * softlockup watchdog start and stop. The arch must select the * SOFTLOCKUP_DETECTOR Kconfig. */ int __weak watchdog_nmi_enable(unsigned int cpu) @@ -335,7 +335,7 @@ static DEFINE_PER_CPU(struct completion, static DEFINE_PER_CPU(struct cpu_stop_work, softlockup_stop_work); /* - * The watchdog thread function - touches the timestamp. + * The watchdog feed function - touches the timestamp. * * It only runs once every sample_period seconds (4 seconds by * default) to reset the softlockup timestamp. If this gets delayed @@ -558,11 +558,7 @@ static void lockup_detector_reconfigure( } /* - * Create the watchdog thread infrastructure and configure the detector(s). - * - * The threads are not unparked as watchdog_allowed_mask is empty. When - * the threads are successfully initialized, take the proper locks and - * unpark the threads in the watchdog_cpumask if the watchdog is enabled. + * Create the watchdog infrastructure and configure the detector(s). */ static __init void lockup_detector_setup(void) { @@ -628,7 +624,7 @@ void lockup_detector_soft_poweroff(void) #ifdef CONFIG_SYSCTL -/* Propagate any changes to the watchdog threads */ +/* Propagate any changes to the watchdog infrastructure */ static void proc_watchdog_update(void) { /* Remove impossible cpus to keep sysctl output clean. */