{"id":2219427,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2219427/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260402234724.88276-8-mohamed@unpredictable.fr>","date":"2026-04-02T23:47:24","name":"[v3,7/7] whpx: i386: introduce proper cpuid support","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ffdf1f83b1429b126706ef2c0868fb1862141757","submitter":{"id":91318,"url":"http://patchwork.ozlabs.org/api/1.0/people/91318/?format=json","name":"Mohamed Mediouni","email":"mohamed@unpredictable.fr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260402234724.88276-8-mohamed@unpredictable.fr/mbox/","series":[{"id":498566,"url":"http://patchwork.ozlabs.org/api/1.0/series/498566/?format=json","date":"2026-04-02T23:47:19","name":"whpx: i386: x2apic emulation for kernel-irqchip=off, feature probing","version":3,"mbox":"http://patchwork.ozlabs.org/series/498566/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219427/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=unpredictable.fr header.i=@unpredictable.fr\n header.a=rsa-sha256 header.s=sig1 header.b=a9cu3H8i;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fmz8c1xLWz1xtJ\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 03 Apr 2026 10:49:04 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1w8RlL-0004Ih-JB; Thu, 02 Apr 2026 19:47:47 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <mohamed@unpredictable.fr>)\n id 1w8RlL-0004IJ-0K\n for qemu-devel@nongnu.org; Thu, 02 Apr 2026 19:47:47 -0400","from p-west2-cluster6-host7-snip4-3.eps.apple.com ([57.103.70.46]\n helo=outbound.mr.icloud.com)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <mohamed@unpredictable.fr>)\n id 1w8RlJ-000445-Fv\n for qemu-devel@nongnu.org; Thu, 02 Apr 2026 19:47:46 -0400","from outbound.mr.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-west-2a-60-percent-6 (Postfix) with ESMTPS id\n C91FD180015B; Thu, 02 Apr 2026 23:47:42 +0000 (UTC)","from localhost.localdomain (unknown [17.57.152.38])\n by p00-icloudmta-asmtp-us-west-2a-60-percent-6 (Postfix) with ESMTPSA id\n D4A641800156; Thu, 02 Apr 2026 23:47:40 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1775173664; x=1777765664;\n bh=c5D9ZkT8JYejwpSreaiXIWK6zThn9vhXnnKzmMKMQA8=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=a9cu3H8ir8YZrH4GRrVEPaTfdTUzCIaMBHXflqpE7Xh0F0r69qMLZunGlkmw1rM2rhjxF4/OiPFpkLy04FpPX3HYo6yRE1cDYS60X8MSwpk9+3o6Sjx1L6m0afMyWT8iusT0QQ2mOney0VavodvUZnra4Uo71k7Gvt6pLts07bmvm/6q8cknqx33uI8rRNDnHz4B7E6VJZ38tBcROxDMhXO/jJIbVVhAGeSH3HzZKGj/ixJ9xnq6stWwzg31Qvm+cK9HovfP+KUrKItE6HvexSVrXADsDt0npcsLU42ZX/Z/xxJ3kV3XOx2WPS2RJJYhLbVT/kORKPaYp07iDkmSnA==","mail-alias-created-date":"1752046281608","From":"Mohamed Mediouni <mohamed@unpredictable.fr>","To":"qemu-devel@nongnu.org","Cc":"Mohamed Mediouni <mohamed@unpredictable.fr>,\n Phil Dennis-Jordan <phil@philjordan.eu>,\n Roman Bolshakov <rbolshakov@ddn.com>, Zhao Liu <zhao1.liu@intel.com>,\n Paolo Bonzini <pbonzini@redhat.com>,\n Pedro Barbuda <pbarbuda@microsoft.com>, Wei Liu <wei.liu@kernel.org>","Subject":"[PATCH v3 7/7] whpx: i386: introduce proper cpuid support","Date":"Fri,  3 Apr 2026 01:47:24 +0200","Message-ID":"<20260402234724.88276-8-mohamed@unpredictable.fr>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260402234724.88276-1-mohamed@unpredictable.fr>","References":"<20260402234724.88276-1-mohamed@unpredictable.fr>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Proofpoint-ORIG-GUID":"E4_OygPwFSxY6QwKw45HzQ0rh4__zHNn","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDAyMDIxMyBTYWx0ZWRfX6DNTH7dthynF\n 4iO5E7J1Fqy9VKFNijndCr+CatOrMyVqEZslnpoH1vdbk0QAXm2u9lRXSNLjrYK5Zwmtr5wb2qL\n nxdVcw/f32GIjm4L4M2FbI++FPxm1L99ueP0aA2gV0nUgTvAHa5Okx2DfibwSmuNZMYJCUR3JYl\n XcLqWRt160ebU7SXAgyCL8hmWN/ymz/63h5EXVNY8s2oghC7kl+9vsRydjh4UslkN8dk5qXJv/2\n b65rtbVWcT2ggcV3NtGhXZrO5ycOsqYIjuPzCxFmnsvGk3LOZQqJ3/UhDUuEaXEiObk+48OKb4Y\n iGanheFsJZjFp3VXSQ34TJzFXJ23Fd5wnkSbEm6SRB5JCXaMlh/nAGA2cC6TlA=","X-Proofpoint-GUID":"E4_OygPwFSxY6QwKw45HzQ0rh4__zHNn","X-Authority-Info-Out":"v=2.4 cv=KuBAGGWN c=1 sm=1 tr=0 ts=69cf001f\n cx=c_apl:c_pps:t_out a=9OgfyREA4BUYbbCgc0Y0oA==:117\n a=9OgfyREA4BUYbbCgc0Y0oA==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22\n a=8S12nBvZezfavlJVhXoA:9","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-02_04,2026-04-02_05,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0 adultscore=0\n clxscore=1030 spamscore=0 phishscore=0 bulkscore=0 mlxscore=0 mlxlogscore=841\n suspectscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam authscore=0\n adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000\n definitions=main-2604020213","Received-SPF":"pass client-ip=57.103.70.46;\n envelope-from=mohamed@unpredictable.fr; helo=outbound.mr.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,\n 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 <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Unlike the implementation in QEMU 10.2, this one works.\n\nIt's not optimal though as it doesn't use the Hyper-V support for this.\n\nSigned-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>\n---\n target/i386/whpx/whpx-all.c | 39 ++++++++++++++++++++++++++++++++++---\n 1 file changed, 36 insertions(+), 3 deletions(-)","diff":"diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex 483a15ffdc..536657e43a 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -2127,6 +2127,35 @@ int whpx_vcpu_run(CPUState *cpu)\n                     }\n                     break;\n                 }\n+            } else {\n+                switch (vcpu->exit_ctx.CpuidAccess.Rax) {\n+                case 0x40000000:\n+                case 0x40000001:\n+                case 0x40000010:\n+                    reg_values[1].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRax;\n+                    reg_values[2].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRcx;\n+                    reg_values[3].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRdx;\n+                    reg_values[4].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRbx;\n+                    break;\n+                }\n+            }\n+\n+            /* Dynamic depending on XCR0 and XSS, so query DefaultResult */\n+            if (vcpu->exit_ctx.CpuidAccess.Rax == 0x07\n+                && vcpu->exit_ctx.CpuidAccess.Rcx == 0) {\n+                if (vcpu->exit_ctx.CpuidAccess.DefaultResultRdx\n+                    & CPUID_7_0_EDX_CET_IBT) {\n+                    reg_values[3].Reg32 |= CPUID_7_0_EDX_CET_IBT;\n+                } else {\n+                    reg_values[3].Reg32 &= ~CPUID_7_0_EDX_CET_IBT;\n+                }\n+\n+                if (vcpu->exit_ctx.CpuidAccess.DefaultResultRcx\n+                    & CPUID_7_0_ECX_CET_SHSTK) {\n+                    reg_values[2].Reg32 |= CPUID_7_0_ECX_CET_SHSTK;\n+                } else {\n+                    reg_values[2].Reg32 &= ~CPUID_7_0_ECX_CET_SHSTK;\n+                }\n             }\n \n             hr = whp_dispatch.WHvSetVirtualProcessorRegisters(\n@@ -2345,8 +2374,12 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n     WHV_CAPABILITY_FEATURES features = {0};\n     WHV_PROCESSOR_FEATURES_BANKS processor_features;\n     WHV_PROCESSOR_PERFMON_FEATURES perfmon_features;\n-    UINT32 cpuidExitList[] = {1};\n-    UINT32 cpuidExitList_nohyperv[] = {1, 0x40000000, 0x40000001, 0x40000010};\n+\n+    UINT32 cpuidExitList[] = {0x0, 0x1, 0x6, 0x7, 0x14, 0x24, 0x29, 0x1E,\n+        0x40000000, 0x40000001, 0x40000010, 0x80000000, 0x80000001,\n+        0x80000002, 0x80000003, 0x80000004, 0x80000007, 0x80000008,\n+        0x8000000A, 0x80000021, 0x80000022, 0xC0000000, 0xC0000001};\n+    UINT32 cpuidExitList_legacy_os[] = {1, 0x40000000, 0x40000001, 0x40000010};\n \n     whpx = &whpx_global;\n \n@@ -2602,7 +2635,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n     hr = whp_dispatch.WHvSetPartitionProperty(\n         whpx->partition,\n         WHvPartitionPropertyCodeCpuidExitList,\n-        whpx->hyperv_enlightenments_enabled ? cpuidExitList : cpuidExitList_nohyperv,\n+        !whpx_is_legacy_os() ? cpuidExitList : cpuidExitList_legacy_os,\n         RTL_NUMBER_OF(cpuidExitList) * sizeof(UINT32));\n \n     if (FAILED(hr)) {\n","prefixes":["v3","7/7"]}