[{"id":3673386,"web_url":"http://patchwork.ozlabs.org/comment/3673386/","msgid":"<13310089-FC17-42D8-9283-B9D380C925E7@unpredictable.fr>","list_archive_url":null,"date":"2026-04-04T05:31:12","subject":"Re: [PATCH v6 07/11] whpx: i386: introduce proper cpuid support","submitter":{"id":91318,"url":"http://patchwork.ozlabs.org/api/people/91318/","name":"Mohamed Mediouni","email":"mohamed@unpredictable.fr"},"content":"> On 4. Apr 2026, at 06:20, Mohamed Mediouni <mohamed@unpredictable.fr> wrote:\n> \n> Unlike the implementation in QEMU 10.2, this one works.\n> \n> It's not optimal though as it doesn't use the Hyper-V support for this.\n> \n> Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>\n> ---\n> target/i386/whpx/whpx-all.c | 39 ++++++++++++++++++++++++++++++++++---\n> 1 file changed, 36 insertions(+), 3 deletions(-)\n> \n> diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\n> index 03233d1b94..3e006496be 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\nHello,\n\nTo not send yet another revision again (if no further revision\nneeded, can be squashed with this when the time comes):\n\nFrom: Mohamed Mediouni <mohamed@unpredictable.fr>\nDate: Sat, 4 Apr 2026 07:00:42 +0200\nSubject: [PATCH] whpx: i386: fix osxsave\n\nOSXSAVE is dynamic and relies on the state of CR4.\nInstead of reading CR4, falling back on the default\nCPUID results provided by the hypervisor.\n\nSigned-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>\n---\n target/i386/whpx/whpx-all.c | 10 ++++++++++\n 1 file changed, 10 insertions(+)\n\ndiff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex ac2671745f..71cc3e0991 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -2149,6 +2149,16 @@ int whpx_vcpu_run(CPUState *cpu)\n                 }\n             }\n \n+            /* OSXSAVE is dynamic. Do this instead of syncing CR4 */\n+            if (vcpu->exit_ctx.CpuidAccess.Rax == 1) {\n+                if (vcpu->exit_ctx.CpuidAccess.DefaultResultRcx\n+                    & CPUID_EXT_OSXSAVE) {\n+                    reg_values[2].Reg32 |= CPUID_EXT_OSXSAVE;\n+                } else {\n+                    reg_values[2].Reg32 &= ~CPUID_EXT_OSXSAVE;\n+                }\n+            }\n+\n             hr = whp_dispatch.WHvSetVirtualProcessorRegisters(\n                 whpx->partition,\n                 cpu->cpu_index,","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=d1dIdO86;\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 4fnkmf4V45z1yCs\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 04 Apr 2026 16:34:24 +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 1w8tdT-0008MH-Pd; Sat, 04 Apr 2026 01:33:33 -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 1w8tba-0007BL-U1\n for qemu-devel@nongnu.org; Sat, 04 Apr 2026 01:31:34 -0400","from p-west3-cluster5-host1-snip4-4.eps.apple.com ([57.103.72.67]\n helo=outbound.ms.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 1w8tbY-0003rn-ID\n for qemu-devel@nongnu.org; Sat, 04 Apr 2026 01:31:34 -0400","from outbound.ms.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-west-3a-10-percent-1 (Postfix) with ESMTPS id\n 5D3AB18000D3; Sat, 04 Apr 2026 05:31:26 +0000 (UTC)","from smtpclient.apple (unknown [17.57.154.37])\n by p00-icloudmta-asmtp-us-west-3a-10-percent-1 (Postfix) with ESMTPSA id\n 0D8DF18000E6; Sat, 04 Apr 2026 05:31:24 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1775280689; x=1777872689;\n bh=Hu2KKijghiT58ujR7hIe3z/kmfJxc7AkGtWu3RDKuLI=;\n h=Content-Type:Mime-Version:Subject:From:Date:Message-Id:To:x-icloud-hme;\n b=d1dIdO86IPt0u07nh/kS6OTS8LOSofQuQ4wnQwS6BVrFz21J7VmN0xs1udq8EU9BulvcjQ6jP3cw4gYv5Gh6RIE1b5gw6lLvRqUGNbe79n4rIpC6DeZFVG4JHLfPXZthT3Sz9U0NuRKCuQ1j83y6K6zE8Gl6bn5PvchpxGsMpkkKbZCMmLRw7g7LzeywUZMxahEAqjLRu2um+9Zl3ocEAuvpuyppuMdL6y1UkJ7BALyC5afW/DqLdDG/QzBPdPR2lWAWX1xK9/loKn8IM5brvv9kDQ0UyPOco6Gz2+rATj3ZsmdtzorDwfBYiEvECJSrK49PVJvENal1JglNw9EIHg==","mail-alias-created-date":"1752046281608","Content-Type":"text/plain;\n\tcharset=us-ascii","Mime-Version":"1.0 (Mac OS X Mail 16.0 \\(3864.500.181\\))","Subject":"Re: [PATCH v6 07/11] whpx: i386: introduce proper cpuid support","From":"Mohamed Mediouni <mohamed@unpredictable.fr>","In-Reply-To":"<20260404042015.86580-8-mohamed@unpredictable.fr>","Date":"Sat, 4 Apr 2026 07:31:12 +0200","Cc":"Wei Liu <wei.liu@kernel.org>, Roman Bolshakov <rbolshakov@ddn.com>,\n Pedro Barbuda <pbarbuda@microsoft.com>,\n Phil Dennis-Jordan <phil@philjordan.eu>,\n Paolo Bonzini <pbonzini@redhat.com>, Zhao Liu <zhao1.liu@intel.com>","Content-Transfer-Encoding":"quoted-printable","Message-Id":"<13310089-FC17-42D8-9283-B9D380C925E7@unpredictable.fr>","References":"<20260404042015.86580-1-mohamed@unpredictable.fr>\n <20260404042015.86580-8-mohamed@unpredictable.fr>","To":"qemu-devel@nongnu.org","X-Mailer":"Apple Mail (2.3864.500.181)","X-Proofpoint-GUID":"LTOUl0zd13eLVZgxpgDA4ggDvpx55TSv","X-Proofpoint-ORIG-GUID":"LTOUl0zd13eLVZgxpgDA4ggDvpx55TSv","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDA0MDA0NiBTYWx0ZWRfX1WKbjXMYQ3Nn\n eKDM7dx5QuhywUGnmHp9tsi5LWmIFs13yZ5EDlehimGe1dHByQkpbsJX8D93RErT83xQTNSqyis\n qV0PyOeLLSWJgFGfgT52mD7kkdzJHhQ22tx0lPWtJGQItohKJjXUgyCGsLajEMDPaIGUlSmjILb\n j95TQgLRTvQt878TVKe8fvLZJ2xy7lNGQrgMKAi6KWovn3ZJzRe88fKU2J90p6B4DADd6hil1LT\n sgVIw979ZtBq1KDhBALZkM787ukdOc8SWss299LbelVjFn6u9cJE+kkAtxXDR1miPd0YLtEL+hh\n coRSfNY0gh0Vyw1zjA2QsHFZt1RcFPczJMN7ozd/AuyWNb95vEetZeWAnByF70=","X-Authority-Info-Out":"v=2.4 cv=epHSD4pX c=1 sm=1 tr=0 ts=69d0a230\n cx=c_apl:c_pps:t_out a=qkKslKyYc0ctBTeLUVfTFg==:117 a=kj9zAlcOel0A:10\n a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=xdUuE5n_Jaq1-9jlNbcA:9\n a=CjuIK1q_8ugA:10","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-03_07,2026-04-03_01,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0 spamscore=0\n bulkscore=0 lowpriorityscore=0 clxscore=1030 mlxlogscore=892 suspectscore=0\n phishscore=0 adultscore=0 mlxscore=0 malwarescore=0 classifier=spam\n authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000\n definitions=main-2604040046","Received-SPF":"pass client-ip=57.103.72.67;\n envelope-from=mohamed@unpredictable.fr; helo=outbound.ms.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"}}]