[xen master] AMD/IOMMU: unshare IRQ .ack and .disable handlers

[patchbot@xxxxxxx]

commit aed6278b2a7faac1bacce2d22aad29bc463fa0c0
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Oct 21 14:11:45 2025 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Oct 21 14:11:45 2025 +0200

    AMD/IOMMU: unshare IRQ .ack and .disable handlers
    
    A .disable handler can't typically be re-used for .ack: The latter needs
    to deal with IRQ migration, while the former shouldn't. Furthermore
    invoking just irq_complete_move() isn't enough; one of
    move_{native,masked}_irq() also needs invoking.
    
    Fixes: 487a1cffd71a ("x86: Implement per-cpu vector for xen hypervisor")
    Fixes: f821102450a1 ("x86: IRQ Migration logic enhancement")
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Release-Acked-by: Oleksii Kurochko<oleksii.kurochko@xxxxxxxxx>
---
 xen/drivers/passthrough/amd/iommu_init.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/xen/drivers/passthrough/amd/iommu_init.c 
b/xen/drivers/passthrough/amd/iommu_init.c
index 3f6d2f5db5..00d2c46cbc 100644
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -428,8 +428,6 @@ static void cf_check iommu_msi_mask(struct irq_desc *desc)
     unsigned long flags;
     struct amd_iommu *iommu = desc->action->dev_id;
 
-    irq_complete_move(desc);
-
     spin_lock_irqsave(&iommu->lock, flags);
     amd_iommu_msi_enable(iommu, IOMMU_CONTROL_DISABLED);
     spin_unlock_irqrestore(&iommu->lock, flags);
@@ -442,6 +440,13 @@ static unsigned int cf_check iommu_msi_startup(struct 
irq_desc *desc)
     return 0;
 }
 
+static void cf_check iommu_msi_ack(struct irq_desc *desc)
+{
+    irq_complete_move(desc);
+    iommu_msi_mask(desc);
+    move_masked_irq(desc);
+}
+
 static void cf_check iommu_msi_end(struct irq_desc *desc, u8 vector)
 {
     iommu_msi_unmask(desc);
@@ -455,7 +460,7 @@ static hw_irq_controller iommu_msi_type = {
     .shutdown = iommu_msi_mask,
     .enable = iommu_msi_unmask,
     .disable = iommu_msi_mask,
-    .ack = iommu_msi_mask,
+    .ack = iommu_msi_ack,
     .end = iommu_msi_end,
     .set_affinity = set_msi_affinity,
 };
--
generated by git-patchbot for /home/xen/git/xen.git#master