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 lists1p.gnu.org (lists1p.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 92A59F99C9C for ; Sat, 18 Apr 2026 22:37:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wEEFE-0007HK-4w; Sat, 18 Apr 2026 18:34:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wEEEz-0006Py-Ue for qemu-devel@nongnu.org; Sat, 18 Apr 2026 18:34:23 -0400 Received: from p-east2-cluster1-host9-snip4-10.eps.apple.com ([57.103.76.113] 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 1wEEEs-0004ze-JG for qemu-devel@nongnu.org; Sat, 18 Apr 2026 18:34:13 -0400 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-100-percent-1 (Postfix) with ESMTPS id 105451800234; Sat, 18 Apr 2026 22:34:05 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1776551649; x=1779143649; bh=35AwHuK3FNutlfTTq4p+Vg27ixeNuT9FvPY378EVDsQ=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=HGy6m1DhbjBukFEOW1YuZ+3TUSCKAi+4JIBtmGn/5uL/7By9TiE1gOykoaNe8PXzdRYkMZTWc9QPd/pApMcnAyUaD5m9ds35D/i3BS3qT3phzDz/RYn1gA4oGmjBC/KE8XHULdbGjSYc7lKxEjT9098phT/7HL1IdcsWoXwBMx9kPGRkzF7NhbU+YskrbnJLOs9hx/Fp9II9k9LiGSP3YJ1Da1YitgG1K4RWjsss7uqbrvH219D8FlvP1wd2qFzPZKTj3A6FGX5/p4xnWCG0fYnvxDXLRw2AcqnJ68TFtBoUfou8+Nt+1CMHLZupPhmtooPnDHZwqFUpfsycbTXJbQ== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-100-percent-1 (Postfix) with ESMTPSA id 8C49D18000DE; Sat, 18 Apr 2026 22:34:03 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Mohamed Mediouni , "Michael S. Tsirkin" , Paolo Bonzini , Zhao Liu , Pedro Barbuda , Roman Bolshakov , qemu-arm@nongnu.org, Pierrick Bouvier , Peter Maydell , Wei Liu , Phil Dennis-Jordan Subject: [PATCH 22/38] whpx: i386: add HV_X64_MSR_GUEST_IDLE when !kernel-irqchip Date: Sun, 19 Apr 2026 00:33:04 +0200 Message-ID: <20260418223320.51330-23-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260418223320.51330-1-mohamed@unpredictable.fr> References: <20260418223320.51330-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE4MDIyOCBTYWx0ZWRfX1bE1zHSsZxLm yGlZnC2zf7EhAcaKCQcmAQ2g1WKn94XpPMtCR12Ost5wuWqSovE+YbrplqgqZvu9e5AjjIS1AL1 gYe/1zyiw7BRvfFS9IwkxNphyrV3FwTT4S12BDoleCbKYt6y171nZqBFltoLyfLTB/9PkKyKFgP 6Yw2tzd2y+sMxAAcG6liTzce53KiWvRPS8xkW6QgRLiIgxV1eWRsm/HMbuiWdp7X/owszuFB3Lp G+Pp5mMuzjfiI74r5/ymEFWR3IK3PMmAbBm1qIw0RXlw1ULQ8wI623YoPRTFLQtpDOWPThu6s2t 9vGy1Ri9gOZLGV+BAiFhRbLzb4+4YLiTVFhpxNHRGTtItEe3rug3Ug44Zc+1qQ= X-Proofpoint-GUID: jRXotVJqI9qHq2FwVkaH6UPAxDpP2uYB X-Proofpoint-ORIG-GUID: jRXotVJqI9qHq2FwVkaH6UPAxDpP2uYB X-Authority-Info-Out: v=2.4 cv=b9q/I9Gx c=1 sm=1 tr=0 ts=69e406df cx=c_apl:c_pps:t_out a=YrL12D//S6tul8v/L+6tKg==:117 a=YrL12D//S6tul8v/L+6tKg==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=mSEN7FZ2dYRJNo9PPvgA: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-04-18_06,2026-04-17_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 adultscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 suspectscore=0 lowpriorityscore=0 clxscore=1030 spamscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604180228 Received-SPF: pass client-ip=57.103.76.113; envelope-from=mohamed@unpredictable.fr; helo=outbound.st.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_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: 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 Add support for an oddball HV_X64_MSR_GUEST_IDLE not-quite-an-HLT that wakes the vCPU even if EFLAGS.IF is set. Signed-off-by: Mohamed Mediouni --- target/i386/whpx/whpx-all.c | 46 ++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 3af5f936d4..4dc4030d87 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -52,6 +52,7 @@ /* for kernel-irqchip=off */ #define HV_X64_MSR_APIC_FREQUENCY 0x40000023 #define HV_X64_MSR_VP_ASSIST_PAGE 0x40000073 +#define HV_X64_MSR_GUEST_IDLE 0x400000f0 static bool is_modern_os = true; @@ -1543,13 +1544,16 @@ static vaddr whpx_vcpu_get_pc(CPUState *cpu, bool exit_context_valid) } } -static int whpx_handle_halt(CPUState *cpu) +static int whpx_handle_halt_generic(CPUState *cpu) { + X86CPU *x86_cpu = X86_CPU(cpu); + CPUX86State *env = &x86_cpu->env; + int ret = 0; bql_lock(); if (!(cpu_test_interrupt(cpu, CPU_INTERRUPT_HARD) && - (cpu_env(cpu)->eflags & IF_MASK)) && + ((cpu_env(cpu)->eflags & IF_MASK) || env->hflags2 & HF2_HYPERV_HLT_MASK)) && !cpu_test_interrupt(cpu, CPU_INTERRUPT_NMI)) { cpu->exception_index = EXCP_HLT; cpu->halted = true; @@ -1560,6 +1564,27 @@ static int whpx_handle_halt(CPUState *cpu) return ret; } +static int whpx_handle_halt(CPUState *cpu) +{ + int ret = 0; + + ret = whpx_handle_halt_generic(cpu); + + return ret; +} + +static int whpx_handle_hyperv_guestidle(CPUState *cpu) +{ + X86CPU *x86_cpu = X86_CPU(cpu); + CPUX86State *env = &x86_cpu->env; + int ret = 0; + + env->hflags2 |= HF2_HYPERV_HLT_MASK; + ret = whpx_handle_halt_generic(cpu); + + return ret; +} + static void whpx_vcpu_kick_out_of_hlt(CPUState *cpu) { WHV_REGISTER_VALUE reg; @@ -1763,9 +1788,10 @@ static void whpx_vcpu_process_async_events(CPUState *cpu) } if ((cpu_test_interrupt(cpu, CPU_INTERRUPT_HARD) && - (env->eflags & IF_MASK)) || + ((env->eflags & IF_MASK) || env->hflags2 & HF2_HYPERV_HLT_MASK)) || cpu_test_interrupt(cpu, CPU_INTERRUPT_NMI)) { cpu->halted = false; + env->hflags2 &= ~HF2_HYPERV_HLT_MASK; } if (cpu_test_interrupt(cpu, CPU_INTERRUPT_SIPI)) { @@ -2035,6 +2061,20 @@ int whpx_vcpu_run(CPUState *cpu) } } + /* + * Windows and Linux both use this MSR. + * Windows 11 25H2 uses it even when not advertised. + */ + if (vcpu->exit_ctx.MsrAccess.MsrNumber == HV_X64_MSR_GUEST_IDLE + && !vcpu->exit_ctx.MsrAccess.AccessInfo.IsWrite + && !whpx_irqchip_in_kernel() + && whpx->hyperv_enlightenments_enabled) { + is_known_msr = 1; + whpx_bump_rip(cpu, &vcpu->exit_ctx); + ret = whpx_handle_hyperv_guestidle(cpu); + break; + } + /* * Linux tries to use it anyway even when not exposed. * Ignore the write as the VP assist page is not used. -- 2.50.1 (Apple Git-155)