From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0DEFC4321E for ; Wed, 30 Mar 2022 12:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347738AbiC3MHg (ORCPT ); Wed, 30 Mar 2022 08:07:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345952AbiC3LzP (ORCPT ); Wed, 30 Mar 2022 07:55:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9603D2B275; Wed, 30 Mar 2022 04:53:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2A49261703; Wed, 30 Mar 2022 11:53:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D95F7C3410F; Wed, 30 Mar 2022 11:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648641201; bh=5IQu0I7zZXv/WhZ/X+UKkJ92MTvXwDQ2xxGXdVwG9Q4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iu9zy+Y78ioN2Ln9J7lYj7QAlxKZbwjWgFnOJ4XuOxeRNQPifteOTGawvXMG/RDd0 zsKu8zHOZ4VnhsGiqKOXWjBesHuvL2piM8elY7U46d7esJZkxHa4Vp793hvRDoPozl QnZxRW7/JJzXbw1pO/Tc4oeEoU0iHAuWB3ZHXWolH4CTk8tDRqx3ZfuVlER7OrqwwR 1flfJMbUjWdJobfsG8tpsr0cp7TYD/vX1Y57n+FV7Luvgl8c14BQSl6946xZMBW8Pg 5TnuJjjS0bXjaVMjT5dP/jJ7tOV9zBw5BPvzzede6GWB2lCgLLXl2H50MNdKTFA3MH f3QdVMw4Xsgbw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stephen Brennan , Petr Mladek , Sergey Senozhatsky , Sasha Levin , linux@roeck-us.net Subject: [PATCH AUTOSEL 4.19 11/22] printk: Add panic_in_progress helper Date: Wed, 30 Mar 2022 07:52:52 -0400 Message-Id: <20220330115303.1672616-11-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330115303.1672616-1-sashal@kernel.org> References: <20220330115303.1672616-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Brennan [ Upstream commit 77498617857f68496b360081dde1a492d40c28b2 ] This will be used help avoid deadlocks during panics. Although it would be better to include this in linux/panic.h, it would require that header to include linux/atomic.h as well. On some architectures, this results in a circular dependency as well. So instead add the helper directly to printk.c. Suggested-by: Petr Mladek Signed-off-by: Stephen Brennan Reviewed-by: Petr Mladek Reviewed-by: Sergey Senozhatsky Signed-off-by: Petr Mladek Link: https://lore.kernel.org/r/20220202171821.179394-2-stephen.s.brennan@oracle.com Signed-off-by: Sasha Levin --- kernel/printk/printk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 57742e193214..9a5ce47e0a58 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -246,6 +246,11 @@ static void __up_console_sem(unsigned long ip) } #define up_console_sem() __up_console_sem(_RET_IP_) +static bool panic_in_progress(void) +{ + return unlikely(atomic_read(&panic_cpu) != PANIC_CPU_INVALID); +} + /* * This is used for debugging the mess that is the VT code by * keeping track if we have the console semaphore held. It's -- 2.34.1