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 BF0F4E88D7A for ; Sat, 4 Apr 2026 04:21:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w8sUq-0006em-CL; Sat, 04 Apr 2026 00:20:32 -0400 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 1w8sUn-0006eK-1H for qemu-devel@nongnu.org; Sat, 04 Apr 2026 00:20:29 -0400 Received: from p-east2-cluster5-host7-snip4-8.eps.apple.com ([57.103.79.31] 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 1w8sUj-000647-VO for qemu-devel@nongnu.org; Sat, 04 Apr 2026 00:20:27 -0400 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-10-percent-0 (Postfix) with ESMTPS id A38991800149; Sat, 04 Apr 2026 04:20:19 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1775276422; x=1777868422; bh=RasIi9DHsbEKe10rsaBffSYDuEjYzkiyY+gG940cZSI=; h=From:To:Subject:Date:Message-ID:Content-Type:MIME-Version:x-icloud-hme; b=JJH11ENWfIMGOwxGIiU0eSXabU5+V72Xe4z6pcf1JQ1vLXP/nRi3zxdcyG8mlYXA4iXWZAMBhmPg6cK8EtHNDsuVJP+SRMd26MLuleCBh4nmDB7r2FZtbblTTimRcJMkLL+p6qZP0wYAw3Do0YMrTRi6g/q5YRB4PRngs4LfIvv4EQyItfLJxgVsiu44uAXMPbk2AqvCQVnb4fFyQ5y0nPZGmiLihxUdBsw5ZzIN33WVXycfdtDk8QaY+S8yqWzt4jI+meQIBHfUJt6lU8xEjtuFyUaCq/sc18Ln6TiTkufZ1sDC779Hv5XmbaxqZdoTbbZk5ctc2MkY9Ch0MHoXpA== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-10-percent-0 (Postfix) with ESMTPSA id AFD281800097; Sat, 04 Apr 2026 04:20:17 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Wei Liu , Roman Bolshakov , Pedro Barbuda , Mohamed Mediouni , Phil Dennis-Jordan , Paolo Bonzini , Zhao Liu Subject: [PATCH v6 00/11] whpx: i386: bug fixes, feature probing and CPUID Date: Sat, 4 Apr 2026 06:20:04 +0200 Message-ID: <20260404042015.86580-1-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDA0MDAzNCBTYWx0ZWRfX3dGka3dRRbWr 2OZHD7ZnYxm2yS7BO3gQwEvksgk0AmHdAfYRoHur/II8oIo1lkGjM5f38/VKA/DGjQnqthN4B2I s0HW8SSNTncZvkbkSnEs6PtC0HD2d1hwSQ0YXfPtsLT+XXJ+7ruaOtiXYJcXHQnEdeQTZnBuMo6 aQtSXV5t0mM9HiVAq5HyDliecaL2dNoNoZThVy+wP1aT7vQE7FGicJT7SJOsh+MfMbyGQI8w1Yg u3Ylby38vNzt1ET0KSsJtJ08nabgrC88BVhft7T63xtiPAvx4KwxCWKPqkVNtQY8LbxdtHCr4oC ZIRjT17S0q+5PLasVWddmIXHb/CuIss7sBXWd0wRJRWdHb9Y4NlR+5zi9WKYVs= X-Proofpoint-GUID: FP29NuuWaNm9kkJRTaA9k2gmUhWIrNqH X-Proofpoint-ORIG-GUID: FP29NuuWaNm9kkJRTaA9k2gmUhWIrNqH X-Authority-Info-Out: v=2.4 cv=Xa2EDY55 c=1 sm=1 tr=0 ts=69d09184 cx=c_apl:c_pps:t_out a=YrL12D//S6tul8v/L+6tKg==:117 a=YrL12D//S6tul8v/L+6tKg==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=1DGgg3L7_nY_qRTbWDsA:9 a=QEXdDO2ut3YA:10 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-04-03_07,2026-04-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 lowpriorityscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 bulkscore=0 clxscore=1030 mlxscore=0 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604040034 Received-SPF: pass client-ip=57.103.79.31; 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_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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This is a supplemental update that includes "whpx: i386: x2apic emulation for kernel-irqchip=off, feature probing" v4 unmodified. This might be too big for QEMU 11.0 at this point though... "whpx: i386: disable TbFlushHypercalls for emulated LAPIC" is a bugfix, and "target/i386: emulate: include name of unhandled instruction" is a debugging aid. "whpx: i386: x2apic emulation" makes things slightly better for Windows 10 users. But I strongly recommend *not* relying on it when possible and using kernel-irqchip=on instead. On Windows 10 however that's more murky because PIC interrupt injection is broken (interrupts don't wake the vCPU from HLT) in that case. "whpx: i386: wire up feature probing" is yet another commit adding a code path not used on Windows 10. It'll tell the user today which CPU features they set are incompatible with the hardware but it does not sync that to the CPUID view that the guest has. And then another commit to enable x2apic emulation by default even for kernel-irqchip=off + re-introducing provided by QEMU enlightenments in a more functional form to signal that the x2apic can be used. I'm not aware of the actual vmware freq leaf being used though. "whpx: x2apic emulation for kernel-irqchip=off follow-up" is rolled into this series. "whpx: i386: reintroduce enlightenments for Windows 10" is a bugfix to make x2APIC work as intended on Windows 10 without emulating an IOMMU. And dependent on this series so included, CPUID intercepts finally... However that's only supported starting from Windows 11/Server 2022. Also ended up switching over Windows 10 to kernel-irqchip=off by default due to PIC interrupt injection being broken. Note: on Windows 10, pic=off is still not very useful on this release on AMD CPUs as Linux will fail to find a calibration source for the timer, as it doesn't understand the VMware TSC frequency leaf. On Intel, Linux will get the TSC frequency from CPUID instead and boot up fine. On Windows 11, Hyper-V enlightenments expose the necessary clock info, so the scenario only affects hyperv=off. That can be solved at a later time. Some performance (or lack thereof...) numbers: On a Ryzen 7 8700GE with a Windows 10 VM running with KVM in nested virt, with kernel-irqchip=off for the virt Alpine Linux x86_64 ISO (3.23.3) with -smp cores=2, boot times as reported through dmesg: - QEMU 10.2: 83 seconds - QEMU 10.2 with a single core: 18.1 seconds - as of this series, x2apic forced off: 29 seconds - as of this series, out of the box: 18 seconds - with kernel-irqchip=on and EDK2: 16.5 seconds - with kernel-irqchip=off and EDK2: 9.5 seconds - and with 1 core instead of two: 12.6 seconds And with this series on a Windows 11 VM on the same hardware: - kernel-irqchip=on: 6.5 seconds - kernel-irqchip=on, x2apic forced off: 7.6 seconds - kernel-irqchip=off: 8.3 seconds - hyperv=off,kernel-irqchip=off: 7.6 seconds... which is faster, so the absence of enlightenment support on Windows 10 doesn't explain things... With kernel-irqchip=on on Windows 10, when booting with SeaBIOS, it gets stuck in syslinux due to PIC interrupt injection being broken there. That can be counted as an infinite boot time (?). checkpatch false positives: ERROR: spaces required around that '*' (ctx:WxV) + UINT32 Ecx, WHV_CPUID_OUTPUT *CpuidOutput)) Not a multiplication but a pointer reference. ERROR: space prohibited after that '&' (ctx:ExW) + & CPUID_7_0_EDX_CET_IBT) { ^ ERROR: space prohibited after that '&' (ctx:ExW) + & CPUID_7_0_ECX_CET_SHSTK) { ^ Because it's multiline. Changes in v6: - kernel-irqchip=off fix: re-registering the interrupt window when the existing one has too low of a TPR value. Folded into "whpx: i386: kernel-irqchip=off fixes". - I/O port access fast path cleanup commit added at the end The path relied on a side effect of whpx_get_reg instead of something cleaner. - Use the CR8 register provided by the hypervisor only when kernel-irqchip=off. Rely on the APIC state synchronisation otherwise. This fixes some register sync errors that surfaced when setting the TPR values properly. Changes in v5/v1 with rename: - kernel-irqchip=off fixes, notably making 64-bit Windows bootable - switching over Windows 10 to kernel-irqchip=off by default Changes in v4: - Ugh for a revision sent quickly, unbreaking the arm64 build... - and making checkpatch happier to some extent Changes in v3: - Fixing CPUID intercepts so that QEMU CPU models work fine now, instead of the partial intercept that was present in QEMU 10.2 - cleanups Changes in v2: - GCC warned when a variable name was re-used within a different (but overlapping) scope in the same function. It also warned with a -Werror=maybe-uninitialized for the MSR write case. Address those - make the in-KVM enlightenments path available on Windows 11 too when -M hyperv=off. Mohamed Mediouni (11): target/i386: emulate: include name of unhandled instruction whpx: i386: x2apic emulation whpx: i386: wire up feature probing whpx: i386: disable TbFlushHypercalls for emulated LAPIC whpx: i386: enable x2apic by default for user-mode LAPIC whpx: i386: reintroduce enlightenments for Windows 10 whpx: i386: introduce proper cpuid support whpx: i386: kernel-irqchip=off fixes whpx: i386: use WHvX64RegisterCr8 only when kernel-irqchip=off whpx: i386: disable kernel-irqchip on Windows 10 when PIC enabled whpx: i386: IO port fast path cleanup accel/whpx/whpx-common.c | 2 + include/system/whpx-common.h | 1 + include/system/whpx-internal.h | 10 + target/arm/whpx/whpx-all.c | 1 + target/i386/cpu.c | 25 ++ target/i386/emulate/x86_emu.c | 4 +- target/i386/whpx/whpx-all.c | 467 ++++++++++++++++++++++++++------- target/i386/whpx/whpx-i386.h | 4 + 8 files changed, 418 insertions(+), 96 deletions(-) create mode 100644 target/i386/whpx/whpx-i386.h -- 2.50.1 (Apple Git-155)