Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 24EF8F99C9C for ; Sat, 18 Apr 2026 22:34:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wEEEa-0006Bf-Jt; Sat, 18 Apr 2026 18:33:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wEEEX-00068M-LR for qemu-devel@nongnu.org; Sat, 18 Apr 2026 18:33:49 -0400 Received: from p-east2-cluster3-host11-snip4-2.eps.apple.com ([57.103.77.173] 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 1wEEEV-0004ty-Jp for qemu-devel@nongnu.org; Sat, 18 Apr 2026 18:33:49 -0400 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-100-percent-1 (Postfix) with ESMTPS id 8D7261800219; Sat, 18 Apr 2026 22:33:42 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1776551626; x=1779143626; bh=8EZPZlRm+WeBpG+PY8ABc8ic+4NnvhCRuAoI2d7ubQQ=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=gU9qNfCy9/LVk0/dibZX0so9eoXa1aRpCaMyKmnj5tXTM9L8I1PXTa9bfgVIFCNO/y2IuVQf+oSRsNv3zmC6fQbfpQzmxTdEtWIYw+sW/NrlNPpciHD2FST8pJAyRNO74k2Ztub9fBHEvuQRGfVoo1+71ILlnOzcBBFfv1XqTD9ZgRQJnt+neI37PkA7YjwNA7rRimdKpOKJGBvBIpgRo2tfdUO8dRUI2Q07OwQOklUhjhXkF9KHBVxh0O6XJD3a/rMPA7UA2xn8k+H4CcMhLxgrKHQAJ+eY+1+hU7kBmaUYkbgUDe464lZVvKXj+jtXrC+Lm2FvrbizRjo+n9/33w== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-100-percent-1 (Postfix) with ESMTPSA id 07B7618000BB; Sat, 18 Apr 2026 22:33:39 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Mohamed Mediouni , "Michael S. Tsirkin" , Paolo Bonzini , Zhao Liu , Pedro Barbuda , Roman Bolshakov , qemu-arm@nongnu.org, Pierrick Bouvier , Peter Maydell , Wei Liu , Phil Dennis-Jordan Subject: [PATCH 09/38] whpx: i386: use WHvX64RegisterCr8 only when kernel-irqchip=off Date: Sun, 19 Apr 2026 00:32:51 +0200 Message-ID: <20260418223320.51330-10-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260418223320.51330-1-mohamed@unpredictable.fr> References: <20260418223320.51330-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE4MDIyOCBTYWx0ZWRfX8S7LpYcxsbkm NfahpoiTuN5AZ2RkyOE6VHJv4tHynNipzgPE8Go67F4p/XwdeiYMnn/WZvRfJn5X+uYX6Y7j7JE Eg3RCyrMxna+hpBGVMbxdTfZTm9iTP33iuuAEsS5nxq6eZBlEOKcOymcnVQXGugJjKSAmQT+EbE cbCcvb8o91s3QL8Cntl8nDopeilaqpjdEq7KLuZAu8VPVeXhfEHNhMGYHoV9VO1c7gYdKD6I5B9 O0JVA6yx53wLgiqy2eQDz70DfPlrRmPUverj+oDu0qbVY1nvLtH8OEWnu58Z9G1+k1sY8I+h71E xtOD4jJ2kSjRdFkw2tltpKBI9r6Q6qdT7QZ+MWgP6wtDK9pFlLRAumQgOfA06Y= X-Proofpoint-GUID: QHg8zqBOFqmtRme37BTVeHGFT4AJXXSQ X-Proofpoint-ORIG-GUID: QHg8zqBOFqmtRme37BTVeHGFT4AJXXSQ X-Authority-Info-Out: v=2.4 cv=b9q/I9Gx c=1 sm=1 tr=0 ts=69e406c8 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-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-18_06,2026-04-17_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 adultscore=0 phishscore=0 mlxlogscore=934 malwarescore=0 mlxscore=0 suspectscore=0 lowpriorityscore=0 clxscore=1030 spamscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604180228 Received-SPF: pass client-ip=57.103.77.173; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org When kernel-irqchip=on, manage TPR as part of the APIC state instead entirely. 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 1d99003a4a..03f490804b 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[] = { WHvX64RegisterCr2, WHvX64RegisterCr3, WHvX64RegisterCr4, - WHvX64RegisterCr8, /* X64 Debug Registers */ /* @@ -459,8 +458,11 @@ void whpx_set_registers(CPUState *cpu, WHPXStateLevel level) vcxt.values[idx++].Reg64 = env->cr[3]; assert(whpx_register_names[idx] == WHvX64RegisterCr4); vcxt.values[idx++].Reg64 = env->cr[4]; - assert(whpx_register_names[idx] == WHvX64RegisterCr8); - vcxt.values[idx++].Reg64 = vcpu->tpr; + /* For kernel-irqchip=on, TPR is managed as part of APIC state */ + if (!whpx_irqchip_in_kernel()) { + WHV_REGISTER_VALUE cr8 = {.Reg64 = vcpu->tpr}; + whpx_set_reg(cpu, WHvX64RegisterCr8, cr8); + } /* 8 Debug Registers - Skipped */ @@ -716,11 +718,14 @@ void whpx_get_registers(CPUState *cpu, WHPXStateLevel level) env->cr[3] = vcxt.values[idx++].Reg64; assert(whpx_register_names[idx] == WHvX64RegisterCr4); env->cr[4] = vcxt.values[idx++].Reg64; - assert(whpx_register_names[idx] == WHvX64RegisterCr8); - tpr = vcxt.values[idx++].Reg64; - if (tpr != vcpu->tpr) { - vcpu->tpr = tpr; - cpu_set_apic_tpr(x86_cpu->apic_state, tpr); + + /* For kernel-irqchip=on, TPR is managed as part of APIC state */ + if (!whpx_irqchip_in_kernel()) { + tpr = vcpu->exit_ctx.VpContext.Cr8; + if (tpr != vcpu->tpr) { + vcpu->tpr = tpr; + cpu_set_apic_tpr(x86_cpu->apic_state, tpr); + } } /* 8 Debug Registers - Skipped */ @@ -1660,7 +1665,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) /* Sync the TPR to the CR8 if was modified during the intercept */ tpr = cpu_get_apic_tpr(x86_cpu->apic_state); - if (tpr != vcpu->tpr) { + if (!whpx_irqchip_in_kernel() && tpr != vcpu->tpr) { vcpu->tpr = tpr; reg_values[reg_count].Reg64 = tpr; qatomic_set(&cpu->exit_request, true); @@ -1702,12 +1707,14 @@ static void whpx_vcpu_post_run(CPUState *cpu) env->eflags = vcpu->exit_ctx.VpContext.Rflags; - uint64_t tpr = vcpu->exit_ctx.VpContext.Cr8; - if (vcpu->tpr != tpr) { - vcpu->tpr = tpr; - bql_lock(); - cpu_set_apic_tpr(x86_cpu->apic_state, vcpu->tpr); - bql_unlock(); + if (!whpx_irqchip_in_kernel()) { + uint64_t tpr = vcpu->exit_ctx.VpContext.Cr8; + if (vcpu->tpr != tpr) { + vcpu->tpr = tpr; + bql_lock(); + cpu_set_apic_tpr(x86_cpu->apic_state, vcpu->tpr); + bql_unlock(); + } } vcpu->interruption_pending = -- 2.50.1 (Apple Git-155)