Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Huang Shijie <shijie@os.amperecomputing.com>
To:     will@kernel.org, catalin.marinas@arm.com
Cc:     patches@amperecomputing.com, zwang@amperecomputing.com,
        darren@os.amperecomputing.com, pasha.tatashin@soleen.com,
        pmladek@suse.com, senozhatsky@chromium.org, rostedt@goodmis.org,
        john.ogness@linutronix.de, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org,
        Huang Shijie <shijie@os.amperecomputing.com>,
        Adam Li <adam.li@amperecomputing.com>
Subject: [PATCH v2] arm64: kexec: flush log to console in NMI context
Date:   Sun, 24 Apr 2022 15:19:52 +0000
Message-Id: <20220424151952.183208-1-shijie@os.amperecomputing.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qsotfIokCuVu0MjMoEgtFtHFcwRUw0ib6BXk3Zjqki5rRVVkVN8IYARmStYC?=
 =?us-ascii?Q?IORWp7L8u7yD9ANUsz6BUbW9poeFbhrcrkxEzRkIsxdYpym+teQKIgMTTLRX?=
 =?us-ascii?Q?8liEjLc41ZPr1JDkQ6QNxCcrrwj5KTsvSjNkzUxtMd7USKl8VWOJrmLrxYK2?=
 =?us-ascii?Q?35Gnk4biHAAALYYaG1SoYzgzLj7xjohqjfsEYSDBwGOORmmZm/Zh5T5j0EYw?=
 =?us-ascii?Q?4YARiB4U3RiBJWolRm8xlAn2LqnIGbf8/3ofSh1Vll7xSKuIcKMwMDY2eyFv?=
 =?us-ascii?Q?FnKjFvzbPYr+VL/YmVG5day6skMq+/0btRlFRijPIAs7qQp9S9yBY6h0jtZJ?=
 =?us-ascii?Q?NA50sJd9RrDxqlfhq21FlsEYlNwFBqWXvqKTT984F7fbpEakG+XDOERd1dZV?=
 =?us-ascii?Q?blucBR043Ygmecl/aoQ5Li0Lk0sJF3oBOaCMzK+ukFI6goei1rPFVCrlct+7?=
 =?us-ascii?Q?SoolT/Nm2EzQo2PFDxzYEws8a+E50YXrLVJHViZuOZYWluvN88hJH1jmtbXE?=
 =?us-ascii?Q?gasE/JiWs7Sqq6oBRuQklTW7eP3dG4gBlE1PVPZoOU71WlMp26hL+Lamr2LY?=
 =?us-ascii?Q?2MZbiEB/X9OGvTodxO2zPV7beHCaD3vmH30eansdnLcO4EX4v1GDH2AKlAsi?=
 =?us-ascii?Q?DoUD1Bi2rHx8piB0R3qX2ZVbwvwkWc2cYgfTr6aCyXJGJ7m7hQYZBcQ+YttI?=
 =?us-ascii?Q?DJ9VpCUpblxskvFqFGG1m7M9xdbFxfqv7sQyzaHM7vlIfcuqjKA3uBrWlg9s?=
 =?us-ascii?Q?+IsrmraeYAzto/RVIe6xwDbNpRec1+vrarTSzxUbkDutNXMFmlI3h2T3soZX?=
 =?us-ascii?Q?4FSH2jih6S9xSid1dkH0M+cxhZ5Re+aZL2QFsunPTO200Tbm73ncLf1KR16L?=
 =?us-ascii?Q?DrI4m66zhIgOC8SanWBDpI9ID0RdZfoS5SDH0WRIxRDcM6OegY5x28Uy0L6I?=
 =?us-ascii?Q?bkoxG8Hq1RDpp+WIZpKKjga6dYGRR3iPmqgzPvOS+XNuXtwSCcfW0sLI30H3?=
 =?us-ascii?Q?WZp3dCjPfbrUtVccjerE40rmCYXj6Fpw23JmlvBqacY5LNILoqA5ekfarjg7?=
 =?us-ascii?Q?ZigjrLHJAxuLUgxBwqVnVJveEI4jpI5tGvFnJ9hZc1zTE4oCZz2iIfu7Erx/?=
 =?us-ascii?Q?0Zn2nvpHWVMk5m2GyPGwtjfHzXGhFyQ0JykCdnXpZVMj2NMaDsMNI2R2VxTX?=
 =?us-ascii?Q?DGYSjYXT7L53AFS2hjGJyZ08At4fi4CGxWGwV7ahOsYdWCAsFRLPkQuhv4fK?=
 =?us-ascii?Q?8wJnBf9wyqKN0Eqh70kgsuoA/EAxRN5xxAIk1pRNNuNfz6vMj2SmhIUkedmX?=
 =?us-ascii?Q?YLKDWOAPQvGzzjkvc0p6C+C1SE7hybsKqHaaQ579TncAM7wmyt/fRwnBdnC0?=
 =?us-ascii?Q?IeTt69KM9xgPswvgOWMGR564U5lhT2i39y5O0Pf3Ifb6PMsRg/aLMIrhrnYo?=
 =?us-ascii?Q?vn+QdKMzPiSEJ5BVNwT/jqVDa1DLVJ4IqNM315URX3atA1D0XXFYtVrz3Be5?=
 =?us-ascii?Q?MDbgmhd1SYXazhAWggws622yvwbUsYzynznQPFP40z/ztqxc9CAUpDreneSe?=
 =?us-ascii?Q?NICISAY2XzjcGeuJEKTbvIo/s0hXTFKtEVB76TAsvmCVrpZt8yPBhz2EWcAy?=
 =?us-ascii?Q?r31CjHVn69MfbTlQRLxkrzGleWD4eNoMmeFxdKzASoXLu/KdtsjxtiQrHCRn?=
 =?us-ascii?Q?E+ap5zLPfRgF3DyJzSIRCCd15z/gWqY6TpvTPpWzJ2bfaBouiwNYIWJpTIiK?=
 =?us-ascii?Q?sp9KLRammYzmo67c6Nh1DD2W6LFcPjbFjFr0BzGUJx89tqm706dS?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1b4650d3-f583-4a04-4ba6-08da25c35d75
