From nobody Thu Jan 8 13:17:12 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=1767053189; cv=none; d=zohomail.com; s=zohoarc; b=lT/LyaJW7lTG/cjSHWhpJ/Un+3MAOqZkjqLW2+rO+Bt5hl77W+12tEQS/it6Z7PcvxsIzRAvcNaSzMht8VU//d9843rwCQ45D2q0+Pdtt6IE9A+IB9sKLbJlQDI2c6Bwq+CG9SNze4+42c1BOj9DmisA0szoewhIlXQrUHLNd08= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767053189; 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=I0HpQlmLeMnsVhsgmIJRE/DJeIbftWJyZSQLdGKoz3c=; b=KNj8Ob1MXav/42st6m+kYggxbKB+kb4gNqz8JZskFSqLM4XZLGZbxYoqsLLlQrcZzfPqaIcTS+b+BHWIuRbEIxz8mYLu/xuj9XPwYg3uLjz4Mh/M33VGB9ZpEGo8raoA8YVoPGkUkNbAAPmiEK/FuaeE17AdtCDya9IAgzSaujg= 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 1767053189784717.8746695203109; Mon, 29 Dec 2025 16:06:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vaNEL-0006Bx-DR; Mon, 29 Dec 2025 19:04:57 -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 1vaNEH-0006AJ-4M for qemu-devel@nongnu.org; Mon, 29 Dec 2025 19:04:49 -0500 Received: from p-east2-cluster6-host9-snip4-2.eps.apple.com ([57.103.76.193] helo=outbound.st.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vaNEF-0003hX-7B for qemu-devel@nongnu.org; Mon, 29 Dec 2025 19:04:48 -0500 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-60-percent-9 (Postfix) with ESMTPS id 2A6551800470; Tue, 30 Dec 2025 00:04:44 +0000 (UTC) Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-60-percent-9 (Postfix) with ESMTPSA id B8FCD180044B; Tue, 30 Dec 2025 00:04:39 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=I0HpQlmLeMnsVhsgmIJRE/DJeIbftWJyZSQLdGKoz3c=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=OWR488ZcLaMoncq8goHO+8O0uO41kv2m3nCeJ1AiPqcBKq+KCwXsI92ubvjQLtq8M9QXd9jRJ7e5W34Vqd3Cd6jdcqwbaqxrbD3eUTTO1veCFEFaBG1fJWp/w83uY4Pu7Lc8Ocs2Ne2l0UmMV+GT2TW4XY1USzLneEpoAWim9fnIVb10cw0fRRCe1y9Q4GSaWJgkmwKLcYdgTyqEI4mtwsbxYPE2t2PeMINvGO3MOS+XHRAEBgNLM46An1krYqHip2Gvzw4QgwwKo+S8QY+GqB/RDqLrEjb8FlIsUOf20Je5NVFOt9P4uEJY3WuqyrCB1Wk/iu+miGn8sWmdg9pQDw== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: mohamed@unpredictable.fr, qemu-devel@nongnu.org Cc: Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Michael S. Tsirkin" , Akihiko Odaki , Eduardo Habkost , Mads Ynddal , Roman Bolshakov , Peter Xu , Shannon Zhao , Pedro Barbuda , Peter Maydell , Cameron Esfahani , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Igor Mammedov , Zhao Liu , Phil Dennis-Jordan , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ani Sinha , Paolo Bonzini , Alexander Graf , Marcel Apfelbaum , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Pierrick Bouvier Subject: [PATCH v13 06/28] hw/arm: virt: cleanly fail on attempt to use the platform vGIC together with ITS Date: Tue, 30 Dec 2025 01:03:38 +0100 Message-ID: <20251230000401.72124-7-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251230000401.72124-1-mohamed@unpredictable.fr> References: <20251230000401.72124-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: L3f12YKyspPzAI4_m2hxj9qtLvBupGlY X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjI5MDIyMiBTYWx0ZWRfX+HLgOnrpmZkW Zph7wVlFZ9XJj3SVTVdHntyPUT4BIyAxQMokEfDzguatu/EFaCogeuSoFlyCLYaWC2cas0RXi05 KK45e+IV6KgGX8Iv3NKKCNlyvv0UrtVc8fzMsPHkQBx55D2nB5J3pRtQoyvmkF13iwRYoo9MzOE JIk7i9nnCCgBWY6xZmJEpgfbLuvE6q9MX0hHrzP55BwB2RnIBCsxWCiAloHx18mCIeoYgfjn/AD BDOWr45Dm+qAekL28uK+xnybjMpIa7hF+X2XGMbDq/BY/Rp5FYVO1DRS2xrbc/nk68/dBgbo8Pb s0dh2XU1tV2WhYlWsRy X-Authority-Info: v=2.4 cv=SLJPlevH c=1 sm=1 tr=0 ts=6953171c cx=c_apl:c_pps a=YrL12D//S6tul8v/L+6tKg==:117 a=YrL12D//S6tul8v/L+6tKg==:17 a=065Y4zqepXN3nrMe:21 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=eCCvHKTOcc9AFgEG6kwA:9 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: L3f12YKyspPzAI4_m2hxj9qtLvBupGlY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-29_07,2025-12-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 clxscore=1030 spamscore=0 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512290222 X-JNJ: AAAAAAABEO2s6sGoWyzZvFjF4ks0ANEB0LFbKrO66pNy8gU9wwvjRnYizKFLFa1mzGLSxHO+Q2lmTVOXBCRd2mDHbUQvGn8dzyuepYtNLSlTHblC4mXkiBdZ6Cy2o6KixS9+Aut+3mbJhINEiyoSacIYM1RwDn9A4rFVFrmaU6Dx/Bfix3QtxwtdiNYWcSpHGbENE/ShIflaF2H3EoicXnft0EbauknZuGUjwbaQKcuhpow/5fodM2tYUib9s04QeopkYJwS2pyGQ+qIXFDQu93HNd8Ngg7lDXu5mW8M/rAzJFmJisfuL/gen2Rg4i2MrDPAqrv0KlIhAMIFsp+LKp8PdrdnA3Jp5V79lhYt6P1oW0VPJPbXtmSLbDWNi1nq6FgTcUIhoh+swP4Ys+1WM/TLXRRmF+eMozLemyZs2BU28dPkhRGyScBwmRXOT6orHXeho7KDFmRL3I3qB+rHtjMKR1fQTk5b71dgwG4yIQKz5rJgZE0QYwfjmim9bj+C/GDl5ahhUDNz3ff2Brq9YLZunbqj972AuDNeoLY/UO1BQqwe/LRZL5AL6JduxxgHrJDUrctfIxOXGesMeVy6q1vqpUIexvlEP9TCvEFjDyfIPYMie1kumDUwKScb7VyzZueg/HtGeJSwmqpfYZt/UPfBhmi+M9/6eHGPZfwAUXl5OVSlp3H3vYfier2/Gcj1F8haqyfXixfIxKQcrcGEVmknArux2QhnY8EkBYgXtFIoaVTz+L+2K4AERwTGZMpdn92FlFK4kDIADPbRTgRi3T4luuJTNxBqOdJyw93o4agySSuF0BAgD3e+VPMzhzx8fppQ9c1IJwLLcGiS3GnhjvYOUtR1fXOxKZ+iWPV/vgtCdMAOHe9iB1pc8PdW9TTOVJoIRmnbBpQdIu/IyKmed8d74MApmApuFj2TCwK5CU1lKAI036/fUOfKIpjCIktT4hs6zF1H94esoymQ 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 (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.76.193; envelope-from=mohamed@unpredictable.fr; helo=outbound.st.icloud.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1767053190630158500 Content-Type: text/plain; charset="utf-8" Switch its to a tristate. Windows Hypervisor Platform's vGIC doesn't support ITS. Deal with this by reporting to the user and exiting. Regular configuration: GICv3 + ITS New default configuration with WHPX: GICv3 with GICv2m And its=3Doff explicitly for the newest machine version: GICv3 + GICv2m Signed-off-by: Mohamed Mediouni Reviewed-by: Pierrick Bouvier --- hw/arm/virt-acpi-build.c | 14 ++++++------ hw/arm/virt.c | 46 +++++++++++++++++++++++++++++++--------- include/hw/arm/virt.h | 4 +++- 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 40ea6b6dd5..86024a1a73 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -473,7 +473,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) nb_nodes =3D num_smmus + 1; /* RC and SMMUv3 */ rc_mapping_count =3D rc_smmu_idmaps_len; =20 - if (vms->its) { + if (virt_is_its_enabled(vms)) { /* * Knowing the ID ranges from the RC to the SMMU, it's possibl= e to * determine the ID ranges from RC that go directly to ITS. @@ -484,7 +484,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) rc_mapping_count +=3D rc_its_idmaps->len; } } else { - if (vms->its) { + if (virt_is_its_enabled(vms)) { nb_nodes =3D 2; /* RC and ITS */ rc_mapping_count =3D 1; /* Direct map to ITS */ } else { @@ -499,7 +499,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) build_append_int_noprefix(table_data, IORT_NODE_OFFSET, 4); build_append_int_noprefix(table_data, 0, 4); /* Reserved */ =20 - if (vms->its) { + if (virt_is_its_enabled(vms)) { /* Table 12 ITS Group Format */ build_append_int_noprefix(table_data, 0 /* ITS Group */, 1); /* Ty= pe */ node_size =3D 20 /* fixed header size */ + 4 /* 1 GIC ITS Identif= ier */; @@ -518,7 +518,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) int smmu_mapping_count, offset_to_id_array; int irq =3D sdev->irq; =20 - if (vms->its) { + if (virt_is_its_enabled(vms)) { smmu_mapping_count =3D 1; /* ITS Group node */ offset_to_id_array =3D SMMU_V3_ENTRY_SIZE; /* Just after the h= eader */ } else { @@ -611,7 +611,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) } } =20 - if (vms->its) { + if (virt_is_its_enabled(vms)) { /* * Map bypassed (don't go through the SMMU) RIDs (input) to * ITS Group node directly: RC -> ITS. @@ -946,7 +946,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) memmap[VIRT_HIGH_GIC_REDIST2].si= ze); } =20 - if (vms->its) { + if (virt_is_its_enabled(vms)) { /* * ACPI spec, Revision 6.0 Errata A * (original 6.0 definition has invalid Length) @@ -962,7 +962,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) } } =20 - if (!(vms->gic_version !=3D VIRT_GIC_VERSION_2 && vms->its) + if (!(vms->gic_version !=3D VIRT_GIC_VERSION_2 && virt_is_its_enabled(= vms)) && !vms->no_gicv3_with_gicv2m) { const uint16_t spi_base =3D vms->irqmap[VIRT_GIC_V2M] + ARM_SPI_BA= SE; =20 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0fb8dcb07d..dcdb740586 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -737,7 +737,7 @@ static void create_its(VirtMachineState *vms) { DeviceState *dev; =20 - assert(vms->its); + assert(virt_is_its_enabled(vms)); if (!kvm_irqchip_in_kernel() && !vms->tcg_its) { /* * Do nothing if ITS is neither supported by the host nor emulated= by @@ -746,6 +746,15 @@ static void create_its(VirtMachineState *vms) return; } =20 + if (whpx_enabled() && vms->tcg_its) { + /* + * Signal to the user when ITS is neither supported by the host + * nor emulated by the machine. + */ + info_report("ITS not supported on WHPX."); + exit(1); + } + dev =3D qdev_new(its_class_name()); =20 object_property_set_link(OBJECT(dev), "parent-gicv3", OBJECT(vms->gic), @@ -957,7 +966,7 @@ static void create_gic(VirtMachineState *vms, MemoryReg= ion *mem) =20 fdt_add_gic_node(vms); =20 - if (vms->gic_version !=3D VIRT_GIC_VERSION_2 && vms->its) { + if (vms->gic_version !=3D VIRT_GIC_VERSION_2 && virt_is_its_enabled(vm= s)) { create_its(vms); } else if (vms->gic_version !=3D VIRT_GIC_VERSION_2 && !vms->no_gicv3_= with_gicv2m) { create_v2m(vms); @@ -2699,18 +2708,34 @@ static void virt_set_highmem_mmio_size(Object *obj,= Visitor *v, extended_memmap[VIRT_HIGH_PCIE_MMIO].size =3D size; } =20 -static bool virt_get_its(Object *obj, Error **errp) +bool virt_is_its_enabled(VirtMachineState *vms) +{ + if (vms->its =3D=3D ON_OFF_AUTO_OFF) { + return false; + } + if (vms->its =3D=3D ON_OFF_AUTO_AUTO) { + if (whpx_enabled()) { + return false; + } + } + return true; +} + +static void virt_get_its(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { VirtMachineState *vms =3D VIRT_MACHINE(obj); + OnOffAuto its =3D vms->its; =20 - return vms->its; + visit_type_OnOffAuto(v, name, &its, errp); } =20 -static void virt_set_its(Object *obj, bool value, Error **errp) +static void virt_set_its(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { VirtMachineState *vms =3D VIRT_MACHINE(obj); =20 - vms->its =3D value; + visit_type_OnOffAuto(v, name, &vms->its, errp); } =20 static bool virt_get_dtb_randomness(Object *obj, Error **errp) @@ -3427,8 +3452,9 @@ static void virt_machine_class_init(ObjectClass *oc, = const void *data) "guest CPU which implements the = ARM " "Memory Tagging Extension"); =20 - object_class_property_add_bool(oc, "its", virt_get_its, - virt_set_its); + object_class_property_add(oc, "its", "OnOffAuto", + virt_get_its, virt_set_its, + NULL, NULL); object_class_property_set_description(oc, "its", "Set on/off to enable/disable " "ITS instantiation"); @@ -3488,8 +3514,8 @@ static void virt_instance_init(Object *obj) vms->highmem_mmio =3D true; vms->highmem_redists =3D true; =20 - /* Default allows ITS instantiation */ - vms->its =3D true; + /* Default allows ITS instantiation if available */ + vms->its =3D ON_OFF_AUTO_AUTO; /* Allow ITS emulation if the machine version supports it */ vms->tcg_its =3D !vmc->no_tcg_its; vms->no_gicv3_with_gicv2m =3D false; diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index c5bc47ee88..394b70c62e 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -147,7 +147,7 @@ struct VirtMachineState { bool highmem_ecam; bool highmem_mmio; bool highmem_redists; - bool its; + OnOffAuto its; bool tcg_its; bool virt; bool ras; @@ -216,4 +216,6 @@ static inline int virt_gicv3_redist_region_count(VirtMa= chineState *vms) vms->highmem_redists) ? 2 : 1; } =20 +bool virt_is_its_enabled(VirtMachineState *vms); + #endif /* QEMU_ARM_VIRT_H */ --=20 2.50.1 (Apple Git-155)