Commit 4ad04e59 authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Michael Ellerman
Browse files

powerpc/iommu: Remove IOMMU device references via bus notifier 



After d905c5df ("PPC: POWERNV: move iommu_add_device earlier"), the
refcnt on the kobject backing the IOMMU group for a PCI device is
elevated by each call to pci_dma_dev_setup_pSeriesLP() (via
set_iommu_table_base_and_group). When we go to dlpar a multi-function
PCI device out:

        iommu_reconfig_notifier ->
                iommu_free_table ->
                        iommu_group_put
                        BUG_ON(tbl->it_group)

We trip this BUG_ON, because there are still references on the table, so
it is not freed. Fix this by moving the powernv bus notifier to common
code and calling it for both powernv and pseries.

Fixes: d905c5df ("PPC: POWERNV: move iommu_add_device earlier")
Signed-off-by: default avatarNishanth Aravamudan <nacc@linux.vnet.ibm.com>
Tested-by: default avatarNishanth Aravamudan <nacc@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 875ebe94

arch/powerpc/include/asm/iommu.h

+6 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ extern void iommu_register_group(struct iommu_table *tbl, 
				 int pci_domain_number, unsigned long pe_num);

extern int iommu_add_device(struct device *dev);

extern void iommu_del_device(struct device *dev);

extern int __init tce_iommu_bus_notifier_init(void);

#else

static inline void iommu_register_group(struct iommu_table *tbl,

					int pci_domain_number,
@@ -128,6 +129,11 @@ static inline int iommu_add_device(struct device *dev) 
static inline void iommu_del_device(struct device *dev)

{

}



static inline int __init tce_iommu_bus_notifier_init(void)

{

        return 0;

}

#endif /* !CONFIG_IOMMU_API */



static inline void set_iommu_table_base_and_group(struct device *dev,

arch/powerpc/kernel/iommu.c

+26 −0
Original line number Diff line number Diff line
@@ -1175,4 +1175,30 @@ void iommu_del_device(struct device *dev) 
}

EXPORT_SYMBOL_GPL(iommu_del_device);



static int tce_iommu_bus_notifier(struct notifier_block *nb,

                unsigned long action, void *data)

{

        struct device *dev = data;



        switch (action) {

        case BUS_NOTIFY_ADD_DEVICE:

                return iommu_add_device(dev);

        case BUS_NOTIFY_DEL_DEVICE:

                if (dev->iommu_group)

                        iommu_del_device(dev);

                return 0;

        default:

                return 0;

        }

}



static struct notifier_block tce_iommu_bus_nb = {

        .notifier_call = tce_iommu_bus_notifier,

};



int __init tce_iommu_bus_notifier_init(void)

{

        bus_register_notifier(&pci_bus_type, &tce_iommu_bus_nb);

        return 0;

}

#endif /* CONFIG_IOMMU_API */

arch/powerpc/platforms/powernv/pci.c

+0 −26
Original line number Diff line number Diff line
@@ -836,30 +836,4 @@ void __init pnv_pci_init(void) 
#endif

}



static int tce_iommu_bus_notifier(struct notifier_block *nb,

		unsigned long action, void *data)

{

	struct device *dev = data;



	switch (action) {

	case BUS_NOTIFY_ADD_DEVICE:

		return iommu_add_device(dev);

	case BUS_NOTIFY_DEL_DEVICE:

		if (dev->iommu_group)

			iommu_del_device(dev);

		return 0;

	default:

		return 0;

	}

}



static struct notifier_block tce_iommu_bus_nb = {

	.notifier_call = tce_iommu_bus_notifier,

};



static int __init tce_iommu_bus_notifier_init(void)

{

	bus_register_notifier(&pci_bus_type, &tce_iommu_bus_nb);

	return 0;

}

machine_subsys_initcall_sync(powernv, tce_iommu_bus_notifier_init);

arch/powerpc/platforms/pseries/iommu.c

+2 −0
Original line number Diff line number Diff line
@@ -1340,3 +1340,5 @@ static int __init disable_multitce(char *str) 
}



__setup("multitce=", disable_multitce);



machine_subsys_initcall_sync(pseries, tce_iommu_bus_notifier_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE