Commit 4e9c542c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-urgent-2023-03-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq updates from Thomas Gleixner:
 "A set of updates for the interrupt susbsystem:

   - Prevent possible NULL pointer derefences in
     irq_data_get_affinity_mask() and irq_domain_create_hierarchy()

   - Take the per device MSI lock before invoking code which relies on
     it being hold

   - Make sure that MSI descriptors are unreferenced before freeing
     them. This was overlooked when the platform MSI code was converted
     to use core infrastructure and results in a fals positive warning

   - Remove dead code in the MSI subsystem

   - Clarify the documentation for pci_msix_free_irq()

   - More kobj_type constification"

* tag 'irq-urgent-2023-03-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq/msi, platform-msi: Ensure that MSI descriptors are unreferenced
  genirq/msi: Drop dead domain name assignment
  irqdomain: Add missing NULL pointer check in irq_domain_create_hierarchy()
  genirq/irqdesc: Make kobj_type structures constant
  PCI/MSI: Clarify usage of pci_msix_free_irq()
  genirq/msi: Take the per-device MSI lock before validating the control structure
  genirq/ipi: Fix NULL pointer deref in irq_data_get_affinity_mask()
parents 1a90673e 0fb7fb71

drivers/base/platform-msi.c

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ void platform_msi_device_domain_free(struct irq_domain *domain, unsigned int vir 
	struct platform_msi_priv_data *data = domain->host_data;



	msi_lock_descs(data->dev);

	msi_domain_depopulate_descs(data->dev, virq, nr_irqs);

	irq_domain_free_irqs_common(domain, virq, nr_irqs);

	msi_free_msi_descs_range(data->dev, virq, virq + nr_irqs - 1);

	msi_unlock_descs(data->dev);

drivers/pci/msi/api.c

+2 −2
Original line number Diff line number Diff line
@@ -163,11 +163,11 @@ EXPORT_SYMBOL_GPL(pci_msix_alloc_irq_at); 


/**

 * pci_msix_free_irq - Free an interrupt on a PCI/MSIX interrupt domain

 *		      which was allocated via pci_msix_alloc_irq_at()

 *

 * @dev:	The PCI device to operate on

 * @map:	A struct msi_map describing the interrupt to free

 *		as returned from the allocation function.

 *

 * Undo an interrupt vector allocation. Does not disable MSI-X.

 */

void pci_msix_free_irq(struct pci_dev *dev, struct msi_map map)

{

include/linux/msi.h

+2 −0
Original line number Diff line number Diff line
@@ -635,6 +635,8 @@ int msi_domain_prepare_irqs(struct irq_domain *domain, struct device *dev, 
			    int nvec, msi_alloc_info_t *args);

int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev,

			     int virq, int nvec, msi_alloc_info_t *args);

void msi_domain_depopulate_descs(struct device *dev, int virq, int nvec);



struct irq_domain *

__platform_msi_create_device_domain(struct device *dev,

				    unsigned int nvec,

kernel/irq/ipi.c

+6 −2
Original line number Diff line number Diff line
@@ -188,9 +188,9 @@ EXPORT_SYMBOL_GPL(ipi_get_hwirq); 
static int ipi_send_verify(struct irq_chip *chip, struct irq_data *data,

			   const struct cpumask *dest, unsigned int cpu)

{

	const struct cpumask *ipimask = irq_data_get_affinity_mask(data);

	const struct cpumask *ipimask;



	if (!chip || !ipimask)

	if (!chip || !data)

		return -EINVAL;



	if (!chip->ipi_send_single && !chip->ipi_send_mask)
@@ -199,6 +199,10 @@ static int ipi_send_verify(struct irq_chip *chip, struct irq_data *data, 
	if (cpu >= nr_cpu_ids)

		return -EINVAL;



	ipimask = irq_data_get_affinity_mask(data);

	if (!ipimask)

		return -EINVAL;



	if (dest) {

		if (!cpumask_subset(dest, ipimask))

			return -EINVAL;

kernel/irq/irqdesc.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static struct attribute *irq_attrs[] = { 
};

ATTRIBUTE_GROUPS(irq);



static struct kobj_type irq_kobj_type = {

static const struct kobj_type irq_kobj_type = {

	.release	= irq_kobj_release,

	.sysfs_ops	= &kobj_sysfs_ops,

	.default_groups = irq_groups,
@@ -335,7 +335,7 @@ postcore_initcall(irq_sysfs_init); 


#else /* !CONFIG_SYSFS */



static struct kobj_type irq_kobj_type = {

static const struct kobj_type irq_kobj_type = {

	.release	= irq_kobj_release,

};