From nobody Sat Apr 11 19:53:10 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=1775356551; cv=none; d=zohomail.com; s=zohoarc; b=LNnRPR239chLiRYi+KbC+URAdkRXNyBPj0HHJC1+8VGc+c0JwhITPAtzGcdnmM14awfzc29DEVZlRoXLF6k4dg8C3x31PnElSTL/DmtA9jvA92X/ZN4EpT2+pLlfewQI6RGhsCDp4CwHzzdo32O6MOq3AcLQgXOVPzWMrzzgkpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775356551; 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=iP6Piv5IE+cZrY5ZT10qnmGENH+bK0UtFOJl7DU/kdg=; b=PeupG6GvghWQHyV8aWEjz2IaeEy6ZtIuxArDiANaqFk9+3jiLaXrvMO6yY7ASQjusAFS0WNmMDuFwwZf8xNwuSdlV6cu5Unp4/f6fKJxk60MESyxRH9+Tk1vP3UORNPr6XvNcrgCQQ71+3k02XqWpqklNZH0ZtrocdehoYQdfkQ= 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 1775356551017104.50239234731669; Sat, 4 Apr 2026 19:35:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w9DJp-0003bK-Q6; Sat, 04 Apr 2026 22:34:33 -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 1w9DJo-0003ap-Eb for qemu-devel@nongnu.org; Sat, 04 Apr 2026 22:34:32 -0400 Received: from p-east2-cluster4-host12-snip4-2.eps.apple.com ([57.103.78.183] helo=outbound.st.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w9DJm-0008Gh-Ub for qemu-devel@nongnu.org; Sat, 04 Apr 2026 22:34:32 -0400 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-60-percent-10 (Postfix) with ESMTPS id 7650F1800144; Sun, 05 Apr 2026 02:34:27 +0000 (UTC) Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-60-percent-10 (Postfix) with ESMTPSA id 93C35180016A; Sun, 05 Apr 2026 02:34:25 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1775356470; x=1777948470; bh=iP6Piv5IE+cZrY5ZT10qnmGENH+bK0UtFOJl7DU/kdg=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=BAIH3juAPWg6h0brCjQYVwCNaltSE7oPJnaOlwU2TYKdgPYX6nic6J/uKncB0qys4LqM8r8Ko1Gnmh30HQBVqBmVOFtqANQYwbRX/z31XSO2xrO53nID9IpBJoKBEq82nVJJ2fD8T8iMWfAaKnshfV3gyyG5e/WlyuzCyYXZeTHWl/3PEMUjPHzMb3jJubaQxqiaLeY5icq/w3LPNmVR3D6w10IyDLEXQJDlW2ZGP7STJk4bTtCJ4W+6pQvhAktL7qY1igBsEHADzcp6Zpkcab/l9KiLDb9S6wJpJGvZ7j943hatU7VMAiFJPElGLzb0AucWVo92owXWMZ/8uoSKxw== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Pedro Barbuda , Wei Liu , Mohamed Mediouni , Paolo Bonzini , Roman Bolshakov , Phil Dennis-Jordan , Zhao Liu Subject: [PATCH v7 09/11] whpx: i386: use WHvX64RegisterCr8 only when kernel-irqchip=off Date: Sun, 5 Apr 2026 04:34:07 +0200 Message-ID: <20260405023409.23142-10-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260405023409.23142-1-mohamed@unpredictable.fr> References: <20260405023409.23142-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: xH6gLu-zr4OiX_mpIhpvZjMkU2kAyqTc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDA1MDAyNCBTYWx0ZWRfX6WKRymWbxnuq PV6y/1Qc5BAQpPxUU18yQnxhv7R/Cu/9orLOV0mwEcRGWLTPwGUk6YqkcNvKAom+MuvVv/kYlkW IavlUtLk9ioN+T9Apuwyh6wIzmA0rV6I5rrOh/w/gQCvV47yyk2UkVc/B/LxwvLd9B9QnTTur1g 02b2yfx33H9IM9mgE/P5FFKfoWV//GfP4xHXqSAjLobXnAYWamdoN1Igp6XRQeyNroIC50HE0OZ +PHemQJzUz2apRUOiwIlytKa/ZvfS13sJP1YueJ9ZDIiup+nKpXg0IjKBiatfwVK5FIAbp2qe6Q qw87ln7FQdMp2TJE+ZgEDohU3d8al/FYQ2ky5r2gVN1HGrrGvdd1LvDobvMZgo= X-Authority-Info-Out: v=2.4 cv=dcqNHHXe c=1 sm=1 tr=0 ts=69d1ca34 cx=c_apl:c_pps:t_out a=YrL12D//S6tul8v/L+6tKg==:117 a=YrL12D//S6tul8v/L+6tKg==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=4IdwVP5-j8YZXVcKM5MA:9 X-Proofpoint-GUID: xH6gLu-zr4OiX_mpIhpvZjMkU2kAyqTc 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-05_01,2026-04-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 clxscore=1030 suspectscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=866 bulkscore=0 mlxscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604050024 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.78.183; envelope-from=mohamed@unpredictable.fr; helo=outbound.st.icloud.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1775356553604154101 Content-Type: text/plain; charset="utf-8" When kernel-irqchip=3Don, manage TPR as part of the APIC state instead enti= rely. This fixes some failure to set state errors. Signed-off-by: Mohamed Mediouni --- target/i386/whpx/whpx-all.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 11d36e0518..0b0b03864b 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -95,7 +95,6 @@ static const WHV_REGISTER_NAME whpx_register_names[] =3D { WHvX64RegisterCr2, WHvX64RegisterCr3, WHvX64RegisterCr4, - WHvX64RegisterCr8, =20 /* X64 Debug Registers */ /* @@ -459,8 +458,11 @@ void whpx_set_registers(CPUState *cpu, WHPXStateLevel = level) vcxt.values[idx++].Reg64 =3D env->cr[3]; assert(whpx_register_names[idx] =3D=3D WHvX64RegisterCr4); vcxt.values[idx++].Reg64 =3D env->cr[4]; - assert(whpx_register_names[idx] =3D=3D WHvX64RegisterCr8); - vcxt.values[idx++].Reg64 =3D vcpu->tpr; + /* For kernel-irqchip=3Don, TPR is managed as part of APIC state */ + if (!whpx_irqchip_in_kernel()) { + WHV_REGISTER_VALUE cr8 =3D {.Reg64 =3D vcpu->tpr}; + whpx_set_reg(cpu, WHvX64RegisterCr8, cr8); + } =20 /* 8 Debug Registers - Skipped */ =20 @@ -716,11 +718,14 @@ void whpx_get_registers(CPUState *cpu, WHPXStateLevel= level) env->cr[3] =3D vcxt.values[idx++].Reg64; assert(whpx_register_names[idx] =3D=3D WHvX64RegisterCr4); env->cr[4] =3D vcxt.values[idx++].Reg64; - assert(whpx_register_names[idx] =3D=3D WHvX64RegisterCr8); - tpr =3D vcxt.values[idx++].Reg64; - if (tpr !=3D vcpu->tpr) { - vcpu->tpr =3D tpr; - cpu_set_apic_tpr(x86_cpu->apic_state, tpr); + + /* For kernel-irqchip=3Don, TPR is managed as part of APIC state */ + if (!whpx_irqchip_in_kernel()) { + tpr =3D vcpu->exit_ctx.VpContext.Cr8; + if (tpr !=3D vcpu->tpr) { + vcpu->tpr =3D tpr; + cpu_set_apic_tpr(x86_cpu->apic_state, tpr); + } } =20 /* 8 Debug Registers - Skipped */ @@ -1660,7 +1665,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) =20 /* Sync the TPR to the CR8 if was modified during the intercept */ tpr =3D cpu_get_apic_tpr(x86_cpu->apic_state); - if (tpr !=3D vcpu->tpr) { + if (!whpx_irqchip_in_kernel() && tpr !=3D vcpu->tpr) { vcpu->tpr =3D tpr; reg_values[reg_count].Reg64 =3D tpr; qatomic_set(&cpu->exit_request, true); @@ -1702,12 +1707,14 @@ static void whpx_vcpu_post_run(CPUState *cpu) =20 env->eflags =3D vcpu->exit_ctx.VpContext.Rflags; =20 - uint64_t tpr =3D vcpu->exit_ctx.VpContext.Cr8; - if (vcpu->tpr !=3D tpr) { - vcpu->tpr =3D tpr; - bql_lock(); - cpu_set_apic_tpr(x86_cpu->apic_state, vcpu->tpr); - bql_unlock(); + if (!whpx_irqchip_in_kernel()) { + uint64_t tpr =3D vcpu->exit_ctx.VpContext.Cr8; + if (vcpu->tpr !=3D tpr) { + vcpu->tpr =3D tpr; + bql_lock(); + cpu_set_apic_tpr(x86_cpu->apic_state, vcpu->tpr); + bql_unlock(); + } } =20 vcpu->interruption_pending =3D --=20 2.50.1 (Apple Git-155)