From nobody Sat Apr 11 20:00:24 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=1775590475; cv=none; d=zohomail.com; s=zohoarc; b=U2ZRIdsRZc35+aLygbtyBrmsaIZZ0UK7rNPacZHfjPK+MujsnVtmfiNdzpewA4bq0xu2vCeqgvAqalcsjsN2/vXAfmGDdTuYWiwldZLgRdi/2Fii7u/LoHEUWmogki/PE1vt2VYRu0MYtw7SbYLi/1zNBb6bQ/U9UB29ILOSN/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775590475; 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=Fwf2hc0HM6piMD7inQigrhq7YGVI+KQPRiX4MHhsvB8=; b=C5WfynOG3lSq2Rx+b//Acy1QvWVFUzauOjKuSpM+v5cmyXpEncqMS7Q9svyHTgt/2UMaYBJtNVqhHQDCXsRbW30l7n70j4tpFHx4Ox1t95K/JeftZL+xgHUg6coKQpeOxoix5TuY5ctegCRdYr4D045i7lyULdU3U+ClOf+HNZ4= 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 1775590475474336.7921255124651; Tue, 7 Apr 2026 12:34:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wABUp-0006hH-Pk; Tue, 07 Apr 2026 14:49:55 -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 1wABT6-0003uc-A1 for qemu-devel@nongnu.org; Tue, 07 Apr 2026 14:48:15 -0400 Received: from qs-2004g-snip4-11.eps.apple.com ([57.103.84.73] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wA7GE-0005An-1b for qemu-devel@nongnu.org; Tue, 07 Apr 2026 10:18:35 -0400 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-100-percent-9 (Postfix) with ESMTPS id 52D4A1800162; Tue, 07 Apr 2026 14:18:30 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-100-percent-9 (Postfix) with ESMTPSA id F24C61800170; Tue, 07 Apr 2026 14:18:27 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1775571513; x=1778163513; bh=Fwf2hc0HM6piMD7inQigrhq7YGVI+KQPRiX4MHhsvB8=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=UM/3yrGIkgNj7jgYmuqAnQr3JrbtXnM8vqfB2GhPxfY7FxxebRxxbA9spPOz2m64xREYi8PUyZuIPLd4M6GEHf+d4bGc/wxK50o7OeY4cLJlJpwD32oLG/wzc1AZKRbIS2jJTFSE4P+qDbq3I1bDDLulxuT6Ozgv4gpJGijynMPx8S5LAaASIWPe4KZmh1rsJSQKTmGs//WyoWXYygEwwqshASUcb5Gqr/CzIcc7Zg/XIHNGxeIJP8yZy8W982360+GDrrkFDIbd+RieapoKn3wPOZDn+Kmny8PRyWNq/ibi6lFUB9Y1oZM/u5C/4/PCh7BL5LNV1STL19YfdWIE0g== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Mohamed Mediouni , Roman Bolshakov , Phil Dennis-Jordan , Zhao Liu , Paolo Bonzini , Wei Liu , Pedro Barbuda Subject: [PATCH v8 13/13] whpx: i386: interrupt priority support Date: Tue, 7 Apr 2026 16:18:09 +0200 Message-ID: <20260407141809.16862-14-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260407141809.16862-1-mohamed@unpredictable.fr> References: <20260407141809.16862-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: 1gZlW2i7FudcfQaZmlM67Y0bnWx2_PPp X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDA3MDEzMSBTYWx0ZWRfX3ol8t+dfO4en FsdpHuSL8m0FxrHvqtIi/YACgnFI75BFjJf+ve7tH/FfGFGN+N9OThUxyuYbRc5eOIJbNhlZ41a iGRFDxQpcyKNpJBMlzg+9iRglatuTlgIFNH1klQqfZFLY3W2SC1NITEYrLaD0648YJZICBrLCv5 OlVE0mRwisDDanvjAGQlc5lp2HOF7+jV/lBQfLyn9au76ptZQkq3omvekAaEA7kC1MxEXSWBHg5 2xht8i7zRiiNT1fTA9gZDD828l4KHJQZlsBxezrrlUP8K3F8snEb9xNU6twqEOweUKpfUUl9tHm H+gMHAEo0XQTe9/pP/+1fOw5s+0qn5QMY0ipMFeDZQPksq1LeLxpfSsTVNXAX8= X-Proofpoint-GUID: 1gZlW2i7FudcfQaZmlM67Y0bnWx2_PPp X-Authority-Info-Out: v=2.4 cv=Wf0BqkhX c=1 sm=1 tr=0 ts=69d51237 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=NuKELtICf0aykZwt-QIA: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-07_03,2026-04-07_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 spamscore=0 malwarescore=0 phishscore=0 clxscore=1030 adultscore=0 lowpriorityscore=0 suspectscore=0 mlxlogscore=667 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604070131 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.84.73; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.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: 1775590476579154100 Content-Type: text/plain; charset="utf-8" Implement APIC IRR interrupt priorities. Even with kernel-irqchip=3Doff, 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 | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 7a31dc6427..569da3b90d 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 =3D 0; WHV_REGISTER_VALUE reg_values[3]; WHV_REGISTER_NAME reg_names[3]; + int irr =3D apic_get_highest_priority_irr(x86_cpu->apic_state); =20 memset(&new_int, 0, sizeof(new_int)); memset(reg_values, 0, sizeof(reg_values)); @@ -1623,10 +1624,23 @@ static void whpx_vcpu_pre_run(CPUState *cpu) } } =20 + if (irr =3D=3D -1) { + if (!(!apic_accept_pic_intr(x86_cpu->apic_state) || !pic_get_outpu= t(isa_pic))) { + /* In case it's a PIC interrupt not going through APIC */ + irr =3D 0; + } else if (whpx_irqchip_in_kernel()) { + /* if kernel-irqchip=3Don, APIC interrupts aren't injected her= e. */ + irr =3D 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 =3D=3D 0)) { assert(!new_int.InterruptionPending); if (cpu_test_interrupt(cpu, CPU_INTERRUPT_HARD)) { cpu_reset_interrupt(cpu, CPU_INTERRUPT_HARD); @@ -1683,13 +1697,17 @@ static void whpx_vcpu_pre_run(CPUState *cpu) } =20 /* Update the state of the interrupt delivery notification */ - if (!vcpu->window_registered && + if ((!vcpu->window_registered || + (vcpu->window_priority < irr && vcpu->window_priority !=3D 0) || + (irr =3D=3D 0 && vcpu->window_priority !=3D 0)) && cpu_test_interrupt(cpu, CPU_INTERRUPT_HARD)) { reg_values[reg_count].DeliverabilityNotifications =3D (WHV_X64_DELIVERABILITY_NOTIFICATIONS_REGISTER) { - .InterruptNotification =3D 1 + .InterruptNotification =3D 1, + .InterruptPriority =3D irr >> 4 }; vcpu->window_registered =3D 1; + vcpu->window_priority =3D irr; reg_names[reg_count] =3D WHvX64RegisterDeliverabilityNotifications; reg_count +=3D 1; } @@ -1703,7 +1721,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=3D%08lx", hr); + " hr=3D%08lx, InterruptPriority=3D%i", hr, irr >>= 4); } } } @@ -1919,6 +1937,7 @@ int whpx_vcpu_run(CPUState *cpu) case WHvRunVpExitReasonX64InterruptWindow: vcpu->ready_for_pic_interrupt =3D 1; vcpu->window_registered =3D 0; + vcpu->window_priority =3D 0; ret =3D 0; break; =20 --=20 2.50.1 (Apple Git-155)