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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 AF49DC04AB5 for ; Thu, 6 Jun 2019 04:47:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6EA5E20665 for ; Thu, 6 Jun 2019 04:47:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6EA5E20665 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:54472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYkJT-0004ld-Ip for qemu-devel@archiver.kernel.org; Thu, 06 Jun 2019 00:47:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42269) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYkHx-00044i-V4 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 00:46:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYkHv-000724-E6 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 00:46:09 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:49352) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYkHl-0006tM-Sn for qemu-devel@nongnu.org; Thu, 06 Jun 2019 00:46:00 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x564fxYd126655 for ; Thu, 6 Jun 2019 00:45:56 -0400 Received: from e13.ny.us.ibm.com (e13.ny.us.ibm.com [129.33.205.203]) by mx0a-001b2d01.pphosted.com with ESMTP id 2sxu6224r0-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 06 Jun 2019 00:45:56 -0400 Received: from localhost by e13.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 6 Jun 2019 05:45:54 +0100 Received: from b01cxnp23032.gho.pok.ibm.com (9.57.198.27) by e13.ny.us.ibm.com (146.89.104.200) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 6 Jun 2019 05:45:52 +0100 Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x564jpJk34406664 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 6 Jun 2019 04:45:51 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 802D2112061; Thu, 6 Jun 2019 04:45:51 +0000 (GMT) Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 11D3C112063; Thu, 6 Jun 2019 04:45:49 +0000 (GMT) Received: from [9.85.82.46] (unknown [9.85.82.46]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP; Thu, 6 Jun 2019 04:45:48 +0000 (GMT) To: David Gibson References: <155910829070.13149.5215948335633966328.stgit@aravinda> <155910843201.13149.14968680567084380259.stgit@aravinda> <20190606014306.GF10319@umbus.fritz.box> From: Aravinda Prasad Date: Thu, 6 Jun 2019 10:15:47 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20190606014306.GF10319@umbus.fritz.box> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 19060604-0064-0000-0000-000003EA6DCD X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00011222; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000286; SDB=6.01213892; UDB=6.00638050; IPR=6.00994972; MB=3.00027201; MTD=3.00000008; XFM=3.00000015; UTC=2019-06-06 04:45:54 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19060604-0065-0000-0000-00003DC4F95A Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-06-06_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906060034 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: Re: [Qemu-devel] [PATCH v9 3/6] target/ppc: Handle NMI guest exit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, paulus@ozlabs.org, qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thursday 06 June 2019 07:13 AM, David Gibson wrote: > On Wed, May 29, 2019 at 11:10:32AM +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. >> >> [1] https://www.spinics.net/lists/kvm-ppc/msg12637.html >> (e20bbd3d and related commits) >> >> Signed-off-by: Aravinda Prasad >> --- >> hw/ppc/spapr.c | 1 + >> hw/ppc/spapr_events.c | 23 +++++++++++++++++++++++ >> hw/ppc/spapr_rtas.c | 5 +++++ >> include/hw/ppc/spapr.h | 6 ++++++ >> target/ppc/kvm.c | 16 ++++++++++++++++ >> target/ppc/kvm_ppc.h | 2 ++ >> target/ppc/trace-events | 1 + >> 7 files changed, 54 insertions(+) >> >> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >> index fae28a9..6b6c962 100644 >> --- a/hw/ppc/spapr.c >> +++ b/hw/ppc/spapr.c >> @@ -1809,6 +1809,7 @@ static void spapr_machine_reset(void) >> >> spapr->cas_reboot = false; >> >> + spapr->mc_status = -1; >> spapr->guest_machine_check_addr = -1; >> >> /* Signal all vCPUs waiting on this condition */ >> diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c >> index ae0f093..a18446b 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(SpaprDrcType drc_type, >> RTAS_LOG_V6_HP_ACTION_REMOVE, drc_type, &drc_id); >> } >> >> +void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered) >> +{ >> + SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); > > You ignore the 'recovered' parameter, is that right? I use the "recovered" parameter, but in the next patch. This was left out when the patch was split in one of the earlier versions. Will modify it. > >> + while (spapr->mc_status != -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 == cpu->vcpu_id) { >> + qemu_system_guest_panicked(NULL); >> + return; >> + } >> + qemu_cond_wait_iothread(&spapr->mc_delivery_cond); >> + /* Meanwhile if the system is reset, then just return */ >> + if (spapr->guest_machine_check_addr == -1) { >> + return; >> + } >> + } >> + spapr->mc_status = cpu->vcpu_id; >> +} >> + >> static void check_exception(PowerPCCPU *cpu, SpaprMachineState *spapr, >> uint32_t token, uint32_t nargs, >> target_ulong args, >> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c >> index e7509cf..e0bdfc8 100644 >> --- a/hw/ppc/spapr_rtas.c >> +++ b/hw/ppc/spapr_rtas.c >> @@ -379,6 +379,11 @@ static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu, >> /* NMI register not called */ >> rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR); >> } else { >> + /* >> + * vCPU issuing "ibm,nmi-interlock" is done with NMI handling, >> + * hence unset mc_status. >> + */ >> + spapr->mc_status = -1; >> qemu_cond_signal(&spapr->mc_delivery_cond); >> rtas_st(rets, 0, RTAS_OUT_SUCCESS); >> } >> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h >> index 9dc5e30..fc3a776 100644 >> --- a/include/hw/ppc/spapr.h >> +++ b/include/hw/ppc/spapr.h >> @@ -190,6 +190,11 @@ struct SpaprMachineState { >> >> /* 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 the CPU >> + * handling the mc. >> + */ >> + int mc_status; >> QemuCond mc_delivery_cond; >> >> /*< public >*/ >> @@ -793,6 +798,7 @@ void spapr_clear_pending_events(SpaprMachineState *spapr); >> 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, bool recovered); >> >> /* DRC callbacks. */ >> void spapr_core_release(DeviceState *dev); >> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c >> index 3bf0a46..39f1a73 100644 >> --- a/target/ppc/kvm.c >> +++ b/target/ppc/kvm.c >> @@ -1761,6 +1761,11 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) >> ret = 0; >> break; >> >> + case KVM_EXIT_NMI: >> + trace_kvm_handle_nmi_exception(); >> + ret = kvm_handle_nmi(cpu, run); >> + break; >> + >> default: >> fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason); >> ret = -1; >> @@ -2844,6 +2849,17 @@ int kvm_arch_msi_data_to_gsi(uint32_t data) >> return data & 0xffff; >> } >> >> +int kvm_handle_nmi(PowerPCCPU *cpu, struct kvm_run *run) >> +{ >> + bool recovered = run->flags & KVM_RUN_PPC_NMI_DISP_FULLY_RECOV; >> + >> + cpu_synchronize_state(CPU(cpu)); >> + >> + spapr_mce_req_event(cpu, recovered); > > Urgh.. KVM calling directly into spapr code isn't conceptually > correct, although it's usually kind of ok in practice. I guess we > already do it for hypercalls, so this is no worse. If we ever have > NMI events for KVM PR or BookE KVM which could happen for non-PAPR > guests, I guess we'll need to re-examine this. ok. > >> + return 0; >> +} >> + >> int kvmppc_enable_hwrng(void) >> { >> if (!kvm_enabled() || !kvm_check_extension(kvm_state, KVM_CAP_PPC_HWRNG)) { >> diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h >> index 45776ca..18693f1 100644 >> --- a/target/ppc/kvm_ppc.h >> +++ b/target/ppc/kvm_ppc.h >> @@ -81,6 +81,8 @@ bool kvmppc_hpt_needs_host_contiguous_pages(void); >> void kvm_check_mmu(PowerPCCPU *cpu, Error **errp); >> void kvmppc_set_reg_ppc_online(PowerPCCPU *cpu, unsigned int online); >> >> +int kvm_handle_nmi(PowerPCCPU *cpu, struct kvm_run *run); >> + >> #else >> >> 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" >> > -- Regards, Aravinda