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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F0FFC3A59F for ; Thu, 29 Aug 2019 10:28:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E8FBA2073F for ; Thu, 29 Aug 2019 10:28:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8FBA2073F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3HfB-000725-KP for qemu-devel@archiver.kernel.org; Thu, 29 Aug 2019 06:28:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46980) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3HcD-00055g-Ez for qemu-devel@nongnu.org; Thu, 29 Aug 2019 06:25:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3Hc7-0004r1-MN for qemu-devel@nongnu.org; Thu, 29 Aug 2019 06:25:16 -0400 Received: from 12.mo7.mail-out.ovh.net ([178.33.107.167]:43496) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i3Hc6-0004lO-Oy for qemu-devel@nongnu.org; Thu, 29 Aug 2019 06:25:11 -0400 Received: from player763.ha.ovh.net (unknown [10.109.146.175]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id D4A2A12ED07 for ; Thu, 29 Aug 2019 12:25:07 +0200 (CEST) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player763.ha.ovh.net (Postfix) with ESMTPSA id 5C6BE93BA886; Thu, 29 Aug 2019 10:25:00 +0000 (UTC) Date: Thu, 29 Aug 2019 12:24:59 +0200 From: Greg Kurz To: Aravinda Prasad Message-ID: <20190829122459.3316a928@bahia.lan> In-Reply-To: <156576307653.29984.11318539963120745329.stgit@aravinda> References: <156576293464.29984.1631520917528142744.stgit@aravinda> <156576307653.29984.11318539963120745329.stgit@aravinda> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 12106520226638043540 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduvddrudeivddgvdeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 178.33.107.167 Subject: Re: [Qemu-devel] [patch-for-4.2 PATCH v11 3/6] target/ppc: Handle NMI guest exit 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@au1.ibm.com, qemu-devel@nongnu.org, paulus@ozlabs.org, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 14 Aug 2019 11:41:16 +0530 Aravinda Prasad wrote: > Memory error such as bit flips that cannot be corrected > by hardware are passed on to the kernel for handling. > If the memory address in error belongs to guest then > the guest kernel is responsible for taking suitable action. > Patch [1] enhances KVM to exit guest with exit reason > set to KVM_EXIT_NMI in such cases. This patch handles > KVM_EXIT_NMI exit. >=20 > [1] https://www.spinics.net/lists/kvm-ppc/msg12637.html > (e20bbd3d and related commits) >=20 > Signed-off-by: Aravinda Prasad > Reviewed-by: David Gibson > --- > hw/ppc/spapr.c | 8 ++++++++ > hw/ppc/spapr_events.c | 23 +++++++++++++++++++++++ > include/hw/ppc/spapr.h | 10 ++++++++++ > target/ppc/kvm.c | 14 ++++++++++++++ > target/ppc/kvm_ppc.h | 2 ++ > target/ppc/trace-events | 1 + > 6 files changed, 58 insertions(+) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 07714cb..99def34 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1813,6 +1813,12 @@ static void spapr_machine_reset(MachineState *mach= ine) > first_ppc_cpu->env.gpr[5] =3D 0; > =20 > spapr->cas_reboot =3D false; > + > + spapr->mc_status =3D -1; > + spapr->guest_machine_check_addr =3D -1; > + > + /* Signal all vCPUs waiting on this condition */ > + qemu_cond_broadcast(&spapr->mc_delivery_cond); > } > =20 > static void spapr_create_nvram(SpaprMachineState *spapr) > @@ -3089,6 +3095,8 @@ static void spapr_machine_init(MachineState *machin= e) > =20 > kvmppc_spapr_enable_inkernel_multitce(); > } > + > + qemu_cond_init(&spapr->mc_delivery_cond); > } > =20 > static int spapr_kvm_type(MachineState *machine, const char *vm_type) > diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c > index ae0f093..a0c66d7 100644 > --- a/hw/ppc/spapr_events.c > +++ b/hw/ppc/spapr_events.c > @@ -620,6 +620,29 @@ void spapr_hotplug_req_remove_by_count_indexed(Spapr= DrcType drc_type, > RTAS_LOG_V6_HP_ACTION_REMOVE, drc_type, &drc= _id); > } > =20 > +void spapr_mce_req_event(PowerPCCPU *cpu) > +{ > + SpaprMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); > + > + while (spapr->mc_status !=3D -1) { > + /* > + * Check whether the same CPU got machine check error > + * while still handling the mc error (i.e., before > + * that CPU called "ibm,nmi-interlock") > + */ > + if (spapr->mc_status =3D=3D cpu->vcpu_id) { > + qemu_system_guest_panicked(NULL); > + return; > + } > + qemu_cond_wait_iothread(&spapr->mc_delivery_cond); hw/ppc/spapr_events.c: In function =E2=80=98spapr_mce_req_event=E2=80=99: hw/ppc/spapr_events.c:638:9: error: implicit declaration of function =E2=80= =98qemu_cond_wait_iothread=E2=80=99; did you mean =E2=80=98qemu_cond_wait_i= mpl=E2=80=99? [-Werror=3Dimplicit-function-declaration] qemu_cond_wait_iothread(&spapr->mc_delivery_cond); ^~~~~~~~~~~~~~~~~~~~~~~ qemu_cond_wait_impl hw/ppc/spapr_events.c:638:9: error: nested extern declaration of =E2=80=98q= emu_cond_wait_iothread=E2=80=99 [-Werror=3Dnested-externs] cc1: all warnings being treated as errors It looks like hw/ppc/spapr_events.c is missing: #include "qemu/main-loop.h" > + /* Meanwhile if the system is reset, then just return */ > + if (spapr->guest_machine_check_addr =3D=3D -1) { > + return; > + } > + } > + spapr->mc_status =3D cpu->vcpu_id; > +} > + > static void check_exception(PowerPCCPU *cpu, SpaprMachineState *spapr, > uint32_t token, uint32_t nargs, > target_ulong args, > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 01c106f..619677a 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -191,6 +191,15 @@ struct SpaprMachineState { > * occurs during the unplug process. */ > QTAILQ_HEAD(, SpaprDimmState) pending_dimm_unplugs; > =20 > + /* State related to "ibm,nmi-register" and "ibm,nmi-interlock" calls= */ > + target_ulong guest_machine_check_addr; > + /* > + * mc_status is set to -1 if mc is not in progress, else is set to t= he CPU > + * handling the mc. > + */ > + int mc_status; > + QemuCond mc_delivery_cond; > + > /*< public >*/ > char *kvm_type; > char *host_model; > @@ -804,6 +813,7 @@ void spapr_clear_pending_events(SpaprMachineState *sp= apr); > int spapr_max_server_number(SpaprMachineState *spapr); > void spapr_store_hpte(PowerPCCPU *cpu, hwaddr ptex, > uint64_t pte0, uint64_t pte1); > +void spapr_mce_req_event(PowerPCCPU *cpu); > =20 > /* DRC callbacks. */ > void spapr_core_release(DeviceState *dev); > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index c922bcb..375dc09 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -1702,6 +1702,11 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_= run *run) > ret =3D 0; > break; > =20 > + case KVM_EXIT_NMI: > + trace_kvm_handle_nmi_exception(); > + ret =3D kvm_handle_nmi(cpu, run); > + break; > + > default: > fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reaso= n); > ret =3D -1; > @@ -2805,6 +2810,15 @@ int kvm_arch_msi_data_to_gsi(uint32_t data) > return data & 0xffff; > } > =20 > +int kvm_handle_nmi(PowerPCCPU *cpu, struct kvm_run *run) > +{ > + cpu_synchronize_state(CPU(cpu)); > + > + spapr_mce_req_event(cpu); > + > + return 0; > +} > + > int kvmppc_enable_hwrng(void) > { > if (!kvm_enabled() || !kvm_check_extension(kvm_state, KVM_CAP_PPC_HW= RNG)) { > diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h > index 2990898..173c000 100644 > --- a/target/ppc/kvm_ppc.h > +++ b/target/ppc/kvm_ppc.h > @@ -84,6 +84,8 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp); > void kvmppc_set_reg_ppc_online(PowerPCCPU *cpu, unsigned int online); > void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset); > =20 > +int kvm_handle_nmi(PowerPCCPU *cpu, struct kvm_run *run); > + > #else > =20 > static inline uint32_t kvmppc_get_tbfreq(void) > diff --git a/target/ppc/trace-events b/target/ppc/trace-events > index 3dc6740..6d15aa9 100644 > --- a/target/ppc/trace-events > +++ b/target/ppc/trace-events > @@ -28,3 +28,4 @@ kvm_handle_papr_hcall(void) "handle PAPR hypercall" > kvm_handle_epr(void) "handle epr" > kvm_handle_watchdog_expiry(void) "handle watchdog expiry" > kvm_handle_debug_exception(void) "handle debug exception" > +kvm_handle_nmi_exception(void) "handle NMI exception" >=20