diff mbox

pci/vmd: Move srcu cleanup after bus/irq domain removal

Message ID 1497996784-9177-1-git-send-email-jonathan.derrick@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jon Derrick June 20, 2017, 10:13 p.m. UTC 
Recent __call_srcu changes have exposed that we need to cleanup srcu
structures after pci_stop_root_bus calls into vmd_msi_free.

Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Acked-by: Keith Busch <keith.busch@intel.com>
Cc: <stable@vger.kernel.org> # 4.11
---
 drivers/pci/host/vmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jon Derrick June 1, 2017, 6:30 p.m. UTC | #1 
+linux-pci

On 06/20/2017 04:13 PM, Jon Derrick wrote:
> Recent __call_srcu changes have exposed that we need to cleanup srcu
> structures after pci_stop_root_bus calls into vmd_msi_free.
> 
> Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
> Acked-by: Keith Busch <keith.busch@intel.com>
> Cc: <stable@vger.kernel.org> # 4.11
> ---
>  drivers/pci/host/vmd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/host/vmd.c b/drivers/pci/host/vmd.c
> index e27ad2a..642a182 100644
> --- a/drivers/pci/host/vmd.c
> +++ b/drivers/pci/host/vmd.c
> @@ -733,10 +733,10 @@ static void vmd_remove(struct pci_dev *dev)
>  	struct vmd_dev *vmd = pci_get_drvdata(dev);
>  
>  	vmd_detach_resources(vmd);
> -	vmd_cleanup_srcu(vmd);
>  	sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
>  	pci_stop_root_bus(vmd->bus);
>  	pci_remove_root_bus(vmd->bus);
> +	vmd_cleanup_srcu(vmd);
>  	vmd_teardown_dma_ops(vmd);
>  	irq_domain_remove(vmd->irq_domain);
>  }
>
Keith Busch June 20, 2017, 11:29 p.m. UTC | #2 
> On 06/20/2017 04:13 PM, Jon Derrick wrote:
> Recent __call_srcu changes have exposed that we need to cleanup srcu
> structures after pci_stop_root_bus calls into vmd_msi_free.

Adding the obligatory:

Fixes: 3906b91844d6 ("PCI: vmd: Use SRCU as a local RCU to prevent delaying global RCU")
 
> Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
> Acked-by: Keith Busch <keith.busch@intel.com>
> Cc: <stable@vger.kernel.org> # 4.11
> ---
>  drivers/pci/host/vmd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/host/vmd.c b/drivers/pci/host/vmd.c
> index e27ad2a..642a182 100644
> --- a/drivers/pci/host/vmd.c
> +++ b/drivers/pci/host/vmd.c
> @@ -733,10 +733,10 @@ static void vmd_remove(struct pci_dev *dev)
>  	struct vmd_dev *vmd = pci_get_drvdata(dev);
>  
>  	vmd_detach_resources(vmd);
> -	vmd_cleanup_srcu(vmd);
>  	sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
>  	pci_stop_root_bus(vmd->bus);
>  	pci_remove_root_bus(vmd->bus);
> +	vmd_cleanup_srcu(vmd);
>  	vmd_teardown_dma_ops(vmd);
>  	irq_domain_remove(vmd->irq_domain);
>  }
>
diff mbox

Patch

diff --git a/drivers/pci/host/vmd.c b/drivers/pci/host/vmd.c
index e27ad2a..642a182 100644
--- a/drivers/pci/host/vmd.c
+++ b/drivers/pci/host/vmd.c
@@ -733,10 +733,10 @@  static void vmd_remove(struct pci_dev *dev)
 	struct vmd_dev *vmd = pci_get_drvdata(dev);
 
 	vmd_detach_resources(vmd);
-	vmd_cleanup_srcu(vmd);
 	sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
 	pci_stop_root_bus(vmd->bus);
 	pci_remove_root_bus(vmd->bus);
+	vmd_cleanup_srcu(vmd);
 	vmd_teardown_dma_ops(vmd);
 	irq_domain_remove(vmd->irq_domain);
 }