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 5FE7FF531CA for ; Mon, 13 Apr 2026 20:54:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCOGn-0007QP-78; Mon, 13 Apr 2026 16:52:33 -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 1wCOGm-0007Pn-5Z for qemu-devel@nongnu.org; Mon, 13 Apr 2026 16:52:32 -0400 Received: from ci-2007c-snip4-4.eps.apple.com ([57.103.88.27] 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 1wCOGk-0007w2-GL for qemu-devel@nongnu.org; Mon, 13 Apr 2026 16:52:31 -0400 Received: from outbound.ci.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-central-1k-10-percent-2 (Postfix) with ESMTPS id 1FBFE180017C; Mon, 13 Apr 2026 20:52:27 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1776113549; x=1778705549; bh=UDUDDhSNImOkwjgegNmDYFGV0Ws4YLT0V61YNwqVXjA=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=ETB+HxkbskVjvhwmcV62cBFlST/oPod1G7vByTb/YFpZ1H0YH9uLYcY0yvLqJtjV0YXlcACcveBdb+kAkcd0oGUJw3e2OH+ROVrjCibfQpVJ4TtCJf/ZxdbEBKo0DFACU8uz71qdSZtJyFrkjA8e59mki2L1rFihoUsW7QQQ3QE2CS6hgRRaYwlZaSQacgaCHx0liq2rk7/5DclQIUxltbW+R/y9wVYxheOktXUyfCnayEMnSA8PGvT898UcZGDQmpWT56hYflOHZxoF+DjKHjVF1adxobNjbbW2I4c6ikYjybLyCfR4NiRvknVWX2CtFMXSjpfn6e8WMTKt+oVw1Q== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (unknown [17.57.156.36]) by p00-icloudmta-asmtp-us-central-1k-10-percent-2 (Postfix) with ESMTPSA id 3B3CB18000B4; Mon, 13 Apr 2026 20:52:26 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Phil Dennis-Jordan , Pedro Barbuda , "Michael S. Tsirkin" , Wei Liu , Paolo Bonzini , Roman Bolshakov , Mohamed Mediouni , Zhao Liu Subject: [PATCH v12 10/15] whpx: i386: disable kernel-irqchip on Windows 10 when PIC enabled Date: Mon, 13 Apr 2026 22:52:02 +0200 Message-ID: <20260413205208.50643-11-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260413205208.50643-1-mohamed@unpredictable.fr> References: <20260413205208.50643-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEzMDIwNSBTYWx0ZWRfX8oLNtJglNxxL iyiDhfrVf8ru/EFh39lXFP9HEipPVCNVqnX8VQg2rWGnCr+WefClake0dxBaHO4txGX1VVenNtY T6wm1ID42z6nu8qhKpYMKPMkmB7M6X2tFvZNgs0olSM/MbFht9KBtBKlSie6WMtaR9O1RhtSQT3 N6BYXbxumrsITRngJepEh+EQ3mHgUw1IA++JZ+TAZXxCmAB6ICou4DYZsX4ssuXYJTHp8ivw+c7 mfmauvEkyVA7w1HOW4ordDMdBEQ3MazO6hBAYjkJ5DcdbAE52Kuid249rEeOHu12Vr8DBXMlp6x s5cYXdyeMaPkZAGsljhaB/BrQfDJZTkYLNa+lyPlzcPzpBlNoI+Nl1YVv94fKs= X-Proofpoint-ORIG-GUID: hnHiS7ByUdoszPJNpqPTpIm3iWzC2RIZ X-Authority-Info-Out: v=2.4 cv=d4/4CBjE c=1 sm=1 tr=0 ts=69dd578c cx=c_apl:c_pps:t_out a=2G65uMN5HjSv0sBfM2Yj2w==:117 a=2G65uMN5HjSv0sBfM2Yj2w==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=nUl_a9z44qMLw6SsMv4A:9 X-Proofpoint-GUID: hnHiS7ByUdoszPJNpqPTpIm3iWzC2RIZ 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-13_03,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=801 lowpriorityscore=0 adultscore=0 malwarescore=0 bulkscore=0 mlxscore=0 clxscore=1030 phishscore=0 suspectscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604130205 Received-SPF: pass client-ip=57.103.88.27; 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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 Move WHvCapabilityCodeProcessorPerfmonFeatures queries as that's how we distinguish if on a legacy OS. Now that Windows guests are booting, disable kernel-irqchip=on by default for Windows 10 when the PIC is enabled. Signed-off-by: Mohamed Mediouni --- target/i386/whpx/whpx-all.c | 69 +++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 74b94b799e..7c80d653d1 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -2447,6 +2447,13 @@ int whpx_accel_init(AccelState *as, MachineState *ms) 0x8000000A, 0x80000021, 0x80000022, 0xC0000000, 0xC0000001}; UINT32 cpuidExitList_legacy_os[] = {1, 0x40000000, 0x40000001, 0x40000010}; + X86MachineState *x86ms = X86_MACHINE(ms); + bool pic_enabled = false; + + if (x86ms->pic == ON_OFF_AUTO_ON || x86ms->pic == ON_OFF_AUTO_AUTO) { + pic_enabled = true; + } + whpx = &whpx_global; if (!init_whp_dispatch()) { @@ -2518,6 +2525,35 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } + /* Enable supported performance monitoring capabilities */ + hr = whp_dispatch.WHvGetCapability( + WHvCapabilityCodeProcessorPerfmonFeatures, &perfmon_features, + sizeof(WHV_PROCESSOR_PERFMON_FEATURES), &whpx_cap_size); + /* + * Relying on this is a crutch to maintain Windows 10 support. + * + * WHvCapabilityCodeProcessorPerfmonFeatures and + * WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks + * are implemented starting from Windows Server 2022 (build 20348). + */ + if (FAILED(hr)) { + warn_report("WHPX: Failed to get performance " + "monitoring features, hr=%08lx", hr); + is_modern_os = false; + } else { + hr = whp_dispatch.WHvSetPartitionProperty( + whpx->partition, + WHvPartitionPropertyCodeProcessorPerfmonFeatures, + &perfmon_features, + sizeof(WHV_PROCESSOR_PERFMON_FEATURES)); + if (FAILED(hr)) { + error_report("WHPX: Failed to set performance " + "monitoring features, hr=%08lx", hr); + ret = -EINVAL; + goto error; + } + } + /* * Error out if WHP doesn't support apic emulation and user is requiring * it. @@ -2530,8 +2566,9 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } - if (whpx->kernel_irqchip_allowed && features.LocalApicEmulation && - whp_dispatch.WHvSetVirtualProcessorInterruptControllerState2) { + if (whpx->kernel_irqchip_allowed && !(whpx_is_legacy_os() && pic_enabled + && !whpx->kernel_irqchip_required) && features.LocalApicEmulation + && whp_dispatch.WHvSetVirtualProcessorInterruptControllerState2) { WHV_X64_LOCAL_APIC_EMULATION_MODE mode = WHvX64LocalApicEmulationModeX2Apic; hr = whp_dispatch.WHvSetPartitionProperty( @@ -2590,34 +2627,6 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } - /* Enable supported performance monitoring capabilities */ - hr = whp_dispatch.WHvGetCapability( - WHvCapabilityCodeProcessorPerfmonFeatures, &perfmon_features, - sizeof(WHV_PROCESSOR_PERFMON_FEATURES), &whpx_cap_size); - /* - * Relying on this is a crutch to maintain Windows 10 support. - * - * WHvCapabilityCodeProcessorPerfmonFeatures and - * WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks - * are implemented starting from Windows Server 2022 (build 20348). - */ - if (FAILED(hr)) { - warn_report("WHPX: Failed to get performance " - "monitoring features, hr=%08lx", hr); - is_modern_os = false; - } else { - hr = whp_dispatch.WHvSetPartitionProperty( - whpx->partition, - WHvPartitionPropertyCodeProcessorPerfmonFeatures, - &perfmon_features, - sizeof(WHV_PROCESSOR_PERFMON_FEATURES)); - if (FAILED(hr)) { - error_report("WHPX: Failed to set performance " - "monitoring features, hr=%08lx", hr); - ret = -EINVAL; - goto error; - } - } /* Enable synthetic processor features */ WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS synthetic_features; -- 2.50.1 (Apple Git-155)