From nobody Mon Feb 9 07:05:36 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=1768571660; cv=none; d=zohomail.com; s=zohoarc; b=hHWlNpYYagjr/BwwlY7eol1C6EV4zampEPdKpeGsWVYeK4I/s9XfFCFg+qMK23otGvEfIuJrqRaPWOGfTdf88Gz4gb858Qp1ELaVzIZ0MZEUrY9WT1s6ElbaeFZiCFT1jcgV06CLttOEux6hyFNFMZnHSQfOVSARRG9KfJkFUXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768571660; 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=F2G+4QyPPZGvVP3hmEoFmjFOWmbiEiXWYTyLCRGbNQo=; b=Gm5kZv1zeqNiGEV8UG9OiF8qUeCibrtT5lsNPPNoBUoMXj2Nm0AEhoGYKJJwf0rqLYrKQs9sWeH7umEvqk0b//lSlO9D9yhZo9IctEl4p1dNSW2wD/R2do1iv3d0+OwwhzDLk2IEbXO2G2hlAQnSXQCl492CM1jB6HW7PwAsWRc= 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 176857166068187.04196350582595; Fri, 16 Jan 2026 05:54:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vgkGE-0003BE-51; Fri, 16 Jan 2026 08:53:10 -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 1vgkG9-00034e-CU for qemu-devel@nongnu.org; Fri, 16 Jan 2026 08:53:06 -0500 Received: from ci-2003e-snip4-2.eps.apple.com ([57.103.91.173] helo=outbound.ci.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vgkG5-00026P-AH for qemu-devel@nongnu.org; Fri, 16 Jan 2026 08:53:02 -0500 Received: from outbound.ci.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-central-1k-60-percent-15 (Postfix) with ESMTPS id A3CB2180F907; Fri, 16 Jan 2026 13:52:56 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.156.36]) by p00-icloudmta-asmtp-us-central-1k-60-percent-15 (Postfix) with ESMTPSA id 1C9C1180F906; Fri, 16 Jan 2026 13:52:53 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=F2G+4QyPPZGvVP3hmEoFmjFOWmbiEiXWYTyLCRGbNQo=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=cGw+UU3+2D7Bnj0oiFGr1PW3ySn7WMbPWIBX7CTxbNLPgNwFgEI+iIwNEFcYWUngyFLp0S7drbqfQIY8nVOw7A9No2X/WgGlhX3LxeU9CqYtXik8UFq0qly6Kp5eZ95s+rn2n9bHI3wuljSer775xFPo+5/gzzMgTL+QerY9aHmjv/B6HLc5yWJzittsiBbgkJqCbDvOSDKoT4KC2O6C/lsc2HTe9Me3zey6a0sx5owL9Lk3jdzXAdLAdJZ7NrjqHv7Q93UELumJpRf0WAvpSnJSBt0xRsQnVHN55Db7gHlzPFjWNVgA0Gzd7JTduSLn3zCXkCeYFDJSiHgFhLYnEQ== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: mohamed@unpredictable.fr, qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pedro Barbuda , Peter Maydell , Eduardo Habkost , Marcel Apfelbaum , Phil Dennis-Jordan , Akihiko Odaki , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Shannon Zhao , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier Subject: [PATCH v16 06/26] hw/arm: virt: cleanly fail on attempt to use the platform vGIC together with ITS Date: Fri, 16 Jan 2026 14:52:15 +0100 Message-ID: <20260116135235.38092-7-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260116135235.38092-1-mohamed@unpredictable.fr> References: <20260116135235.38092-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: lVZrG6kohWjbZDYiBw7XVeSeuysVl6yD X-Authority-Info: v=2.4 cv=VLvQXtPX c=1 sm=1 tr=0 ts=696a42b9 cx=c_apl:c_apl_out:c_pps a=2G65uMN5HjSv0sBfM2Yj2w==:117 a=2G65uMN5HjSv0sBfM2Yj2w==:17 a=065Y4zqepXN3nrMe:21 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=tHnZtBUoIiMOMUCmYmkA:9 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: lVZrG6kohWjbZDYiBw7XVeSeuysVl6yD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE2MDA5NyBTYWx0ZWRfX5137MGOTt79h 0DwIwnmeE0uXhaioxDUmry+D5P0Ps6RpbmnpqaqBcesSdskpv6jR3PgmJYp9N5zs+G0GBiKr3sA rJ3jzDkbSim9q8u9q1eN92RSIHNe7ym/5JU7bwWsulPotgVIQE/Xj/GJu6tJOmz1sEGd0+T/g4l 8/dEiVqg4O28M7E8/hlJOHVhJjZJ137L9/UPbDTD3U2BmiRrd33s+w/E4kbeD54bipWy6zoKgr4 p9supGdx0rSkYfNgrSKB8SkdWijp3zBuRC4uCA9KVI8fVgAiho8YZATPLC/M+fSpaFu83JYC8YB aIvE2Tr4CVLkyDwltws 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=2026-01-16_05,2026-01-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 suspectscore=0 adultscore=0 spamscore=0 bulkscore=0 mlxscore=0 clxscore=1030 mlxlogscore=999 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2601160097 X-JNJ: AAAAAAABEd6niHOy0/rbk/Nk0kVco/LO6FjzlTUA/l/NnoYdY+X9DAL3BZlyjiRhGLnjEXpbY1K9z1bwKBxYzSktOkGWal6GWpCT1nM6Wg/+iOaWHN0qimmInkIQeuyet7CY/EAupFNyhZcjq+3JhCW8ywmuYAqcrJpzu8vb8uydEXJowNQvtDLRPXIUf6xEp+3voCqsBtYEGPwNUWz1DmhaQ1pWtB3cRNuDAel4AqvwjnAvf1HDiCFodAkGVsIwZxjcekCFP6H/yVckzhVr05ixavs7ZFQMP2CJzDcT5LzJeR3D/ZpBG3E4DtR+GE686qN23El5fYcW7Gx7g23T4aMmHl/SuQBIdcHRHuoKdqRQ0/XaOYq/pdwuZhaQdSAUOFHBQIWjvS8PTzhmHmaPeQrcYr9K2A06o1f2JifD4yNTSbzBNKiN42GoXtvefW61kCPgBOvaUFdrUAiYkh17GrJTDVWddTnpeTyDUiulOSE4tIiGalg/nqiLLzySabXIHuBxVYuUGwfXw47cQlFYZilk/dwRwB3i1JSWCrqp+waVyqBJwz8Uf7IutZ9o9I0luvf2yTKm9zionevB/cKpwVfIsbr29l3yMOUfPUwDgwRdbFMOEjNITAb5Yb7c1Kp+k7bhIkM8sfPGV2IQGlKCT1KG4yYrFVwIgU8U32O4NDVoD4v7nQKHUUCCA2x7jbo7jWQlG4VlGCXgXA8KLCnDSGpn+CS1vhMuJ0jrE2zQS8l3m7f8G+xzbNuZPpyN8X5M2RDQaUtguDSF0WKcgies7ZOAl4+i44iekyimM50svUoWKx9nz9CHWBI= 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.91.173; envelope-from=mohamed@unpredictable.fr; helo=outbound.ci.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_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1768571661522158500 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 275f26d439..b4656b3476 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()) { + /* + * Signal to the user when ITS is neither supported by the host + * nor emulated by the machine. + */ + error_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); @@ -2704,18 +2713,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) @@ -3436,8 +3461,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"); @@ -3497,8 +3523,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 b7e59b8c63..23c714d67e 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; @@ -218,4 +218,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)