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 A79C2F34C63 for ; Mon, 13 Apr 2026 16:55:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCKXn-0006wL-0K; Mon, 13 Apr 2026 12:53:51 -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 1wCKXi-0006w4-Oz for qemu-devel@nongnu.org; Mon, 13 Apr 2026 12:53:47 -0400 Received: from p-west2-cluster1-host7-snip4-10.eps.apple.com ([57.103.68.93] helo=outbound.mr.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCKXh-0005ai-A4 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 12:53:46 -0400 Received: from outbound.mr.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-2a-10-percent-1 (Postfix) with ESMTPS id 36B4618016E9; Mon, 13 Apr 2026 16:53:41 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1776099223; x=1778691223; bh=poibcXPqvaJ8YaZ5/PTr9/BHGmofzQDktL0gBjdI+dM=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=HwBOcBzhgnu1oqKLgMcuHn7whWxzBzAtpZhvHdIzx1e6+Ef/8q/4dUu2njKYtiQaL9eutYOeExMfhe7WxUqpUK08ZsKeVfDdbCoKes0vWo0jVl9CKaEuxsMosF2EyVzgQAj1eBr8RTZicTdJbBBHfBqe0zIdRLsmQ17j/vYO61W1hCHMKnE5JR4k7ZCRgUKoI/Q7uAQ08RWRIYnoIq/X6si9X9W4j4j+gFpxvqpnEpDa7n5/P62TWnSTKY5XqZfZ1g5luU+gSW/rAz6UMjTE6eSUU6uDR7LhUuPemfoo0SmHLES9hFWTKFMsrKxw9s2DepwAZqSnqix4PQ4rWUG3Aw== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (unknown [17.57.152.38]) by p00-icloudmta-asmtp-us-west-2a-10-percent-1 (Postfix) with ESMTPSA id 7C1C6180034A; Mon, 13 Apr 2026 16:53:36 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Pedro Barbuda , Mohamed Mediouni , Paolo Bonzini , Zhao Liu , Roman Bolshakov , Wei Liu , Phil Dennis-Jordan Subject: [PATCH v11 13/15] whpx: i386: interrupt priority support Date: Mon, 13 Apr 2026 18:52:15 +0200 Message-ID: <20260413165217.47105-14-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260413165217.47105-1-mohamed@unpredictable.fr> References: <20260413165217.47105-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEzMDE2NiBTYWx0ZWRfX0rrVXH3b3Lvl 7BHhzMiI8i3Wvo49pNEfra3vyEn/U2tLC14ScCMmklPHNdxHx8lICqdIYa2SFoNT5aLf010IHDV 70zxfvct4GoymzMROpqy5PRgbO1RGUDrvwkn1QQUNduYYM4KPPu5Lr0bOtYRAZ6Y8Eo+Vtn6T/i 7CGQdNLp1W7RqqBHjZgMGFfdDMA5SgQ5JR5r3PtHPxEIbv3JVMS9mWNbHtxgTOFCV3QtTGqmUZn 0iEuDCFmIrz5TQaTo34JfNfQSKxpjVjQYWCqDCmEGl6EFqOnguls0mmAvqP+tnhfSx21ZkC9eQy 8nviQm4TSwnZv9iCh/ulu+yU1xvAvIPoxz6Frj6lTG6g9MGXYVScW4oQ67zA88= X-Authority-Info-Out: v=2.4 cv=P/43RyAu c=1 sm=1 tr=0 ts=69dd1f96 cx=c_apl:c_pps:t_out a=9OgfyREA4BUYbbCgc0Y0oA==:117 a=9OgfyREA4BUYbbCgc0Y0oA==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=NuKELtICf0aykZwt-QIA:9 X-Proofpoint-ORIG-GUID: bpTtNxr3sD7a8ZYemr-E43X7j_byJcrs X-Proofpoint-GUID: bpTtNxr3sD7a8ZYemr-E43X7j_byJcrs 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-13_03,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1030 suspectscore=0 malwarescore=0 mlxlogscore=658 spamscore=0 adultscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604130166 Received-SPF: pass client-ip=57.103.68.93; envelope-from=mohamed@unpredictable.fr; helo=outbound.mr.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_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 Implement APIC IRR interrupt priorities. Even with kernel-irqchip=off, Hyper-V is aware of interrupt priorities and implements CR8/TPR, with the InterruptPriority field being followed. Signed-off-by: Mohamed Mediouni --- target/i386/whpx/whpx-all.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 7a31dc6427..8cd81fffee 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -1588,6 +1588,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) UINT32 reg_count = 0; WHV_REGISTER_VALUE reg_values[3]; WHV_REGISTER_NAME reg_names[3]; + int irr = apic_get_highest_priority_irr(x86_cpu->apic_state); memset(&new_int, 0, sizeof(new_int)); memset(reg_values, 0, sizeof(reg_values)); @@ -1623,10 +1624,20 @@ static void whpx_vcpu_pre_run(CPUState *cpu) } } + if (irr == -1) { + if (pic_get_output(isa_pic)) { + /* In case it's a PIC interrupt */ + irr = 0; + } else if (cpu_test_interrupt(cpu, CPU_INTERRUPT_HARD)) { + abort(); + } + } + /* Get pending hard interruption or replay one that was overwritten */ if (!whpx_irqchip_in_kernel()) { if (!vcpu->interruption_pending && - vcpu->interruptable && (env->eflags & IF_MASK)) { + vcpu->interruptable && (env->eflags & IF_MASK) + && (vcpu->tpr < irr || irr == 0)) { assert(!new_int.InterruptionPending); if (cpu_test_interrupt(cpu, CPU_INTERRUPT_HARD)) { cpu_reset_interrupt(cpu, CPU_INTERRUPT_HARD); @@ -1683,13 +1694,17 @@ static void whpx_vcpu_pre_run(CPUState *cpu) } /* Update the state of the interrupt delivery notification */ - if (!vcpu->window_registered && + if ((!vcpu->window_registered || + (vcpu->window_priority < irr && vcpu->window_priority != 0) || + (irr == 0 && vcpu->window_priority != 0)) && cpu_test_interrupt(cpu, CPU_INTERRUPT_HARD)) { reg_values[reg_count].DeliverabilityNotifications = (WHV_X64_DELIVERABILITY_NOTIFICATIONS_REGISTER) { - .InterruptNotification = 1 + .InterruptNotification = 1, + .InterruptPriority = irr >> 4 }; vcpu->window_registered = 1; + vcpu->window_priority = irr; reg_names[reg_count] = WHvX64RegisterDeliverabilityNotifications; reg_count += 1; } @@ -1703,7 +1718,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) reg_names, reg_count, reg_values); if (FAILED(hr)) { error_report("WHPX: Failed to set interrupt state registers," - " hr=%08lx", hr); + " hr=%08lx, InterruptPriority=%i", hr, irr >> 4); } } } @@ -1919,6 +1934,7 @@ int whpx_vcpu_run(CPUState *cpu) case WHvRunVpExitReasonX64InterruptWindow: vcpu->ready_for_pic_interrupt = 1; vcpu->window_registered = 0; + vcpu->window_priority = 0; ret = 0; break; -- 2.50.1 (Apple Git-155)