From nobody Sat Feb 7 05:52:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1586234440; cv=none; d=zohomail.com; s=zohoarc; b=cIgvybbMl9c/+jFJY3qXqMvH0KPGql+O2sVb0/tm0CmqyrusDwk84baVHZYwfRDDSCcwi4MiWBnSDkdVEn73xydbZGwj9SKoyqy7tavI+OlISztkNDjL0Alr+tqsc5LkbkGk0DA37pkiKJvnhxL9wGyLpHi64PXPafIuz0HFSi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586234440; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dUg3mfYLO6zyl+K3CyHg7UMG+f3DK5KaPVR4QKSiTz4=; b=CBImy6DLx6qkfQ71lS61VWbqGVtQ8Nup8aypDNqvuVlumBdnteLKdeNBnRwQAtjGPWnj6A2wbqFieCEME60OV2RlNtTXEvsPBR9knDCiUzmDrdNCFesa5jxFYjGQukPut4N0DiPBPc/2WkuwKZRIlR3TV1jm6D95/eIAXRfT72c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586234440805614.9318345687612; Mon, 6 Apr 2020 21:40:40 -0700 (PDT) Received: from localhost ([::1]:41042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLg2R-0006NT-J2 for importer@patchew.org; Tue, 07 Apr 2020 00:40:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52395) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLfyN-0007zs-Gv for qemu-devel@nongnu.org; Tue, 07 Apr 2020 00:36:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLfyM-0004EU-4y for qemu-devel@nongnu.org; Tue, 07 Apr 2020 00:36:27 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:44791) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jLfyL-0004Bi-Ps; Tue, 07 Apr 2020 00:36:26 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 48xF3K3SH6z9sSb; Tue, 7 Apr 2020 14:36:13 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1586234173; bh=DUnTri7UMEV9sPL1R6ffZJAUsoqegh6MBdGQbtcDAxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W+mhxOeMtJvqlhPBm0agJzRIEoupKGsXeppToXgisYD2ACkiW+emDykx0FTMYNl4T prp6bJJUkg2cALl3URuOM31HW5bqjCpkoy0up/MQOvZ5DTXDzfTcrxjnJPkpSFtV46 g9zgkmNYk8ynjaryW2OaCLT9RCYFq3lgKMaWDIKs= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 06/10] ppc/spapr: Don't kill the guest if a recovered FWNMI machine check delivery fails Date: Tue, 7 Apr 2020 14:36:02 +1000 Message-Id: <20200407043606.291546-7-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200407043606.291546-1-david@gibson.dropbear.id.au> References: <20200407043606.291546-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@ozlabs.ru, qemu-devel@nongnu.org, Nicholas Piggin , groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin Try to be tolerant of FWNMI delivery errors if the machine check had been recovered by the host. Signed-off-by: Nicholas Piggin Message-Id: <20200325142906.221248-5-npiggin@gmail.com> Reviewed-by: Greg Kurz [dwg: Updated comment at Greg's suggestion] Signed-off-by: David Gibson --- hw/ppc/spapr_events.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index c8964eb25d..1069d0197b 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -833,13 +833,28 @@ static void spapr_mce_dispatch_elog(PowerPCCPU *cpu, = bool recovered) /* get rtas addr from fdt */ rtas_addr =3D spapr_get_rtas_addr(); if (!rtas_addr) { - error_report( + if (!recovered) { + error_report( "FWNMI: Unable to deliver machine check to guest: rtas_addr not found."); - qemu_system_guest_panicked(NULL); + qemu_system_guest_panicked(NULL); + } else { + warn_report( +"FWNMI: Unable to deliver machine check to guest: rtas_addr not found. " +"Machine check recovered."); + } g_free(ext_elog); return; } =20 + /* + * By taking the interlock, we assume that the MCE will be + * delivered to the guest. CAUTION: don't add anything that could + * prevent the MCE to be delivered after this line, otherwise the + * guest won't be able to release the interlock and ultimately + * hang/crash? + */ + spapr->fwnmi_machine_check_interlock =3D cpu->vcpu_id; + stq_be_phys(&address_space_memory, rtas_addr + RTAS_ERROR_LOG_OFFSET, env->gpr[3]); cpu_physical_memory_write(rtas_addr + RTAS_ERROR_LOG_OFFSET + @@ -876,9 +891,15 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recover= ed) * that CPU called "ibm,nmi-interlock") */ if (spapr->fwnmi_machine_check_interlock =3D=3D cpu->vcpu_id) { - error_report( + if (!recovered) { + error_report( "FWNMI: Unable to deliver machine check to guest: nested machine check."); - qemu_system_guest_panicked(NULL); + qemu_system_guest_panicked(NULL); + } else { + warn_report( +"FWNMI: Unable to deliver machine check to guest: nested machine check. " +"Machine check recovered."); + } return; } qemu_cond_wait_iothread(&spapr->fwnmi_machine_check_interlock_cond= ); @@ -906,7 +927,6 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovere= d) warn_report("Received a fwnmi while migration was in progress"); } =20 - spapr->fwnmi_machine_check_interlock =3D cpu->vcpu_id; spapr_mce_dispatch_elog(cpu, recovered); } =20 --=20 2.25.2