Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 88FB3CFA76B for ; Fri, 21 Nov 2025 10:06:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMO0H-00057X-6b; Fri, 21 Nov 2025 05:04:34 -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 1vMNzj-0004pk-Hu for qemu-arm@nongnu.org; Fri, 21 Nov 2025 05:03:59 -0500 Received: from p-east3-cluster4-host4-snip4-10.eps.apple.com ([57.103.84.43] 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 1vMNzY-0007wn-MM for qemu-arm@nongnu.org; Fri, 21 Nov 2025 05:03:56 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-100-percent-4 (Postfix) with ESMTPS id 5610D180016B; Fri, 21 Nov 2025 10:03:13 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=wtcxvFTSbaMjuWwbvanOvh6RbmS7zpwJ+HsSvmiHZ4c=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=PvP9v2eHcgnU8Mx5CdCLHUYLIIAr5ppx+RE30H0b9YDbCw49JsG/B9tqFpGzjIF5wJZklJU22/kwbc93PbqZhqGVGOVk7WQ7m7kmx0K8yvX0vGAg65EjTWD4YzhrB9rnfpsws23ktUEh/udomJmp3ILa2tIbYL8cANlX4pMftV9T8KnCb9GXZITpHINVWhGhg2NbQW0B2RAnHIwaVl26Didb9wyCbdJ84O1aXiUizqKDPz+yx9rMazrzcOmfBgE34v+P/rGwaLVvt934T68KPhK74lrWJwyBccvCCKjLrYo9Ns6EaPelxP0TkYSqs2GUC9QEXobzbWl9Ax++ohZw+w== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-100-percent-4 (Postfix) with ESMTPSA id B1BF01801104; Fri, 21 Nov 2025 10:03:10 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org, mohamed@unpredictable.fr Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexander Graf , Peter Maydell , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Pedro Barbuda , Akihiko Odaki , Peter Xu , Mads Ynddal Subject: [PATCH v11 16/28] hw/arm: virt: cleanly fail on attempt to use the platform vGIC together with ITS Date: Fri, 21 Nov 2025 11:02:28 +0100 Message-ID: <20251121100240.89117-17-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251121100240.89117-1-mohamed@unpredictable.fr> References: <20251121100240.89117-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTIxMDA3NiBTYWx0ZWRfX1f/BXqKCrb5E ZRVS0O+BCXqOqLpOon7xZRdYev4DXuZAGTUcLzeL4ZFGfd3wa5GJpvEaZ1voG6bCZ0uKiGxVrGJ 0RypyUy4VtLa3QDfwrNIPrSuWp2yfqvqSHqptcVWtYJAOOfRUDk7x1sd9Tl//HHyJcr6WCx+fAj vmj2hBCZ5DoFhHbltAl9reJQtPJs3BbgdI97sNvxkDx07mXhoVxzKnjKIg1nNafUQZaKXCMdVmW ozyxFzq4nRrrFjmW6gMCYJF49M6EjzLUGo7KuhEz3mqOOMaYSB+at3Zh/Vl36KtT2iKRm1M0/p6 cbY6z80snj9UGUu8ZKI X-Authority-Info: v=2.4 cv=WbkBqkhX c=1 sm=1 tr=0 ts=692038e3 cx=c_apl:c_pps a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=065Y4zqepXN3nrMe:21 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=tHnZtBUoIiMOMUCmYmkA:9 X-Proofpoint-GUID: QfpOWxABjlFxI38SroaF_8vJuqaTKR2M X-Proofpoint-ORIG-GUID: QfpOWxABjlFxI38SroaF_8vJuqaTKR2M 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-11-21_03,2025-11-20_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 adultscore=0 malwarescore=0 mlxlogscore=899 bulkscore=0 clxscore=1030 suspectscore=0 mlxscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511210076 X-JNJ: AAAAAAABHFcz9isLBLuc7YemWrdDiEvEPSkPnMNJKJSHe6Bacv0iOrq6opDscD0MhoGlAYXyb4KjRz2ZTiIeW1h2hKp603JzchUrvtenoZnilK9DV+ryALU0K+ETpNz+9X/ZVVp1Gk/TH0DJywM1zPmamUrch7wpEhD7plnztKfMNT6AwriNmud6TWx4QQa+11EsQv7LcGohNBGvUEnWwOMBNNY4XYRLvBucKKdmF4kS+dOSHeEdvgHC7BVL+3uJFNAUk5ZkT8Pk/DK0soSFSoEZGLKgElfdKxzQn1Ar0lFw0v7ZBClqtvBa7pLyfC+pPA0z6IL482LGyA8Ziy+lznpJMW8OC66492brS1RLTatjl18wYJiy52QHsEUv5z+qFecAByxDpXp6IeZ6iEqvi6emYnqxr5U50bi2mRdeY01AXWATYbLfiieajsGtPdoXAqLIBNbIUOPt2QZGGU2YOoXxHuhKO5qFkm9nulgeRnhB8GOETzajnohVkp0DZ3j1Kurq4H6XKrrDOPadE5ZCZdaJNAsRjRtOwHBA9tq8eF/ogpYpMNjSXnn8Acl7SHTk+6ZshhtwgHoe4QQwTCCAtJ19sL1LPWkIzwc6RHuCqeu3qyAojFIxMOEkwH2Ddv1fAVSutwdSCo/O4+pyf8/QKdeZhwtVBl54OyVePtUCOZQPzCiEBQ0jBlT3mIJ4MaWPXjAU5Avdmb0XQ4nxAUzpEt8Eebnjw1f6woECZb3PbxRd2OwwIx7TeEk= Received-SPF: pass client-ip=57.103.84.43; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_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-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org 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=off explicitly for the newest machine version: GICv3 + GICv2m Signed-off-by: Mohamed Mediouni --- hw/arm/virt-acpi-build.c | 15 +++++++------ hw/arm/virt.c | 46 +++++++++++++++++++++++++++++++--------- include/hw/arm/virt.h | 4 +++- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index e2062f5d21..c8ac58b64e 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, VirtMachineState *vms) nb_nodes = num_smmus + 1; /* RC and SMMUv3 */ rc_mapping_count = rc_smmu_idmaps_len; - if (vms->its) { + if (virt_is_its_enabled(vms)) { /* * Knowing the ID ranges from the RC to the SMMU, it's possible to * determine the ID ranges from RC that go directly to ITS. @@ -484,7 +484,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) rc_mapping_count += rc_its_idmaps->len; } } else { - if (vms->its) { + if (virt_is_its_enabled(vms)) { nb_nodes = 2; /* RC and ITS */ rc_mapping_count = 1; /* Direct map to ITS */ } else { @@ -499,7 +499,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) build_append_int_noprefix(table_data, IORT_NODE_OFFSET, 4); build_append_int_noprefix(table_data, 0, 4); /* Reserved */ - if (vms->its) { + if (virt_is_its_enabled(vms)) { /* Table 12 ITS Group Format */ build_append_int_noprefix(table_data, 0 /* ITS Group */, 1); /* Type */ node_size = 20 /* fixed header size */ + 4 /* 1 GIC ITS Identifier */; @@ -518,7 +518,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) int smmu_mapping_count, offset_to_id_array; int irq = sdev->irq; - if (vms->its) { + if (virt_is_its_enabled(vms)) { smmu_mapping_count = 1; /* ITS Group node */ offset_to_id_array = SMMU_V3_ENTRY_SIZE; /* Just after the header */ } else { @@ -611,7 +611,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } - 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, VirtMachineState *vms) memmap[VIRT_HIGH_GIC_REDIST2].size); } - 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,8 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } - if (!(vms->gic_version != VIRT_GIC_VERSION_2 && vms->its) && !vms->no_gicv3_with_gicv2m) { + if (!(vms->gic_version != VIRT_GIC_VERSION_2 && virt_is_its_enabled(vms)) + && !vms->no_gicv3_with_gicv2m) { const uint16_t spi_base = vms->irqmap[VIRT_GIC_V2M] + ARM_SPI_BASE; /* 5.2.12.16 GIC MSI Frame Structure */ diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9817299975..ddc6d4d3b1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -738,7 +738,7 @@ static void create_its(VirtMachineState *vms) { DeviceState *dev; - 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 @@ -747,6 +747,15 @@ static void create_its(VirtMachineState *vms) return; } + 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 = qdev_new(its_class_name()); object_property_set_link(OBJECT(dev), "parent-gicv3", OBJECT(vms->gic), @@ -958,7 +967,7 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem) fdt_add_gic_node(vms); - if (vms->gic_version != VIRT_GIC_VERSION_2 && vms->its) { + if (vms->gic_version != VIRT_GIC_VERSION_2 && virt_is_its_enabled(vms)) { create_its(vms); } else if (vms->gic_version != VIRT_GIC_VERSION_2 && !vms->no_gicv3_with_gicv2m) { create_v2m(vms); @@ -2702,18 +2711,34 @@ static void virt_set_highmem_mmio_size(Object *obj, Visitor *v, extended_memmap[VIRT_HIGH_PCIE_MMIO].size = size; } -static bool virt_get_its(Object *obj, Error **errp) +bool virt_is_its_enabled(VirtMachineState *vms) +{ + if (vms->its == ON_OFF_AUTO_OFF) { + return false; + } + if (vms->its == 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 = VIRT_MACHINE(obj); + OnOffAuto its = vms->its; - return vms->its; + visit_type_OnOffAuto(v, name, &its, errp); } -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 = VIRT_MACHINE(obj); - vms->its = value; + visit_type_OnOffAuto(v, name, &vms->its, errp); } static bool virt_get_dtb_randomness(Object *obj, Error **errp) @@ -3430,8 +3455,9 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) "guest CPU which implements the ARM " "Memory Tagging Extension"); - 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"); @@ -3491,8 +3517,8 @@ static void virt_instance_init(Object *obj) vms->highmem_mmio = true; vms->highmem_redists = true; - /* Default allows ITS instantiation */ - vms->its = true; + /* Default allows ITS instantiation if available */ + vms->its = ON_OFF_AUTO_AUTO; /* Allow ITS emulation if the machine version supports it */ vms->tcg_its = !vmc->no_tcg_its; vms->no_gicv3_with_gicv2m = false; diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 3ff83aaabe..abacc366bf 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(VirtMachineState *vms) vms->highmem_redists) ? 2 : 1; } +bool virt_is_its_enabled(VirtMachineState *vms); + #endif /* QEMU_ARM_VIRT_H */ -- 2.50.1 (Apple Git-155)