From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874611; cv=none; d=zohomail.com; s=zohoarc; b=ZZe6El+wJlfxa680Y8nR98VOhwnG6+aV0p2UyCHbOxTbewW6Fp9zMAjHLEZcZMRMj1oeirmBYvwwqBAnLmzu/r9yW29eCbgFHs7eF5JDg1c2MawoKOs2mhNq4ShCLhZOzUiVvRtSek01tJdACwC+zktpbk+HOkW/oH8k3mPpLuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874611; h=Content-Type: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=fZA8/l25pege+AA3tp9V2oguHyeiwhKKjkx8GHgz6Co=; b=lA6hrRDScDoRHw5OPourCP7sq8G54fXI+WPuCIRJ7jxiBN2Cy0fqIxqNVVBaYzNjMJT9WHXvqWa7Zq9gfspZX4zDXyswj3GV6bZxMATVpXTgn6PJjZMKzp9NltBt+IlQ5Tuf3WPk+xQUh18qEi8lgHyM4QSL/6WhvPgAEilQH2Q= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177287461184760.965323978613924; Sat, 7 Mar 2026 01:10:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vync8-0006gY-MC; Sat, 07 Mar 2026 04:06:24 -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 1vync4-0006eb-Nq for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:20 -0500 Received: from qs-2007b-snip4-2.eps.apple.com ([57.103.84.143] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vynbz-0000ws-Jz for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:20 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 684AF18000AE; Sat, 7 Mar 2026 09:06:12 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id 621CD18000A2; Sat, 7 Mar 2026 09:06:10 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874373; x=1775466373; bh=fZA8/l25pege+AA3tp9V2oguHyeiwhKKjkx8GHgz6Co=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=dEok6FyJXD6MDTlW1b3bTyqQkUEt0iz2oWiThoMnrlrZ43rfAkI+/2T5e4Uid2Pmd3McikmdbSk9X5SwhCVBpV0p0PGw9ZiH4C0xAhQBBpF9PQkLRX2xvb9DBqkoPKBpbWR/P13yw0ZmwYBA7fNlMyyg/tuZ96jPiFF5kCvXWMWpojSo85CqBqhXm4K6Axo0NHD81YkJ2K+db1bKGtTu9zgDQBxtqAmmzoYeuIj7znZAQIH1mIt5i/ohMUK1V01L9gNbxexyIbQL9N/hiCRabTcj8P0CRuNwGNcRsPbTxbBomDa7MfXQLMStPcVfOmzVjDWjBSxm36Lfc7pQkjeErA== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 01/14] hw/intc: Add hvf vGIC interrupt controller support Date: Sat, 7 Mar 2026 10:05:53 +0100 Message-ID: <20260307090606.95300-2-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: ZMmgrFdGijev97qZyxRyYOtxWa6nrXD6 X-Proofpoint-ORIG-GUID: ZMmgrFdGijev97qZyxRyYOtxWa6nrXD6 X-Authority-Info-Out: v=2.4 cv=TZObdBQh c=1 sm=1 tr=0 ts=69abea84 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=D2JAlcJVxmvnjXxMMLIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfX8CEureW57WBt ZKvgsveN/Z2yJN/UZsWQsMnbKyrxKtL4ZtgzDAhuQtK8p52CG6Mu9AZejNW7Wh+bNd1kYvk9oxF WsUsTTyW5qbgY2pEjquaJbnjhx2DMpOH6tkzPTmkOUEzl7rRFtFTJdVpQZ8nwalnJaIQJOs6Uko yS89c13rOkR5/RQ4yhapNlISzukxcL+xbPySn0RR34dDEwYjQ0cyOhezYCWLLmr/3y2onifZCYg FlLVzSOKMFXUl+sY01AVO1TXJNm4OpfChOAeM54x8lD3YkekBrHeiCD+BlUB9+mabiGFSmD1OKT lFDNAZqd9YbhcJe2NMS9/q/ywalwm36zzaaqN6Tq9/B+WRBAA9xDiFxXjw0Q14= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1030 mlxscore=0 bulkscore=0 phishscore=0 spamscore=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=999 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABd/EzJrDZcsJfU6EsBCQ9h4Ksm8LwcYhzxZrWnYIrkwa8KlOa9n+aIdBmDdoy/j0vmtsYAjZwsQje7SiMfWD+vHhXeNIVLm+3C2zu9tgyf9ALaIYsb31sGNcIimYRbOmsUy4O08WLvcUXZiW3hgtDDp/vgG/6svXWQvdnQj33n7WsgS5B/kczQ7hEiWyBIy2WbLlUwJBz726HI2WynvNtxlxgrsRz3hSfMgnskkK3ypP9aPw9SK7qPpVcN6iNRHartMn9WurFGd/q/u21f3njGHKfB1WLVoShPS1Au/kmkvc4I9aE0a/3MXetbOgMkl6XEbD1djt/RrVT3HolUfa+tcGPRSbyRdmF5kEIkzlyBaomTM6WMRevqISj9P5QBpAAhpAvjMlFv9pR8F0+RMg32tLSIpEEituKKXRTI5Y75Dkq712Z6Wp1Rh8Je3mJB5301ZGPGl+Ao03Fby1B5BAFX0h9SbLnScyWV2ou+gO7rT6var+g/GLSpa6o4wrCNkvaZCGj/Y3HvKsMPxycx0Qd61uv26sqkPnNlqJK6gsX5U/TvwwjvbEmqjASRL2oGoP9BStuWsQsF8l6emBtPSXan/uizoBiD0lmJFSSfXLMBdyLQGO/cF+LZ9vjv3gIOephP5mltOY0dhrM9Vsm9i8NzfyWKKUqVnBw3lNl2r6lXbuT97TKAibStk38Kouc2EYMtU0bNrg+fGg6HJHXGq2P5W4tag1ECMXVpQMg5uwBXti/IdiS/M24L0QqxrFPTVYMuCIZ2nQhH11ETSWlTFQ= 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=57.103.84.143; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874612408158500 This opens up the door to nested virtualisation support. Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/arm_gicv3_hvf.c | 741 +++++++++++++++++++++++++++++ hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_common.h | 1 + 3 files changed, 743 insertions(+) create mode 100644 hw/intc/arm_gicv3_hvf.c diff --git a/hw/intc/arm_gicv3_hvf.c b/hw/intc/arm_gicv3_hvf.c new file mode 100644 index 0000000000..55171a796b --- /dev/null +++ b/hw/intc/arm_gicv3_hvf.c @@ -0,0 +1,741 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * ARM Generic Interrupt Controller using HVF platform support + * + * Copyright (c) 2025 Mohamed Mediouni + * Based on vGICv3 KVM code by Pavel Fedin + * + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/intc/arm_gicv3_common.h" +#include "qemu/error-report.h" +#include "qemu/module.h" +#include "system/runstate.h" +#include "system/hvf.h" +#include "system/hvf_int.h" +#include "hvf_arm.h" +#include "gicv3_internal.h" +#include "vgic_common.h" +#include "qom/object.h" +#include "target/arm/cpregs.h" +#include + +/* For the GIC, override the check outright, as availability is checked el= sewhere. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability" + +struct HVFARMGICv3Class { + ARMGICv3CommonClass parent_class; + DeviceRealize parent_realize; + ResettablePhases parent_phases; +}; + +typedef struct HVFARMGICv3Class HVFARMGICv3Class; + +/* This is reusing the GICv3State typedef from ARM_GICV3_ITS_COMMON */ +DECLARE_OBJ_CHECKERS(GICv3State, HVFARMGICv3Class, + HVF_GICV3, TYPE_HVF_GICV3); + +/* + * Loop through each distributor IRQ related register; since bits + * corresponding to SPIs and PPIs are RAZ/WI when affinity routing + * is enabled, we skip those. + */ +#define for_each_dist_irq_reg(_irq, _max, _field_width) \ + for (_irq =3D GIC_INTERNAL; _irq < _max; _irq +=3D (32 / _field_width)) + +/* + * Wrap calls to the vGIC APIs to assert_hvf_ok() + * as a macro to keep the code clean. + */ +#define hv_gic_get_distributor_reg(offset, reg) \ + assert_hvf_ok(hv_gic_get_distributor_reg(offset, reg)) + +#define hv_gic_set_distributor_reg(offset, reg) \ + assert_hvf_ok(hv_gic_set_distributor_reg(offset, reg)) + +#define hv_gic_get_redistributor_reg(vcpu, reg, value) \ + assert_hvf_ok(hv_gic_get_redistributor_reg(vcpu, reg, value)) + +#define hv_gic_set_redistributor_reg(vcpu, reg, value) \ + assert_hvf_ok(hv_gic_set_redistributor_reg(vcpu, reg, value)) + +#define hv_gic_get_icc_reg(vcpu, reg, value) \ + assert_hvf_ok(hv_gic_get_icc_reg(vcpu, reg, value)) + +#define hv_gic_set_icc_reg(vcpu, reg, value) \ + assert_hvf_ok(hv_gic_set_icc_reg(vcpu, reg, value)) + +#define hv_gic_get_ich_reg(vcpu, reg, value) \ + assert_hvf_ok(hv_gic_get_ich_reg(vcpu, reg, value)) + +#define hv_gic_set_ich_reg(vcpu, reg, value) \ + assert_hvf_ok(hv_gic_set_ich_reg(vcpu, reg, value)) + +static void hvf_dist_get_priority(GICv3State *s, hv_gic_distributor_reg_t = offset + , uint8_t *bmp) +{ + uint64_t reg; + uint32_t *field; + int irq; + field =3D (uint32_t *)(bmp); + + for_each_dist_irq_reg(irq, s->num_irq, 8) { + hv_gic_get_distributor_reg(offset, ®); + *field =3D reg; + offset +=3D 4; + field++; + } +} + +static void hvf_dist_put_priority(GICv3State *s, hv_gic_distributor_reg_t = offset + , uint8_t *bmp) +{ + uint32_t reg, *field; + int irq; + field =3D (uint32_t *)(bmp); + + for_each_dist_irq_reg(irq, s->num_irq, 8) { + reg =3D *field; + hv_gic_set_distributor_reg(offset, reg); + offset +=3D 4; + field++; + } +} + +static void hvf_dist_get_edge_trigger(GICv3State *s, hv_gic_distributor_re= g_t offset, + uint32_t *bmp) +{ + uint64_t reg; + int irq; + + for_each_dist_irq_reg(irq, s->num_irq, 2) { + hv_gic_get_distributor_reg(offset, ®); + reg =3D half_unshuffle32(reg >> 1); + if (irq % 32 !=3D 0) { + reg =3D (reg << 16); + } + *gic_bmp_ptr32(bmp, irq) |=3D reg; + offset +=3D 4; + } +} + +static void hvf_dist_put_edge_trigger(GICv3State *s, hv_gic_distributor_re= g_t offset, + uint32_t *bmp) +{ + uint32_t reg; + int irq; + + for_each_dist_irq_reg(irq, s->num_irq, 2) { + reg =3D *gic_bmp_ptr32(bmp, irq); + if (irq % 32 !=3D 0) { + reg =3D (reg & 0xffff0000) >> 16; + } else { + reg =3D reg & 0xffff; + } + reg =3D half_shuffle32(reg) << 1; + hv_gic_set_distributor_reg(offset, reg); + offset +=3D 4; + } +} + +/* Read a bitmap register group from the kernel VGIC. */ +static void hvf_dist_getbmp(GICv3State *s, hv_gic_distributor_reg_t offset= , uint32_t *bmp) +{ + uint64_t reg; + int irq; + + for_each_dist_irq_reg(irq, s->num_irq, 1) { + + hv_gic_get_distributor_reg(offset, ®); + *gic_bmp_ptr32(bmp, irq) =3D reg; + offset +=3D 4; + } +} + +static void hvf_dist_putbmp(GICv3State *s, hv_gic_distributor_reg_t offset, + hv_gic_distributor_reg_t clroffset, uint32_t *= bmp) +{ + uint32_t reg; + int irq; + + for_each_dist_irq_reg(irq, s->num_irq, 1) { + /* + * If this bitmap is a set/clear register pair, first write to the + * clear-reg to clear all bits before using the set-reg to write + * the 1 bits. + */ + if (clroffset !=3D 0) { + reg =3D 0; + hv_gic_set_distributor_reg(clroffset, reg); + clroffset +=3D 4; + } + reg =3D *gic_bmp_ptr32(bmp, irq); + hv_gic_set_distributor_reg(offset, reg); + offset +=3D 4; + } +} + +static void hvf_gicv3_check(GICv3State *s) +{ + uint64_t reg; + uint32_t num_irq; + + /* Sanity checking s->num_irq */ + hv_gic_get_distributor_reg(HV_GIC_DISTRIBUTOR_REG_GICD_TYPER, ®); + num_irq =3D ((reg & 0x1f) + 1) * 32; + + if (num_irq < s->num_irq) { + error_report("Model requests %u IRQs, but HVF supports max %u", + s->num_irq, num_irq); + abort(); + } +} + +static void hvf_gicv3_put_cpu_el2(CPUState *cpu_state, run_on_cpu_data arg) +{ + int num_pri_bits; + + /* Redistributor state */ + GICv3CPUState *c =3D arg.host_ptr; + hv_vcpu_t vcpu =3D c->cpu->accel->fd; + + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_VMCR_EL2, c->ich_vmcr_el2); + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_HCR_EL2, c->ich_hcr_el2); + + for (int i =3D 0; i < GICV3_LR_MAX; i++) { + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_LR0_EL2, c->ich_lr_el2[i]); + } + + num_pri_bits =3D c->vpribits; + + switch (num_pri_bits) { + case 7: + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_AP0R0_EL2 + 3, + c->ich_apr[GICV3_G0][3]); + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_AP0R0_EL2 + 2, + c->ich_apr[GICV3_G0][2]); + /* fall through */ + case 6: + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_AP0R0_EL2 + 1, + c->ich_apr[GICV3_G0][1]); + /* fall through */ + default: + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_AP0R0_EL2, + c->ich_apr[GICV3_G0][0]); + } + + switch (num_pri_bits) { + case 7: + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_AP1R0_EL2 + 3, + c->ich_apr[GICV3_G1NS][3]); + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_AP1R0_EL2 + 2, + c->ich_apr[GICV3_G1NS][2]); + /* fall through */ + case 6: + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_AP1R0_EL2 + 1, + c->ich_apr[GICV3_G1NS][1]); + /* fall through */ + default: + hv_gic_set_ich_reg(vcpu, HV_GIC_ICH_REG_AP1R0_EL2, + c->ich_apr[GICV3_G1NS][0]); + } +} + +static void hvf_gicv3_put_cpu(CPUState *cpu_state, run_on_cpu_data arg) +{ + uint32_t reg; + uint64_t reg64; + int i, num_pri_bits; + + /* Redistributor state */ + GICv3CPUState *c =3D arg.host_ptr; + hv_vcpu_t vcpu =3D c->cpu->accel->fd; + + reg =3D c->gicr_waker; + hv_gic_set_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_IGROU= PR0, reg); + + reg =3D c->gicr_igroupr0; + hv_gic_set_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_IGROU= PR0, reg); + + reg =3D ~0; + hv_gic_set_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ICENA= BLER0, reg); + reg =3D c->gicr_ienabler0; + hv_gic_set_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ISENA= BLER0, reg); + + /* Restore config before pending so we treat level/edge correctly */ + reg =3D half_shuffle32(c->edge_trigger >> 16) << 1; + hv_gic_set_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ICFGR= 1, reg); + + reg =3D ~0; + hv_gic_set_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ICPEN= DR0, reg); + reg =3D c->gicr_ipendr0; + hv_gic_set_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ISPEN= DR0, reg); + + reg =3D ~0; + hv_gic_set_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ICACT= IVER0, reg); + reg =3D c->gicr_iactiver0; + hv_gic_set_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ISACT= IVER0, reg); + + for (i =3D 0; i < GIC_INTERNAL; i +=3D 4) { + reg =3D c->gicr_ipriorityr[i] | + (c->gicr_ipriorityr[i + 1] << 8) | + (c->gicr_ipriorityr[i + 2] << 16) | + (c->gicr_ipriorityr[i + 3] << 24); + hv_gic_set_redistributor_reg(vcpu, + HV_GIC_REDISTRIBUTOR_REG_GICR_IPRIORITYR0 + i, reg); + } + + /* CPU interface state */ + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_SRE_EL1, c->icc_sre_el1); + + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_CTLR_EL1, + c->icc_ctlr_el1[GICV3_NS]); + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_IGRPEN0_EL1, + c->icc_igrpen[GICV3_G0]); + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_IGRPEN1_EL1, + c->icc_igrpen[GICV3_G1NS]); + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_PMR_EL1, c->icc_pmr_el1); + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_BPR0_EL1, c->icc_bpr[GICV3_G0]= ); + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_BPR1_EL1, c->icc_bpr[GICV3_G1N= S]); + + num_pri_bits =3D ((c->icc_ctlr_el1[GICV3_NS] & + ICC_CTLR_EL1_PRIBITS_MASK) >> + ICC_CTLR_EL1_PRIBITS_SHIFT) + 1; + + switch (num_pri_bits) { + case 7: + reg64 =3D c->icc_apr[GICV3_G0][3]; + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_AP0R0_EL1 + 3, reg64); + reg64 =3D c->icc_apr[GICV3_G0][2]; + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_AP0R0_EL1 + 2, reg64); + /* fall through */ + case 6: + reg64 =3D c->icc_apr[GICV3_G0][1]; + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_AP0R0_EL1 + 1, reg64); + /* fall through */ + default: + reg64 =3D c->icc_apr[GICV3_G0][0]; + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_AP0R0_EL1, reg64); + } + + switch (num_pri_bits) { + case 7: + reg64 =3D c->icc_apr[GICV3_G1NS][3]; + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_AP1R0_EL1 + 3, reg64); + reg64 =3D c->icc_apr[GICV3_G1NS][2]; + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_AP1R0_EL1 + 2, reg64); + /* fall through */ + case 6: + reg64 =3D c->icc_apr[GICV3_G1NS][1]; + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_AP1R0_EL1 + 1, reg64); + /* fall through */ + default: + reg64 =3D c->icc_apr[GICV3_G1NS][0]; + hv_gic_set_icc_reg(vcpu, HV_GIC_ICC_REG_AP1R0_EL1, reg64); + } + + /* Registers beyond this point are with nested virt only */ + if (c->gic->maint_irq) { + hvf_gicv3_put_cpu_el2(cpu_state, arg); + } +} + +static void hvf_gicv3_put(GICv3State *s) +{ + uint32_t reg; + int ncpu, i; + + hvf_gicv3_check(s); + + reg =3D s->gicd_ctlr; + hv_gic_set_distributor_reg(HV_GIC_DISTRIBUTOR_REG_GICD_CTLR, reg); + + /* per-CPU state */ + + for (ncpu =3D 0; ncpu < s->num_cpu; ncpu++) { + run_on_cpu_data data; + data.host_ptr =3D &s->cpu[ncpu]; + run_on_cpu(s->cpu[ncpu].cpu, hvf_gicv3_put_cpu, data); + } + + /* s->enable bitmap -> GICD_ISENABLERn */ + hvf_dist_putbmp(s, HV_GIC_DISTRIBUTOR_REG_GICD_ISENABLER0 + , HV_GIC_DISTRIBUTOR_REG_GICD_ICENABLER0, s->enabled); + + /* s->group bitmap -> GICD_IGROUPRn */ + hvf_dist_putbmp(s, HV_GIC_DISTRIBUTOR_REG_GICD_IGROUPR0 + , 0, s->group); + + /* Restore targets before pending to ensure the pending state is set on + * the appropriate CPU interfaces in the kernel + */ + + /* s->gicd_irouter[irq] -> GICD_IROUTERn */ + for (i =3D GIC_INTERNAL; i < s->num_irq; i++) { + uint32_t offset =3D HV_GIC_DISTRIBUTOR_REG_GICD_IROUTER32 + (8 * i) + - (8 * GIC_INTERNAL); + hv_gic_set_distributor_reg(offset, s->gicd_irouter[i]); + } + + /* + * s->trigger bitmap -> GICD_ICFGRn + * (restore configuration registers before pending IRQs so we treat + * level/edge correctly) + */ + hvf_dist_put_edge_trigger(s, HV_GIC_DISTRIBUTOR_REG_GICD_ICFGR0, s->ed= ge_trigger); + + /* s->pending bitmap -> GICD_ISPENDRn */ + hvf_dist_putbmp(s, HV_GIC_DISTRIBUTOR_REG_GICD_ISPENDR0, + HV_GIC_DISTRIBUTOR_REG_GICD_ICPENDR0, s->pending); + + /* s->active bitmap -> GICD_ISACTIVERn */ + hvf_dist_putbmp(s, HV_GIC_DISTRIBUTOR_REG_GICD_ISACTIVER0, + HV_GIC_DISTRIBUTOR_REG_GICD_ICACTIVER0, s->active); + + /* s->gicd_ipriority[] -> GICD_IPRIORITYRn */ + hvf_dist_put_priority(s, HV_GIC_DISTRIBUTOR_REG_GICD_IPRIORITYR0, s->g= icd_ipriority); +} + +static void hvf_gicv3_get_cpu_el2(CPUState *cpu_state, run_on_cpu_data arg) +{ + int num_pri_bits; + + /* Redistributor state */ + GICv3CPUState *c =3D arg.host_ptr; + hv_vcpu_t vcpu =3D c->cpu->accel->fd; + + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_VMCR_EL2, &c->ich_vmcr_el2); + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_HCR_EL2, &c->ich_hcr_el2); + + for (int i =3D 0; i < GICV3_LR_MAX; i++) { + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_LR0_EL2, &c->ich_lr_el2[i]= ); + } + + num_pri_bits =3D c->vpribits; + + switch (num_pri_bits) { + case 7: + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_AP0R0_EL2 + 3, + &c->ich_apr[GICV3_G0][3]); + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_AP0R0_EL2 + 2, + &c->ich_apr[GICV3_G0][2]); + /* fall through */ + case 6: + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_AP0R0_EL2 + 1, + &c->ich_apr[GICV3_G0][1]); + /* fall through */ + default: + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_AP0R0_EL2, + &c->ich_apr[GICV3_G0][0]); + } + + switch (num_pri_bits) { + case 7: + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_AP1R0_EL2 + 3, + &c->ich_apr[GICV3_G1NS][3]); + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_AP1R0_EL2 + 2, + &c->ich_apr[GICV3_G1NS][2]); + /* fall through */ + case 6: + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_AP1R0_EL2 + 1, + &c->ich_apr[GICV3_G1NS][1]); + /* fall through */ + default: + hv_gic_get_ich_reg(vcpu, HV_GIC_ICH_REG_AP1R0_EL2, + &c->ich_apr[GICV3_G1NS][0]); + } +} + +static void hvf_gicv3_get_cpu(CPUState *cpu_state, run_on_cpu_data arg) +{ + uint64_t reg; + int i, num_pri_bits; + + /* Redistributor state */ + GICv3CPUState *c =3D arg.host_ptr; + hv_vcpu_t vcpu =3D c->cpu->accel->fd; + + hv_gic_get_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_IGROU= PR0, + ®); + c->gicr_igroupr0 =3D reg; + hv_gic_get_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ISENA= BLER0, + ®); + c->gicr_ienabler0 =3D reg; + hv_gic_get_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ICFGR= 1, + ®); + c->edge_trigger =3D half_unshuffle32(reg >> 1) << 16; + hv_gic_get_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ISPEN= DR0, + ®); + c->gicr_ipendr0 =3D reg; + hv_gic_get_redistributor_reg(vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_ISACT= IVER0, + ®); + c->gicr_iactiver0 =3D reg; + + for (i =3D 0; i < GIC_INTERNAL; i +=3D 4) { + hv_gic_get_redistributor_reg( + vcpu, HV_GIC_REDISTRIBUTOR_REG_GICR_IPRIORITYR0 + i, ®); + c->gicr_ipriorityr[i] =3D extract32(reg, 0, 8); + c->gicr_ipriorityr[i + 1] =3D extract32(reg, 8, 8); + c->gicr_ipriorityr[i + 2] =3D extract32(reg, 16, 8); + c->gicr_ipriorityr[i + 3] =3D extract32(reg, 24, 8); + } + + /* CPU interface */ + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_SRE_EL1, &c->icc_sre_el1); + + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_CTLR_EL1, + &c->icc_ctlr_el1[GICV3_NS]); + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_IGRPEN0_EL1, + &c->icc_igrpen[GICV3_G0]); + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_IGRPEN1_EL1, + &c->icc_igrpen[GICV3_G1NS]); + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_PMR_EL1, &c->icc_pmr_el1); + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_BPR0_EL1, &c->icc_bpr[GICV3_G0= ]); + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_BPR1_EL1, &c->icc_bpr[GICV3_G1= NS]); + num_pri_bits =3D ((c->icc_ctlr_el1[GICV3_NS] & ICC_CTLR_EL1_PRIBITS_MA= SK) >> + ICC_CTLR_EL1_PRIBITS_SHIFT) + + 1; + + switch (num_pri_bits) { + case 7: + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_AP0R0_EL1 + 3, + &c->icc_apr[GICV3_G0][3]); + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_AP0R0_EL1 + 2, + &c->icc_apr[GICV3_G0][2]); + /* fall through */ + case 6: + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_AP0R0_EL1 + 1, + &c->icc_apr[GICV3_G0][1]); + /* fall through */ + default: + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_AP0R0_EL1, + &c->icc_apr[GICV3_G0][0]); + } + + switch (num_pri_bits) { + case 7: + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_AP1R0_EL1 + 3, + &c->icc_apr[GICV3_G1NS][3]); + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_AP1R0_EL1 + 2, + &c->icc_apr[GICV3_G1NS][2]); + /* fall through */ + case 6: + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_AP1R0_EL1 + 1, + &c->icc_apr[GICV3_G1NS][1]); + /* fall through */ + default: + hv_gic_get_icc_reg(vcpu, HV_GIC_ICC_REG_AP1R0_EL1, + &c->icc_apr[GICV3_G1NS][0]); + } + + /* Registers beyond this point are with nested virt only */ + if (c->gic->maint_irq) { + hvf_gicv3_get_cpu_el2(cpu_state, arg); + } +} + +static void hvf_gicv3_get(GICv3State *s) +{ + uint64_t reg; + int ncpu, i; + + hvf_gicv3_check(s); + + hv_gic_get_distributor_reg(HV_GIC_DISTRIBUTOR_REG_GICD_CTLR, ®); + s->gicd_ctlr =3D reg; + + /* Redistributor state (one per CPU) */ + + for (ncpu =3D 0; ncpu < s->num_cpu; ncpu++) { + run_on_cpu_data data; + data.host_ptr =3D &s->cpu[ncpu]; + run_on_cpu(s->cpu[ncpu].cpu, hvf_gicv3_get_cpu, data); + } + + /* GICD_IGROUPRn -> s->group bitmap */ + hvf_dist_getbmp(s, HV_GIC_DISTRIBUTOR_REG_GICD_IGROUPR0, s->group); + + /* GICD_ISENABLERn -> s->enabled bitmap */ + hvf_dist_getbmp(s, HV_GIC_DISTRIBUTOR_REG_GICD_ISENABLER0, s->enabled); + + /* GICD_ISPENDRn -> s->pending bitmap */ + hvf_dist_getbmp(s, HV_GIC_DISTRIBUTOR_REG_GICD_ISPENDR0, s->pending); + + /* GICD_ISACTIVERn -> s->active bitmap */ + hvf_dist_getbmp(s, HV_GIC_DISTRIBUTOR_REG_GICD_ISACTIVER0, s->active); + + /* GICD_ICFGRn -> s->trigger bitmap */ + hvf_dist_get_edge_trigger(s, HV_GIC_DISTRIBUTOR_REG_GICD_ICFGR0 + , s->edge_trigger); + + /* GICD_IPRIORITYRn -> s->gicd_ipriority[] */ + hvf_dist_get_priority(s, HV_GIC_DISTRIBUTOR_REG_GICD_IPRIORITYR0 + , s->gicd_ipriority); + + /* GICD_IROUTERn -> s->gicd_irouter[irq] */ + for (i =3D GIC_INTERNAL; i < s->num_irq; i++) { + uint32_t offset =3D HV_GIC_DISTRIBUTOR_REG_GICD_IROUTER32 + + (8 * i) - (8 * GIC_INTERNAL); + hv_gic_get_distributor_reg(offset, &s->gicd_irouter[i]); + } +} + +static void hvf_gicv3_set_irq(void *opaque, int irq, int level) +{ + GICv3State *s =3D opaque; + if (irq > s->num_irq) { + return; + } + hv_gic_set_spi(GIC_INTERNAL + irq, !!level); +} + +static void hvf_gicv3_icc_reset(CPUARMState *env, const ARMCPRegInfo *ri) +{ + GICv3CPUState *c; + + c =3D env->gicv3state; + c->icc_pmr_el1 =3D 0; + /* + * Architecturally the reset value of the ICC_BPR registers + * is UNKNOWN. We set them all to 0 here; when the kernel + * uses these values to program the ICH_VMCR_EL2 fields that + * determine the guest-visible ICC_BPR register values, the + * hardware's "writing a value less than the minimum sets + * the field to the minimum value" behaviour will result in + * them effectively resetting to the correct minimum value + * for the host GIC. + */ + c->icc_bpr[GICV3_G0] =3D 0; + c->icc_bpr[GICV3_G1] =3D 0; + c->icc_bpr[GICV3_G1NS] =3D 0; + + c->icc_sre_el1 =3D 0x7; + memset(c->icc_apr, 0, sizeof(c->icc_apr)); + memset(c->icc_igrpen, 0, sizeof(c->icc_igrpen)); +} + +static void hvf_gicv3_reset_hold(Object *obj, ResetType type) +{ + GICv3State *s =3D ARM_GICV3_COMMON(obj); + HVFARMGICv3Class *kgc =3D HVF_GICV3_GET_CLASS(s); + + if (kgc->parent_phases.hold) { + kgc->parent_phases.hold(obj, type); + } + + hvf_gicv3_put(s); +} + + +/* + * CPU interface registers of GIC needs to be reset on CPU reset. + * For the calling arm_gicv3_icc_reset() on CPU reset, we register + * below ARMCPRegInfo. As we reset the whole cpu interface under single + * register reset, we define only one register of CPU interface instead + * of defining all the registers. + */ +static const ARMCPRegInfo gicv3_cpuif_reginfo[] =3D { + { .name =3D "ICC_CTLR_EL1", .state =3D ARM_CP_STATE_BOTH, + .opc0 =3D 3, .opc1 =3D 0, .crn =3D 12, .crm =3D 12, .opc2 =3D 4, + /* + * If ARM_CP_NOP is used, resetfn is not called, + * So ARM_CP_NO_RAW is appropriate type. + */ + .type =3D ARM_CP_NO_RAW, + .access =3D PL1_RW, + .readfn =3D arm_cp_read_zero, + .writefn =3D arm_cp_write_ignore, + /* + * We hang the whole cpu interface reset routine off here + * rather than parcelling it out into one little function + * per register + */ + .resetfn =3D hvf_gicv3_icc_reset, + }, +}; + +static void hvf_gicv3_realize(DeviceState *dev, Error **errp) +{ + ERRP_GUARD(); + GICv3State *s =3D HVF_GICV3(dev); + HVFARMGICv3Class *kgc =3D HVF_GICV3_GET_CLASS(s); + int i; + + kgc->parent_realize(dev, errp); + if (*errp) { + return; + } + + if (s->revision !=3D 3) { + error_setg(errp, "unsupported GIC revision %d for platform GIC", + s->revision); + } + + if (s->security_extn) { + error_setg(errp, "the platform vGICv3 does not implement the " + "security extensions"); + return; + } + + if (s->nmi_support) { + error_setg(errp, "NMI is not supported with the platform GIC"); + return; + } + + if (s->nb_redist_regions > 1) { + error_setg(errp, "Multiple VGICv3 redistributor regions are not " + "supported by HVF"); + error_append_hint(errp, "A maximum of %d VCPUs can be used", + s->redist_region_count[0]); + return; + } + + gicv3_init_irqs_and_mmio(s, hvf_gicv3_set_irq, NULL); + + for (i =3D 0; i < s->num_cpu; i++) { + ARMCPU *cpu =3D ARM_CPU(qemu_get_cpu(i)); + + define_arm_cp_regs(cpu, gicv3_cpuif_reginfo); + } + + if (s->maint_irq && s->maint_irq !=3D HV_GIC_INT_MAINTENANCE) { + error_setg(errp, "vGIC maintenance IRQ mismatch with the hardcoded= one in HVF."); + return; + } +} + +static void hvf_gicv3_class_init(ObjectClass *klass, const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + ARMGICv3CommonClass *agcc =3D ARM_GICV3_COMMON_CLASS(klass); + HVFARMGICv3Class *kgc =3D HVF_GICV3_CLASS(klass); + + agcc->pre_save =3D hvf_gicv3_get; + agcc->post_load =3D hvf_gicv3_put; + + device_class_set_parent_realize(dc, hvf_gicv3_realize, + &kgc->parent_realize); + resettable_class_set_parent_phases(rc, NULL, hvf_gicv3_reset_hold, NUL= L, + &kgc->parent_phases); +} + +static const TypeInfo hvf_arm_gicv3_info =3D { + .name =3D TYPE_HVF_GICV3, + .parent =3D TYPE_ARM_GICV3_COMMON, + .instance_size =3D sizeof(GICv3State), + .class_init =3D hvf_gicv3_class_init, + .class_size =3D sizeof(HVFARMGICv3Class), +}; + +static void hvf_gicv3_register_types(void) +{ + type_register_static(&hvf_arm_gicv3_info); +} + +type_init(hvf_gicv3_register_types) + +#pragma clang diagnostic pop diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 96742df090..b7baf8a0f6 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -42,6 +42,7 @@ arm_common_ss.add(when: 'CONFIG_ARM_GIC', if_true: files(= 'arm_gicv3_cpuif_common arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpui= f.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'= )) specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('a= rm_gicv3_whpx.c')) +specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_true: files('= arm_gicv3_hvf.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: f= iles('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c')) diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3= _common.h index c55cf18120..9adcab0a0c 100644 --- a/include/hw/intc/arm_gicv3_common.h +++ b/include/hw/intc/arm_gicv3_common.h @@ -315,6 +315,7 @@ DECLARE_OBJ_CHECKERS(GICv3State, ARMGICv3CommonClass, =20 /* Types for GICv3 kernel-irqchip */ #define TYPE_WHPX_GICV3 "whpx-arm-gicv3" +#define TYPE_HVF_GICV3 "hvf-arm-gicv3" =20 struct ARMGICv3CommonClass { /*< private >*/ --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874480; cv=none; d=zohomail.com; s=zohoarc; b=Seb9t7NAx4T2m5xGaTcvVMEC4jMT5QXtvZ1A63GgTZmyCfgBXeyolRQZy4tuTjoqWLBB6cuvYcXl53UXnROZOKaGGProg+JFZx1faxkmcosg7eIkfpFvuysGkodJQErhduSYUwxs2nYwh6b1kUFzViCcQ6IkNOBNVlZhBFjoLts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874480; h=Content-Type: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=1RV2oa9C2DaRGIF3rfTp8Tdv8xxfIYsPZWi/MFo/wCM=; b=JeA9DmHsQHQcNVZ/ZHUe17RMcEYhe+fueh2KkSeB6TYj0xQXCLi7NAdGFFnFtjjgo36yH2iv9pjAvW0EjCeVrmwYgL0JSrqWXAvXhVPnHlR013zrZE6lDRh9DZ5rZErTPdNdKcjwkF3KgjAd/9DFnWmHO4D3kLolmUh7J3Ui52Y= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874479943638.7842419288847; Sat, 7 Mar 2026 01:07:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vync6-0006fJ-M3; Sat, 07 Mar 2026 04:06:23 -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 1vync3-0006cW-Gw for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:19 -0500 Received: from qs-2007e-snip4-10.eps.apple.com ([57.103.84.180] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vync0-0000xC-05 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:19 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id E88C81800124; Sat, 7 Mar 2026 09:06:13 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id 4CF54180012C; Sat, 7 Mar 2026 09:06:12 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874375; x=1775466375; bh=1RV2oa9C2DaRGIF3rfTp8Tdv8xxfIYsPZWi/MFo/wCM=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=EfNmxTYhP/iPtMsjHePrifQHHnluFSvXAMN6qhZm2NBeAeG0EcbTW+44hNTp4oBI+aQ9l6joDmh/V33dvLt8LHc0oYYNHKABgd4D8bHWa8ROHjt3cXRPK5IkA6jzasFpzuGTh+d3fWcEUlpwRuo+Cy+0cVA+EKY1VF/3AFzOkAoLE3Hs898GCsQleOw2sdEsDinoCzO0smcfCP3uoH487xGUYZu+QQRAQLx6yYeQOVgRAXYaPmB1mrYOx4IX1juaDu22sGEunJoaQh4DR7j4D2gzxufWBih/Jia0bGX2Xwolgd/Hlbyh8Wkq/HwC9Z0wlAlPJh6lfq/ntORbvlDlbw== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 02/14] hw/intc: arm_gicv3_hvf: save/restore Apple GIC state Date: Sat, 7 Mar 2026 10:05:54 +0100 Message-ID: <20260307090606.95300-3-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 50rGIxlFEqqew9E013UyqTdZ-K_JqzoH X-Proofpoint-ORIG-GUID: 50rGIxlFEqqew9E013UyqTdZ-K_JqzoH X-Authority-Info-Out: v=2.4 cv=TZObdBQh c=1 sm=1 tr=0 ts=69abea86 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=kNOF8fv34t_zTB2Y_VIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfX6DQO7H3cQXEt z8UkfYRZbG0xTZA+5vTa4H0/6udVEHBtupq9b4wlcN2+rcYjXOFlMDvezn5nFpTnlBAoXa4Wjko SMcdGToEYxKMOAoZZ8yiBzpiGzR6J7hA5aMO8HPiJT09Ily7GpwBEEYG5kOZU7Gtvbri5bKgtvH co5o7a1lM/BFSX+NesSL83F2CkvRZE+NIdTUQos+lAmkEsRZgKAetrxjFPxgC9SCKUGolMXBhEj vAm+63SNOO6RWVL+1C8wooOwjMFKAhT7MNFwk5k2M1xqhfqw1HVuzIhEX31u1vacX93PiaKDb1/ 5f1oQyNQNCiV0aGeLVWtPqImGreZv9ndyJUQfk6tP2PuR2LCpgecyz8arWvnds= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1030 mlxscore=0 bulkscore=0 phishscore=0 spamscore=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=999 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABIrh+w7yMSbIl9rrI2qSCQzXWpBT+Q0Obvy2vDTkUah7itQqcHVmtP0BYJYpsLaO2xhXmN3yZyYYTZeV6DRYk8Z/ZVXIXTEY3BXFa/opMzOCdOWCTMwvs1rI8zTkiApyQzSjRM+ODOepEhS3JfPCfxXxE9dT465hInNAY8piMr13aBPaTnsAIh+SFyjacFGlf7h1hNpvT84Sq8zFEUd/DGK3Sl8kYHrSRFWGtUtT5B0qtSlCriAyz6pxrkw3WI/Po/rqFYqXnxQizm77q/fDdz7mnJUpM4nWRM5QIKgNxtmWS2aHxK9UPvub8ImtbVmswxzk/dZQrUvzceTfXY3IojMnKbEGvjioAsQvVKYIeah+vbmuKsVUOmFa7FqvUZgAf1zAJ5Ype+T8pE99y/dOk8qFXpyZO7/a6WnPDIJsfwQkKRCHGV7UdDolqE1irFx0XXD7hHOAbRTDZ3un3q2wc9pxdgEobT3PgiBZmowfCixH9p2+VHRrt5Om1X7sbe7wGpTIeF3QSiW7GDpucVSKQjO4xwgghQHRwStDDwx1w5iLz4CspKwTR6V4shh0Nra0Mb7M79YU3QfOivfLJCVsn4pNSdfdXE3+aBi4rzRKzHnZmXCyjHQCvF8xWIMLwVl6o2Pmfk8+pDQftPvwjuz6T5AAQcPTO0zW1+QH+ZmQVm0h1WCSEiiA5wfym7lnjxoqlXL06u9srSBvMCWIBQ9BgGg1orJxfdAKATFaAWcZon+WVnernN7dKO1HIZ/WXONolflGuoMxm0M+MOdML2LRm87+2Hf2lxIRNPCh9P7H+0NslnA== 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=57.103.84.180; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874483503154100 On HVF, some of the GIC state is in an opaque Apple-provided structure. Save/restore that state to be able to save/restore VMs that use the hardwar= e GIC. Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/arm_gicv3_common.c | 1 + hw/intc/arm_gicv3_hvf.c | 95 ++++++++++++++++++++++++++++-- hw/intc/arm_gicv3_hvf_stub.c | 25 ++++++++ hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_common.h | 3 + 5 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 hw/intc/arm_gicv3_hvf_stub.c diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 9200671c7a..9c3fb2f4bf 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -305,6 +305,7 @@ static const VMStateDescription vmstate_gicv3 =3D { .subsections =3D (const VMStateDescription * const []) { &vmstate_gicv3_gicd_no_migration_shift_bug, &vmstate_gicv3_gicd_nmi, + &vmstate_gicv3_hvf, NULL } }; diff --git a/hw/intc/arm_gicv3_hvf.c b/hw/intc/arm_gicv3_hvf.c index 55171a796b..18e5b3fe68 100644 --- a/hw/intc/arm_gicv3_hvf.c +++ b/hw/intc/arm_gicv3_hvf.c @@ -13,6 +13,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "system/runstate.h" +#include "migration/vmstate.h" #include "system/hvf.h" #include "system/hvf_int.h" #include "hvf_arm.h" @@ -34,8 +35,13 @@ struct HVFARMGICv3Class { =20 typedef struct HVFARMGICv3Class HVFARMGICv3Class; =20 -/* This is reusing the GICv3State typedef from ARM_GICV3_ITS_COMMON */ -DECLARE_OBJ_CHECKERS(GICv3State, HVFARMGICv3Class, +typedef struct HVFGICv3State { + GICv3State gicv3_state; + uint32_t size; + void *state; +} HVFGICv3State; + +DECLARE_OBJ_CHECKERS(HVFGICv3State, HVFARMGICv3Class, HVF_GICV3, TYPE_HVF_GICV3); =20 /* @@ -660,7 +666,7 @@ static const ARMCPRegInfo gicv3_cpuif_reginfo[] =3D { static void hvf_gicv3_realize(DeviceState *dev, Error **errp) { ERRP_GUARD(); - GICv3State *s =3D HVF_GICV3(dev); + GICv3State *s =3D (GICv3State *)HVF_GICV3(dev); HVFARMGICv3Class *kgc =3D HVF_GICV3_GET_CLASS(s); int i; =20 @@ -707,6 +713,87 @@ static void hvf_gicv3_realize(DeviceState *dev, Error = **errp) } } =20 +/* + * HVF doesn't have a way to save the RDIST pending tables + * to guest memory, only to an opaque data structure. + */ +static bool gicv3_is_hvf(void *opaque) +{ + return hvf_enabled() && hvf_irqchip_in_kernel(); +} + +static int hvf_gic_opaque_state_save(void *opaque) +{ + HVFGICv3State *gic =3D opaque; + hv_gic_state_t gic_state; + hv_return_t err; + size_t size; + + gic_state =3D hv_gic_state_create(); + if (gic_state =3D=3D NULL) { + error_report("hvf: vgic: failed to create hv_gic_state_create."); + return 1; + } + err =3D hv_gic_state_get_size(gic_state, &size); + gic->size =3D size; + if (err !=3D HV_SUCCESS) { + error_report("hvf: vgic: failed to get GIC state size."); + os_release(gic_state); + return 1; + } + gic->state =3D g_malloc(gic->size); + err =3D hv_gic_state_get_data(gic_state, gic->state); + if (err !=3D HV_SUCCESS) { + error_report("hvf: vgic: failed to get GIC state."); + os_release(gic_state); + return 1; + } + + os_release(gic_state); + return 0; +} + +static int hvf_gic_opaque_state_free(void *opaque) +{ + HVFGICv3State *gic =3D opaque; + free(gic->state); + return 0; +} + +static int hvf_gic_opaque_state_restore(void *opaque, int version_id) +{ + HVFGICv3State *gic =3D opaque; + hv_return_t err; + if (!gic->size) { + return 0; + } + err =3D hv_gic_set_state(gic->state, gic->size); + if (err !=3D HV_SUCCESS) { + error_report("hvf: vgic: failed to restore GIC state."); + return 1; + } + return 0; +} + +const VMStateDescription vmstate_gicv3_hvf =3D { + .name =3D "arm_gicv3/hvf_gic_state", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D gicv3_is_hvf, + .pre_save =3D hvf_gic_opaque_state_save, + .post_save =3D hvf_gic_opaque_state_free, + .post_load =3D hvf_gic_opaque_state_restore, + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT32(size, HVFGICv3State), + VMSTATE_VBUFFER_ALLOC_UINT32(state, + HVFGICv3State, 0, 0, + size), + VMSTATE_END_OF_LIST() + }, +}; + static void hvf_gicv3_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -726,7 +813,7 @@ static void hvf_gicv3_class_init(ObjectClass *klass, co= nst void *data) static const TypeInfo hvf_arm_gicv3_info =3D { .name =3D TYPE_HVF_GICV3, .parent =3D TYPE_ARM_GICV3_COMMON, - .instance_size =3D sizeof(GICv3State), + .instance_size =3D sizeof(HVFGICv3State), .class_init =3D hvf_gicv3_class_init, .class_size =3D sizeof(HVFARMGICv3Class), }; diff --git a/hw/intc/arm_gicv3_hvf_stub.c b/hw/intc/arm_gicv3_hvf_stub.c new file mode 100644 index 0000000000..a587332c7c --- /dev/null +++ b/hw/intc/arm_gicv3_hvf_stub.c @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * ARM Generic Interrupt Controller using HVF platform support stub + * + * Copyright (c) 2026 Mohamed Mediouni + * + */ +#include "qemu/osdep.h" +#include "hw/intc/arm_gicv3_common.h" +#include "migration/vmstate.h" +#include "qemu/typedefs.h" + +static bool needed_never(void *opaque) +{ + return false; +} + +const VMStateDescription vmstate_gicv3_hvf =3D { + .name =3D "arm_gicv3/hvf_gic_state", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D needed_never, + .version_id =3D 1, + .minimum_version_id =3D 1, +}; diff --git a/hw/intc/meson.build b/hw/intc/meson.build index b7baf8a0f6..c6de2d9d00 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -43,6 +43,7 @@ arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: file= s('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'= )) specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('a= rm_gicv3_whpx.c')) specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_true: files('= arm_gicv3_hvf.c')) +specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_false: files(= 'arm_gicv3_hvf_stub.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: f= iles('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c')) diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3= _common.h index 9adcab0a0c..03ab3e8f2f 100644 --- a/include/hw/intc/arm_gicv3_common.h +++ b/include/hw/intc/arm_gicv3_common.h @@ -339,4 +339,7 @@ void gicv3_init_irqs_and_mmio(GICv3State *s, qemu_irq_h= andler handler, */ const char *gicv3_class_name(void); =20 +/* HVF vGIC-specific state: stubbed out on a build with HVF disabled */ +extern const VMStateDescription vmstate_gicv3_hvf; + #endif --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874479; cv=none; d=zohomail.com; s=zohoarc; b=bHOmA6FUgZ4EEG6vDA1J5+oB3R7Q5QzjfXSX1UIv+57zJ5SfC1JcAflutZsFOO4C43avhYeI1G7OlwEBdR4ZkfAdsySoqs9IMMb1YnHGChZY3N1AIBOwmNbLKFXFcWVxbj5M+dYRtsOMxQSpYouhUIjGeb43dy6JZwPpFXPWTmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874479; h=Content-Type: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=MVkulPZG/P32eig2T0uS/HmO19+ssM94R08S2oM1hno=; b=LeCbbOd9DsT1wU4eL4sbpnJ1C3ulKuD84nxdEkCt1wJ0xbETTAQFEHtN4NvAF20vIWBkDFqNihp48P01e9uOonVLZciWbneQhi30Byj5BjoRQK1wTUvT+aXSLAgqtKTQSwQtB82ubLkP84NlRAeIG7OL0Byx+YmkaYypqBbKusE= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874479989379.6142752922908; Sat, 7 Mar 2026 01:07:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncB-0006i8-4E; Sat, 07 Mar 2026 04:06:27 -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 1vync4-0006es-Ve for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:21 -0500 Received: from qs-2007k-snip4-11.eps.apple.com ([57.103.84.241] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vync1-0000xQ-Bg for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:20 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 7D3AB1800138; Sat, 7 Mar 2026 09:06:15 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id D108F18000A2; Sat, 7 Mar 2026 09:06:13 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874376; x=1775466376; bh=MVkulPZG/P32eig2T0uS/HmO19+ssM94R08S2oM1hno=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=WaXdxC+aRiroW2olGmX6TGHLwx4MFAMzqbDyTFjMiK2QvxAr57BcNAqMTeEAoRG9Hf3FLbaM+lTq2qGnPRZglF/VVpwlAnEaOqD8f0E+jPDXQsw221jv2D5UpzH0QVGbbDECq8vpUWUOqzCckntqLGSUT8UgkEhSMlxBnioJcSbbwuHJnlV9aFSH9FYlosO8IaPsdb70hIMv54XhXmWycnQDWPGxFTuGAJM3xfShCEOoYFz+7b+C214LJJp34AUui4ZMVG+doIE7YkmrUc8scfeBGau5EZsOEoHaB77sqhngfxBc4thsLTqSnyjwJa3Rf7fA720ffXBIeIeiMwgOxg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 03/14] accel, hw/arm, include/system/hvf: infrastructure changes for HVF vGIC Date: Sat, 7 Mar 2026 10:05:55 +0100 Message-ID: <20260307090606.95300-4-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Info-Out: v=2.4 cv=AZa83nXG c=1 sm=1 tr=0 ts=69abea87 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=n4FVybPFTm1vobq06wUA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: 8Nf9TH5e4ktW7pRvFuafFSi_SWtVBEd3 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfXwBm7ujWJawbR 0WMvpIrE3Dy2ACEcfWOGC7trAbbgNGq+elwjx2on3ilbPffvcJle0pKTR08C5LGO8AuI5Uo4NPq AhdMUc4Ftjc2OuVNhUykAGkhfFJDFT1I0HBK8J+JkR4lMtZCZAcjGkHX/v5sJSWieOHGTEl6laK GyTCfdkini4hQPzbMnT0mVGfGF1Sn1n1D0ApixJDTkHxepNMF6JNaLcFuR8rOiZkSs6EH6rVCgG YS1Nqel0XVCdG8myqJLVYfBtTQb739K9p5AenB999Bwj8LyqZ71jSJMo3akN59LabkOG6/5Md8z YTdLd4B3D//pyur9d18t8wJWtfpY/+FJFYbnG8umeiykC8UvUdMIu7rWqCV7yk= X-Proofpoint-GUID: 8Nf9TH5e4ktW7pRvFuafFSi_SWtVBEd3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 spamscore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 mlxscore=0 clxscore=1030 malwarescore=0 suspectscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABnekHjfnLpsCdbuJ8v0VXnVSO+UyJLGvlnSG7nY/+RulHoQvM9UlY5igjgFDPZQQjvrkIj2l8k49brNDCK22OzW9cZOouOfjNhr0zm3xJeUXOs2pypSbhoNIUPYzmDs2QATREeAZOhWFw/XcduSXBNmRELzCxznPsFckgJKSE+ynrUQuLY9zczZq+5liqECLOO/tdDOLPQEx3mE1ZksPJsEOz7s4t6pQR2ISBD9YiAPSRlYgXpjOpurUo8R9IZt1r/7dnSxIJlcucJZPYN8pNeSmWUl1BwHpI614+0cU9tQDzC41zT7Hp3vJT9bXUlbAvoSzoVqrO55c+wBsZbGtZn8T2ejBQgWmkp274NbWUTBMkQ2ODH+aAd321BG31if+MLbZV7YAWMZjLcOCZtmYtq0hgcQIp/lX6LahucLGwncfGt/3GWIT8cddjt9RvCQPyAribqBiov22KgwgzYGbiXU0Zo3NchQjqI+YU195tKdRmtX+tTtrqRIKOj2+FPuMff2qxJ0zmmrtx0OM4M2uGN9iF5Vod/uoPsOljye2Ay9Req1jwLWg0+S4gvXSDRdJxFYcwUmgh64TD23ol92aC/jdBi4e+6wP6YrIBbVq0ovjHJ68QRfLRAgrahcujtgUSAa/9WMCSsUsk2ztaknf8T2gak8LKZQnhIoW5Ovqrmxa5PNAYZf6PrsromQ+WjRHMOsjbeQeZpoak50RBFs/+rVgwMdKrpgpZTghj2uREUoa5mhN4mrP1MjqwPsJQ091IN0iYFOR4T1mL4FuQRS/f62se 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=57.103.84.241; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874483510154100 Misc changes needed for HVF vGIC enablement. Note: x86_64 macOS exposes interrupt controller virtualisation since macOS = 12. Keeping an #ifdef here in case we end up supporting that... However, given that x86_64 macOS is on its way out, it'll probably (?) not = be supported in Qemu. Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- accel/hvf/hvf-all.c | 50 ++++++++++++++++++++++++++++++++++++++ accel/stubs/hvf-stub.c | 1 + hw/arm/virt.c | 23 +++++++++++++++--- hw/intc/arm_gicv3_common.c | 3 +++ include/system/hvf.h | 3 +++ system/vl.c | 2 ++ 6 files changed, 78 insertions(+), 4 deletions(-) diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c index 5f357c6d19..a296b108bc 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -10,6 +10,8 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qapi/error.h" +#include "qapi/qapi-visit-common.h" #include "accel/accel-ops.h" #include "exec/cpu-common.h" #include "system/address-spaces.h" @@ -21,6 +23,7 @@ #include "trace.h" =20 bool hvf_allowed; +bool hvf_kernel_irqchip; =20 const char *hvf_return_string(hv_return_t ret) { @@ -216,6 +219,43 @@ static int hvf_gdbstub_sstep_flags(AccelState *as) return SSTEP_ENABLE | SSTEP_NOIRQ; } =20 +static void hvf_set_kernel_irqchip(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + OnOffSplit mode; + if (!visit_type_OnOffSplit(v, name, &mode, errp)) { + return; + } + + switch (mode) { + case ON_OFF_SPLIT_ON: +#ifdef HOST_X86_64 + /* macOS 12 onwards exposes an HVF virtual APIC. */ + error_setg(errp, "HVF: kernel irqchip is not currently implemented= for x86."); + break; +#else + hvf_kernel_irqchip =3D true; + break; +#endif + + case ON_OFF_SPLIT_OFF: + hvf_kernel_irqchip =3D false; + break; + + case ON_OFF_SPLIT_SPLIT: + error_setg(errp, "HVF: split irqchip is not supported on HVF."); + break; + + default: + /* + * The value was checked in visit_type_OnOffSplit() above. If + * we get here, then something is wrong in QEMU. + */ + abort(); + } +} + static void hvf_accel_class_init(ObjectClass *oc, const void *data) { AccelClass *ac =3D ACCEL_CLASS(oc); @@ -223,6 +263,16 @@ static void hvf_accel_class_init(ObjectClass *oc, cons= t void *data) ac->init_machine =3D hvf_accel_init; ac->allowed =3D &hvf_allowed; ac->gdbstub_supported_sstep_flags =3D hvf_gdbstub_sstep_flags; +#ifdef HOST_X86_64 + hvf_kernel_irqchip =3D false; +#else + hvf_kernel_irqchip =3D true; +#endif + object_class_property_add(oc, "kernel-irqchip", "on|off|split", + NULL, hvf_set_kernel_irqchip, + NULL, NULL); + object_class_property_set_description(oc, "kernel-irqchip", + "Configure HVF irqchip"); } =20 static const TypeInfo hvf_accel_type =3D { diff --git a/accel/stubs/hvf-stub.c b/accel/stubs/hvf-stub.c index 42eadc5ca9..6bd08759ba 100644 --- a/accel/stubs/hvf-stub.c +++ b/accel/stubs/hvf-stub.c @@ -10,3 +10,4 @@ #include "system/hvf.h" =20 bool hvf_allowed; +bool hvf_kernel_irqchip; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7456614d05..7a6fad1094 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -837,7 +837,7 @@ static void create_gic(VirtMachineState *vms, MemoryReg= ion *mem) * interrupts; there are always 32 of the former (mandated by GIC spec= ). */ qdev_prop_set_uint32(vms->gic, "num-irq", NUM_IRQS + 32); - if (!kvm_irqchip_in_kernel()) { + if (!kvm_irqchip_in_kernel() && !hvf_irqchip_in_kernel()) { qdev_prop_set_bit(vms->gic, "has-security-extensions", vms->secure= ); } =20 @@ -860,7 +860,8 @@ static void create_gic(VirtMachineState *vms, MemoryReg= ion *mem) qdev_prop_set_array(vms->gic, "redist-region-count", redist_region_count); =20 - if (!kvm_irqchip_in_kernel()) { + if (!kvm_irqchip_in_kernel() && + !(hvf_enabled() && hvf_irqchip_in_kernel())) { if (vms->tcg_its) { object_property_set_link(OBJECT(vms->gic), "sysmem", OBJECT(mem), &error_fatal); @@ -871,7 +872,7 @@ static void create_gic(VirtMachineState *vms, MemoryReg= ion *mem) ARCH_GIC_MAINT_IRQ); } } else { - if (!kvm_irqchip_in_kernel()) { + if (!kvm_irqchip_in_kernel() && !hvf_irqchip_in_kernel()) { qdev_prop_set_bit(vms->gic, "has-virtualization-extensions", vms->virt); } @@ -2118,7 +2119,15 @@ static void finalize_gic_version(VirtMachineState *v= ms) accel_name =3D "KVM with kernel-irqchip=3Doff"; } else if (whpx_enabled()) { gics_supported |=3D VIRT_GIC_VERSION_3_MASK; - } else if (tcg_enabled() || hvf_enabled() || qtest_enabled()) { + } else if (hvf_enabled()) { + if (!hvf_irqchip_in_kernel()) { + gics_supported |=3D VIRT_GIC_VERSION_2_MASK; + } + /* Hypervisor.framework doesn't expose EL2<->1 transition notifier= s */ + if (!(!hvf_irqchip_in_kernel() && vms->virt)) { + gics_supported |=3D VIRT_GIC_VERSION_3_MASK; + } + } else if (tcg_enabled() || qtest_enabled()) { gics_supported |=3D VIRT_GIC_VERSION_2_MASK; if (module_object_class_by_name("arm-gicv3")) { gics_supported |=3D VIRT_GIC_VERSION_3_MASK; @@ -2160,6 +2169,8 @@ static void finalize_msi_controller(VirtMachineState = *vms) vms->msi_controller =3D VIRT_MSI_CTRL_GICV2M; } else if (whpx_enabled()) { vms->msi_controller =3D VIRT_MSI_CTRL_GICV2M; + } else if (hvf_enabled() && hvf_irqchip_in_kernel()) { + vms->msi_controller =3D VIRT_MSI_CTRL_GICV2M; } else { vms->msi_controller =3D VIRT_MSI_CTRL_ITS; } @@ -2179,6 +2190,10 @@ static void finalize_msi_controller(VirtMachineState= *vms) error_report("ITS not supported on WHPX."); exit(1); } + if (hvf_enabled() && hvf_irqchip_in_kernel()) { + error_report("ITS not supported on HVF when using the hardware= vGIC."); + exit(1); + } } =20 assert(vms->msi_controller !=3D VIRT_MSI_CTRL_AUTO); diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 9c3fb2f4bf..f7ba74e6d5 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -33,6 +33,7 @@ #include "hw/arm/linux-boot-if.h" #include "system/kvm.h" #include "system/whpx.h" +#include "system/hvf.h" =20 =20 static void gicv3_gicd_no_migration_shift_bug_post_load(GICv3State *cs) @@ -659,6 +660,8 @@ const char *gicv3_class_name(void) return "kvm-arm-gicv3"; } else if (whpx_enabled()) { return TYPE_WHPX_GICV3; + } else if (hvf_enabled() && hvf_irqchip_in_kernel()) { + return TYPE_HVF_GICV3; } else { if (kvm_enabled()) { error_report("Userspace GICv3 is not supported with KVM"); diff --git a/include/system/hvf.h b/include/system/hvf.h index d3dcf088b3..dc8da85979 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -26,8 +26,11 @@ #ifdef CONFIG_HVF_IS_POSSIBLE extern bool hvf_allowed; #define hvf_enabled() (hvf_allowed) +extern bool hvf_kernel_irqchip; +#define hvf_irqchip_in_kernel() (hvf_kernel_irqchip) #else /* !CONFIG_HVF_IS_POSSIBLE */ #define hvf_enabled() 0 +#define hvf_irqchip_in_kernel() 0 #endif /* !CONFIG_HVF_IS_POSSIBLE */ =20 #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf") diff --git a/system/vl.c b/system/vl.c index 38d7b849e0..871799a2ae 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1780,6 +1780,8 @@ static void qemu_apply_legacy_machine_options(QDict *= qdict) false); object_register_sugar_prop(ACCEL_CLASS_NAME("whpx"), "kernel-irqch= ip", value, false); + object_register_sugar_prop(ACCEL_CLASS_NAME("hvf"), "kernel-irqchi= p", value, + false); qdict_del(qdict, "kernel-irqchip"); } =20 --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874582; cv=none; d=zohomail.com; s=zohoarc; b=XLSkXVDcOdOhWlWJN2ZANrw2Al7Zeh76+FkcBA27n9j9FY6Hv0Z4M0N5i1zsNCBLhA1ieG9phPeeJ7uSrRkMFrIxlkDjpiZ0fdR5zWCNQdxjYW+oBIwZRegYuHWrJKvTJdNaQgpn9NdRiOOj+Gx8GOhZ9v1ogmplxRn4zrh9Koc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874582; 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=eJB3IuLEqPjgyixFo7qaEcwJGAeuNrjFWqtH2jy/vaQ=; b=U6ZbRfWs5CGHG4oHxkfCKu9a4bUxzuZ61jnT+cK96V52aeo1mE1DwXuz+bUY0vAXK7BsWFoJFw8/D0ZLmNjAcccHY9UTpjzGN94VGVylPrLRcewNU9wybHxx1eOCRqVQbDd5NIQouo1ElSSm2DMIhNBoIDD6FG/m/fD38I6Einw= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874582391714.7109354447927; Sat, 7 Mar 2026 01:09:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vync8-0006gN-9d; Sat, 07 Mar 2026 04:06:24 -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 1vync4-0006ed-P8 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:20 -0500 Received: from qs-2007i-snip4-2.eps.apple.com ([57.103.84.213] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vync2-0000xl-SR for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:20 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 0F0E91800120; Sat, 7 Mar 2026 09:06:16 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id 5E8981800132; Sat, 7 Mar 2026 09:06:15 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874378; x=1775466378; bh=eJB3IuLEqPjgyixFo7qaEcwJGAeuNrjFWqtH2jy/vaQ=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=LYgVxa62QMDmUQbu461kRtCiXgkRIFf+YWuEKffRltE0dS4jlXLgGBoYjeJuCZ5W2oS/JAqo/Ff5iPsJnU7E7wOBqdtyjkyXoAELStpAgCP4cNQ2IRuW4QYxnURC1jkF2Ddx6VustGwd19QEMSBbA5ejnffUjQNBoQXnhOStr7HWHu32UUL8tPkOasntStXkhd1DPKq6TFEbKyhBIyZJa/4y8LPmtEkBhPxxCoxTZlYVxfic/EyTJAzlm31VtaC6nEodHKtlwALnTd6NSn4GIU/b8IOu1m1RgxFiiPdCmAidHhOb1uW08YHztlQQYtRhmRdaQ0EbFtQ7KrplKcgmuQ== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 04/14] target/arm: hvf: instantiate GIC early Date: Sat, 7 Mar 2026 10:05:56 +0100 Message-ID: <20260307090606.95300-5-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: 877EMMDnfl_sTIgTcyuEQAnw5UgJY6Nb X-Proofpoint-GUID: 877EMMDnfl_sTIgTcyuEQAnw5UgJY6Nb X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfX8IDewjCO79+z BLk+Fb46brawpXhz7QEJsj8azGL2el5Ek+n7q3484wtr9LBkz1gXb+v/d9eZ8Upp4XG4Mp07vwZ xQjo9nP6T9qyVTrTRTOoURdkF7cTRswbiDp4Tw3sVQnpMfEJ0hfdC6it5gFfgxLMHoCRorCUzcQ /Trf8PUnf1aKN1cXrPoyIoYz975cyp5VcW/8EqNUR5BmciY5pQVxw4ZU/P98q0R9jU38sGpCVNG +bARJ8JDlxelffHh1keq7bEMQpZjHH/ElvmWJ6zh40ambmXCOawnHD8WMIW2jdBvWIDpXLny7sJ vR6Auxvbh6RaUiv1jb5PPPsYupi27sxcU0FhKzqVErgW1M0plhrKpOTSFhtiOQ= X-Authority-Info-Out: v=2.4 cv=DMeCIiNb c=1 sm=1 tr=0 ts=69abea89 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=gV1jYa02L3q0mTRDDQ4A:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 malwarescore=0 adultscore=0 spamscore=0 mlxlogscore=618 phishscore=0 bulkscore=0 clxscore=1030 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAAB2jTt/VcY7BJ8gQhRW4d+bh6IsKsEi7q7IWEBjMJiIdvMm/DlG6NFC4nMBpLY7PF1GRzYq6Pg9cUtHEeBItGsoztEqgIXWy01YbnhqS+bAsDnpWkS7zRBtIj9nM19mzIuMZzgzhqH5JEGJe0Rr4uB9WfwU0NIhH/ZG31gN5fWnx4ONmXVLs2C5fc54SOpOo/5pd9N9oQOeG3PT+kuvhnzpTJx/y1hGURGybqG+mFahI/KrETXutw+3lrvFirRODCFbi+QpRf5Y3/SDMMPVBb91nZDatkYjaHmvanx0ww372pyucOvZv8XSDMF2nC+JF4GdWlK64mO7gTmuVU1iObfJRKNPelXN+pRHqliDmBADMqvHNluKmat+AL8pW4HxPtHw2K3OMsOXTNPqkda8d8phefvfeSUQBb9IWCsmEDMWnKdH9NA0Ij/CoaKKo+lXJFRtizXtxtofeXjiHUTEbmg1fWKJMn0arb90aANH5ptKmJKRa+nOA4otQLG+13bj0LP5kb+wAWvuxFo9m1BhBQN8cPtFThfmd73MqyJnZPXUGC49EdCe/a2LkYKx1iDaAFXMzqRziARZ5gwC9BO5cfrtnRyTVIn7CtXKs+bdtNO08bvMHfDdOiF3h/p1mqjCabnjGaLRSAdKokQfM/ceob7HVxsgCaeI/Vq2sbthze2pSR/lJGLa0pDUl6hfIhXRy9TDoI3pcWBMhNWTt960tjYzWv497xfx9RowX1g6OOXGh4VlJYu 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=57.103.84.213; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874598958158500 Content-Type: text/plain; charset="utf-8" While figuring out a better spot for it, put it in hv_arch_vm_create(). After hv_vcpu_create is documented as too late, and deferring vCPU initialization isn't enough either. Signed-off-by: Mohamed Mediouni --- target/arm/hvf/hvf.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 5fc8f6bbbd..22d476cda9 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1230,6 +1230,28 @@ hv_return_t hvf_arch_vm_create(MachineState *ms, uin= t32_t pa_range) chosen_ipa_bit_size =3D pa_range; =20 ret =3D hv_vm_create(config); + if (hvf_irqchip_in_kernel()) { + if (__builtin_available(macOS 15.0, *)) { + /* + * Instantiate GIC. + * This must be done prior to the creation of any vCPU + * but past hv_vm_create() + */ + hv_gic_config_t cfg =3D hv_gic_config_create(); + hv_gic_config_set_distributor_base(cfg, 0x08000000); + hv_gic_config_set_redistributor_base(cfg, 0x080A0000); + ret =3D hv_gic_create(cfg); + if (ret !=3D HV_SUCCESS) { + error_report("error creating platform VGIC"); + goto cleanup; + } + os_release(cfg); + } else { + error_report("HVF: Unsupported OS for platform vGIC."); + ret =3D HV_UNSUPPORTED; + goto cleanup; + } + } =20 cleanup: os_release(config); --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874506; cv=none; d=zohomail.com; s=zohoarc; b=QwerhptGkNHmPmD0RMp+IhgUBmYGQa2kg4yE9rBebYrLMTKuMG9j0CUov6r9rDSSuE+FR5RFBCsZtRJQIxiMEKqZTRt41psZQ6KJ/nvD/gGkfMX6EM7gXH+qz34YTFVmaYPYVJRqKPe/omlhgfGj5iaFsTfRS9FTon8cgVw6sf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874506; 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=Y1w+e/5Nu/r4eEn8jsNGQIW/Mli5pSCotqFMq4Mz5y0=; b=H675dy6cA9NP0VYiMaI6mrvkXxchCe7q2nR7DOPL5dV5CIzeu1leJ+MXPtml4j4Gr0E9QQNVCbXEngSym/1+b1IzaJA1oimxTujmj4j9uSV/SvmOlQ8CAYyJ0pP0lgEj1+nkWperbDdIdeYRKpVvxYapy+fg6q5qmc9Erd7v+OQ= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874506931406.88941087096975; Sat, 7 Mar 2026 01:08:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncC-0006jS-R8; Sat, 07 Mar 2026 04:06:28 -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 1vync7-0006g8-QS for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:23 -0500 Received: from qs-2007a-snip4-1.eps.apple.com ([57.103.84.132] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vync4-0000yv-EA for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:22 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 919E8180013B; Sat, 7 Mar 2026 09:06:18 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id E2FAC180011C; Sat, 7 Mar 2026 09:06:16 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874379; x=1775466379; bh=Y1w+e/5Nu/r4eEn8jsNGQIW/Mli5pSCotqFMq4Mz5y0=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=P8MMSf9o5ugyGqFTMdJxRO0jJAKoJZzYvqWZPe4M20hup71dhxNuLBT0x+aL5n8DI3ob+h9Tb1DE5UHfx1xTAmsIZ2+PU04hEed43rFChUFw8N1RoVvEMCJOogJgB77izBIAK4g/V19L/+J0giuRegVXV8ryrdihs1GeMNf4lvy7hzE5SJeXwHfWoNVA/pIWHAZNQ+ZaNE+/Qgy/+gSgwRKbvPBPcZ4/gNm0OxVqCZvHjHm38ZwQJIosuPW2Yg7l8bjKVep2DaQdLraRMlsV1O/4N9rOZyOEkgYLk9Uj6pb76s1rArECj1AyC97YnngpdtcnAiVdonCAlJbtTp92QQ== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 05/14] hw/arm, target/arm: nested virtualisation on HVF Date: Sat, 7 Mar 2026 10:05:57 +0100 Message-ID: <20260307090606.95300-6-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: HxgNSdPH8EYRAvsWiPnNElyVhLDyPwxV X-Proofpoint-GUID: HxgNSdPH8EYRAvsWiPnNElyVhLDyPwxV X-Authority-Info-Out: v=2.4 cv=Criys34D c=1 sm=1 tr=0 ts=69abea8b cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=0QeE6rx795gg9bSW8oEA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfXwlQIUUdBqUS7 Ed6fqwgTNyjZHdeIA6tl8psERaBZlrVmtzZ1lLu34kTQFy5DP6AXZ/ldwGuEPrVdQXxT5gdMecG 57fmK9Q1Sc0O0J976Ni9rB2+1K526UYZk3Wqs5uvcKnyc1IWiXtF1B/SFKqukUTCarr0kWeY/uV iGYyATe7rSAqOGqlbF+viApQsSw5VmZVY4jNxnFZIdY2IoQV2TmAOjWGHIU5Myieiwg2koJroJ7 hDvGQUvQ7/SmJ0OonMNLiXLm73QNZmukkVJ7xOfKzLR6IlZRyfZ9zBuSgnRx3Q01aKHWF8yxkiv GY8BiAMgpk1KltfGoaWYYA2+WyAdP4fM/chOqoqVZuKR13GPZGIbqme/2v/2L0= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1030 phishscore=0 malwarescore=0 mlxscore=0 bulkscore=0 spamscore=0 adultscore=0 mlxlogscore=860 suspectscore=0 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABgJTQRL21oDTA7FNpLnePRxFSccXttrQMPv2TriEH0M+KPGGGpHaB5sGYC7NkKOgPXZ54NZ9K1uSQzbuy+tcSMO79p1+QTCPQtHTYUP43BrnpdagqQC61Bn0NMH+p9SQaA3qaAteUUAk0oNcTJTH403EqsNmrJvhjStoVOidDcYJ6DxgN37SPCm9TzRYly8KDHH9TuXTChV7GZ+105F0v2CeM8/gGN4w8+vWg/VfcVGWGzTDFg5ct3GlrM8kY68a91dZ8Gx6pxQdLqK4EePPejCq/FEJ+9b/qIGZ9IlxykxJVsvjcs76i2Dh2roeridHGNbqqnKQzWYID6r82q1fZlmXxIVLC3P9efyAIWENgplzc4QqDpEPH4225fS8Z9MrlwYSMCWzXNfKENsWkg/AL1Zb7lR24kFHMEcmXuAGzxVvFzmb2EYC77IgoQsGtnu1r7nfn1r3KWNw2FB9XI3t0KUL8ZF+yAO3yRyObahGqnF9AHy3CM6f1mYQd0S2FhS7caNKxbby8CaL/zrIVFHn+bJCsvuD4v+8bgWW4ZCBTYLJ2GO4TFA/p/Hp0OWMSosZVEykukbGdGdlMks+SHNA/83AQgcgxDT5HRs2BCei1J87MPnkber0h+McXJA7oJFn1VCY/CEasmH32at/cfG+0fV8Uwd7wFYJZGYQ5GgU3QFvMJ14UDyBm0C0dWwSFQRK4SAeW4QeM8OONHBxYNrX6PsVixybbqWv2ACqXi0CvBK8WJtnKYqY= 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=57.103.84.132; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874509268154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Mohamed Mediouni --- accel/hvf/hvf-all.c | 1 + accel/stubs/hvf-stub.c | 1 + hw/arm/virt.c | 5 +++++ include/system/hvf.h | 5 +++++ target/arm/hvf/hvf.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 52 insertions(+), 2 deletions(-) diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c index a296b108bc..1c1437b467 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -24,6 +24,7 @@ =20 bool hvf_allowed; bool hvf_kernel_irqchip; +bool hvf_nested_virt; =20 const char *hvf_return_string(hv_return_t ret) { diff --git a/accel/stubs/hvf-stub.c b/accel/stubs/hvf-stub.c index 6bd08759ba..cec1cbb056 100644 --- a/accel/stubs/hvf-stub.c +++ b/accel/stubs/hvf-stub.c @@ -11,3 +11,4 @@ =20 bool hvf_allowed; bool hvf_kernel_irqchip; +bool hvf_nested_virt; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7a6fad1094..90769936d0 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2661,6 +2661,11 @@ static void virt_set_virt(Object *obj, bool value, E= rror **errp) VirtMachineState *vms =3D VIRT_MACHINE(obj); =20 vms->virt =3D value; + /* + * At this point, HVF is not initialised yet. + * However, it needs to know if nested virt is enabled at init time. + */ + hvf_nested_virt_enable(value); } =20 static bool virt_get_highmem(Object *obj, Error **errp) diff --git a/include/system/hvf.h b/include/system/hvf.h index dc8da85979..0f0632f7ae 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -28,9 +28,14 @@ extern bool hvf_allowed; #define hvf_enabled() (hvf_allowed) extern bool hvf_kernel_irqchip; #define hvf_irqchip_in_kernel() (hvf_kernel_irqchip) +extern bool hvf_nested_virt; +#define hvf_nested_virt_enabled() (hvf_nested_virt) +#define hvf_nested_virt_enable(enable) hvf_nested_virt =3D enable #else /* !CONFIG_HVF_IS_POSSIBLE */ #define hvf_enabled() 0 #define hvf_irqchip_in_kernel() 0 +#define hvf_nested_virt_enabled() 0 +#define hvf_nested_virt_enable(enable) 0 #endif /* !CONFIG_HVF_IS_POSSIBLE */ =20 #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf") diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 22d476cda9..e2d23d89f4 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -27,6 +27,7 @@ #include "system/memory.h" #include "hw/core/boards.h" #include "hw/core/irq.h" +#include "hw/arm/virt.h" #include "qemu/main-loop.h" #include "system/cpus.h" #include "arm-powerctl.h" @@ -1103,6 +1104,10 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPU= Features *ahcf) (1ULL << ARM_FEATURE_PMU) | (1ULL << ARM_FEATURE_GENERIC_TIMER); =20 + if (hvf_nested_virt_enabled()) { + ahcf->features |=3D 1ULL << ARM_FEATURE_EL2; + } + for (i =3D 0; i < ARRAY_SIZE(regs); i++) { r |=3D hv_vcpu_config_get_feature_reg(config, regs[i].reg, &host_isar.idregs[regs[i].inde= x]); @@ -1218,6 +1223,19 @@ void hvf_arch_vcpu_destroy(CPUState *cpu) assert_hvf_ok(ret); } =20 +static bool hvf_arm_el2_supported(void) +{ + bool is_nested_virt_supported; + if (__builtin_available(macOS 15.0, *)) { + hv_return_t ret =3D hv_vm_config_get_el2_supported(&is_nested_virt= _supported); + assert_hvf_ok(ret); + } else { + return false; + } + return is_nested_virt_supported; +} + + hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range) { hv_return_t ret; @@ -1229,6 +1247,20 @@ hv_return_t hvf_arch_vm_create(MachineState *ms, uin= t32_t pa_range) } chosen_ipa_bit_size =3D pa_range; =20 + if (__builtin_available(macOS 15.0, *)) { + if (hvf_nested_virt_enabled()) { + if (!hvf_arm_el2_supported()) { + error_report("Nested virtualization not supported on this = system."); + goto cleanup; + } + ret =3D hv_vm_config_set_el2_enabled(config, true); + if (ret !=3D HV_SUCCESS) { + error_report("Failed to enable nested virtualization."); + goto cleanup; + } + } + } + ret =3D hv_vm_create(config); if (hvf_irqchip_in_kernel()) { if (__builtin_available(macOS 15.0, *)) { @@ -1420,6 +1452,13 @@ static void hvf_psci_cpu_off(ARMCPU *arm_cpu) assert(ret =3D=3D QEMU_ARM_POWERCTL_RET_SUCCESS); } =20 +static int hvf_psci_get_target_el(void) +{ + if (hvf_nested_virt_enabled()) { + return 2; + } + return 1; +} /* * Handle a PSCI call. * @@ -1441,7 +1480,6 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *= excp_ret) CPUState *target_cpu_state; ARMCPU *target_cpu; target_ulong entry; - int target_el =3D 1; int32_t ret =3D 0; =20 trace_arm_psci_call(param[0], param[1], param[2], param[3], @@ -1495,7 +1533,7 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *= excp_ret) entry =3D param[2]; context_id =3D param[3]; ret =3D arm_set_cpu_on(mpidr, entry, context_id, - target_el, target_aarch64); + hvf_psci_get_target_el(), target_aarch64); break; case QEMU_PSCI_0_1_FN_CPU_OFF: case QEMU_PSCI_0_2_FN_CPU_OFF: --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874563; cv=none; d=zohomail.com; s=zohoarc; b=UPTU/yHnJNOjzZn67FuNynGoTHh/3Jl029xT9yNn/YbuiSJkN1xnX1R24D4xt04Ex3TMnca3rfuQlLM+uPX/nHulmDOHn+d1pFVHdKvLgumL7wyIsDQHUxp4Z4Mnf4/v+S3OppC08fBcDSnANr91egL8Saj/o8YP4u/U3dmS2+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874563; h=Content-Type: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=9jpE+2nLPExT6vUlDoHmebeUqyW4uAk1Hb3dZhzK48E=; b=fltO63ip5jh6fyaJs3/Zg42grgo+qNorFNdIh9dPnBPUPiJonMtuefcmFYZUxq5SC5a4B62dPttcQ7UwKB+rW0t9PsMEigRZHio8Y/Wpbi8PZbDJEsdVUDonTvkcRFiz6GxJx2hF46tc7aZbOIREbPnpTdTgUT6YqKpfjPtcMfY= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874563234391.0458119818535; Sat, 7 Mar 2026 01:09:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncC-0006jD-MZ; Sat, 07 Mar 2026 04:06:28 -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 1vyncA-0006ht-RJ for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:26 -0500 Received: from qs-2007f-snip4-5.eps.apple.com ([57.103.84.186] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vync8-00010k-13 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:26 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 863C31800127; Sat, 7 Mar 2026 09:06:20 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id 711771800135; Sat, 7 Mar 2026 09:06:18 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874383; x=1775466383; bh=9jpE+2nLPExT6vUlDoHmebeUqyW4uAk1Hb3dZhzK48E=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=MJTk1FPfM/G75sBlJAQ93PS4PIVNC5uvFSdHf8hkR3o8eRjenneQ5Ddk1OeQ3Anz+D+cyB1jRkxhML01dXHGLm/DOWsT8Q1PDkk5tqg6S/Sgp2ewtXoBQ241LHQh1qDjDPo5k7I4rTA/XWz3fT87R2N4J3J4RO1OWy6nSond+SiPrT/BqNcbEEkdWCcXEmRZ42ncsXE2K3siMwGtLtSj614XnC6No0BANVB+xLsF/dNU6oJOu2GnAZkv7M/eoAoZ/IvN3ullV7j4kARWBjuuSakpk67q23I0cUk6ZKyBQ2EiTh2ZEloKLUq26gRC03ylNJj/SXgNjPtuPSTakgy+aQ== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 06/14] hvf: only call hvf_sync_vtimer() when running without the platform vGIC Date: Sat, 7 Mar 2026 10:05:58 +0100 Message-ID: <20260307090606.95300-7-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: YG0I842cr0zFEdtsjTDaZJ1u5og-_WTq X-Authority-Info-Out: v=2.4 cv=KaffcAYD c=1 sm=1 tr=0 ts=69abea8d cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=PzQS8Z__MZ2uSZov3vkA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfX2v12OhaHmmWA 8rvT2kEwhLVNKewBFUO+xyemkjBOv9hWkFjhh4BkxxdbtT1NHeXSwn88nkBnAKCL1LrCeJXArDr MHGH152Y5Td9Sy9MYfGrAfsbEQVUFHtbH2N3qShBBSIAWzujSQlwhpuUTa/4BOg3p4dctVqwwg7 ZDs2jX4bf23EWUexrYW1Fze5MBbhpv058QQU5s7vl24E8936YvXpzBHKa6jcKskrkeMLf53dg/4 wpANi//cfgCns2pweGIKMzxL0d/+J0HQCTn+pzZk/9EsM6oijkpjoZtaszJ82LRiq2A4iqKCGEj n54nXQ/sPIqgOLUUhkUtTZBD4by0D0d9z4xf4T+z/KcT2iTLmim085Vlyx6NhA= X-Proofpoint-ORIG-GUID: YG0I842cr0zFEdtsjTDaZJ1u5og-_WTq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=896 adultscore=0 phishscore=0 lowpriorityscore=0 clxscore=1030 mlxscore=0 bulkscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABUl3RcVLzE2JmZjjT3i/4ckzhSuoSUSJG4UQeW/p/3lnHp8pMUAVNItUvzYPiXaaKaToa5RV3afQGyrgWAVg5x8F0V9B9TTgvt0tuap51Qpj4+f3brSn7wfHMyCg+Qv0NXSVgu7I/u5tmBnFWuyIvd0+1B5bk2Pd4ze+oU32MRk0GbQeLyF1mIQiooe7LkF60xjpPPUtVjAD3chuyDjyKwgEq6G3x91cv7ChbIS/Ppk5MX3b1nFvfOpaZdE9m6n8PJpLHpPSpxFBPRfQfPodOZNwJL9qDyZkVHiYKmfuConsDoNVVlpGFLuqfb1IuEAdeaUWwoeZalXjPFwRyLtK0bfKJJ4AH8ORiYfMWoy5dghN9AJgAAqgfvU1fz0r8bQY+ENvbwERXk/1aVqoHyfgbVxR3GZ7O6APeV4z1mS7vUS81dhnKSgWIxmJMYzM4Iq5+P3HVCQ0dwQCFvqNIr4ag5PzR76Nff+G3OFOAnKMPWlP/nFppPKi4tkfQKzr19y41toUcNSucEGPhFOi1afncdWjvjSe6YzBQyd447sdPxP6ssgJWghA0p1sRkU/EPg1EgqmntMc6riXnFTnIbenynb9zdfcWCNl6o/kYZ7lhpvni4rbZKZsV0JVv+4KnH75zBux7faL0+49ZSTk3R5aQcExIxBgM2eCqwrF8v7VbGIV+zf/SWP8u3i0u+Kv1CIm/3lrJ61srrr1WUAORZ06L8A17kViCxGsHSwGqVNWJfEHTBzFWTC/EfV4HK02YqN7kboA= 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=57.103.84.186; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874564086154100 When running with the Apple vGIC, the EL1 vtimer is handled by the platform. Signed-off-by: Mohamed Mediouni Reviewed-by: Mads Ynddal Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/hvf/hvf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index e2d23d89f4..0bb33abb9f 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -2368,7 +2368,9 @@ static int hvf_handle_vmexit(CPUState *cpu, hv_vcpu_e= xit_t *exit) =20 switch (exit->reason) { case HV_EXIT_REASON_EXCEPTION: - hvf_sync_vtimer(cpu); + if (!hvf_irqchip_in_kernel()) { + hvf_sync_vtimer(cpu); + } ret =3D hvf_handle_exception(cpu, &exit->exception); break; case HV_EXIT_REASON_VTIMER_ACTIVATED: --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874537; cv=none; d=zohomail.com; s=zohoarc; b=KFZpVKuHo5llGLxjw2Jimr04yptqxmYFhKXkn335J6j4eTxHSAcZRczd8pVlu4dJscjwISXlFYz30y+TvXn4c8R/MBcF2eRGKmv/JeulXv/J+C5solaKeuFRHNBRTo5mGd1Oiu0Nn74d7nZA0IgQ7SWUVP0SjYEBoMOwfW0zJiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874537; h=Content-Type: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=15Wr/qFQ0GSLP0MpMuauhM/vfqwWNU5xwujZf7sJ9io=; b=ZQWXAKBtVH+VSAU1gIvijOtXSkILKjrVz7iOPwTFdWAvYvYXAc7F2fjKJcBI+EL2nf3JidRGLJnLhxj1puIYvE/Dm1Z3Olegrdbe7PS26A1p4GMDLALGV60YDkchBn+5P0DJW6mUmLClCr4n4j1HTgCLibWEYjp2fJo4yjpVhNg= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874537013302.6283741047106; Sat, 7 Mar 2026 01:08:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncD-0006jq-7Y; Sat, 07 Mar 2026 04:06:29 -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 1vync9-0006hI-Fi for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:25 -0500 Received: from qs-2007f-snip4-11.eps.apple.com ([57.103.84.191] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vync7-00010R-KH for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:24 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id B91E5180012F; Sat, 7 Mar 2026 09:06:21 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id 1F82B180011C; Sat, 7 Mar 2026 09:06:20 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874382; x=1775466382; bh=15Wr/qFQ0GSLP0MpMuauhM/vfqwWNU5xwujZf7sJ9io=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=LNPMZJBkaxq39r/Gi2hA3+3r13ITU6uksJC7sRlJwLoMH2iAv+aC/3BUn9G4orGsjwAirffPDXcYHhalNDB2hZrdDvK9IVMKkuAtIBw45gFu16z6db+7w3OMH8LSojVb4xAX7XKz384UDOPj8jyzJ2ZDteYVZq7xxvoSuqGR6pQRRX1B9ZjcWi+fDksensuvbhLTxE58r+cK4bcldxqjaheJlchjNuvzb6YF3vatgcSFNmk3AVR6LMQr+4EtR2zNpL4JcJUmmL14+CluFoeecOULdPvCWM8guZfMuyq0CEBTVkO8IYXBE46T+YSJX91P1QO/TIewHGYRayXo+RBIvA== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 07/14] hvf: gate ARM_FEATURE_PMU register emulation behind not being at EL2 Date: Sat, 7 Mar 2026 10:05:59 +0100 Message-ID: <20260307090606.95300-8-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: SP3ndxO-Rsz2ggE4tWrObsQ-pppVrN3u X-Proofpoint-GUID: SP3ndxO-Rsz2ggE4tWrObsQ-pppVrN3u X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfXw/Krt8RnwLvC thSuv9kocoaedyounR7L2u1O/R6q6tBE+gHbBb/AkoJFYKko8pQb96MUy+SWYjJiycpXHGtb/XV 2dLbA5wqPgaZhE/FLQOmrxIgJ8ojPdNqn87Bv2Lth0fmZ01ydsefDMGqVb4njfNL4PZlwWI7PhR oFZOrw9FPUhtxWyVT07c0oE2Qrpgemv2+RqY3AagedgmjmePXi+dpqUXNEBMxYqa9TmaSbGHkQS TKaoDwz8+Um5myEch2R89UB9tDk0AISli+hz3DsdC3bnvJZME6+bcH6M+jmlmZgZ1wlVXoevSr4 uJq+dmu/QKKqJBDFRN88rf3HabiAXpkHf1ukoEjW869DoHoL1RnThLTNwaNCJo= X-Authority-Info-Out: v=2.4 cv=CN8nnBrD c=1 sm=1 tr=0 ts=69abea8e cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=lOv7bB1OiAV5i3s2B4UA:9 a=NqO74GWdXPXpGKcKHaDJD/ajO6k=:19 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 mlxscore=0 adultscore=0 clxscore=1030 malwarescore=0 mlxlogscore=748 spamscore=0 bulkscore=0 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABkPewVmk8BJ3LBFCIe23IHFbfIx64G2o0LvGNXmiv8U4b/D/7gYuwujrlXOwjGVMpC2p+OmXrAfG4inivgRBlJQ+VSotCz5tVpRUmGyWT2fe4oU48SgGvZTGVu1cZ/2pNVW6iFQGuNR7S5nL+pYAA30C0xI6OSDXP/NMCYei1ZOTuSq3Y+9DIDBxNQe4gKyRy5TOx5m+VTf1a6SBNOKIQ3YAFfVF4OyWQABTEmaiEbdT2CiAtaMfNjaw3NJ36G1HEE/ny1JFaIyr1uR2p3CD/X15uhefWVHPQKelY/uHqskPK0EWFU4IhhGKrV/Bml9RkJkYYVDpvQdUmviRM0hfPRf5Mzst2OS4h816bK21WDQcPCtC78Hda86ILDBHGM5pXwHZ6+Ncbsnt/IozIvtet7YjSLb5R05+XQRRdLA/FAUyAYrlC/UszB6JyfZb+eMc9QexsqUye1NMKBx/A1M1LbKolrKWlt4+Kk0VFtLPVeL2XqfvrlTpCptMr1YrrlC1JLTw1i3SM3ElR35Ber40iGimlwtJOibEBcOqPAg+I9Tn+o5q1EtawR5R+DJPm6sxMlzfZSZFF3csJDci785yPTcOYxL2KI5DeCCQd/HuitpOFI7izCoF4n6jbepKzXS1/QUiLruA7uJ1Y64XoSCKmi2lujwEZIEOVnUuwK1Gmikic8wz5kkAG8wnWsIJlcbZM7BAgluuDKx8wuctbmnl5DNS0PGSOU2Da83oFjqn9RTCVslLMsZ/LH+DkazjjP2w= 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=57.103.84.191; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874538278158500 From Apple documentation: > When EL2 is disabled, PMU register accesses trigger "Trapped MSR, MRS, or > System Instruction" exceptions. When this happens, hv_vcpu_run()=E2=80=AF= returns, and the > =E2=80=AFhv_vcpu_exit_t=E2=80=AFobject contains the information about thi= s exception. > When EL2 is enabled, the handling of PMU register accesses is determined = by the PMUVer > field of ID_AA64DFR0_EL1=E2=80=AFregister. > If the PMUVer=E2=80=AFfield value is zero or is invalid, PMU register acc= esses generate "Undefined" > exceptions, which are sent to the guest. > If the PMUVer=E2=80=AFfield value is non-zero and valid, PMU register acc= esses are emulated by the framework. > The ID_AA64DFR0_EL1=E2=80=AFregister can be modified via hv_vcpu_set_sys_= reg=E2=80=AFAPI. Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/hvf/hvf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 0bb33abb9f..f926e16fd7 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1601,7 +1601,7 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t re= g, uint64_t *val) ARMCPU *arm_cpu =3D ARM_CPU(cpu); CPUARMState *env =3D &arm_cpu->env; =20 - if (arm_feature(env, ARM_FEATURE_PMU)) { + if (!hvf_nested_virt_enabled() && arm_feature(env, ARM_FEATURE_PMU)) { switch (reg) { case SYSREG_PMCR_EL0: *val =3D env->cp15.c9_pmcr; @@ -1862,7 +1862,7 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t r= eg, uint64_t val) SYSREG_OP2(reg), val); =20 - if (arm_feature(env, ARM_FEATURE_PMU)) { + if (!hvf_nested_virt_enabled() && arm_feature(env, ARM_FEATURE_PMU)) { switch (reg) { case SYSREG_PMCCNTR_EL0: pmu_op_start(env); --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874609; cv=none; d=zohomail.com; s=zohoarc; b=d0r7FQpoiYzg+dUllDorXW5y2RMn2hV5b1bD/D0ELPq6kUNnbRV1RBZHiJrI69QoIk7BBlks47xkFiN9dh5UbNCao7wb+ih43mhkHSVI2ywMrulxJ5xTO1Z5Gdx/3iYeFYhQVYxslfJdIUFTyGQbghjL+9V9kpNQn9M70rHt2aM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874609; h=Content-Type: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=ZP3unKI1M4eoMiNGulIAhIzwyD2Qc4GEP0+nr2HF7pw=; b=ibffWrLNCJ9VZicjIU2YajUpecvEQ6VnluCJ4Hyam8rwBNO5hnxNSrU010LJhoNJwJvmvhic6fV2tT0Z8ERRmbwLoJs1hSrdji7Tvuo+h+OlNbUYMz4wNicxZYHMIb5JE03gSm2JfEM92HPyb2z+6gKZ7C2o9J6G2Uo/WHO7LKY= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874609525610.6822839382023; Sat, 7 Mar 2026 01:10:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncE-0006lF-Md; Sat, 07 Mar 2026 04:06:30 -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 1vyncC-0006j6-BV for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:28 -0500 Received: from qs-2007e-snip4-3.eps.apple.com ([57.103.84.174] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vync9-00011F-7p for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:27 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 34B89180011C; Sat, 7 Mar 2026 09:06:23 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id A0EB9180011A; Sat, 7 Mar 2026 09:06:21 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874384; x=1775466384; bh=ZP3unKI1M4eoMiNGulIAhIzwyD2Qc4GEP0+nr2HF7pw=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=eKOeAun7CbWA2wCHgaVBXcN2AbznfZXr/+dWS2Ty0XeFmpSE8dR2dForJVqzuXMB5bO5aTuXJBMju4jmAjoV4yr98qslPluJgv+/1WhUTAeyXaI1d3uR7LIPMwmS6Ar5la+Na6CQDa34hgRS9QJu4zHUyT5/VxKeG9kIUnPxPB0/RgDGkCJUIymieHiamBwsrxn4KL9u5kZIkYfx+Bl/FeuAVYsng9fDu6eqJqK/lbSs49X2Scw0a5nSkucaBTM6ASf9P2S2yeOM8fmwZMVw+A4oN3SQ2JsnYzkZfovYzkBX6e3wwVK0y0xZet1OGFL7v40G3nSxq7Q3sxwrPePwuw== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 08/14] hvf: arm: allow exposing minimal PMU when running with nested virt on Date: Sat, 7 Mar 2026 10:06:00 +0100 Message-ID: <20260307090606.95300-9-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: XLX8XPc0l57Z4OE1z0XqDi-xHwzMN0JQ X-Authority-Info-Out: v=2.4 cv=KaffcAYD c=1 sm=1 tr=0 ts=69abea8f cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=DEZpVyLLCdwXg5o-P5sA:9 a=NqO74GWdXPXpGKcKHaDJD/ajO6k=:19 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfXyvmlDqlVpnZt 3E4SYMoEbEqONTdVdeoEsUlkqpo1kLsRxk0NYHwJZJViyVe2XzpIO3mbi7G061t6lidlgAvylT7 fz3YUbzqkvkduTvqFDiJk0TSFqv8QWMjaJcTIJ5qQ9VzQWOegrSffJcEl12/2kb0wwE6v+ArOxK Vmcm/H5omvtJ0ab8ZybGRRHtikn61suRAVzuPj0/oTXuZfGJdd9IY38KD7H5tMawehaU974DBBu TCtNpVuaGayXHFjYuis9/ulnu1hZD3D/YqyDdzG4j8is/2+R0AJx6NTlvlkd5RVzKYtxqaFDbHz d0/Y6HHAvGKQ1CURJIID2sRy1PbQ5ynUTj9BHt7rFsdP/crJS3Q8wHf/mSp5po= X-Proofpoint-ORIG-GUID: XLX8XPc0l57Z4OE1z0XqDi-xHwzMN0JQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=647 adultscore=0 phishscore=0 lowpriorityscore=0 clxscore=1030 mlxscore=0 bulkscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABS653C8NAbgRf83hRbN0R8ZOIKVia1Dv0NpiIPjcj6csmuzBDle3x3qa6TMXVIna2R8uA/vrEedy6N/21jh8e7A9saGqxdmII5Re8Dz3HN9jOmVfIVwcxZKabPGs4Lz1Xe+QdItAhRhHSPF/waGWvcek088C4ne9hBV9G80OInDy66T4H+y1RBIB4jUuxnqHkD4tk6304tYm/zm9PkRwrOwdniZM8M1LPWdmpWTxuZdHjku/nCqgeY6RTMJqfp/kFIPmklXy3+Va4X0aibLTBdfT3cutOxrh8Pe8sSR+3GC0T+hqCi8aTAESfmhQr38eb/1hF3ctoWslozMBBbpOp7tdVXENUWZD5/MdS1rbkbsKjrMOpgSPiA1cisCOSyDNFweHuiVhQ1SHh+2MqmHIokErIq4g40T4QDwAhGoEk9ga+GQgC4jcFx94xIT0qpAt4K3aafNtaRlLyhcP9VlGB1bt26+7BTFILIXuykDup3jsBzNi8hOB3eE05wtOKdehuEZd3eBnRLVTEyBM79D4aXv+gkZd0FjbYTgIr61PTNU7xu5Sb0UrttuNes5usGdmuWikFFtMgq3Ss9vAIY2kgA0I1nvnWmS7B+dlcmmFgPJ/1J1wQtmAVlXK7vmNdz3fGN66YQhl69W7ipzUtUuNe/5pOymz2XzJMC4QLFGkV2J6f98u8E5WL6zwh/5b7TqFeAltLn/bfPvOQgJsAWz5jS6/98nl1U/5FPxqlGYyNkeKI6duBNVK/s8qYNDWULXQK8+6ubQ== 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=57.103.84.174; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874610584158500 When running with nested virt on, a minimum PMU is exposed by Hypervisor.fr= amework if a valid PMUVer register value is set. That PMU isn't exposed otherwise. Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/hvf/hvf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index f926e16fd7..30272107a3 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1145,6 +1145,10 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPU= Features *ahcf) =20 clamp_id_aa64mmfr0_parange_to_ipa_size(&host_isar); =20 + if (hvf_nested_virt_enabled()) { + FIELD_DP64_IDREG(&host_isar, ID_AA64DFR0, PMUVER, 0x1); + } + ahcf->isar =3D host_isar; =20 /* --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874611; cv=none; d=zohomail.com; s=zohoarc; b=B/cnCt4hmYPDNhgnwClo1TAAfHSfgDPdWvvaL3Yh5fUvxbBUcJUWsG9rf2MBLZrqA+nKZWUtoH6w6wF2ogywp2P61z0LGKxB4s9D+dvlDP0e5X6KPiRaMeDWzFLH71+adKHA67lerIpeQbDzBo7xEiwUS5/wWhmLuqwHbcv5i/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874611; h=Content-Type: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=6UuB8iVHhPQblcJXhzbN5Wpvalp9/JAXN2NrpAvEGcI=; b=n/axsaTZEjV1JB3oqf7mANJsgLdoaLMG3rvWPL5bOccR1HWsC3joCZrm5F9H4GRrGU04MHpISZq5wFSlAF/yGrD4pfnETusYl/P/QdwlWahfwa+iLNL4f1my3qKCcEz27cE1zAIQIugMp4iD3t8Js2rvIt/ZImSGZm6qpSeqzMw= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874611142434.3956642480432; Sat, 7 Mar 2026 01:10:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncK-0006mY-Tc; Sat, 07 Mar 2026 04:06:38 -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 1vyncF-0006la-2y for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:31 -0500 Received: from qs-2007h-snip4-1.eps.apple.com ([57.103.84.202] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyncC-00013S-SA for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:30 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 21B47180012C; Sat, 7 Mar 2026 09:06:24 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id 15F0E180009C; Sat, 7 Mar 2026 09:06:22 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874388; x=1775466388; bh=6UuB8iVHhPQblcJXhzbN5Wpvalp9/JAXN2NrpAvEGcI=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=bJLnONPbPYbfbvC57EE/RrmQHwl3B6GPG5hGzmX4VKxiH3JGMN7choE2gtoxk9JMld2ejrb7ZOWFbFCf186JXQzfyftbv/xHvyI4eh8uppkq2G6fYmTQiiHEWmt5VMfsJC68M/sPIDDmleI/aOob5Lf3SpJkdv4r0ioWYv5UXm7hVDoYAfPoSSBMmAAGG71jK2zW2Ocs0VnZCuAv/6Hj8KzGOkZGPPgYKaAB5L+xJf46bQNJsIuvn/BxVO95C1VPRsaUHPoaz14uWDbHZyZ5HH6LOIcSOCLUk3IrBO8uZ3da490u7Z7cC5/fNpVMN+YZ7AcTjYRgyW5qU5eL/Bk+/Q== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 09/14] target/arm: hvf: add asserts for code paths not leveraged when using the vGIC Date: Sat, 7 Mar 2026 10:06:01 +0100 Message-ID: <20260307090606.95300-10-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: vO8ZTWH4TCAA2xcNe8BPb6RwrEqY1e_k X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfX5wDDnpVt9oiY Yr3NOy0nbu70k0r91K9YJnfdpSP7e2jfWm1QWHqLMiczlIXNY+8D25LUtAWfne6TfistkdzWSek FDMR/zELYxJkcZ1KLa2X/RfYYvJuVszAQweVArqBspUxwENMzY8c6lCjM08R2CzDmA4W8W9iDfb Hv1144voVSy4N1Y8z8bivXIWRdf2MBhyzovwv+pIzOmubKiRJKMGzm19qhc9i5Qh3FFlijkZNCF lgE0xI5EDIyUxfQYEqCldFlxX9X0vntLLZpiB3U0/3DwBRpm/pNHfdTa9VEs556DNX/8TqbE5CP b/UTAlOceFhsyPWAaCPO0wcSripUK9dmTOHTBdg8pxk5ioPR5rY4+11aNOZUS0= X-Authority-Info-Out: v=2.4 cv=KNtXzVFo c=1 sm=1 tr=0 ts=69abea92 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=vbFX7M0ab_H1AmF9bzsA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: vO8ZTWH4TCAA2xcNe8BPb6RwrEqY1e_k X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 bulkscore=0 mlxlogscore=526 suspectscore=0 clxscore=1030 phishscore=0 mlxscore=0 lowpriorityscore=0 spamscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABzghG9VpaQ2CzH8KwqiuUaW3gVIJX23Vev9wXaSPS7p75AAMMt6vDG3lfFZDk9tnH3DhBoYcE4D3ADH6pdMOGxDD+eTcyN3B8c8dTbfhui9vZTDElRKk80FnoYo07UErPbl5D6Im2bLOeXcycMOOimfSmeopyjHbV7OCbO/Eyr6iBkbFIR5PKfLFFEV337R9Ko/n1EjCo+ELoEwIvnkUM9Q5O/HLnH+20Q1lKim2cX6R8STe7DkmMgrYUwn4Reqf/ps/ya01ZgnoIfaeuXLRCogsm3vo5hBDxkmaJ3KZQE1sis7t37ukPMz2JuxMUH3WXw0rV1J+kn8vr7mhNR10OHuINc9+Q6T8BG5CkkE6c69NreAgu7gUXFP7IlwNMHZI/XHx6K8V8WEGbYGGy76l5KJQKgLOMVACGGlkZIB4+HNehxPYw59a6bZJnckceUoAjhuIVSYK1UOK4OiU1dGzRjL2q6tBG10IajuG8EY8ub2bEzgYn/UYmpGZAid9mUhy3+Yrz13c71dsauUJtqsAr4wA3Lctq8kDCza3DR7499c9i2i7sBT6mS2SDzzNf+gt6nOKXLUlAauUQ/tM46/zmT/Ml1+YwWsdjCfUuHzskGuZSzERjj93zXai9yT8NhYbDE8IvLMtJDxEu++vOfFYUMlVdh/SlYGnr5Z/Us2E99QhNfq+EM/jPbcX34v/1MJxrY355lL3YR9Wnb9RJWEKCZQpGRqDo+3eKR4qwNahQIZnG6XeRn88q3lV1 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=57.103.84.202; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874612722154100 When using the vGIC, timers are directly handled by the platform. No vmexits ought to happen in that case. Abort if reaching those code paths. Signed-off-by: Mohamed Mediouni Reviewed-by: Mads Ynddal Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/hvf/hvf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 30272107a3..53ca84c35d 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1681,6 +1681,7 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t re= g, uint64_t *val) case SYSREG_ICC_SGI1R_EL1: case SYSREG_ICC_SRE_EL1: case SYSREG_ICC_CTLR_EL1: + assert(!hvf_irqchip_in_kernel()); /* Call the TCG sysreg handler. This is only safe for GICv3 regs. = */ if (hvf_sysreg_read_cp(cpu, "GICv3", reg, val)) { return 0; @@ -1971,6 +1972,7 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t r= eg, uint64_t val) case SYSREG_ICC_SGI0R_EL1: case SYSREG_ICC_SGI1R_EL1: case SYSREG_ICC_SRE_EL1: + assert(!hvf_irqchip_in_kernel()); /* Call the TCG sysreg handler. This is only safe for GICv3 regs. = */ if (hvf_sysreg_write_cp(cpu, "GICv3", reg, val)) { return 0; @@ -2378,6 +2380,7 @@ static int hvf_handle_vmexit(CPUState *cpu, hv_vcpu_e= xit_t *exit) ret =3D hvf_handle_exception(cpu, &exit->exception); break; case HV_EXIT_REASON_VTIMER_ACTIVATED: + assert(!hvf_irqchip_in_kernel()); qemu_set_irq(arm_cpu->gt_timer_outputs[GTIMER_VIRT], 1); cpu->accel->vtimer_masked =3D true; break; --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874501; cv=none; d=zohomail.com; s=zohoarc; b=RRQzjm0w8n6LuBmDsGhgPZKuvhwGLdz/xBM3QOo+FxXNy01Sp0s4ky9GhGwYpA5AueKjFEOKxsI2irQU79P/R3y5WOPP/rM8+p2+JPqabuhyHHMtT2FRYn7BV3okQat+KfTpD7RxfRnWQ3Nk8Efkhn4M5YfnmmMWz67T4d24CpY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874501; 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=7K7Ydla37vwloPdHUz7tPsEx0hHirAQLjDnCNzmv+/s=; b=GvtvjDQ6G7Vhj13mqAoPw+GnPKxBbwOvIuClaE1qtTZZ73wqlaVqWr+0NZ6qpRiy2uM7+HZNlZLu3G2A49FJl1zP2Ethir9ZjEuNHZjJO+yyeYhZZcVACmF/RLFukAgESE/tpJPxMt0A8i4tZp2ItFZ88KV4B0YgnEWdd0HH064= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874501734892.2324039215638; Sat, 7 Mar 2026 01:08:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncR-0006og-Gt; Sat, 07 Mar 2026 04:06:43 -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 1vyncN-0006nD-9V for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:39 -0500 Received: from qs-2007a-snip4-8.eps.apple.com ([57.103.84.139] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyncE-000148-AU for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:32 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 9E9FB180013E; Sat, 7 Mar 2026 09:06:26 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id A893F1800402; Sat, 7 Mar 2026 09:06:24 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874389; x=1775466389; bh=7K7Ydla37vwloPdHUz7tPsEx0hHirAQLjDnCNzmv+/s=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=aDYjz4i9h+yDk+4HT9uuPBICpgT4x/bajEPRMw4RNaUpHI9telSA3PeOOS5jwdOfvXjRv/ZJb+riLYAUVCBoKCsB/JGni5DD4TVNHD26AJ3pLag0c8psjHJVs/AkN3Llklw6aVKyBpK8jZLkgH0fps2uq63DWidgRTZkAMat7HMuKm+Sl7IxMn3VrIXsu3GY8DJ1mb/BVu9MidxnvKo+EH8CKHPR+owPGQCeYUZ15EComDUplsSZE7AY9HXTsP7iSDhHrdb5fqx2KaHfspktF9wLmPIzsEk2Ia9dRRdyncr1EQ77kwyldHVnjuZLTisVPjeUlKgLHDetJp1aoAi/ig== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 10/14] hvf: sync registers used at EL2 Date: Sat, 7 Mar 2026 10:06:02 +0100 Message-ID: <20260307090606.95300-11-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: WKwzne07u485ea-dcBO74Dpqibh007CE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfX0mWx8qkYonl+ WzYNW+UmqAG48f6rRS0EEf9evW2MRvCZ8Rc9+3ip6T+cGVOQpD4NXdowErgRm/h9YWzA5orhVCY essAoc5Uo8fH8Y0H33vfO/MjX7MvgeGz3AvpZLNf7wHgJ8vM5Ubu0erKfjnqFCyv/mRUHFi7pau gFxu8woYYLyzmuWTHFhAULv/ZS39kyJ63cJ9AN4OVM+nPeh7yA/YCbqb0SFWsBRR648utFzch8o UhoYgWzJDQ3taWCXRCaZ1eY/4/fMgMOCxWnaAU/4GowwyV5b3MVVr25iY8hsVrdxSIIHemgpy/v VjPddXxWgg8s+a9MNyVsx90iO2TD94Gkfgkj5iSSCXB89QW/nRHcvzEkdiP3h8= X-Authority-Info-Out: v=2.4 cv=HPPO14tv c=1 sm=1 tr=0 ts=69abea93 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Ml6fgdKjPmdD6r9HfocA:9 X-Proofpoint-GUID: WKwzne07u485ea-dcBO74Dpqibh007CE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 lowpriorityscore=0 clxscore=1030 mlxscore=0 spamscore=0 suspectscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 malwarescore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABjW6jfZMSYdnr3wp96JG9xFNjYDB8bMvvwvutWijHpdHMJUeIkKxBHCD834Yb+E4DUmWHChBIkYoMB/BDKIImAxWnknz5dAOfllSpa3IWwfXQ3ypiO25JEgxUFmlkNqD+2cBJs0LCe7XpTjb+fS5CBIccr1dRTk+R9dn8uEg4MNGC9CzbZhOxAtXlLJDw0tvESfr8G4HIJwkvihFA6BxH9vkiMD+Dlc7vJS19bxPSrTQvZi3ad5yWDaBGPeDK88fzNBjRT3Do7tjMuOXrEC0tSSt82uxJ9iV3jmCn852Y4l1f4CZROwOomju/kOfc+CH1yKPWJP1KDvNF/ImR3iitn7Hs+5m8s0PvHzVm7MuqgDNJOEuk/m9PYZAjXTXqv4tZWazcn2UxG9vwzWgEIWQusAIpqORK7XQkPjqlQEhw2Cbo6d8LxR2Tx9lMxPEjuR7KtXMsXPmNr3gWb4AQBEYKpwLjoSVe9Zg67t4TfgAWIjUTSWhiLkYuLHbSqRM5ieKjiiG4epkpNkrc3E51D+ONWgRUAarYVvnfHc6XevTDTN0hs5VCIIynzI2jdR2rj58ZJsIMMyowNWgikvQGMj+2VfoRZ2i6dic5IEW31VkYIOKkKCaHOeF/wZ5lW7+GjUgIcmL3H5sAa3GvKVWhMGa4nSE4+bkU2AKguCGKdLXpCprTbhCEu7a4NByX8Ceu2RxSuv9COJF6o+wlu7TKKsv4sdrI/sXa/2qSYsnUoEU= 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=57.103.84.139; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874505577154100 Content-Type: text/plain; charset="utf-8" When starting up the VM at EL2, more sysregs are available. Sync the state = of those. In addition, sync the state of the EL1 physical timer when the vGIC is used= , even if running at EL1. However, no OS running at EL1 is expected to use those r= egisters. Signed-off-by: Mohamed Mediouni --- target/arm/hvf/hvf.c | 61 +++++++++++++++++++++++++++++++++---- target/arm/hvf/sysreg.c.inc | 44 ++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 6 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 53ca84c35d..949c4a3431 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -467,37 +467,75 @@ static const struct hvf_reg_match hvf_sme2_preg_match= [] =3D { * * SME2 registers are guarded by a runtime availability attribute instead = of a * compile-time def, so verify those at runtime in hvf_arch_init_vcpu() be= low. + * + * Nested virt registers are handled via a runtime check, so override the = guarded + * availability check done by Clang. */ =20 +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability" + #define DEF_SYSREG(HVF_ID, ...) \ QEMU_BUILD_BUG_ON(HVF_ID !=3D KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARG= S__))); #define DEF_SYSREG_15_02(...) =20 +#define DEF_SYSREG_EL2(HVF_ID, ...) \ + QEMU_BUILD_BUG_ON(HVF_ID !=3D KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARG= S__))); + +#define DEF_SYSREG_VGIC(HVF_ID, ...) \ + QEMU_BUILD_BUG_ON(HVF_ID !=3D KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARG= S__))); + +#define DEF_SYSREG_VGIC_EL2(HVF_ID, ...) \ + QEMU_BUILD_BUG_ON(HVF_ID !=3D KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARG= S__))); + #include "sysreg.c.inc" =20 #undef DEF_SYSREG #undef DEF_SYSREG_15_02 +#undef DEF_SYSREG_EL2 +#undef DEF_SYSREG_VGIC +#undef DEF_SYSREG_VGIC_EL2 =20 -#define DEF_SYSREG(HVF_ID, op0, op1, crn, crm, op2) HVF_ID, +#define DEF_SYSREG(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID}, #define DEF_SYSREG_15_02(...) +#define DEF_SYSREG_EL2(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID, .el2 =3D= true}, +#define DEF_SYSREG_VGIC(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID, .vgic = =3D true}, +#define DEF_SYSREG_VGIC_EL2(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID, tru= e, true}, + +struct hvf_sreg { + hv_sys_reg_t sreg; + bool vgic; + bool el2; +}; =20 -static const hv_sys_reg_t hvf_sreg_list[] =3D { +static struct hvf_sreg hvf_sreg_list[] =3D { #include "sysreg.c.inc" }; =20 #undef DEF_SYSREG #undef DEF_SYSREG_15_02 +#undef DEF_SYSREG_EL2 +#undef DEF_SYSREG_VGIC +#undef DEF_SYSREG_VGIC_EL2 + +#pragma clang diagnostic pop =20 #define DEF_SYSREG(...) -#define DEF_SYSREG_15_02(HVF_ID, op0, op1, crn, crm, op2) HVF_ID, +#define DEF_SYSREG_15_02(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID}, +#define DEF_SYSREG_EL2(...) +#define DEF_SYSREG_VGIC(...) +#define DEF_SYSREG_VGIC_EL2(...) =20 API_AVAILABLE(macos(15.2)) -static const hv_sys_reg_t hvf_sreg_list_sme2[] =3D { +static struct hvf_sreg hvf_sreg_list_sme2[] =3D { #include "sysreg.c.inc" }; =20 #undef DEF_SYSREG #undef DEF_SYSREG_15_02 +#undef DEF_SYSREG_EL2 +#undef DEF_SYSREG_VGIC +#undef DEF_SYSREG_VGIC_EL2 =20 /* * For FEAT_SME2 migration, we need to store PSTATE.{SM,ZA} bits which are @@ -1320,6 +1358,9 @@ int hvf_arch_init_vcpu(CPUState *cpu) #define DEF_SYSREG_15_02(HVF_ID, ...) \ g_assert(HVF_ID =3D=3D KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARGS= __))); #define DEF_SYSREG(...) +#define DEF_SYSREG_EL2(...) +#define DEF_SYSREG_VGIC(...) +#define DEF_SYSREG_VGIC_EL2(...) =20 #include "sysreg.c.inc" =20 @@ -1347,11 +1388,19 @@ int hvf_arch_init_vcpu(CPUState *cpu) =20 /* Populate cp list for all known sysregs */ for (i =3D 0; i < ARRAY_SIZE(hvf_sreg_list); i++) { - hv_sys_reg_t hvf_id =3D hvf_sreg_list[i]; + hv_sys_reg_t hvf_id =3D hvf_sreg_list[i].sreg; uint64_t kvm_id =3D HVF_TO_KVMID(hvf_id); uint32_t key =3D kvm_to_cpreg_id(kvm_id); const ARMCPRegInfo *ri =3D get_arm_cp_reginfo(arm_cpu->cp_regs, ke= y); =20 + if (hvf_sreg_list[i].vgic && !hvf_irqchip_in_kernel()) { + continue; + } + + if (hvf_sreg_list[i].el2 && !hvf_nested_virt_enabled()) { + continue; + } + if (ri) { assert(!(ri->type & ARM_CP_NO_RAW)); arm_cpu->cpreg_indexes[sregs_cnt++] =3D kvm_id; @@ -1360,7 +1409,7 @@ int hvf_arch_init_vcpu(CPUState *cpu) if (__builtin_available(macOS 15.2, *)) { if (hvf_arm_sme2_supported()) { for (i =3D 0; i < ARRAY_SIZE(hvf_sreg_list_sme2); i++) { - hv_sys_reg_t hvf_id =3D hvf_sreg_list_sme2[i]; + hv_sys_reg_t hvf_id =3D hvf_sreg_list_sme2[i].sreg; uint64_t kvm_id =3D HVF_TO_KVMID(hvf_id); uint32_t key =3D kvm_to_cpreg_id(kvm_id); const ARMCPRegInfo *ri =3D get_arm_cp_reginfo(arm_cpu->cp_= regs, key); diff --git a/target/arm/hvf/sysreg.c.inc b/target/arm/hvf/sysreg.c.inc index 7a2f880f78..c11dbf274e 100644 --- a/target/arm/hvf/sysreg.c.inc +++ b/target/arm/hvf/sysreg.c.inc @@ -153,3 +153,47 @@ DEF_SYSREG_15_02(HV_SYS_REG_ID_AA64ZFR0_EL1, 3, 0, 0, = 4, 4) DEF_SYSREG_15_02(HV_SYS_REG_ID_AA64SMFR0_EL1, 3, 0, 0, 4, 5) DEF_SYSREG_15_02(HV_SYS_REG_SMPRI_EL1, 3, 0, 1, 2, 4) DEF_SYSREG_15_02(HV_SYS_REG_SMCR_EL1, 3, 0, 1, 2, 6) +/* + * Block these because of the same issue as virtual counters in + * that caused the revert in 28b0ed32b32c7e5094cf2f1ec9c0645c65fad2aa + * + * DEF_SYSREG_VGIC(HV_SYS_REG_CNTP_CTL_EL0, 3, 3, 14, 2, 1) + * DEF_SYSREG_VGIC(HV_SYS_REG_CNTP_CVAL_EL0, 3, 3, 14, 2, 2) + */ +#ifdef SYNC_NO_RAW_REGS +DEF_SYSREG_VGIC(HV_SYS_REG_CNTP_TVAL_EL0, 3, 3, 14, 2, 0) +#endif + +/* + * Also block these because of the same issue as virtual counters in + * that caused the revert in 28b0ed32b32c7e5094cf2f1ec9c0645c65fad2aa + * + * DEF_SYSREG_VGIC_EL2(HV_SYS_REG_CNTHP_CVAL_EL2, 3, 4, 14, 2, 2) + * DEF_SYSREG_VGIC_EL2(HV_SYS_REG_CNTHP_CTL_EL2, 3, 4, 14, 2, 1) + */ +DEF_SYSREG_VGIC_EL2(HV_SYS_REG_CNTHCTL_EL2, 3, 4, 14, 1, 0) +#ifdef SYNC_NO_RAW_REGS +DEF_SYSREG_VGIC_EL2(HV_SYS_REG_CNTHP_TVAL_EL2, 3, 4, 14, 2, 0) +#endif +DEF_SYSREG_VGIC_EL2(HV_SYS_REG_CNTVOFF_EL2, 3, 4, 14, 0, 3) + +DEF_SYSREG_EL2(HV_SYS_REG_CPTR_EL2, 3, 4, 1, 1, 2) +DEF_SYSREG_EL2(HV_SYS_REG_ELR_EL2, 3, 4, 4, 0, 1) +DEF_SYSREG_EL2(HV_SYS_REG_ESR_EL2, 3, 4, 5, 2, 0) +DEF_SYSREG_EL2(HV_SYS_REG_FAR_EL2, 3, 4, 6, 0, 0) +DEF_SYSREG_EL2(HV_SYS_REG_HCR_EL2, 3, 4, 1, 1, 0) +DEF_SYSREG_EL2(HV_SYS_REG_HPFAR_EL2, 3, 4, 6, 0, 4) +DEF_SYSREG_EL2(HV_SYS_REG_MAIR_EL2, 3, 4, 10, 2, 0) +DEF_SYSREG_EL2(HV_SYS_REG_MDCR_EL2, 3, 4, 1, 1, 1) +DEF_SYSREG_EL2(HV_SYS_REG_SCTLR_EL2, 3, 4, 1, 0, 0) +DEF_SYSREG_EL2(HV_SYS_REG_SPSR_EL2, 3, 4, 4, 0, 0) +DEF_SYSREG_EL2(HV_SYS_REG_SP_EL2, 3, 6, 4, 1, 0) +DEF_SYSREG_EL2(HV_SYS_REG_TCR_EL2, 3, 4, 2, 0, 2) +DEF_SYSREG_EL2(HV_SYS_REG_TPIDR_EL2, 3, 4, 13, 0, 2) +DEF_SYSREG_EL2(HV_SYS_REG_TTBR0_EL2, 3, 4, 2, 0, 0) +DEF_SYSREG_EL2(HV_SYS_REG_TTBR1_EL2, 3, 4, 2, 0, 1) +DEF_SYSREG_EL2(HV_SYS_REG_VBAR_EL2, 3, 4, 12, 0, 0) +DEF_SYSREG_EL2(HV_SYS_REG_VMPIDR_EL2, 3, 4, 0, 0, 5) +DEF_SYSREG_EL2(HV_SYS_REG_VPIDR_EL2, 3, 4, 0, 0, 0) +DEF_SYSREG_EL2(HV_SYS_REG_VTCR_EL2, 3, 4, 2, 1, 2) +DEF_SYSREG_EL2(HV_SYS_REG_VTTBR_EL2, 3, 4, 2, 1, 0) --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874528; cv=none; d=zohomail.com; s=zohoarc; b=ke81o+weJY4Bsdy2xpk7ZmhGCQQdgSrtu/TffnF9yUKlyqS7I1TBdRTZLBPGPBZW7Y96Etga6E3Yk4pBKJw7cLEz6jj6ALwFGG6lonIjeubNJ03tLmgVq6C6AIP4q3o1w4+Tp3DSVtnRwIvnlg0qeoJ/ScTbXLQIOco+KQUBdls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874528; h=Content-Type: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=syC9+/wPtHmD5MD5ZZLKFPDmC7DIMxth9hphPRcSA70=; b=GSi5V+oW5ElqrNrOXP6Q1Pxa0eEa3vv/YTd6BVm2U04aM0HN9gZxm8STwsfS3Uz3U+0TCMLNZVr+QB7W1Yz1Jeev7U8md5sm7bLnPwLy95/1BsTOzOiaEqGINdkx4771Mu6hHnn/i/BYhBAFZKP8bYsn2w4xCQ1GD36Yl1gkkPY= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874528772287.2520469544005; Sat, 7 Mar 2026 01:08:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncQ-0006oO-CU; Sat, 07 Mar 2026 04:06:42 -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 1vyncN-0006nE-9v for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:39 -0500 Received: from qs-2007c-snip4-1.eps.apple.com ([57.103.84.152] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyncG-00015J-9E for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:33 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 36071180009C; Sat, 7 Mar 2026 09:06:28 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id 43A9A180013C; Sat, 7 Mar 2026 09:06:26 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874390; x=1775466390; bh=syC9+/wPtHmD5MD5ZZLKFPDmC7DIMxth9hphPRcSA70=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=Js7XWRd/3Ef9JnnGOOi/IsUbJuadXo2Tu3BKFOFT/vyjgohAVKO1WU1g6ckAlDVkTGmjaMRsB60xLm5TqDDxRxgaOG/lvSP+UyHnzg6sJ8qkDRGu1Aj8OCW65Zzqc28l/NUeL6ZEgItWTRp2a/P94QJytyH0TOo59B5UCHzRPO+y22bXqNKhdiUSnEvOk6FjT4oztCmWBR6VYoAg6hkKONhWFq2gtsXGjYWN3ZOTwZPrKweIY1VallTwrPRLDMBF7lqDU0Zhwk421CU0Gh/IH4YlCzOXOW52HgnIBH1AvEhZ2aNLKBQRFaK0x8y0RfAF9COY3InEfLAo037Y1Fo7jQ== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 11/14] target/arm: hvf: pass through CNTHCTL_EL2 and MDCCINT_EL1 Date: Sat, 7 Mar 2026 10:06:03 +0100 Message-ID: <20260307090606.95300-12-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Info-Out: v=2.4 cv=AtjjHe9P c=1 sm=1 tr=0 ts=69abea95 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=L1bH-B2CdzmaWMF7168A:9 a=NqO74GWdXPXpGKcKHaDJD/ajO6k=:19 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfX5CqF5A3gqAjh wh+5VZYhrMVINLcfr9R9Xxk7VApI7dBkrbkfFdPiQ/IRl5nxC+JnLDhQjLHSxWEQEAbi53z7n21 1ksA99NA4Vut7CsHw0dKhEKaYV5BfVmmKU2wJYhVjdANunMQ4DbOumLFBxi7jk8LsKawpE/1/31 b2JBwfkC/1JOd5+0l71UI1/tiYfHyo3yqGa/eFpJx4iBdelg+HWFDySEWhkKnVd9Auu3FLuyKVy uNXlq+FaxqseiDRwB3b377HSHh/kyRf7JQhPAzswJF2oXjGywJCZE6exp9MjLEjp6L1BlqMJU7/ WqfvUMP8XrWsXx41MN9xL0ts75OgcAcB4PS7vg2HzzuJHv02A4q8jL6frX+2FY= X-Proofpoint-GUID: Eeie2X6u7C5b6AsogarDAlgi8KRMxjAG X-Proofpoint-ORIG-GUID: Eeie2X6u7C5b6AsogarDAlgi8KRMxjAG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=643 mlxscore=0 spamscore=0 bulkscore=0 malwarescore=0 suspectscore=0 clxscore=1030 phishscore=0 adultscore=0 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABSwtHa4cTGG5zi29xD743kLpvvaF+g0YzmNMRiHlitO5ZyKiaUY5pzBtnBPO83tR9gUOaZ5hTe48ecZBe8l/4dbk5s+qiw2Flt4GMxqT8i37xhS4t3l1vrUhyDWCXDlrU7vYcGRw0CH1wvvRrdp1T2zkFNC47UN2FcEy5+YRBX7IkkFVOBF1IXOQ2z/Ey0dU3t5UIBNDhf3LtXyg9/weSjK+N6lYQA2fB52DNfFyO0QhC7DZaAszu9UmNDMDz0oVRhNmTO5vP8P9zPvRNtRohx+7VUR/U28XBuc6Htu/yZ6g9mooKtn2oDVSnwmc9N8U+/uf7Qgg40xbRpIrlZt14xbSnWG/HA++JUnyWbbVtV9lHO69TEOx09BjhlNRriKC27UaH37bPiBLRlWnpkxAK/KhdNSg9N0fb49d2V71K8AbUK50/Hee9jzQ5dXncq9vXGc0gP7jpz2N1a4vHCq+ufLy+kylvMgGelOvZ27YNmj5hg0WajPl6tFCHzkldTvpFL22JfheQcwGJkailw1k+REIPApFbtYGCwKhAY1xbWdvAD+/fQFAmelWrbOABIK3FceMlkH4o0VJU3UuImqOdUh16K7nRhZaHWB5AUjrYNIprnPpqjN2WgrTc+jMegf8uVh8QzmVxNf5i+HPi9pRIFBUIkUFni6v5b7xcbtYcotBtxLV1RcBZSxSApCFtt3lTdfzhUPWgK7jQSleVd9f58RmdpT3ZDh8T8r6S7hU7sYbCT5OFHhbI7eBeeFldbIaj6MvUjZpIsimcyLiuSoEQor4= 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=57.103.84.152; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874532109158500 HVF traps accesses to CNTHCTL_EL2. For nested guests, HVF traps accesses to= MDCCINT_EL1. Pass through those accesses to the Hypervisor.framework library. Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/hvf/hvf.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 949c4a3431..6666d77e18 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -296,6 +296,10 @@ void hvf_arm_init_debug(void) #define SYSREG_DBGWVR15_EL1 SYSREG(2, 0, 0, 15, 6) #define SYSREG_DBGWCR15_EL1 SYSREG(2, 0, 0, 15, 7) =20 +/* EL2 registers */ +#define SYSREG_CNTHCTL_EL2 SYSREG(3, 4, 14, 1, 0) +#define SYSREG_MDCCINT_EL1 SYSREG(2, 0, 0, 2, 0) + #define WFX_IS_WFE (1 << 0) =20 #define TMR_CTL_ENABLE (1 << 0) @@ -1704,6 +1708,14 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t r= eg, uint64_t *val) case SYSREG_OSDLR_EL1: /* Dummy register */ return 0; + case SYSREG_CNTHCTL_EL2: + if (__builtin_available(macOS 15.0, *)) { + assert_hvf_ok(hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_C= NTHCTL_EL2, val)); + } + return 0; + case SYSREG_MDCCINT_EL1: + assert_hvf_ok(hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_MDCCI= NT_EL1, val)); + return 0; case SYSREG_ICC_AP0R0_EL1: case SYSREG_ICC_AP0R1_EL1: case SYSREG_ICC_AP0R2_EL1: @@ -1992,6 +2004,14 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t = reg, uint64_t val) case SYSREG_OSDLR_EL1: /* Dummy register */ return 0; + case SYSREG_CNTHCTL_EL2: + if (__builtin_available(macOS 15.0, *)) { + assert_hvf_ok(hv_vcpu_set_sys_reg(cpu->accel->fd, HV_SYS_REG_C= NTHCTL_EL2, val)); + } + return 0; + case SYSREG_MDCCINT_EL1: + assert_hvf_ok(hv_vcpu_set_sys_reg(cpu->accel->fd, HV_SYS_REG_MDCCI= NT_EL1, val)); + return 0; case SYSREG_LORC_EL1: /* Dummy register */ return 0; --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874684; cv=none; d=zohomail.com; s=zohoarc; b=LorRvC3Pud7fRR798ZCYDT7ht0QMnPipij8nMgQwX2pJA30doWHFi865Kc30jOvpfTWqZNORpoTkqX3qEYipIDUVYAXuoAJO5/bQK7BsN39vCrIQlIOOKR3Xfy/0CIdn3vCcRxqmOrkcKeq9PcTAHztyHsjMPF10ekrpX4fOME0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874684; 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=yzxkgOl2guir8XqGgTOwtCi0aepwJ3dRIj3hzOek3c4=; b=jAv/UT0G761T0Pe5zQMVfbkE3ELfbG7NYfNgLdH6XlLFhWUg27ZqaAkJL/A2MHiVvOHQogxKU3j7/bVvoG3tLlPFpFBjSKLEFFxh+XQEEA20b6VB9/NnJ9TxjsTHoza6hctNDWi7Y6OKj0902iG58+YYgSa3P/PxG/JpcUF3avc= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874684606702.1750692972179; Sat, 7 Mar 2026 01:11:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncT-0006s6-Kb; Sat, 07 Mar 2026 04:06:45 -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 1vyncP-0006nt-8G for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:41 -0500 Received: from qs-2001l-snip4-11.eps.apple.com ([57.103.87.123] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyncK-000164-HV for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:40 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id BA0021800408; Sat, 7 Mar 2026 09:06:29 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id C71851800124; Sat, 7 Mar 2026 09:06:27 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874392; x=1775466392; bh=yzxkgOl2guir8XqGgTOwtCi0aepwJ3dRIj3hzOek3c4=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=Lnyp6mPiKfERdNKoUnqdf6h9mdIdFzbO2xaADQkgTrJBttwA+WvTfccY0QAUJ1h9Avw0i4xOYhlVdnRyha+F6MZOoSO7cOQCWO6TmtsqNby1GuOIq5w2Fd8MAT6idT1+0GZmNzl4M7ySOBhqhTMiGu/rp5xtRgtx4pclNdzAsy19QWU83Zx1KCrN0CH2i4FuRE1qo9wjDRXVux4o3iJSjd4BXCWvlNweUlUmStvRlsiGlghXpG5W95wOjbEDY6sM3O5A9j5O/MICqu1HGHtWxzsMuapxZM21RPKgeOPfkuOV0OfHAyifcE2U7lc3kowU2Ci1hwL6WIUgV35KRccrPA== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 12/14] hvf: arm: disable SME when nested virt is active Date: Sat, 7 Mar 2026 10:06:04 +0100 Message-ID: <20260307090606.95300-13-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: s1FhqoIQHqJ5W6-QRbrIU2lpmomIoL7v X-Authority-Info-Out: v=2.4 cv=Qblrf8bv c=1 sm=1 tr=0 ts=69abea96 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=h9724yil-ocX87RSi0QA:9 a=NqO74GWdXPXpGKcKHaDJD/ajO6k=:19 X-Proofpoint-ORIG-GUID: s1FhqoIQHqJ5W6-QRbrIU2lpmomIoL7v X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfX76rzzUEScLuG zv8OvddAGyT5XJ4pzpS9MJ/0wUzAdoa0lSz3ENbTRsz/30bcR2PtHaN7BDvun0MeqAywFB6Ji/l SAuNodAt2crhLSbNKAUcDRijDUokJF7Ws6ulBEcj8pG+TWnQ0iMXX8pbsmrclEqQ6KOlTXR6HtD CuJnOpZojDGxJJDL3XHPtl83kneAQrulz1aemvMcIH8D2tKSHZQ7sy+IblhTKnUX2UtIEnJ270q m7vpKRc4BCu/xsFHfBXEfx0piBJoJtuOTVtNcGuptyVZzBEm2AffcAyIQ7/aGEvKlbwTi2SMwN4 fekP/cJltqgzSvI5B5TW+/O8D+Bv3RcGEU0pha6yR65JUQ8FakkK3wJ4HRFk+A= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 adultscore=0 malwarescore=0 mlxscore=0 suspectscore=0 clxscore=1030 mlxlogscore=859 phishscore=0 spamscore=0 bulkscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABXFWmQL4DLTAU+5bKSmU8/hegSIMKerwd8ky2IQ6iHBg3RxSH4QkiwMi2oi+RLGKZAdhXMjByE8wDCE/FJoJwYNJNxGsad+S2jjRuiwHb4U6hMQaheU8CNhJeTkFbZvsTssiXasE/gVycjEejo85FVkuplC1+/pB1tXXqbVffXlZ33+0r6YGTSUTK408IP80A7P/SxcwQcNDVOynhGaWI0dYeoqbeT/mSbRN5Uw4EzDzUk2CphEleMd/yzh8Ssi5LuVaS59Y/jdA0O8g7eqVEv5EOdQJzRKF6aF7Ft+XDevY8YKAM052gs3as/5ivJW4GT/1yYcK+vej+tJ49Y+3cWWHidtA8FACMZUYE3RWe/tWNEmACdFKnpKGo8hdpsBD9i5RQAIytrPRqWqt9aQeuHTvrD+mtTlGawl/OUZZxfp7RDG8ScF3lOAEqpGdprJ02opfHjiwzj93IGiYKHm7dbndjxW512z3U16nDIBdLyYWLtVngqqRLb7Je/9pbEIK3MrQYDxpjwILpihgNepByQvT8KmqEGvs8sczHEwNPHF3C8cmt9Nn2jECpfY8dmFi+xt1UbGCifc/XYfZWaqRZnh00Fo8QBzHoX0dJsEMgtsaRQWJn34a+VQF7AKPKC4hhaxIv+iZ0OJ38hibjKw5qy9tbPeQ7nsi4HpwUwuaGNJIAJy8a9VrEqIUprZ2WyUBxxWCzz4fIMw3cgPs9kcOXhc3taxetTijEUeKWTgAlLpdi5zV//5v7+Q== 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=57.103.87.123; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874686839158500 Content-Type: text/plain; charset="utf-8" Currently, Apple doesn't support the nested virtualisation + SME combinatio= n. Signed-off-by: Mohamed Mediouni --- target/arm/hvf/hvf.c | 3 +++ target/arm/hvf_arm.h | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 6666d77e18..2cb4c4aa4e 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1189,6 +1189,9 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUF= eatures *ahcf) =20 if (hvf_nested_virt_enabled()) { FIELD_DP64_IDREG(&host_isar, ID_AA64DFR0, PMUVER, 0x1); + /* SME is not implemented with nested virt on the Apple side */ + SET_IDREG(&host_isar, ID_AA64PFR1, + GET_IDREG(&host_isar, ID_AA64PFR1) & ~R_ID_AA64PFR1_SME_MASK= ); } =20 ahcf->isar =3D host_isar; diff --git a/target/arm/hvf_arm.h b/target/arm/hvf_arm.h index 6b1c3b9792..9cb58ad9ab 100644 --- a/target/arm/hvf_arm.h +++ b/target/arm/hvf_arm.h @@ -11,6 +11,7 @@ #ifndef QEMU_HVF_ARM_H #define QEMU_HVF_ARM_H =20 +#include "system/hvf.h" #include "target/arm/cpu-qom.h" =20 /** @@ -35,6 +36,10 @@ void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu); if (__builtin_available(macOS 15.2, *)) { size_t svl_bytes; hv_return_t result =3D hv_sme_config_get_max_svl_bytes(&svl_by= tes); + /* Nested virt not supported together with SME right now. */ + if (hvf_nested_virt_enabled()) { + return false; + } if (result =3D=3D HV_UNSUPPORTED) { return false; } --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874660; cv=none; d=zohomail.com; s=zohoarc; b=EsraTy2s5mitZPPTe3wLB/hwdg9VUDD1h8RK6RrTbV/33UQWbqTUiaF9Q8ShIrZp5OB654q2Qha6c82DXSBi8oN/90902brDpZlCPDktJIZjwtOQwuHJbJz8MKM6tykiX8Puud60tGs9LEd1nAk9IIvh6/jIkLZyzfaNn8wJRs4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874660; h=Content-Type: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=ijV/TFHDkMx/sDtjnbI4Tcf5/3qsWHHZ7tvtB+wJk+k=; b=m/neeaGZZAOmgNS4v9dZZgU1hK49xxzPFwRKMuj5Erh/zaJv6vykvYXCjs0pRW/GG272Q5B/aN5CZjH4TUv8dwFjyQbZVws6uiGxsbOrkObyhLms0fI6tKQEf0/xp14rUj5zm6ojrO6sFMoBhuNeNcZPYqaHGcwCMwrZQ8EDc+8= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874660715510.9056575769207; Sat, 7 Mar 2026 01:11:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncZ-00073D-GF; Sat, 07 Mar 2026 04:06:51 -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 1vyncR-0006ow-FE for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:43 -0500 Received: from qs-2001d-snip4-1.eps.apple.com ([57.103.87.34] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyncM-00016n-UE for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:42 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 502EA180013C; Sat, 7 Mar 2026 09:06:31 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id 574181800402; Sat, 7 Mar 2026 09:06:29 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874394; x=1775466394; bh=ijV/TFHDkMx/sDtjnbI4Tcf5/3qsWHHZ7tvtB+wJk+k=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=GEo8ndkg3WVssGC5Jo7tbBctYgWZjOJ3Vz2hyUEAV1EeXXkiJUQ1TDOxzw9dz8ndSs5BEmjtR7IaMfPbopzOefXL5KYNnwKIwrXVmCKbGqGeWd5nsOOzZnDEYjfKtiJgi8XWDDSdjOC4xszxU1Ta58+FayiNjz4bUJT7V3OKZIQyp/qm37eEtVcBnIseVAmce9olirwFFwBwLH6CRLmvE7zzeFQjIBa+DXprJ8F2IEiW19FpXqDUrpVukbaFRc0neUdrb87Bkp1h74OvA+D2Jjxx7tAYY+PYRgtgjghg682/+A5Rdv/FIOAJ+vIqmiQN9c45rA7g//GCTH3BNHVpfw== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 13/14] hvf: enable nested virtualisation support Date: Sat, 7 Mar 2026 10:06:05 +0100 Message-ID: <20260307090606.95300-14-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: UYmpPHKUVrPIofjuwGuC0lEmC9VpQxJU X-Proofpoint-GUID: UYmpPHKUVrPIofjuwGuC0lEmC9VpQxJU X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfX8eYPu7YVmCdB 1QWXGRZ1/NR8Di4rrMvQS9O+pLQdg/ztIPeowVoLbthwzX4gsbJkgJWLGPeD4RxIVRq4NKPIcMN glIgmf1bMBcQNppQfB9WIaEjQTDGHCXe6v6TF3fgvGuTkMOkU8I6OOA46JUA524HxJ6gwU534Lh 7GkGBAIQCmfR/dzSsU7354ASLyr13kE2kp0jzXsC/IhoWjeDLq3mKtWsZKxU7aDOaA/fE/C/0nP JYJf2FWMZdmTzQ9yXhWqJWUUM6nMsbyVBIQmVLB7HUMTSHydTuwa3DQqTtxy2I7OguFwyImAJjx +OEHQp1V9aEbGZ9zaQkr+e/8VKHbZaQbOl+4y0pMuqWKd8oD4CwugwsqzUqmpM= X-Authority-Info-Out: v=2.4 cv=DMeCIiNb c=1 sm=1 tr=0 ts=69abea98 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=5Chse3eIq3h0lgOaJ4gA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 malwarescore=0 adultscore=0 spamscore=0 mlxlogscore=981 phishscore=0 bulkscore=0 clxscore=1030 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABFeFRUEZYCpEE9TpLA/6SKuqfY7XyVHX/PMbtCzpxCpPY46ctIFWm0AK1iNucOu08EJLATTQLejY1R8VGzG4/Z5HbgjVxRuCtV/1K+6YevyTUG0uoWqkQyCkXg3Q7PxA4AKyXTsm8sboiDOGT0Z2IjHz+7yTXa+KeJqln/95NGy9ZYqepSvf8r5QYYYstKfZQsWFhFFuEzlv3o3Cl+zCzrnGnzRouGFw1YUJ9qMemK2WOI1iRPmI7ltCaUx54G/BNodrgLmGDLVUfgWLgqwbDynmxcKwjtR3NFSHJB0lMXd90PeHXPIHcODS4XqQG6WeNXu2Yy56eXOFFLv/krbbkaZcqXZFSAm0QzJjNsnYE4fLMO5gtCGvNY5y4EC9HyK59zVfrCNQmgHy1nEvl+WpgItvDAhsUzl1boxDZVJGvL9jg63FANfw0MJE8pBi9DzNyPwEbst39ajNi7LYmkDAzf1FUm2l6DrgFgkj0V2yZ+tb5r5304vqVdBrgmgvve8eIvDizmxhsyi0dgLA1OFSa66h3x0q2qNhsLQxZvz9H3yyAxJZi50EL57DaPFHxUNFnRHXC6ZCOV8m1x5aTLds4WpZRrNo1GHQwm3blv6YmKDB0ETNErmttQFSigXxnTppB5sktzo7xakQToHlkzR0RrT9Pdd2doRw3q/kse7ga74OCqj5i9Nya+jwIHMhRQQT1lsxAFBwRVuWfvbwJin+3rT5SNKE0pH1+JWjr0sQMZRIz6z+kVLE= 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=57.103.87.34; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874662462158500 Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/virt.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 90769936d0..bced9f67f4 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2393,13 +2393,20 @@ static void machvirt_init(MachineState *machine) exit(1); } =20 - if (vms->virt && !kvm_enabled() && !tcg_enabled() && !qtest_enabled())= { + if (vms->virt && !kvm_enabled() && !tcg_enabled() + && !hvf_enabled() && !qtest_enabled()) { error_report("mach-virt: %s does not support providing " "Virtualization extensions to the guest CPU", current_accel_name()); exit(1); } =20 + if (vms->virt && hvf_enabled() && !hvf_irqchip_in_kernel()) { + error_report("mach-virt: For HVF and Virtualization extensions " + "only kernel-irqchip=3Don is currently supported"); + exit(1); + } + if (vms->mte && hvf_enabled()) { error_report("mach-virt: %s does not support providing " "MTE to the guest CPU", --=20 2.50.1 (Apple Git-155) From nobody Mon Apr 13 09:22:57 2026 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1772874480; cv=none; d=zohomail.com; s=zohoarc; b=M/52CSC6WKSKe+yOlcPMCt4Zi/JwCjARhr9fLwTmwv77IU0SqzOrZ93EK+SxzQnADZZHCVp08F4evmgtu7pMBA2hpmjMhJXY5kMmd5kyGZvPu1ALqL0twvpaFg4IOKFf7Djvf/RktIgjVYOzMrZxTQpqxARGknc6liJuSS7G1h4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772874480; 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=hle0o+U/f2vujv/4zDDblnnwIkB2kG2UZAlEYajCDCM=; b=kGXi40Y0uSUuz49tLLsMrqsKSvz61hOEfCABUUA1Pd2hAXFrt+Iee5lR4dv2Y8Weq4fi+0Vu/Xm+29YtR/gQxvGwnoG/ae+1b8YA4XMUVJu1UMMmHJofVQE/SKvuydPBdR+jF0Ef3rvnrVzUZr9GVS5HyrM7t1k1FLgH9D5ccbY= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772874480935109.79955462414864; Sat, 7 Mar 2026 01:08:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyncW-0006xJ-7i; Sat, 07 Mar 2026 04:06:48 -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 1vyncP-0006oN-Oo for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:41 -0500 Received: from qs-2001k-snip4-6.eps.apple.com ([57.103.87.109] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyncM-00017k-S0 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 04:06:41 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id D8CA1180010B; Sat, 7 Mar 2026 09:06:32 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id D88A21800128; Sat, 7 Mar 2026 09:06:30 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1772874395; x=1775466395; bh=hle0o+U/f2vujv/4zDDblnnwIkB2kG2UZAlEYajCDCM=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=VuTb0qKXPWc5yeF6Y8q6gWJ1myorLin0J5cl9MRkzn5grmUezb4gyUCl10rXxkfhpmA5SgLDZIE4YdWWfMCqZg1IfT/gd3+fCG82j+RNB7BSMp/ObFT4sE11ebp3J3QyogrnRoW5TNo/YNtfAAzakfzzapSHHeLIatXRsmjJ9ZRGHdyi94zwrhfjLjUyAzEiKpqwME5UfTq1SgJnwv6UCXoqW65bQkxzYbzyspkArrS9efQ/CJSiLM28u0fRuNS2+EtYMomJ0GqTClIRzc4WYfQOk5S31qAoWEDk2KMpADtGVSwTKRpcR048EpfZ+fCL6AcGSe2B8jA8WhL6qHflbg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Phil Dennis-Jordan , Roman Bolshakov , Mads Ynddal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Manos Pitsidianakis , qemu-arm@nongnu.org, Mohamed Mediouni Subject: [PATCH v17 14/14] hvf: arm: move SME2 registers to common hvf_sreg structure Date: Sat, 7 Mar 2026 10:06:06 +0100 Message-ID: <20260307090606.95300-15-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260307090606.95300-1-mohamed@unpredictable.fr> References: <20260307090606.95300-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Info-Out: v=2.4 cv=KJ5XzVFo c=1 sm=1 tr=0 ts=69abea99 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=FlfE2Sm0emw1bnAL0rsA:9 X-Proofpoint-GUID: CcphG2fXQYfWYs0CYQRWozs6OY-Nbxnc X-Proofpoint-ORIG-GUID: CcphG2fXQYfWYs0CYQRWozs6OY-Nbxnc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA3MDA4MyBTYWx0ZWRfX88R+kRNsX497 c8XKNbYPcgZj+xACVSJm/LK5T+fkTzQJCWY4FId9k7FmqcDywEQOephxW9TpnHXeQi5xkN0gKul suejvncneWe2CgIwpW4izQuWpRsGX8rtRrcxAYfosDSiBw1ay0Kj32NEkSexlycSyG0mw7rjRVu v8UPY9s1HOo/2LxuYi4xjbFUnGzcCnT85Q99tjmZms+ZxE1tCa7CZdNxg/E3co2gkaLUMH5xBD7 Rjh/TcDHax2JvQDFKw9s/ZU4OdH2Ga3rKqNIzFx0aqkpBwIsrZ/OQGV4rqRNfUr/byUDso7IsMz Iwc2+y1Y2ZpqO5KIzLEnF6TlQ6X37fAkbDyDx4oeeBShfYEX0W3SCKTttPip2Q= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-07_03,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 clxscore=1030 mlxscore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=999 spamscore=0 phishscore=0 malwarescore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603070083 X-JNJ: AAAAAAABOFDvImjSZZ9xxlXTqQRyLdOuuAbKWhkFzJk8qS5DKBmAXV1o9s2hpg04ihO5/sQDIV5iEAiyU1LzfdhaxLC7Ha5qAwB9MhCeXNk5YS03EQDy3L62d6PFu4N/To29ovaQRiLbDEFoFOWqEhL0HSkZIijggrexVjv1zet0UFpwMBf+cmEpShA0klnyoENeQOzL3zxlt/JlU8rszWrmqfAnac1t1rEcfcPOES1XFFiHR/NEfmmonv7dY9JlY7giIIFOvWWq5pgh6QfkJroCr0NEPq01IyfwbwYAIZzV8TuBtG4VPVdXpSa4Q2glK8ZtUMYNnG3+iE+UxlhyZ+f5zNs4cTJPqK/9EIcDAOTwCR4ZTtFU2zq4S0q/zdviF1vVgFbrHVV+/4lS2Geq2yPvHvgfJRHMgozkKMavImhHREHG6HpUHIWdTOsku0k5CICM68awXJOIGDpHx5VIj9uAMs8pBcnDs8EqR52RFNpfFIhB/sMpms4+aG6phGa1lE734jvVR+wqaF2LOU42qqKye0DYhU91RZEpJmGtOp25Tcy2XMthKitoRA40J2KZxAMERv0e7I4hxeHuYVgtF/hugyaCrXgB6FJ5RXSnTgQLW4bcA59LoMQ1t14tBmK7CtK78lHA86LtrnXQRutIHBRt108JFnUINP7d7XXl13vqEAckBjAXVyEd9gAcTs6S51dx4XJJSiXRzxE0J2adyHN+lztAXJDIqx0DrQBtWSlVl6fzNNuVL/mURpHM49bkDQ== 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=57.103.87.109; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @unpredictable.fr) X-ZM-MESSAGEID: 1772874482973158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Mohamed Mediouni --- target/arm/hvf/hvf.c | 77 +++++++++++-------------------------- target/arm/hvf/sysreg.c.inc | 14 +++---- 2 files changed, 29 insertions(+), 62 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 2cb4c4aa4e..4630d76930 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -481,7 +481,9 @@ static const struct hvf_reg_match hvf_sme2_preg_match[]= =3D { =20 #define DEF_SYSREG(HVF_ID, ...) \ QEMU_BUILD_BUG_ON(HVF_ID !=3D KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARG= S__))); -#define DEF_SYSREG_15_02(...) + +#define DEF_SYSREG_SME2(HVF_ID, ...) \ + QEMU_BUILD_BUG_ON(HVF_ID !=3D KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARG= S__))); =20 #define DEF_SYSREG_EL2(HVF_ID, ...) \ QEMU_BUILD_BUG_ON(HVF_ID !=3D KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARG= S__))); @@ -495,13 +497,13 @@ static const struct hvf_reg_match hvf_sme2_preg_match= [] =3D { #include "sysreg.c.inc" =20 #undef DEF_SYSREG -#undef DEF_SYSREG_15_02 +#undef DEF_SYSREG_SME2 #undef DEF_SYSREG_EL2 #undef DEF_SYSREG_VGIC #undef DEF_SYSREG_VGIC_EL2 =20 #define DEF_SYSREG(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID}, -#define DEF_SYSREG_15_02(...) +#define DEF_SYSREG_SME2(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID, .sme2 = =3D true}, #define DEF_SYSREG_EL2(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID, .el2 =3D= true}, #define DEF_SYSREG_VGIC(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID, .vgic = =3D true}, #define DEF_SYSREG_VGIC_EL2(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID, tru= e, true}, @@ -510,6 +512,7 @@ struct hvf_sreg { hv_sys_reg_t sreg; bool vgic; bool el2; + bool sme2; }; =20 static struct hvf_sreg hvf_sreg_list[] =3D { @@ -517,30 +520,13 @@ static struct hvf_sreg hvf_sreg_list[] =3D { }; =20 #undef DEF_SYSREG -#undef DEF_SYSREG_15_02 +#undef DEF_SYSREG_SME2 #undef DEF_SYSREG_EL2 #undef DEF_SYSREG_VGIC #undef DEF_SYSREG_VGIC_EL2 =20 #pragma clang diagnostic pop =20 -#define DEF_SYSREG(...) -#define DEF_SYSREG_15_02(HVF_ID, op0, op1, crn, crm, op2) {HVF_ID}, -#define DEF_SYSREG_EL2(...) -#define DEF_SYSREG_VGIC(...) -#define DEF_SYSREG_VGIC_EL2(...) - -API_AVAILABLE(macos(15.2)) -static struct hvf_sreg hvf_sreg_list_sme2[] =3D { -#include "sysreg.c.inc" -}; - -#undef DEF_SYSREG -#undef DEF_SYSREG_15_02 -#undef DEF_SYSREG_EL2 -#undef DEF_SYSREG_VGIC -#undef DEF_SYSREG_VGIC_EL2 - /* * For FEAT_SME2 migration, we need to store PSTATE.{SM,ZA} bits which are * accessible with the SVCR pseudo-register. However, in the HVF API this = is @@ -1357,23 +1343,11 @@ int hvf_arch_init_vcpu(CPUState *cpu) hv_return_t ret; int i; =20 - if (__builtin_available(macOS 15.2, *)) { - if (hvf_arm_sme2_supported()) { - sregs_match_len +=3D ARRAY_SIZE(hvf_sreg_list_sme2) + 1; - } - -#define DEF_SYSREG_15_02(HVF_ID, ...) \ - g_assert(HVF_ID =3D=3D KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARGS= __))); -#define DEF_SYSREG(...) -#define DEF_SYSREG_EL2(...) -#define DEF_SYSREG_VGIC(...) -#define DEF_SYSREG_VGIC_EL2(...) - -#include "sysreg.c.inc" - -#undef DEF_SYSREG -#undef DEF_SYSREG_15_02 + if (hvf_arm_sme2_supported()) { + /* SVCR will be added at the end. */ + sregs_match_len +=3D 1; } + env->aarch64 =3D true; =20 /* system count frequency sanity check */ @@ -1408,31 +1382,24 @@ int hvf_arch_init_vcpu(CPUState *cpu) continue; } =20 + if (hvf_sreg_list[i].sme2 && !hvf_arm_sme2_supported()) { + continue; + } + if (ri) { assert(!(ri->type & ARM_CP_NO_RAW)); arm_cpu->cpreg_indexes[sregs_cnt++] =3D kvm_id; } } - if (__builtin_available(macOS 15.2, *)) { - if (hvf_arm_sme2_supported()) { - for (i =3D 0; i < ARRAY_SIZE(hvf_sreg_list_sme2); i++) { - hv_sys_reg_t hvf_id =3D hvf_sreg_list_sme2[i].sreg; - uint64_t kvm_id =3D HVF_TO_KVMID(hvf_id); - uint32_t key =3D kvm_to_cpreg_id(kvm_id); - const ARMCPRegInfo *ri =3D get_arm_cp_reginfo(arm_cpu->cp_= regs, key); =20 - if (ri) { - assert(!(ri->type & ARM_CP_NO_RAW)); - arm_cpu->cpreg_indexes[sregs_cnt++] =3D kvm_id; - } - } - /* - * Add SVCR last. It is elsewhere assumed its index is after - * hvf_sreg_list and hvf_sreg_list_sme2. - */ - arm_cpu->cpreg_indexes[sregs_cnt++] =3D HVF_TO_KVMID(SVCR); - } + if (hvf_arm_sme2_supported()) { + /* + * Add SVCR last. It is elsewhere assumed its index is after + * hvf_sreg_list. + */ + arm_cpu->cpreg_indexes[sregs_cnt++] =3D HVF_TO_KVMID(SVCR); } + arm_cpu->cpreg_array_len =3D sregs_cnt; arm_cpu->cpreg_vmstate_array_len =3D sregs_cnt; =20 diff --git a/target/arm/hvf/sysreg.c.inc b/target/arm/hvf/sysreg.c.inc index c11dbf274e..2d29c2feec 100644 --- a/target/arm/hvf/sysreg.c.inc +++ b/target/arm/hvf/sysreg.c.inc @@ -146,13 +146,13 @@ DEF_SYSREG(HV_SYS_REG_CNTV_CTL_EL0, 3, 3, 14, 3, 1) DEF_SYSREG(HV_SYS_REG_CNTV_CVAL_EL0, 3, 3, 14, 3, 2) DEF_SYSREG(HV_SYS_REG_SP_EL1, 3, 4, 4, 1, 0) =20 -DEF_SYSREG_15_02(HV_SYS_REG_SMCR_EL1, 3, 0, 1, 2, 6) -DEF_SYSREG_15_02(HV_SYS_REG_SMPRI_EL1, 3, 0, 1, 2, 4) -DEF_SYSREG_15_02(HV_SYS_REG_TPIDR2_EL0, 3, 3, 13, 0, 5) -DEF_SYSREG_15_02(HV_SYS_REG_ID_AA64ZFR0_EL1, 3, 0, 0, 4, 4) -DEF_SYSREG_15_02(HV_SYS_REG_ID_AA64SMFR0_EL1, 3, 0, 0, 4, 5) -DEF_SYSREG_15_02(HV_SYS_REG_SMPRI_EL1, 3, 0, 1, 2, 4) -DEF_SYSREG_15_02(HV_SYS_REG_SMCR_EL1, 3, 0, 1, 2, 6) +DEF_SYSREG_SME2(HV_SYS_REG_SMCR_EL1, 3, 0, 1, 2, 6) +DEF_SYSREG_SME2(HV_SYS_REG_SMPRI_EL1, 3, 0, 1, 2, 4) +DEF_SYSREG_SME2(HV_SYS_REG_TPIDR2_EL0, 3, 3, 13, 0, 5) +DEF_SYSREG_SME2(HV_SYS_REG_ID_AA64ZFR0_EL1, 3, 0, 0, 4, 4) +DEF_SYSREG_SME2(HV_SYS_REG_ID_AA64SMFR0_EL1, 3, 0, 0, 4, 5) +DEF_SYSREG_SME2(HV_SYS_REG_SMPRI_EL1, 3, 0, 1, 2, 4) +DEF_SYSREG_SME2(HV_SYS_REG_SMCR_EL1, 3, 0, 1, 2, 6) /* * Block these because of the same issue as virtual counters in * that caused the revert in 28b0ed32b32c7e5094cf2f1ec9c0645c65fad2aa --=20 2.50.1 (Apple Git-155)