{"id":2225092,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2225092/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260420104248.86702-35-mohamed@unpredictable.fr/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/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":"<20260420104248.86702-35-mohamed@unpredictable.fr>","date":"2026-04-20T10:42:44","name":"[v2,34/38] whpx: i386: don't increment eip on MSR access raising GPF","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c8e69434524cdbc152af214110d29b02b636f55d","submitter":{"id":91318,"url":"http://patchwork.ozlabs.org/api/1.1/people/91318/?format=json","name":"Mohamed Mediouni","email":"mohamed@unpredictable.fr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260420104248.86702-35-mohamed@unpredictable.fr/mbox/","series":[{"id":500592,"url":"http://patchwork.ozlabs.org/api/1.1/series/500592/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500592","date":"2026-04-20T10:42:10","name":"WHPX x86 updates for QEMU 11.1","version":2,"mbox":"http://patchwork.ozlabs.org/series/500592/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225092/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225092/checks/","tags":{},"headers":{"Return-Path":"","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=gMeNcNdv;\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=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.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 4fzhzj1zgRz1yCv\n\tfor ; Mon, 20 Apr 2026 20:48:33 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wEm77-0008RV-1F; Mon, 20 Apr 2026 06:44:25 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wEm74-0008PV-Sy\n for qemu-devel@nongnu.org; Mon, 20 Apr 2026 06:44:22 -0400","from p-west3-cluster4-host9-snip4-3.eps.apple.com ([57.103.74.234]\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 )\n id 1wEm73-0000nf-Dn\n for qemu-devel@nongnu.org; Mon, 20 Apr 2026 06:44:22 -0400","from outbound.ms.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-west-3a-100-percent-1 (Postfix) with ESMTPS id\n B3BAA1800449; Mon, 20 Apr 2026 10:44:18 +0000 (UTC)","from localhost.localdomain (unknown [17.57.154.37])\n by p00-icloudmta-asmtp-us-west-3a-100-percent-1 (Postfix) with ESMTPSA id\n 00DA2180014D; Mon, 20 Apr 2026 10:44:15 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1776681860; x=1779273860;\n bh=rPSPa9QNEGa/mspx8muwq7AvyIqsfM0CKqiZ0OTwje8=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=gMeNcNdvmjD9YpMasB5IE3dRDlj+B2WRGE9GEj9KyX7LoQSQp+lCeaJVvjp4KD/YFqLONkxgCFUDenyRh4WOQwVs4qRFlxTuATeGZGlTE0gShE2gwy1/VIfnZaX5LqlL/n8tIjSn/Ff9TXcNHHGU0YjCoXE8tq8Kh50QCFbIBMqD5oWMca0vk5G/I33tOr6Y2+6fuDjZJXw8x1Z1foMaNnrrdEAbFtS7PfcyBkdTPZY2mO3cB+j9t8En98zd6RDehtXAaMnDUTN+A5KdFFgG2Ntetj816FvDk7Xbm1u9XmOEoUfw0ZL0PZ4+6YcqKo2CGT5z2502NyGsU6dsGcf+CA==","mail-alias-created-date":"1752046281608","From":"Mohamed Mediouni ","To":"qemu-devel@nongnu.org","Cc":"qemu-arm@nongnu.org, Mohamed Mediouni ,\n Paolo Bonzini ,\n Phil Dennis-Jordan ,\n Roman Bolshakov ,\n Pierrick Bouvier ,\n Pedro Barbuda , Wei Liu ,\n \"Michael S. Tsirkin\" ,\n Peter Maydell , Zhao Liu ","Subject":"[PATCH v2 34/38] whpx: i386: don't increment eip on MSR access\n raising GPF","Date":"Mon, 20 Apr 2026 12:42:44 +0200","Message-ID":"<20260420104248.86702-35-mohamed@unpredictable.fr>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260420104248.86702-1-mohamed@unpredictable.fr>","References":"<20260420104248.86702-1-mohamed@unpredictable.fr>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Authority-Info-Out":"v=2.4 cv=IqQTsb/g c=1 sm=1 tr=0 ts=69e60383\n cx=c_apl:c_pps:t_out a=qkKslKyYc0ctBTeLUVfTFg==:117 a=A5OVakUREuEA:10\n a=VkNPw1HP01LnGYTKEx00:22 a=N0YEvnU7VqbRQIRMxcMA:9","X-Proofpoint-GUID":"YxoqcTplDF3fAxDC33PbX8kwXAxpEfLf","X-Proofpoint-ORIG-GUID":"YxoqcTplDF3fAxDC33PbX8kwXAxpEfLf","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDIwMDEwNCBTYWx0ZWRfX4FBRlfBWzUCe\n ZhE+GPTlE8Oo4ykYyP6S5rm0z0HSvXqV+PuJr+Wg5mrGSkyO6+7QzC0u38Zt5wo9uEZByFePMg5\n gOmRv0BtCiQ3XmH+IQr+Xg7Axa44foryHGLgTWrrkNHNp3IAN40fm+WtMLS+extfSm3fQIYAMci\n GKpyDyrrcPdaA5I8nAKMOm16/DZ7nE2K3ee/aX0vZkQkWEn/OoPl/En2O6grs5VEugsJxT28mCE\n 1mOcUNFja0zDbyLM2A1DgHiLj1p1CAmosKh8DxvkEWHM3PNYDnPfwaDMAgeWlBEvFony22r7vmU\n TrnYr20Hmlg5z4/AVZkXt3npmWwTtMFaLw/D1SJnqFMo88IwTKEFPoP5dZWqu8=","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-20_02,2026-04-17_04,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0 bulkscore=0\n phishscore=0 spamscore=0 adultscore=0 suspectscore=0 clxscore=1030 mlxscore=0\n mlxlogscore=757 malwarescore=0 lowpriorityscore=0 classifier=spam authscore=0\n adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000\n definitions=main-2604200104","Received-SPF":"pass client-ip=57.103.74.234;\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 SPF_HELO_PASS=-0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Signed-off-by: Mohamed Mediouni \n---\n target/i386/whpx/whpx-all.c | 12 ++++++++++++\n 1 file changed, 12 insertions(+)","diff":"diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex f9f12484c9..b0692935e7 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -2179,6 +2179,7 @@ int whpx_vcpu_run(CPUState *cpu)\n WHV_REGISTER_NAME reg_names[3];\n UINT32 reg_count;\n bool is_known_msr = 0; \n+ bool raises_gpf = false;\n uint64_t val;\n \n if (vcpu->exit_ctx.MsrAccess.AccessInfo.IsWrite) {\n@@ -2211,6 +2212,7 @@ int whpx_vcpu_run(CPUState *cpu)\n is_known_msr = 1;\n if (val & MSR_IA32_APICBASE_RESERVED) {\n x86_emul_raise_exception(&X86_CPU(cpu)->env, EXCP0D_GPF, 0);\n+ raises_gpf = true;\n }\n if (!vcpu->exit_ctx.MsrAccess.AccessInfo.IsWrite) {\n /* Read path unreachable on Hyper-V */\n@@ -2220,6 +2222,7 @@ int whpx_vcpu_run(CPUState *cpu)\n int msr_ret = cpu_set_apic_base(X86_CPU(cpu)->apic_state, val);\n if (msr_ret < 0) {\n x86_emul_raise_exception(&X86_CPU(cpu)->env, EXCP0D_GPF, 0);\n+ raises_gpf = true;\n } else {\n whpx_set_reg(cpu, WHvX64RegisterApicBase, reg);\n }\n@@ -2239,6 +2242,7 @@ int whpx_vcpu_run(CPUState *cpu)\n reg_values[1].Reg64 = val;\n if (msr_ret < 0) {\n x86_emul_raise_exception(&X86_CPU(cpu)->env, EXCP0D_GPF, 0);\n+ raises_gpf = true;\n }\n } else {\n bql_lock();\n@@ -2246,6 +2250,7 @@ int whpx_vcpu_run(CPUState *cpu)\n bql_unlock();\n if (msr_ret < 0) {\n x86_emul_raise_exception(&X86_CPU(cpu)->env, EXCP0D_GPF, 0);\n+ raises_gpf = true;\n }\n }\n }\n@@ -2295,6 +2300,13 @@ int whpx_vcpu_run(CPUState *cpu)\n \n if (!is_known_msr && !whpx->ignore_unknown_msr) {\n x86_emul_raise_exception(&X86_CPU(cpu)->env, EXCP0D_GPF, 0);\n+ raises_gpf = true;\n+ }\n+\n+ /* When a GPF is raised, do not change Rip. */\n+ if (raises_gpf) {\n+ reg_values[0].Reg64 =\n+ vcpu->exit_ctx.VpContext.Rip;\n }\n \n hr = whp_dispatch.WHvSetVirtualProcessorRegisters(\n","prefixes":["v2","34/38"]}