Skip to content

Commit 7d4d892

Browse files
committed
x86/xen: Rework MSI teardown
X86 cannot store the irq domain pointer in struct device without breaking XEN because the irq domain pointer takes precedence over arch_*_msi_irqs() fallbacks. XENs MSI teardown relies on default_teardown_msi_irqs() which invokes arch_teardown_msi_irq(). default_teardown_msi_irqs() is a trivial iterator over the msi entries associated to a device. Implement this loop in xen_teardown_msi_irqs() to prepare for removal of the fallbacks for X86. This is a preparatory step to wrap XEN MSI alloc/free into a irq domain which in turn allows to store the irq domain pointer in struct device and to use the irq domain functions directly. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Juergen Gross <jgross@suse.com> Link: https://lore.kernel.org/r/20200826112333.326841410@linutronix.de
1 parent 2905c50 commit 7d4d892

1 file changed

Lines changed: 18 additions & 5 deletions

File tree

arch/x86/pci/xen.c

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -377,20 +377,31 @@ static void xen_initdom_restore_msi_irqs(struct pci_dev *dev)
377377
static void xen_teardown_msi_irqs(struct pci_dev *dev)
378378
{
379379
struct msi_desc *msidesc;
380+
int i;
381+
382+
for_each_pci_msi_entry(msidesc, dev) {
383+
if (msidesc->irq) {
384+
for (i = 0; i < msidesc->nvec_used; i++)
385+
xen_destroy_irq(msidesc->irq + i);
386+
}
387+
}
388+
}
389+
390+
static void xen_pv_teardown_msi_irqs(struct pci_dev *dev)
391+
{
392+
struct msi_desc *msidesc = first_pci_msi_entry(dev);
380393

381-
msidesc = first_pci_msi_entry(dev);
382394
if (msidesc->msi_attrib.is_msix)
383395
xen_pci_frontend_disable_msix(dev);
384396
else
385397
xen_pci_frontend_disable_msi(dev);
386398

387-
/* Free the IRQ's and the msidesc using the generic code. */
388-
default_teardown_msi_irqs(dev);
399+
xen_teardown_msi_irqs(dev);
389400
}
390401

391402
static void xen_teardown_msi_irq(unsigned int irq)
392403
{
393-
xen_destroy_irq(irq);
404+
WARN_ON_ONCE(1);
394405
}
395406

396407
#endif
@@ -413,7 +424,7 @@ int __init pci_xen_init(void)
413424
#ifdef CONFIG_PCI_MSI
414425
x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
415426
x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
416-
x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;
427+
x86_msi.teardown_msi_irqs = xen_pv_teardown_msi_irqs;
417428
pci_msi_ignore_mask = 1;
418429
#endif
419430
return 0;
@@ -437,6 +448,7 @@ static void __init xen_hvm_msi_init(void)
437448
}
438449

439450
x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs;
451+
x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;
440452
x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
441453
}
442454
#endif
@@ -473,6 +485,7 @@ int __init pci_xen_initial_domain(void)
473485
#ifdef CONFIG_PCI_MSI
474486
x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
475487
x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
488+
x86_msi.teardown_msi_irqs = xen_teardown_pv_msi_irqs;
476489
x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs;
477490
pci_msi_ignore_mask = 1;
478491
#endif

0 commit comments

Comments
 (0)