From nobody Sat Sep 21 02:39:05 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=1705588562; cv=none; d=zohomail.com; s=zohoarc; b=YVbaDmqqK605kL8UjTaZFqyzS0HDg1XF8Uj4ev7y6MesPWUlTUGmwDVPpGVl0EEHeIAm0sbmCaf78r21uKJf9sPD7/ZMAp6xDgUgjnbpGplN+VBjmIo8cfK7HaFG7i8atQcAuicsky/wBuL+j9+NGeemtQFQ5ENVO/YNVxBj/zw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705588562; 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=tyegRE89BCdZ65rmU2oEmpSG5mQnQdAuvHj+XZQ0w4g=; b=kqQWrm/3fAvi9P1CR8p5n/VYK90gf92atQX9A4YV4gJLpnG/QqtXQ1b4VNWDw3Vdpb6IVKQK7dWSgAwGpsVgvsZHp9aFlLvXOoglIBDDniT5Tawv5P/gvs4ZmwiA9fJAjg0XajJmlElpfQdA3heGslkpJ4X5GxcKEPneKNId+xo= 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 1705588562601166.285054060819; Thu, 18 Jan 2024 06:36:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQTUG-0000i7-Cg; Thu, 18 Jan 2024 09:35:20 -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 1rQTUE-0000f0-Lu; Thu, 18 Jan 2024 09:35:18 -0500 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQTU9-0002gS-Rz; Thu, 18 Jan 2024 09:35:18 -0500 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1d6efe27c1dso11271985ad.0; Thu, 18 Jan 2024 06:35:13 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 06:35:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705588511; x=1706193311; 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=tyegRE89BCdZ65rmU2oEmpSG5mQnQdAuvHj+XZQ0w4g=; b=E5meCBdXYiUYMFWRed2VEogjgqi9g7RL73DAjwBVpKA0sW/wHicFLWdNxCAeZ6XmeB FMKlJ8cbIhKW7Jzd4UxBF7KA1gS8Yb2jE0BtYZ8U0Cu2gNH2qzg1vrdb8B28f8BcJi/0 Hi9kd9jP0sIsFIf1bhysYa8eo0wgMc7kCn0kszJyOg0wXRjSpY/X+Gp53/hyHQPxP6SJ Pr8nih1Z3Zd569mwe1XVk6xUZ7zwou0PM7F+1Av2dgrMeDcv/vljvYZXClA4RPetSqHH HyMmzSCt5SKTvfBneT5eO7DoM1AOpyVJzArc3X+UDmpNLIwwp8cAnTsC96MjJdalzwE1 FZBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705588511; x=1706193311; 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=tyegRE89BCdZ65rmU2oEmpSG5mQnQdAuvHj+XZQ0w4g=; b=qErI6zUioP0l5hudjsenCCc6iwpAZAyoChWpYYVC6aZQBrwjZfXGwfG+FICNjmYKZp n8KAU2ABE0YCU/qf0Hog+fmbgDqs2JzhYliJoFe1i2UVQonR7ayKo37WlrISfcf4pGel 0Mpf1luIsqyOjUkUGIQgnwbJtTdU0S74OfRSh6pnLQHDgKXSVZ5ZWvZOGpOVuhqs9PJQ numcedAKRRMKFN+bV7e6QkllS0lwZmEQNjVZCVEvxz9Dt7zTUaDs2/0IdU68cO+5cAlV Yq2wqArXcBXttK4D6cAaLLD7vG9i8n5Ga63wt2cgK39qX7qip7M5dY8BkML68yYsuBP7 r24w== X-Gm-Message-State: AOJu0YxqTae/AQN2VBF7kzlYxk61+WqqZTaY+NpTaKc9ptP/P5Hbl6HE f8Hxp0fjywhp9xZGkk6YQ0CZJfKCbbWXsiSFOyJckrswTIFCb/QNHqYIM83M X-Google-Smtp-Source: AGHT+IFMLknYq40yQYU4u6PSqoeNnj/P4sbIBrvwAjy1UnlTQx9ycK0sK1lH8qS9oSCRQgufNWWykQ== X-Received: by 2002:a17:903:2446:b0:1d5:5a4f:a49e with SMTP id l6-20020a170903244600b001d55a4fa49emr1186310pls.81.1705588511580; Thu, 18 Jan 2024 06:35:11 -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 1/4] nmi: add MCE class for implementing machine check injection commands Date: Fri, 19 Jan 2024 00:34:56 +1000 Message-ID: <20240118143459.166994-2-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::635; envelope-from=npiggin@gmail.com; helo=mail-pl1-x635.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: 1705588564492100007 Content-Type: text/plain; charset="utf-8" Like commit 9cb805fd26 ("cpus: Define callback for QEMU "nmi" command") this implements a machine check injection command framework and defines a monitor command for ppc. Signed-off-by: Nicholas Piggin --- include/hw/nmi.h | 20 ++++++++++++ include/monitor/hmp-target.h | 1 - include/monitor/hmp.h | 1 + hw/core/nmi.c | 61 ++++++++++++++++++++++++++++++++++++ monitor/hmp-cmds.c | 1 + target/ppc/ppc-qmp-cmds.c | 10 ++++++ hmp-commands.hx | 20 +++++++++++- 7 files changed, 112 insertions(+), 2 deletions(-) diff --git a/include/hw/nmi.h b/include/hw/nmi.h index fff41bebc6..09f9ca122a 100644 --- a/include/hw/nmi.h +++ b/include/hw/nmi.h @@ -42,4 +42,24 @@ struct NMIClass { =20 void nmi_monitor_handle(int cpu_index, Error **errp); =20 + +#define TYPE_MCE "mce" + +#define MCE_CLASS(klass) \ + OBJECT_CLASS_CHECK(MCEClass, (klass), TYPE_MCE) +#define MCE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(MCEClass, (obj), TYPE_MCE) +#define MCE(obj) \ + INTERFACE_CHECK(MCEState, (obj), TYPE_MCE) + +typedef struct MCEState MCEState; + +typedef struct MCEClass { + InterfaceClass parent_class; + + void (*mce_monitor_handler)(MCEState *n, const QDict *qdict, Error **e= rrp); +} MCEClass; + +void mce_monitor_handle(const QDict *qdict, Error **errp); + #endif /* NMI_H */ diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index d78e979f05..dec6dba8e5 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -46,7 +46,6 @@ CPUState *mon_get_cpu(Monitor *mon); =20 void hmp_info_mem(Monitor *mon, const QDict *qdict); void hmp_info_tlb(Monitor *mon, const QDict *qdict); -void hmp_mce(Monitor *mon, const QDict *qdict); void hmp_info_local_apic(Monitor *mon, const QDict *qdict); void hmp_info_sev(Monitor *mon, const QDict *qdict); void hmp_info_sgx(Monitor *mon, const QDict *qdict); diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 13f9a2dedb..fe14a855a0 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -56,6 +56,7 @@ void hmp_ringbuf_read(Monitor *mon, const QDict *qdict); void hmp_cont(Monitor *mon, const QDict *qdict); void hmp_system_wakeup(Monitor *mon, const QDict *qdict); void hmp_nmi(Monitor *mon, const QDict *qdict); +void hmp_mce(Monitor *mon, const QDict *qdict); void hmp_info_network(Monitor *mon, const QDict *qdict); void hmp_set_link(Monitor *mon, const QDict *qdict); void hmp_balloon(Monitor *mon, const QDict *qdict); diff --git a/hw/core/nmi.c b/hw/core/nmi.c index a7bce8a04a..d653f054eb 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -85,3 +85,64 @@ static void nmi_register_types(void) } =20 type_init(nmi_register_types) + +struct do_mce_s { + const QDict *qdict; + Error *err; + bool handled; +}; + +static void mce_children(Object *o, struct do_mce_s *ns); + +static int do_mce(Object *o, void *opaque) +{ + struct do_mce_s *ms =3D opaque; + MCEState *m =3D (MCEState *) object_dynamic_cast(o, TYPE_MCE); + + if (m) { + MCEClass *mc =3D MCE_GET_CLASS(m); + + ms->handled =3D true; + mc->mce_monitor_handler(m, ms->qdict, &ms->err); + if (ms->err) { + return -1; + } + } + mce_children(o, ms); + + return 0; +} + +static void mce_children(Object *o, struct do_mce_s *ms) +{ + object_child_foreach(o, do_mce, ms); +} + +void mce_monitor_handle(const QDict *qdict, Error **errp) +{ + struct do_mce_s ms =3D { + .qdict =3D qdict, + .err =3D NULL, + .handled =3D false + }; + + mce_children(object_get_root(), &ms); + if (ms.handled) { + error_propagate(errp, ms.err); + } else { + error_setg(errp, "machine does not provide MCEs"); + } +} + +static const TypeInfo mce_info =3D { + .name =3D TYPE_MCE, + .parent =3D TYPE_INTERFACE, + .class_size =3D sizeof(MCEClass), +}; + +static void mce_register_types(void) +{ + type_register_static(&mce_info); +} + +type_init(mce_register_types) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 871898ac46..0e46c107b6 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -28,6 +28,7 @@ #include "hw/intc/intc.h" #include "qemu/log.h" #include "sysemu/sysemu.h" +#include "hw/nmi.h" =20 bool hmp_handle_error(Monitor *mon, Error *err) { diff --git a/target/ppc/ppc-qmp-cmds.c b/target/ppc/ppc-qmp-cmds.c index ee0b99fce7..43fa5980d2 100644 --- a/target/ppc/ppc-qmp-cmds.c +++ b/target/ppc/ppc-qmp-cmds.c @@ -31,6 +31,7 @@ #include "qapi/qapi-commands-machine-target.h" #include "cpu-models.h" #include "cpu-qom.h" +#include "hw/nmi.h" =20 static target_long monitor_get_ccr(Monitor *mon, const struct MonitorDef *= md, int val) @@ -91,6 +92,15 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) dump_mmu(env1); } =20 +void hmp_mce(Monitor *mon, const QDict *qdict) +{ + Error *err =3D NULL; + + mce_monitor_handle(qdict, &err); + + hmp_handle_error(mon, err); +} + const MonitorDef monitor_defs[] =3D { { "fpscr", offsetof(CPUPPCState, fpscr) }, /* Next instruction pointer */ diff --git a/hmp-commands.hx b/hmp-commands.hx index 765349ed14..384cf5d0c4 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1509,12 +1509,30 @@ ERST .cmd =3D hmp_mce, }, =20 -#endif SRST ``mce`` *cpu* *bank* *status* *mcgstatus* *addr* *misc* Inject an MCE on the given CPU (x86 only). ERST =20 +#endif + +#if defined(TARGET_PPC) + + { + .name =3D "mce", + .args_type =3D "cpu_index:i,srr1_mask:l,dsisr:i,dar:l,recovered:i= ", + .params =3D "cpu srr1_mask dsisr dar recovered", + .help =3D "inject a MCE on the given CPU", + .cmd =3D hmp_mce, + }, + +SRST +``mce`` *cpu* *srr1_mask* *dsisr* *dar* *recovered* + Inject a low-level MCE on the given CPU (PPC only). +ERST + +#endif + #ifdef CONFIG_POSIX { .name =3D "getfd", --=20 2.42.0 From nobody Sat Sep 21 02:39:05 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 From nobody Sat Sep 21 02:39:05 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=1705588562; cv=none; d=zohomail.com; s=zohoarc; b=VazqZ0wdgk7mfC9qBVNQFyT2cW9OyMQvLlT41Ng2gMv1Ds8Qf4MHNWuLy1qqdoIu+cOFGvFo73GDTVq3djw4Yamf3Q7yUOkwZA3LSPacdd8IBRlPveNKKgcLq5qm3TfLb4NCwvxWDuLbpNvPR3WXWlFHI+odIegXQ3HGmZEwXfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705588562; 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=JzJXeQ+PvoT8R5v1TQeEmYDb1fPyOsrjHcJXrlSHSmA=; b=al6Y73HGHpztqRGJ1XLASwLIDdgVHa2xaWT6t1ayyoACedoyexatXdS0BtdUlgqqag/Cz8ESCKBp0k0DTZBllkN0yJBsttujm3IVYj4mTanj+PrLnR0CxNRf3vaxy44tzuEMwQhXZvYkjva0JxEI1oxjDb0hylla7bSPW98+LtQ= 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 1705588562596771.3929635591329; Thu, 18 Jan 2024 06:36:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQTUL-0000k6-RZ; Thu, 18 Jan 2024 09:35:25 -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 1rQTUK-0000jf-Ib; Thu, 18 Jan 2024 09:35:24 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQTUI-0002jy-2W; Thu, 18 Jan 2024 09:35:23 -0500 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1d542701796so71715815ad.1; Thu, 18 Jan 2024 06:35:21 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 06:35:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705588520; x=1706193320; 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=JzJXeQ+PvoT8R5v1TQeEmYDb1fPyOsrjHcJXrlSHSmA=; b=d2uAW/h+93zd26fXdGQYCzrmDRZfoHBrDdbBhze6ehIbZ6C/M++a53b/BiI+F6bpae 47c2u/t/i3TdHivRq2whlYZwW/shCikdFyXOmHQ7p2I8LhY1wwUrjY9G607L7UQjAKEa 2hXIt8BlN3nYuUHDMrhy0JD49gjYVsvgheAU4/2giarO4wp309QZ9kPLx813l7eo5/fU 1pTCaGA8lMbSohjfgqhEnrUdKL4s0sPWsBJWI1rN6FKgdNOnHdTdYF7t+H7RsJLVeAR3 DDsuMoa8DuM6FhceYQdqHeXv3RYEDlDWsZ/wfxqnI95qnnm2rg28oDrsU6pQ5QcLViaa fEJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705588520; x=1706193320; 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=JzJXeQ+PvoT8R5v1TQeEmYDb1fPyOsrjHcJXrlSHSmA=; b=IMwdAfUwaZBrvTKTYwe6HGC9aAss5tQvkVDy9ttwKgFjHFT2ub1mnirz92hVKm6z5w RZt+DkBDPBCYbe0ExNQLoCR3hJbFAIhuFs53y1ommTmoJRQt7qROPKrTPKyWTNNm1WuU eG25CsaAy2EgWsxUwkwv9lg29iqRB6DRzz5CKvK2Nq8eylImZVf3m6z1Cgm7OzjT37I8 5Jneium3ThjrHkciBe+CZjsRd7s3j1z/WN3nVU9Q4eai4zkGFVgoCqtKW643RifAnIoh LcmjIfEEZ2opco06dJdqlzZCCr2E+Eb8AtXNdpptRZKjM30tJBHhn1C01LEcsRgaHffQ G/6w== X-Gm-Message-State: AOJu0YxQ3KAARmo9bsZntQl85TUS7rRL2nn2cCmLinbqdTLRayQd6saU w+yOgjNp1clZA5QjxbWbhBuB8yeOOxaWWeuDUhmvUbZb+bR92i9PN3f2znQl X-Google-Smtp-Source: AGHT+IHuWxmaXV21z3OygcGZgWiecPNVCw+iKtaylSbpyOMcJBYwqgnIB15dRu9cGDDofjzBHqRt7A== X-Received: by 2002:a17:903:258b:b0:1d5:aeee:e756 with SMTP id jb11-20020a170903258b00b001d5aeeee756mr784084plb.26.1705588519752; Thu, 18 Jan 2024 06:35:19 -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 3/4] target/ppc: Add machine check interrupt injection helper Date: Fri, 19 Jan 2024 00:34:58 +1000 Message-ID: <20240118143459.166994-4-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::62c; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62c.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: 1705588564427100002 Content-Type: text/plain; charset="utf-8" This matches the NMI injection helper function. Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_events.c | 3 +-- target/ppc/excp_helper.c | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index cb0eeee587..4be9a5ba3a 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -875,8 +875,7 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovere= d) =20 if (spapr->fwnmi_machine_check_addr =3D=3D -1) { /* Non-FWNMI case, deliver it like an architected CPU interrupt. */ - cs->exception_index =3D POWERPC_EXCP_MCHECK; - ppc_cpu_do_interrupt(cs); + ppc_cpu_do_machine_check(cs); return; } =20 diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 58fd08729a..133477acba 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -2601,6 +2601,13 @@ void ppc_cpu_do_system_reset(CPUState *cs) powerpc_excp(cpu, POWERPC_EXCP_RESET); } =20 +void ppc_cpu_do_machine_check(CPUState *cs) +{ + PowerPCCPU *cpu =3D POWERPC_CPU(cs); + + powerpc_excp(cpu, POWERPC_EXCP_MCHECK); +} + void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); --=20 2.42.0 From nobody Sat Sep 21 02:39:05 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=1705588581; cv=none; d=zohomail.com; s=zohoarc; b=A+9eA7S9CGRLxNW1Meu59xrLdYr0Pl1WsWOiXIf5qraQ0ds/pr81r0sO4sHCUEzieZG+tR58n3gJI3hG5TocIzTnplcWiC3JDi+kuwVNnI/tka293xMJj73X0yp2mKLOqXpTOfdwoAQg8pWJf0sxNG2XLWFkmQHXECMM+VPs0nQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705588581; 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=t2SiDlfSpv/xIYQQlc/t25+KSlNBDOqQls9PCpLJRNA=; b=iZMqQ/OucFDYckmvH6lyDA3gUWMppjuG9ZTi2n5bvBLhF+8eEmaYpr8mMXyj0DIIwkORU/U2Rw6MIxrngiWirTO27VL0ZVVVDmDAjNVg0AZE1UJQBdkNz3Fg24eUacEnwOOPgu/2bcrLLRrU574hFiiWSO7LXCzceml72BQVF6s= 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 1705588581922154.01809252290502; Thu, 18 Jan 2024 06:36:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQTUR-0000mG-CM; Thu, 18 Jan 2024 09:35:31 -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 1rQTUN-0000lb-Me; Thu, 18 Jan 2024 09:35:28 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQTUL-0002lN-Sn; Thu, 18 Jan 2024 09:35:27 -0500 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1d5f252411aso20125295ad.2; Thu, 18 Jan 2024 06:35:25 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 06:35:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705588524; x=1706193324; 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=t2SiDlfSpv/xIYQQlc/t25+KSlNBDOqQls9PCpLJRNA=; b=A+lBC+BU13fQoEOpLRHACsgIZpHNNAzMYbIBW10P+WuOyn13kLud50xAh2+qGGSfsn +ElhvcZV1CSpVp1mhTkrO5j0Dpv0wYFM7DSS6yvgV1/ft/5yk4tu/2Pysc25K3WiD1xH 5sIugazGJtYEQCV322RfSYoX3vR9NqwMGB+mx4VC+oT5dNxN6dd1Yf6gGyDmtg4wnc+X S4a3wZDdzdDP0i4J2WRml4C/0+faKIjnyz8adNaabSSPMIzbjXWOI/yXQKB2vBa6uWYg Q3vGz06qljQfvoPllFpPIS/rQQ/utvIUhZDf1B05ZKBTqrSwiwBUGKlk0raeEn4xTKHK 2BZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705588524; x=1706193324; 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=t2SiDlfSpv/xIYQQlc/t25+KSlNBDOqQls9PCpLJRNA=; b=Rc33SyLoufwzUzKlfM17cqy+gH457fXOSXuTE3xy4ue8KmAUKXlTTAMjGDHDXcaUWt 4EJ2ET1/sI7z/PH0S3m0dleQ9ho0kVHLCZnzn9m5nqJkfP23WUZPfsmNMXAA6FufEBEf qyhTiyeYacSCnuFYUqU4FbfUNz1FlywUG7X5dIam3beUfbvVfWN4Ki6crT5GJPipIIWF JI+OoeYfWlF9C3Y9UBspADsWv1+RWzvr4JFGwxmBQwekO42izqrU51A5dy0qwwpIhhnY zjAbXFhhq+PLjq/dGASTZkR0s/T+FlIqg6lmuuK5uYm1YAVRx1eHu76hD7PLvzDIrC/H BzHg== X-Gm-Message-State: AOJu0YzBYUeGdZmLSsQIJNoAfaqZ2BlG9evcVI9TnTghDhfKhMFx8VUl AXcZSMV4NaQKRrts5K1hL/90BvVKljqaRxroGAw2oYFLvdo7I4bStU/1Gzl+ X-Google-Smtp-Source: AGHT+IGUHwIqQwWh7xFh9ZYKAGBsTXc+l2RNacUJU01jjfL1TTi/dyPYZ94h+X3ueiGMKwQ4ieNJXg== X-Received: by 2002:a17:903:1207:b0:1d4:e04b:3eea with SMTP id l7-20020a170903120700b001d4e04b3eeamr1116173plh.31.1705588523959; Thu, 18 Jan 2024 06:35:23 -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 4/4] ppc/pnv: Implement mce injection Date: Fri, 19 Jan 2024 00:34:59 +1000 Message-ID: <20240118143459.166994-5-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::62d; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62d.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: 1705588583943100006 Content-Type: text/plain; charset="utf-8" This implements mce injection for pnv. Signed-off-by: Nicholas Piggin --- target/ppc/cpu.h | 1 + hw/ppc/pnv.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index aa22523316..b046a12f8c 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1593,6 +1593,7 @@ void ppc_maybe_interrupt(CPUPPCState *env); void ppc_cpu_do_interrupt(CPUState *cpu); bool ppc_cpu_exec_interrupt(CPUState *cpu, int int_req); void ppc_cpu_do_system_reset(CPUState *cs); +void ppc_cpu_do_machine_check(CPUState *cs); void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector); extern const VMStateDescription vmstate_ppc_cpu; #endif diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 427013fd60..2d18190aeb 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -38,6 +38,7 @@ #include "hw/loader.h" #include "hw/nmi.h" #include "qapi/visitor.h" +#include "qapi/qmp/qdict.h" #include "monitor/monitor.h" #include "hw/intc/intc.h" #include "hw/ipmi/ipmi.h" @@ -2461,11 +2462,63 @@ static void pnv_nmi(NMIState *n, int cpu_index, Err= or **errp) } } =20 +typedef struct MCEInjectionParams { + uint64_t srr1_mask; + uint32_t dsisr; + uint64_t dar; + bool recovered; +} MCEInjectionParams; + +static void pnv_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); + ppc_cpu_do_machine_check(cs); + + env->spr[SPR_SRR1] |=3D (params->srr1_mask & srr1_mce_bits); + if (params->dsisr) { + env->spr[SPR_DSISR] =3D params->dsisr; + env->spr[SPR_DAR] =3D params->dar; + } + + if (!params->recovered) { + env->msr &=3D ~MSR_RI; + } +} + +static void pnv_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, pnv_do_mce_on_cpu, RUN_ON_CPU_HOST_PTR(¶ms)); + } +} + static void pnv_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); InterruptStatsProviderClass *ispc =3D INTERRUPT_STATS_PROVIDER_CLASS(o= c); NMIClass *nc =3D NMI_CLASS(oc); + MCEClass *mcec =3D MCE_CLASS(oc); =20 mc->desc =3D "IBM PowerNV (Non-Virtualized)"; mc->init =3D pnv_init; @@ -2483,6 +2536,7 @@ static void pnv_machine_class_init(ObjectClass *oc, v= oid *data) mc->default_ram_id =3D "pnv.ram"; ispc->print_info =3D pnv_pic_print_info; nc->nmi_monitor_handler =3D pnv_nmi; + mcec->mce_monitor_handler =3D pnv_mce; =20 object_class_property_add_bool(oc, "hb-mode", pnv_machine_get_hb, pnv_machine_set_hb); @@ -2549,6 +2603,7 @@ static const TypeInfo types[] =3D { .interfaces =3D (InterfaceInfo[]) { { TYPE_INTERRUPT_STATS_PROVIDER }, { TYPE_NMI }, + { TYPE_MCE }, { }, }, }, --=20 2.42.0