genirq/msi: Provide msi_domain_alloc/free_irqs_descs_locked()

Usage sites which do allocations of the MSI descriptors before invoking
msi_domain_alloc_irqs() require to lock the MSI decriptors accross the
operation.

Provide entry points which can be called with the MSI mutex held and lock
the mutex in the existing entry points.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20211206210747.765371053@linutronix.de

diff --git a/include/linux/msi.h b/include/linux/msi.h
index 2cf6c530588d5333497be66eca67a618316241b1..69c588efe85b43070b0941f2a7ad635a372bac35 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -383,9 +383,12 @@ struct irq_domain *msi_create_irq_domain(struct fwnode_handle *fwnode,
                                         struct irq_domain *parent);
 int __msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,
                            int nvec);
+int msi_domain_alloc_irqs_descs_locked(struct irq_domain *domain, struct device *dev,
+                                      int nvec);
 int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,
                          int nvec);
 void __msi_domain_free_irqs(struct irq_domain *domain, struct device *dev);
+void msi_domain_free_irqs_descs_locked(struct irq_domain *domain, struct device *dev);
 void msi_domain_free_irqs(struct irq_domain *domain, struct device *dev);
 struct msi_domain_info *msi_get_domain_info(struct irq_domain *domain);
 

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index 97ec245803f0d613a8b76eabc0545e8552afe6b5..3b21e99bb793cfaa10f9e925d47de4ce1b0abef6 100644 (file)
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -672,10 +672,8 @@ int __msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,
                virq = __irq_domain_alloc_irqs(domain, -1, desc->nvec_used,
                                               dev_to_node(dev), &arg, false,
                                               desc->affinity);
-               if (virq < 0) {
-                       ret = msi_handle_pci_fail(domain, desc, allocated);
-                       goto cleanup;
-               }
+               if (virq < 0)
+                       return msi_handle_pci_fail(domain, desc, allocated);
 
                for (i = 0; i < desc->nvec_used; i++) {
                        irq_set_msi_desc_off(virq, i, desc);
@@ -709,7 +707,7 @@ int __msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,
                }
                ret = irq_domain_activate_irq(irq_data, can_reserve);
                if (ret)
-                       goto cleanup;
+                       return ret;
        }
 
 skip_activate:
@@ -724,38 +722,63 @@ skip_activate:
                }
        }
        return 0;
-
-cleanup:
-       msi_domain_free_irqs(domain, dev);
-       return ret;
 }
 
 /**
- * msi_domain_alloc_irqs - Allocate interrupts from a MSI interrupt domain
+ * msi_domain_alloc_irqs_descs_locked - Allocate interrupts from a MSI interrupt domain
  * @domain:    The domain to allocate from
  * @dev:       Pointer to device struct of the device for which the interrupts
  *             are allocated
  * @nvec:      The number of interrupts to allocate
  *
+ * Must be invoked from within a msi_lock_descs() / msi_unlock_descs()
+ * pair. Use this for MSI irqdomains which implement their own vector
+ * allocation/free.
+ *
  * Return: %0 on success or an error code.
  */
-int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,
-                         int nvec)
+int msi_domain_alloc_irqs_descs_locked(struct irq_domain *domain, struct device *dev,
+                                      int nvec)
 {
        struct msi_domain_info *info = domain->host_data;
        struct msi_domain_ops *ops = info->ops;
        int ret;
 
+       lockdep_assert_held(&dev->msi.data->mutex);
+
        ret = ops->domain_alloc_irqs(domain, dev, nvec);
        if (ret)
-               return ret;
+               goto cleanup;
 
        if (!(info->flags & MSI_FLAG_DEV_SYSFS))
                return 0;
 
        ret = msi_device_populate_sysfs(dev);
        if (ret)
-               msi_domain_free_irqs(domain, dev);
+               goto cleanup;
+       return 0;
+
+cleanup:
+       msi_domain_free_irqs_descs_locked(domain, dev);
+       return ret;
+}
+
+/**
+ * msi_domain_alloc_irqs - Allocate interrupts from a MSI interrupt domain
+ * @domain:    The domain to allocate from
+ * @dev:       Pointer to device struct of the device for which the interrupts
+ *             are allocated
+ * @nvec:      The number of interrupts to allocate
+ *
+ * Return: %0 on success or an error code.
+ */
+int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, int nvec)
+{
+       int ret;
+
+       msi_lock_descs(dev);
+       ret = msi_domain_alloc_irqs_descs_locked(domain, dev, nvec);
+       msi_unlock_descs(dev);
        return ret;
 }
 
@@ -785,21 +808,40 @@ void __msi_domain_free_irqs(struct irq_domain *domain, struct device *dev)
 }
 
 /**
- * msi_domain_free_irqs - Free interrupts from a MSI interrupt @domain associated to @dev
+ * msi_domain_free_irqs_descs_locked - Free interrupts from a MSI interrupt @domain associated to @dev
  * @domain:    The domain to managing the interrupts
  * @dev:       Pointer to device struct of the device for which the interrupts
  *             are free
+ *
+ * Must be invoked from within a msi_lock_descs() / msi_unlock_descs()
+ * pair. Use this for MSI irqdomains which implement their own vector
+ * allocation.
  */
-void msi_domain_free_irqs(struct irq_domain *domain, struct device *dev)
+void msi_domain_free_irqs_descs_locked(struct irq_domain *domain, struct device *dev)
 {
        struct msi_domain_info *info = domain->host_data;
        struct msi_domain_ops *ops = info->ops;
 
+       lockdep_assert_held(&dev->msi.data->mutex);
+
        if (info->flags & MSI_FLAG_DEV_SYSFS)
                msi_device_destroy_sysfs(dev);
        ops->domain_free_irqs(domain, dev);
 }
 
+/**
+ * msi_domain_free_irqs - Free interrupts from a MSI interrupt @domain associated to @dev
+ * @domain:    The domain to managing the interrupts
+ * @dev:       Pointer to device struct of the device for which the interrupts
+ *             are free
+ */
+void msi_domain_free_irqs(struct irq_domain *domain, struct device *dev)
+{
+       msi_lock_descs(dev);
+       msi_domain_free_irqs_descs_locked(domain, dev);
+       msi_unlock_descs(dev);
+}
+
 /**
  * msi_get_domain_info - Get the MSI interrupt domain info for @domain
  * @domain:    The interrupt domain to retrieve data from