From nobody Sat Sep 21 05:53:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1705588611; cv=none; d=zohomail.com; s=zohoarc; b=a4sJScRYaaVpDu212KJASOnecM+haOIcVgzCdtD956e2bhl9qQD23Uj7tCXQWDXMP62NNbX+AtapcPLMbtMJkz8Z9E2oJvT0ZqsNQo3Znbc2ZblCmnEX8R25NmDPQW2B73hrUuVRVc3PUaoXo0sn4PUF1PuzQTG2gUSNWsAdUQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705588611; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0PMar5WLxiz8HCDxfpKJnPx5DoYzCuY0jWLEgpLUHWo=; b=A8GQ7WlhJA0uujClp+WzOEHksW8EtuqZtgfOcGyB9Mck2qeDnHH8uJC4gnf7wPuqtW90TBwe/A1bePSdBhRCWEAUGw1w09m327TT9ChXGIW2m6fRYXArfiRLmX39G+8CYDkPo4c2BAAmmR01LvzKswWmKecOuDg4oFwVEqnBDO0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 170558861175018.545399845175098; Thu, 18 Jan 2024 06:36:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQTUH-0000iJ-39; Thu, 18 Jan 2024 09:35:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQTUF-0000hI-Ik; Thu, 18 Jan 2024 09:35:19 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQTUD-0002hD-JW; Thu, 18 Jan 2024 09:35:19 -0500 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1d542701796so71715125ad.1; Thu, 18 Jan 2024 06:35:16 -0800 (PST) Received: from wheely.local0.net (124-171-76-150.tpgi.com.au. [124.171.76.150]) by smtp.gmail.com with ESMTPSA id la11-20020a170902fa0b00b001d4ac461a6fsm1484371plb.86.2024.01.18.06.35.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 06:35:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705588515; x=1706193315; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0PMar5WLxiz8HCDxfpKJnPx5DoYzCuY0jWLEgpLUHWo=; b=Zu7kirK2xpUCupzq3r7BY/4UX5LfbFWJYM/O+jztU8R5VZN75ZU6PhUfwAYUge1QqZ rmRlgcqzAOE4qF5HRIf4BvxSAHT37+Q0o4Txlp4lwXe7cQal2fCd+CnsmGekgwPo9Ggn QhtIHSbFDlhLb2VhCGZeDJILOeC5boCUS8ZSwWEF4HjHez3VOxURscxosRoNznCousyn yvoW9OFOOH5PZxuobf/GIMMmZ5Yx+EgpSLgX80zOi2y8mV5yS3tcsFM0CcqPDElLpLBu hgbGNgQuXVX4oakDAkZ4zr465+s+x9gyyZcbfznK/gad0TuORT2nEChRdJln9a633bif GsiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705588515; x=1706193315; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0PMar5WLxiz8HCDxfpKJnPx5DoYzCuY0jWLEgpLUHWo=; b=nYIc/jvnRaRUcCHodOctwYapRIIdiidSVm7xwoy1AjrgVjce1h5lzNIEkRWK/31qU/ HNZcImKIbs6xQ/CBw3H2TTPht9W4Wfxd9wl2MDqdOiWUZKCvVq7IqYqjNK4Yni0875MM ny7iipMDNDVdY8ABf5NjuphO+6YusTsARS5GkLGe49cMFnHCVYgwfFFYO8B5cCEtSxZr SNHoGpnpSrD33Ur9s1Ebjnw4FZDBDr4g0YMR/zWLnIBqWWt7El9rKaAxfz2q2MD2Mcdz Jk/4SX2hwRA0qq6jmM0kRfibwMh8D96kYQa0rSRZLHWa5Smao1KvhjI9xTCudlOGoKHK 3Cxw== X-Gm-Message-State: AOJu0YyScJkxQoNFSI9VK8rowCIZMJZ3yIvXP1etG49GLkkk/LYSiEYb o3Ms53faWE/fbBeOw0Pgmp7dH9RtNtdUigyVC5SAjPcsJOiX1tatemFKiKo5 X-Google-Smtp-Source: AGHT+IHwZBnQY8IMjJFX1S5g+cjmWbvyyHAhx/VMtVLiKQxOHtxMdqYPShbs6/1aWY5bNA/Z65UaRw== X-Received: by 2002:a17:902:bb97:b0:1d4:7863:7580 with SMTP id m23-20020a170902bb9700b001d478637580mr771676pls.109.1705588515565; Thu, 18 Jan 2024 06:35:15 -0800 (PST) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barrat?= , Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora , qemu-devel@nongnu.org Subject: [PATCH 2/4] ppc/spapr: Implement mce injection Date: Fri, 19 Jan 2024 00:34:57 +1000 Message-ID: <20240118143459.166994-3-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240118143459.166994-1-npiggin@gmail.com> References: <20240118143459.166994-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1705588612150100001 Content-Type: text/plain; charset="utf-8" This implements mce injection for spapr. (qemu) mce 0 0x200000 0x80 0xdeadbeef 0 Disabling lock debugging due to kernel taint MCE: CPU0: machine check (Severe) Host SLB Multihit DAR: 00000000deadbe= ef [Recovered] MCE: CPU0: machine check (Severe) Host SLB Multihit [Recovered] MCE: CPU0: PID: 495 Comm: a NIP: [0000000130ee07c8] MCE: CPU0: Initiator CPU MCE: CPU0: Unknown [ 71.567193] MCE: CPU0: NIP: [c0000000000d7f6c] plpar_hcall_norets+0x1c/0= x28 [ 71.567249] MCE: CPU0: Initiator CPU [ 71.567308] MCE: CPU0: Unknown Signed-off-by: Nicholas Piggin --- include/hw/ppc/spapr.h | 3 +++ hw/ppc/spapr.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 5b5ba9ef77..d8f925a391 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -1015,6 +1015,9 @@ void spapr_init_all_lpcrs(target_ulong value, target_= ulong mask); hwaddr spapr_get_rtas_addr(void); bool spapr_memory_hot_unplug_supported(SpaprMachineState *spapr); =20 +void spapr_mce_inject(CPUState *cs, uint64_t srr1_mask, uint32_t dsisr, + uint64_t dar, bool recovered); + void spapr_vof_reset(SpaprMachineState *spapr, void *fdt, Error **errp); void spapr_vof_quiesce(MachineState *ms); bool spapr_vof_setprop(MachineState *ms, const char *path, const char *pro= pname, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 40fdbd5d12..641b763836 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -89,6 +89,7 @@ #include "hw/ppc/pef.h" =20 #include "monitor/monitor.h" +#include "qapi/qmp/qdict.h" =20 #include =20 @@ -3584,6 +3585,56 @@ static void spapr_nmi(NMIState *n, int cpu_index, Er= ror **errp) } } =20 +typedef struct MCEInjectionParams { + uint64_t srr1_mask; + uint32_t dsisr; + uint64_t dar; + bool recovered; +} MCEInjectionParams; + +static void spapr_do_mce_on_cpu(CPUState *cs, run_on_cpu_data data) +{ + MCEInjectionParams *params =3D data.host_ptr; + PowerPCCPU *cpu =3D POWERPC_CPU(cs); + CPUPPCState *env =3D &cpu->env; + uint64_t srr1_mce_bits =3D PPC_BITMASK(42, 45) | PPC_BIT(36); + + cpu_synchronize_state(cs); + + env->spr[SPR_SRR0] =3D env->nip; + env->spr[SPR_SRR1] =3D (env->msr & ~srr1_mce_bits) | + (params->srr1_mask & srr1_mce_bits); + if (params->dsisr) { + env->spr[SPR_DSISR] =3D params->dsisr; + env->spr[SPR_DAR] =3D params->dar; + } + + spapr_mce_req_event(cpu, params->recovered); +} + +static void spapr_mce(MCEState *m, const QDict *qdict, Error **errp) +{ + int cpu_index =3D qdict_get_int(qdict, "cpu_index"); + uint64_t srr1_mask =3D qdict_get_int(qdict, "srr1_mask"); + uint32_t dsisr =3D qdict_get_int(qdict, "dsisr"); + uint64_t dar =3D qdict_get_int(qdict, "dar"); + bool recovered =3D qdict_get_int(qdict, "recovered"); + CPUState *cs; + + cs =3D qemu_get_cpu(cpu_index); + + if (cs !=3D NULL) { + MCEInjectionParams params =3D { + .srr1_mask =3D srr1_mask, + .dsisr =3D dsisr, + .dar =3D dar, + .recovered =3D recovered, + }; + + run_on_cpu(cs, spapr_do_mce_on_cpu, RUN_ON_CPU_HOST_PTR(¶ms)); + } +} + int spapr_lmb_dt_populate(SpaprDrc *drc, SpaprMachineState *spapr, void *fdt, int *fdt_start_offset, Error **errp) { @@ -4689,6 +4740,7 @@ static void spapr_machine_class_init(ObjectClass *oc,= void *data) SpaprMachineClass *smc =3D SPAPR_MACHINE_CLASS(oc); FWPathProviderClass *fwc =3D FW_PATH_PROVIDER_CLASS(oc); NMIClass *nc =3D NMI_CLASS(oc); + MCEClass *mcec =3D MCE_CLASS(oc); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); PPCVirtualHypervisorClass *vhc =3D PPC_VIRTUAL_HYPERVISOR_CLASS(oc); XICSFabricClass *xic =3D XICS_FABRIC_CLASS(oc); @@ -4743,6 +4795,7 @@ static void spapr_machine_class_init(ObjectClass *oc,= void *data) smc->resize_hpt_default =3D SPAPR_RESIZE_HPT_ENABLED; fwc->get_dev_path =3D spapr_get_fw_dev_path; nc->nmi_monitor_handler =3D spapr_nmi; + mcec->mce_monitor_handler =3D spapr_mce; smc->phb_placement =3D spapr_phb_placement; vhc->cpu_in_nested =3D spapr_cpu_in_nested; vhc->deliver_hv_excp =3D spapr_exit_nested; @@ -4810,6 +4863,7 @@ static const TypeInfo spapr_machine_info =3D { .interfaces =3D (InterfaceInfo[]) { { TYPE_FW_PATH_PROVIDER }, { TYPE_NMI }, + { TYPE_MCE }, { TYPE_HOTPLUG_HANDLER }, { TYPE_PPC_VIRTUAL_HYPERVISOR }, { TYPE_XICS_FABRIC }, --=20 2.42.0