From nobody Mon Feb 9 02:27:50 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; 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; dmarc=fail(p=none dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1579193217; cv=none; d=zohomail.com; s=zohoarc; b=XZe5CMrIsiTYJMSH0WJ9K2vahWeabTWIHPM5BoWm0aAkbwCLPf6dAHn9F3k7w78Y+3yy3FPl6639pnCvd/sp3Z6euBIVW6184uOU58T2jcthNCVlF+mYBsjvUiMX7c6zWTGdPt3St0I3cWwQVcC5/JYvGi3RUKRiKLiahIYZMPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579193217; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=tei/NbG53h0wuHYOoyakjjGaKdIXD3dZT9v3aIMNp40=; b=OVUtWl2Gq1f6gyG+EysHSeX/rcd8l2N9B1mOGh4myBnbBOhWqqCNbSUytPW3PeAhFlW5IuwAvFnXfUwXK/DRZAwTrxXLgb0Dp63VUJl1LHlngnkZepEAvrTb98txeevWUif8bnffd9OyMjwjWkJYvSaUfmP0EojjUzaV/QlhgGI= ARC-Authentication-Results: i=1; mx.zohomail.com; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157919321705066.17039293396965; Thu, 16 Jan 2020 08:46:57 -0800 (PST) Received: from localhost ([::1]:44928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is8IJ-00089T-FN for importer@patchew.org; Thu, 16 Jan 2020 11:46:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43703) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is8Cz-00015C-Uc for qemu-devel@nongnu.org; Thu, 16 Jan 2020 11:41:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1is8Cw-0005z6-8o for qemu-devel@nongnu.org; Thu, 16 Jan 2020 11:41:25 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:5092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1is8Cw-0005y1-1a for qemu-devel@nongnu.org; Thu, 16 Jan 2020 11:41:22 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 00GGcTbn146415 for ; Thu, 16 Jan 2020 11:41:21 -0500 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2xh8d6dhv8-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 16 Jan 2020 11:41:20 -0500 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 16 Jan 2020 16:41:18 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 16 Jan 2020 16:41:15 -0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 00GGfEDl34406652 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Jan 2020 16:41:14 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5384AA405D; Thu, 16 Jan 2020 16:41:14 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2E73AA406B; Thu, 16 Jan 2020 16:41:12 +0000 (GMT) Received: from localhost.localdomain.com (unknown [9.199.49.154]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 16 Jan 2020 16:41:11 +0000 (GMT) From: Ganesh Goudar To: aik@ozlabs.ru, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au Subject: [PATCH v19 6/7] migration: Include migration support for machine check handling Date: Thu, 16 Jan 2020 22:09:51 +0530 X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200116163952.11090-1-ganeshgr@linux.ibm.com> References: <20200116163952.11090-1-ganeshgr@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 20011616-0012-0000-0000-0000037DF004 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20011616-0013-0000-0000-000021BA2496 Message-Id: <20200116163952.11090-7-ganeshgr@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-01-16_05:2020-01-16, 2020-01-16 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 phishscore=0 suspectscore=2 adultscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-2001160136 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 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: paulus@ozlabs.org, Ganesh Goudar , Aravinda Prasad , groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aravinda Prasad This patch includes migration support for machine check handling. Especially this patch blocks VM migration requests until the machine check error handling is complete as these errors are specific to the source hardware and is irrelevant on the target hardware. Signed-off-by: Aravinda Prasad [Do not set FWNMI cap in post_load, now its done in .apply hook] Signed-off-by: Ganesh Goudar --- hw/ppc/spapr.c | 47 ++++++++++++++++++++++++++++++++++++++++++ hw/ppc/spapr_events.c | 16 +++++++++++++- hw/ppc/spapr_rtas.c | 4 ++++ include/hw/ppc/spapr.h | 2 +- 4 files changed, 67 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 46bac1a83c..c8bc2fa9f3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -46,6 +46,7 @@ #include "migration/qemu-file-types.h" #include "migration/global_state.h" #include "migration/register.h" +#include "migration/blocker.h" #include "mmu-hash64.h" #include "mmu-book3s-v3.h" #include "cpu-models.h" @@ -1683,6 +1684,8 @@ static void spapr_machine_reset(MachineState *machine) =20 /* Signal all vCPUs waiting on this condition */ qemu_cond_broadcast(&spapr->mc_delivery_cond); + + migrate_del_blocker(spapr->fwnmi_migration_blocker); } =20 static void spapr_create_nvram(SpaprMachineState *spapr) @@ -1965,6 +1968,42 @@ static const VMStateDescription vmstate_spapr_dtb = =3D { }, }; =20 +static bool spapr_fwnmi_needed(void *opaque) +{ + SpaprMachineState *spapr =3D (SpaprMachineState *)opaque; + + return spapr->guest_machine_check_addr !=3D -1; +} + +static int spapr_fwnmi_pre_save(void *opaque) +{ + SpaprMachineState *spapr =3D (SpaprMachineState *)opaque; + + /* + * Check if machine check handling is in progress and print a + * warning message. + */ + if (spapr->mc_status !=3D -1) { + warn_report("A machine check is being handled during migration. Th= e" + "handler may run and log hardware error on the destination= "); + } + + return 0; +} + +static const VMStateDescription vmstate_spapr_machine_check =3D { + .name =3D "spapr_machine_check", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D spapr_fwnmi_needed, + .pre_save =3D spapr_fwnmi_pre_save, + .fields =3D (VMStateField[]) { + VMSTATE_UINT64(guest_machine_check_addr, SpaprMachineState), + VMSTATE_INT32(mc_status, SpaprMachineState), + VMSTATE_END_OF_LIST() + }, +}; + static const VMStateDescription vmstate_spapr =3D { .name =3D "spapr", .version_id =3D 3, @@ -1999,6 +2038,7 @@ static const VMStateDescription vmstate_spapr =3D { &vmstate_spapr_cap_large_decr, &vmstate_spapr_cap_ccf_assist, &vmstate_spapr_cap_fwnmi, + &vmstate_spapr_machine_check, NULL } }; @@ -2814,6 +2854,13 @@ static void spapr_machine_init(MachineState *machine) spapr_create_lmb_dr_connectors(spapr); } =20 + if (spapr_get_cap(spapr, SPAPR_CAP_FWNMI_MCE) =3D=3D SPAPR_CAP_ON) { + /* Create the error string for live migration blocker */ + error_setg(&spapr->fwnmi_migration_blocker, + "A machine check is being handled during migration. The handle= r" + "may run and log hardware error on the destination"); + } + /* Set up RTAS event infrastructure */ spapr_events_init(spapr); =20 diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 54eaf28a9e..884e455f02 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -43,6 +43,7 @@ #include "qemu/main-loop.h" #include "hw/ppc/spapr_ovec.h" #include +#include "migration/blocker.h" =20 #define RTAS_LOG_VERSION_MASK 0xff000000 #define RTAS_LOG_VERSION_6 0x06000000 @@ -843,6 +844,8 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovere= d) { SpaprMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); CPUState *cs =3D CPU(cpu); + int ret; + Error *local_err =3D NULL; =20 if (spapr->guest_machine_check_addr =3D=3D -1) { /* @@ -872,8 +875,19 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recover= ed) return; } } - spapr->mc_status =3D cpu->vcpu_id; =20 + ret =3D migrate_add_blocker(spapr->fwnmi_migration_blocker, &local_err= ); + if (ret =3D=3D -EBUSY) { + /* + * We don't want to abort so we let the migration to continue. + * In a rare case, the machine check handler will run on the targe= t. + * Though this is not preferable, it is better than aborting + * the migration or killing the VM. + */ + warn_report("Received a fwnmi while migration was in progress"); + } + + spapr->mc_status =3D cpu->vcpu_id; spapr_mce_dispatch_elog(cpu, recovered); } =20 diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 3f162d82f5..b1594443c7 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -50,6 +50,7 @@ #include "hw/ppc/fdt.h" #include "target/ppc/mmu-hash64.h" #include "target/ppc/mmu-book3s-v3.h" +#include "migration/blocker.h" =20 static void rtas_display_character(PowerPCCPU *cpu, SpaprMachineState *spa= pr, uint32_t token, uint32_t nargs, @@ -453,6 +454,9 @@ static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu, spapr->mc_status =3D -1; qemu_cond_signal(&spapr->mc_delivery_cond); rtas_st(rets, 0, RTAS_OUT_SUCCESS); + migrate_del_blocker(spapr->fwnmi_migration_blocker); + error_free(spapr->fwnmi_migration_blocker); + spapr->fwnmi_migration_blocker =3D NULL; } =20 static struct rtas_call { diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index a90e677cc3..12e7b1eddc 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -219,7 +219,7 @@ struct SpaprMachineState { unsigned gpu_numa_id; SpaprTpmProxy *tpm_proxy; =20 - bool fwnmi_calls_registered; + Error *fwnmi_migration_blocker; }; =20 #define H_SUCCESS 0 --=20 2.17.2