From nobody Sat Sep 21 05:57:20 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