Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2529675lqp; Mon, 25 Mar 2024 01:17:29 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVLdW5T76eJJ2d4m/sEJnAdJ4xN+qfXK+wBGO2DACDHxhjI7tsx+IF5AJlYcbMh5owpVMwwsZXEDa9gZsDmNsgSUkETlq+hVaYBETBm2A== X-Google-Smtp-Source: AGHT+IG1+xcDA3KqPTRGee2PC3W64X1b5yV1iXvJpRwJ3VDRhrIQ8VY20//dLNvG7x95rIJMKEbV X-Received: by 2002:a92:d790:0:b0:368:9818:8d46 with SMTP id d16-20020a92d790000000b0036898188d46mr318915iln.32.1711354649077; Mon, 25 Mar 2024 01:17:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711354649; cv=pass; d=google.com; s=arc-20160816; b=WYG5u7Tx09FsFrrmpfmgZvLZHBFnK/iA44FlAnjN+aDajxqMtddoRlzYY//NWfHTPj PJNEb80Rd82Fos1sMxgynDHiS8dHqIfI2fK0i0qrouDk7fX78x2fNCNFIOxMlwu6byK8 QDT5Wn7ljpM7o60Y7VyDgYLDHSrZ/zhPiYCaWvPCpgAauOFlk9yMt/TSgky+VSVHRNBB ACWze6U+WbPg3+LpyK2VK3zIzC26WNIfUqU7GexlW2JiyxQavv7WAnuIz2ovsrD2Xoe6 mhFjM5+efUEzpMmT4JKVI68E2/sk9Bly2gZKOlg1eNHeVx6lIaEPoSyPpQrP5oDULhY1 OIyA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=UmK0Dn+zSGLw1xnEQZ4srUwKmNdgtGWHxY9JWyOVaTI=; fh=yJxSnEwdhilIk+VzND6adzGC7IV1gIIfyrgLbFeSc3w=; b=eKBPQaFK9is6XNvzb8Eolio/Vd0iiT2xy/pPzVkCKqiz2+o84jY9SyWhikjoAowgpZ cgWhtjsBUruvZHXM19hwujtDUJBRRaLM/+ibbah40/Ex1najJpZEJPd5Dc7iXmekfEf5 RuTw4OK8E8eogfjvNS2VRZ7tsjw+wujA4Uk+4egIK2q5gNB137XWzxUmXLmaxZEpoCcA TOjyZnmRPq4i39vDwED/lz+1bwPqW/fGqJThubHSYJV453GT7rg7dokHi/QjHo/p1Xen NuzTKnkAg2KS0oIFcHb1lQr2R0EQhZtDBFmU393QZ6/S78t3WcDQgSj+qLsXC3G+PPGN Ghkg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="B8/O3aTR"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116027-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116027-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id p3-20020a63fe03000000b005e4e759dd6fsi7019326pgh.433.2024.03.25.01.17.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 01:17:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116027-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="B8/O3aTR"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116027-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116027-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 993C6296F36 for ; Mon, 25 Mar 2024 08:17:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9565D26B80D; Mon, 25 Mar 2024 03:27:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="B8/O3aTR" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DF37175C8E; Sun, 24 Mar 2024 23:36:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323390; cv=none; b=cGwnlPKLvBdatKG4nf6IHhzb0SYRfIznWj6EN5GBSWlUDa8Ul1kV1HUHykptxylG1Mb0W0WM8gC6w3S8MNCuwhsgnGnJX77VrnTg3afTsv6baxwXjUbtYaq8pjCNwR+aLqEH+OqNEw5A0eLVOTN4RkO3XxiF91tcgSnG8qn8pBs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323390; c=relaxed/simple; bh=uyYm/hTPynukJH3N+FZgPpV/0Ja5FnJGYAm2qYYs7Qo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hhd68pIQpx1hAmmGz/mSrKBi/q0egW9SPlJXbhbS+d/QKaKl2IY/CQ36pa9BKREvGMcozFSDXfKa3kkY67jg9dRRMSA828vr29P0r9BHP+6wHvljljwl+vPaA34Kjqdw63FOe8QlTf338BGpGExnojJz2rKuf9Sgfm3Ps2LzP54= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B8/O3aTR; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55CCEC43390; Sun, 24 Mar 2024 23:36:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323390; bh=uyYm/hTPynukJH3N+FZgPpV/0Ja5FnJGYAm2qYYs7Qo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B8/O3aTRSkKRi9YNVzlYRQGwm71/oUb8nrEZ9pilMtJqKQJEjEwre5ojmILFv6LeN qXUrZmercaIa4ClnMBS1KrQYY5RlVF8G1VYNDti/+qRNRNCrmaLNY2TPOzn+IVuXT0 TBJyXZT3w4Opl5yT1+4kNHkf1fph/Ht0C/5Fr8/5q7AoUrHFaQI4DaDiUYTucutSW6 kWLxt16PrjCs/P3a22PNnQc3c663z0sOSOvXELSRQ3p3kKFnuCq7eJxIQdA6bsL+no BcFZDgv9lA7qs+7LT5jyKFPwxgLPlFufYNGLHfzqvd+8ZlIO2TDMx2pQ6uSxCCE2LA m5BBeDdKmMvUg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stephen Brennan , Petr Mladek , Sergey Senozhatsky , Sasha Levin Subject: [PATCH 5.15 090/317] printk: Add panic_in_progress helper Date: Sun, 24 Mar 2024 19:31:10 -0400 Message-ID: <20240324233458.1352854-91-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324233458.1352854-1-sashal@kernel.org> References: <20240324233458.1352854-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit 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 Stable-dep-of: d04d5882cd67 ("printk: Disable passing console lock owner completely during panic()") 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 8b110b245d92c..de44ccf9743c1 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -258,6 +258,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.43.0