X-MS-Exchange-CrossTenant-AuthSource: DM8PR01MB6824.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 07:23:44.8954
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: xw4DPiBTQriZtD+k8eW0InPrbgvQNvIilKu4+Gioqy7IZRhL7E3+pd9H/bsPnkP6EB5knlSQp0hO6X2hoR4hzipLX0Fd538fBPdN/AKsnoR86hofIFZiY8FlhcO3HrNN
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR01MB7486
X-Spam-Status: No, score=-0.1 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If kdump is configured, nmi_panic() may run to machine_kexec().

In NMI context, the defer_console_output() defers the console
output by using wake_up_klogd to flush the printk ringbuffer
to console.

But in the machine_kexec, the system will reset, and there is
no chance for the wake_up_klogd to do its job. So we can _not_
see any log on the console since the nmi_panic
(nmi_panic() will disable the irq).

This patch fixes this issue by using console_flush_on_panic()
to flush to console.

After this patch, we can see all the log since the nmi_panic
in the panic console.

Tested-by: Adam Li <adam.li@amperecomputing.com>
Signed-off-by: Huang Shijie <shijie@os.amperecomputing.com>
---
v1 --> v2:
	update this patch since the printk system is changed.

	v1:https://lkml.iu.edu/hypermail/linux/kernel/2106.2/01703.html
---
 arch/arm64/kernel/machine_kexec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index e16b248699d5..e961464a881e 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -6,6 +6,7 @@
  * Copyright (C) Huawei Futurewei Technologies.
  */
 
+#include <linux/console.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/kernel.h>
@@ -188,6 +189,8 @@ void machine_kexec(struct kimage *kimage)
 		"Some CPUs may be stale, kdump will be unreliable.\n");
 
 	pr_info("Bye!\n");
+	if (in_nmi())
+		console_flush_on_panic(CONSOLE_FLUSH_PENDING);
 
 	local_daif_mask();
 
-- 
2.30.2