From patchwork Fri Dec 18 11:44:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoming Ni X-Patchwork-Id: 345709 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 8A0A4C2BBCF for ; Fri, 18 Dec 2020 11:45:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 56EB423A7D for ; Fri, 18 Dec 2020 11:45:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726394AbgLRLpH (ORCPT ); Fri, 18 Dec 2020 06:45:07 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:9466 "EHLO szxga06-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726309AbgLRLpG (ORCPT ); Fri, 18 Dec 2020 06:45:06 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Cy6T12LY8zhtQJ; Fri, 18 Dec 2020 19:43:49 +0800 (CST) Received: from use12-sp2.huawei.com (10.67.189.174) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.498.0; Fri, 18 Dec 2020 19:44:12 +0800 From: Xiaoming Ni To: , , , , , , , CC: , Subject: [PATCH 2/4] hung_task: Replace "did_panic" with is_be_panic() Date: Fri, 18 Dec 2020 19:44:04 +0800 Message-ID: <20201218114406.61906-3-nixiaoming@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201218114406.61906-1-nixiaoming@huawei.com> References: <20201218114406.61906-1-nixiaoming@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.189.174] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org Replace the global variable "did_panic" with is_be_panic() Signed-off-by: Xiaoming Ni --- kernel/hung_task.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/kernel/hung_task.c b/kernel/hung_task.c index bb2e3e15c84c..3374b993da4c 100644 --- a/kernel/hung_task.c +++ b/kernel/hung_task.c @@ -50,7 +50,6 @@ unsigned long __read_mostly sysctl_hung_task_check_interval_secs; int __read_mostly sysctl_hung_task_warnings = 10; -static int __read_mostly did_panic; static bool hung_task_show_lock; static bool hung_task_call_panic; static bool hung_task_show_all_bt; @@ -72,18 +71,6 @@ unsigned int __read_mostly sysctl_hung_task_all_cpu_backtrace; unsigned int __read_mostly sysctl_hung_task_panic = CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE; -static int -hung_task_panic(struct notifier_block *this, unsigned long event, void *ptr) -{ - did_panic = 1; - - return NOTIFY_DONE; -} - -static struct notifier_block panic_block = { - .notifier_call = hung_task_panic, -}; - static void check_hung_task(struct task_struct *t, unsigned long timeout) { unsigned long switch_count = t->nvcsw + t->nivcsw; @@ -223,7 +210,7 @@ static void check_hung_uninterruptible_tasks(unsigned long timeout) * If the system crashed already then all bets are off, * do not report extra hung tasks: */ - if (test_taint(TAINT_DIE) || did_panic) + if (test_taint(TAINT_DIE) || unlikely(is_being_panic())) return; hung_task_show_lock = false; @@ -347,8 +334,6 @@ static int watchdog(void *dummy) static int __init hung_task_init(void) { - atomic_notifier_chain_register(&panic_notifier_list, &panic_block); - /* Disable hung task detector on suspend */ pm_notifier(hungtask_pm_notify, 0);