From nobody Sat Apr 11 19:54:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1775173742; cv=none; d=zohomail.com; s=zohoarc; b=JHdgWyXfRC0pmJr2M2TLZnmVSddWLf2E73oHk77+OLcTZQd8rBTrPuaZkn3lb7bJqkkCxOtTb7QoDpHeM6WgZbsKSrpogHvrTT/EPfoKA6chhmHcUhulNF0nOBMee9ML6GhVq6JujP3HeXNMXG0qW/LQKfMTL4Kw58rDIQzUKvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775173742; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=c5D9ZkT8JYejwpSreaiXIWK6zThn9vhXnnKzmMKMQA8=; b=lwI3PeQX8t30c89BLRYsS0NLmLJRYDebxM2gqN0ogIV0q6Q2JLowExNFukpCHLZc5bcZIq0RBlFQaptFl/tWOwVxjumV13V4HmNto2tAQqr+v7ycSYvFi1MgBj8QLIvjarYyA2qYl5xq9SFsb8c/wMwMsQ4a8C2Fldr0VFgRrYs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775173742971134.48002665546517; Thu, 2 Apr 2026 16:49:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w8RlL-0004Ih-JB; Thu, 02 Apr 2026 19:47:47 -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 1w8RlL-0004IJ-0K for qemu-devel@nongnu.org; Thu, 02 Apr 2026 19:47:47 -0400 Received: from p-west2-cluster6-host7-snip4-3.eps.apple.com ([57.103.70.46] helo=outbound.mr.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w8RlJ-000445-Fv for qemu-devel@nongnu.org; Thu, 02 Apr 2026 19:47:46 -0400 Received: from outbound.mr.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-2a-60-percent-6 (Postfix) with ESMTPS id C91FD180015B; Thu, 02 Apr 2026 23:47:42 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.152.38]) by p00-icloudmta-asmtp-us-west-2a-60-percent-6 (Postfix) with ESMTPSA id D4A641800156; Thu, 02 Apr 2026 23:47:40 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1775173664; x=1777765664; bh=c5D9ZkT8JYejwpSreaiXIWK6zThn9vhXnnKzmMKMQA8=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=a9cu3H8ir8YZrH4GRrVEPaTfdTUzCIaMBHXflqpE7Xh0F0r69qMLZunGlkmw1rM2rhjxF4/OiPFpkLy04FpPX3HYo6yRE1cDYS60X8MSwpk9+3o6Sjx1L6m0afMyWT8iusT0QQ2mOney0VavodvUZnra4Uo71k7Gvt6pLts07bmvm/6q8cknqx33uI8rRNDnHz4B7E6VJZ38tBcROxDMhXO/jJIbVVhAGeSH3HzZKGj/ixJ9xnq6stWwzg31Qvm+cK9HovfP+KUrKItE6HvexSVrXADsDt0npcsLU42ZX/Z/xxJ3kV3XOx2WPS2RJJYhLbVT/kORKPaYp07iDkmSnA== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Mohamed Mediouni , Phil Dennis-Jordan , Roman Bolshakov , Zhao Liu , Paolo Bonzini , Pedro Barbuda , Wei Liu 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: quoted-printable X-Proofpoint-ORIG-GUID: E4_OygPwFSxY6QwKw45HzQ0rh4__zHNn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDAyMDIxMyBTYWx0ZWRfX6DNTH7dthynF 4iO5E7J1Fqy9VKFNijndCr+CatOrMyVqEZslnpoH1vdbk0QAXm2u9lRXSNLjrYK5Zwmtr5wb2qL nxdVcw/f32GIjm4L4M2FbI++FPxm1L99ueP0aA2gV0nUgTvAHa5Okx2DfibwSmuNZMYJCUR3JYl XcLqWRt160ebU7SXAgyCL8hmWN/ymz/63h5EXVNY8s2oghC7kl+9vsRydjh4UslkN8dk5qXJv/2 b65rtbVWcT2ggcV3NtGhXZrO5ycOsqYIjuPzCxFmnsvGk3LOZQqJ3/UhDUuEaXEiObk+48OKb4Y 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 cx=c_apl:c_pps:t_out a=9OgfyREA4BUYbbCgc0Y0oA==:117 a=9OgfyREA4BUYbbCgc0Y0oA==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=8S12nBvZezfavlJVhXoA: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-02_04,2026-04-02_05,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 clxscore=1030 spamscore=0 phishscore=0 bulkscore=0 mlxscore=0 mlxlogscore=841 suspectscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604020213 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=57.103.70.46; 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, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1775173744263158501 Content-Type: text/plain; charset="utf-8" Unlike the implementation in QEMU 10.2, this one works. It's not optimal though as it doesn't use the Hyper-V support for this. Signed-off-by: Mohamed Mediouni --- target/i386/whpx/whpx-all.c | 39 ++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 483a15ffdc..536657e43a 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -2127,6 +2127,35 @@ int whpx_vcpu_run(CPUState *cpu) } break; } + } else { + switch (vcpu->exit_ctx.CpuidAccess.Rax) { + case 0x40000000: + case 0x40000001: + case 0x40000010: + reg_values[1].Reg64 =3D vcpu->exit_ctx.CpuidAccess.Def= aultResultRax; + reg_values[2].Reg64 =3D vcpu->exit_ctx.CpuidAccess.Def= aultResultRcx; + reg_values[3].Reg64 =3D vcpu->exit_ctx.CpuidAccess.Def= aultResultRdx; + reg_values[4].Reg64 =3D vcpu->exit_ctx.CpuidAccess.Def= aultResultRbx; + break; + } + } + + /* Dynamic depending on XCR0 and XSS, so query DefaultResult */ + if (vcpu->exit_ctx.CpuidAccess.Rax =3D=3D 0x07 + && vcpu->exit_ctx.CpuidAccess.Rcx =3D=3D 0) { + if (vcpu->exit_ctx.CpuidAccess.DefaultResultRdx + & CPUID_7_0_EDX_CET_IBT) { + reg_values[3].Reg32 |=3D CPUID_7_0_EDX_CET_IBT; + } else { + reg_values[3].Reg32 &=3D ~CPUID_7_0_EDX_CET_IBT; + } + + if (vcpu->exit_ctx.CpuidAccess.DefaultResultRcx + & CPUID_7_0_ECX_CET_SHSTK) { + reg_values[2].Reg32 |=3D CPUID_7_0_ECX_CET_SHSTK; + } else { + reg_values[2].Reg32 &=3D ~CPUID_7_0_ECX_CET_SHSTK; + } } =20 hr =3D whp_dispatch.WHvSetVirtualProcessorRegisters( @@ -2345,8 +2374,12 @@ int whpx_accel_init(AccelState *as, MachineState *ms) WHV_CAPABILITY_FEATURES features =3D {0}; WHV_PROCESSOR_FEATURES_BANKS processor_features; WHV_PROCESSOR_PERFMON_FEATURES perfmon_features; - UINT32 cpuidExitList[] =3D {1}; - UINT32 cpuidExitList_nohyperv[] =3D {1, 0x40000000, 0x40000001, 0x4000= 0010}; + + UINT32 cpuidExitList[] =3D {0x0, 0x1, 0x6, 0x7, 0x14, 0x24, 0x29, 0x1E, + 0x40000000, 0x40000001, 0x40000010, 0x80000000, 0x80000001, + 0x80000002, 0x80000003, 0x80000004, 0x80000007, 0x80000008, + 0x8000000A, 0x80000021, 0x80000022, 0xC0000000, 0xC0000001}; + UINT32 cpuidExitList_legacy_os[] =3D {1, 0x40000000, 0x40000001, 0x400= 00010}; =20 whpx =3D &whpx_global; =20 @@ -2602,7 +2635,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms) hr =3D whp_dispatch.WHvSetPartitionProperty( whpx->partition, WHvPartitionPropertyCodeCpuidExitList, - whpx->hyperv_enlightenments_enabled ? cpuidExitList : cpuidExitLis= t_nohyperv, + !whpx_is_legacy_os() ? cpuidExitList : cpuidExitList_legacy_os, RTL_NUMBER_OF(cpuidExitList) * sizeof(UINT32)); =20 if (FAILED(hr)) { --=20 2.50.1 (Apple Git-155)