{"id":2231456,"url":"http://patchwork.ozlabs.org/api/patches/2231456/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430172204.1006673-42-pbonzini@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260430172204.1006673-42-pbonzini@redhat.com>","list_archive_url":null,"date":"2026-04-30T17:21:47","name":"[PULL,41/58] whpx: i386: don't increment eip on MSR access raising GPF","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8de5ffc38261c750a8c30840b592f608a3643352","submitter":{"id":2701,"url":"http://patchwork.ozlabs.org/api/people/2701/?format=json","name":"Paolo Bonzini","email":"pbonzini@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430172204.1006673-42-pbonzini@redhat.com/mbox/","series":[{"id":502347,"url":"http://patchwork.ozlabs.org/api/series/502347/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502347","date":"2026-04-30T17:21:16","name":"[PULL,01/58] pythondeps: bump to meson 1.11.1","version":1,"mbox":"http://patchwork.ozlabs.org/series/502347/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2231456/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231456/checks/","tags":{},"related":[],"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 (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=dm+1Af89;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=google header.b=sZpWnjvk;\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 4g61RL0ZKzz1yGq\n\tfor ; Fri, 01 May 2026 03:30:54 +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 1wIV7l-0007j1-S8; Thu, 30 Apr 2026 13:24:30 -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 1wIV7e-0006sN-PF\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 13:24:22 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\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 1wIV7c-0004rL-Vp\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 13:24:22 -0400","from mail-qk1-f199.google.com (mail-qk1-f199.google.com\n [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-272-n4ZmW-4kODaucQzitUKmAw-1; Thu, 30 Apr 2026 13:24:17 -0400","by mail-qk1-f199.google.com with SMTP id\n af79cd13be357-8eb04352924so224228385a.1\n for ; Thu, 30 Apr 2026 10:24:17 -0700 (PDT)","from [192.168.10.48] ([151.49.85.67])\n by smtp.gmail.com with ESMTPSA id\n af79cd13be357-8fbb0fe8595sm34097085a.11.2026.04.30.10.24.12\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 30 Apr 2026 10:24:13 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1777569860;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=sbjWcZdrNQsZzCJqWUMwt6OVdlowLhocYfWplzHM/v4=;\n b=dm+1Af891dvptvEnUdduX/Bw4IefBn+wWVtZJ1KnIEbYxEPE3hI6jfKttT2IcGvsIKl1ad\n XlufvZeAvcw4NJs8TlR5RuBYg3lOXn2pvvWOL2g88/jZ0r8Q/DMOUgUhEWKwrXYc62trZU\n gbPQ4ThNc1jBbj2NwPKTEUBolGm6P0w=","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1777569856; x=1778174656; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=sbjWcZdrNQsZzCJqWUMwt6OVdlowLhocYfWplzHM/v4=;\n b=sZpWnjvk7M+FTNxtPCToff0ciun3BlV/yMxTXMdY0Akn/M3yKkYn0LR4M1TtimCijB\n u3zXDilgK2PoCrfJ7mQKVmkJIbO/FmzNZQUWaK3AqRRslyysO/Cu08MLlk3grwIFV1Q3\n UXEuYlTOmD9DHqbZC+UnXHHC2f+RXD0bK9p17Zt31V4QFAywevOncHvYZOjCdvyFoQ+v\n 8Y8iaDQRJ+S6vDjLoA7kF92oorQ++z8+tTMa4l6mSJt5Qy+zAS9aGrj69by5O645VoIr\n OyR1C8D0odk0UVMcdt8UPAkSEorjufn378rI+Qh16080IApQCTlzsFz07Fnp+Ww5jSHc\n 8JzQ=="],"X-MC-Unique":"n4ZmW-4kODaucQzitUKmAw-1","X-Mimecast-MFC-AGG-ID":"n4ZmW-4kODaucQzitUKmAw_1777569857","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777569856; x=1778174656;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=sbjWcZdrNQsZzCJqWUMwt6OVdlowLhocYfWplzHM/v4=;\n b=bkc6hClnPsbx7fWiz2YiR47pYGDFZXY3cD04FnVaUFJt5SeXPh9zXRtaJdvcVdTQ0p\n Hohf5G3E7eFncw864n+IPSQh12dbZHwRjvuNUukma6INTygJ4WhanPGUb4AzRnI7us86\n 6MlFKgiznbRToIN7tSb6hTLRj5O8W8kP9WCIR+T9L1RqwOrjNdpEItXFodCnAOkbt5/4\n n6N5tyszd24ZchWF/DVqlQQm1wUqwYgap2Pqp8AcrnexsaYKjHjrnm0eZ8TTa9wB3YRm\n +q1TBuyN2bCrWPQvjOn2F4BJS70/T7/x5sYNOVXD0rtmK42nwyeIAPxcK2nEL/a+KvnS\n 7WvQ==","X-Gm-Message-State":"AOJu0YwyexAmYgl/2s8s3FoJBNUXkAzU6CWX+lMiPRcfdbM7t6AuoXRO\n r3fDd1hwmddFjfZt2Aw1nlU+/Adn6snosShGuoLgJqj3PF8KkKEHfLVVvQ2Bkni/aCOAZE3b2IA\n Q+fqulOaxGTL491Yj2oP6MFRW7NYOUneJi5hwfNiQ20T9Aemv6GEkRvoIGvLc+AlZdfe9q409Jo\n BYOWPTtMs3XtnuJlr5UiIOAZNXykf0qc9qH7TY3huB","X-Gm-Gg":"AeBDies8Bw6EfBYxKoqcGe5JSYmMNQHIHS4hAfnloWIHEv0ROvkgZcq0iYzHAhYq1bD\n qq9laxXw+Kkp3Pp2IddZpEpcjFygc2HxsrFrB374Q9Av3ON0yyYNjf1upURqxrVIwc/h1FXu7nY\n vtagLveQ3lEUgANav22sdwMfS4H8e0q87U0NEQDDQZIcplgBcNtPOTLkgaRK7bHZwtTU4kifF91\n 1OuaIlwCO5C/Vbhc3/8bkm8l6o3d2pzdgwM6XuegL8XcRjq35h1T+NMx6Sqpu6kaMSkB1O94t0W\n s843SDLg0UKvsSz3PlD1h07mvGjoFN1bbl4roVjonUQQ62Bl3ffJf7NjVL7jgjjxHtoU9btfMd3\n dm3g4wXqF3/urKe9mnHNC5HJkhslO4g49CslwlJ+qe5sda0VusYcsmGFqxw4WkoOVdQze6Ne7Xi\n TyUvTEHKWhIA3NLFSZGIJAox9cm5pmXrMCZjQ=","X-Received":["by 2002:a05:620a:4455:b0:8ea:bddc:690b with SMTP id\n af79cd13be357-8fa89324cd3mr587589785a.51.1777569855918;\n Thu, 30 Apr 2026 10:24:15 -0700 (PDT)","by 2002:a05:620a:4455:b0:8ea:bddc:690b with SMTP id\n af79cd13be357-8fa89324cd3mr587580385a.51.1777569855175;\n Thu, 30 Apr 2026 10:24:15 -0700 (PDT)"],"From":"Paolo Bonzini ","To":"qemu-devel@nongnu.org","Cc":"Mohamed Mediouni ","Subject":"[PULL 41/58] whpx: i386: don't increment eip on MSR access raising\n GPF","Date":"Thu, 30 Apr 2026 19:21:47 +0200","Message-ID":"<20260430172204.1006673-42-pbonzini@redhat.com>","X-Mailer":"git-send-email 2.54.0","In-Reply-To":"<20260430172204.1006673-1-pbonzini@redhat.com>","References":"<20260430172204.1006673-1-pbonzini@redhat.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=170.10.133.124;\n envelope-from=pbonzini@redhat.com;\n helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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 ","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":"From: Mohamed Mediouni \n\nSigned-off-by: Mohamed Mediouni \nLink: https://lore.kernel.org/r/20260422214225.2242-33-mohamed@unpredictable.fr\nSigned-off-by: Paolo Bonzini \n---\n target/i386/whpx/whpx-all.c | 11 +++++++++++\n 1 file changed, 11 insertions(+)","diff":"diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex eecc7f48ed9..4bb99a8e900 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -2048,6 +2048,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@@ -2086,6 +2087,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@@ -2105,6 +2107,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@@ -2112,6 +2115,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@@ -2135,6 +2139,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":["PULL","41/58"]}