[PATCH 1/2] x86/vmd: Select device dma ops to override

[PATCH 1/2] x86/vmd: Select device dma ops to override

[Keith Busch]

VMD device doesn't usually have device archdata specific dma_ops, so we
need to override the default ops for VMD devices.

Signed-off-by: Keith Busch <keith.busch@intel.com>
---
 arch/x86/pci/vmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/pci/vmd.c b/arch/x86/pci/vmd.c
index 7792aba..b1662bf 100644
--- a/arch/x86/pci/vmd.c
+++ b/arch/x86/pci/vmd.c
@@ -261,7 +261,7 @@ static struct device *to_vmd_dev(struct device *dev)
 
 static struct dma_map_ops *vmd_dma_ops(struct device *dev)
 {
-	return to_vmd_dev(dev)->archdata.dma_ops;
+	return get_dma_ops(to_vmd_dev(dev));
 }
 
 static void *vmd_alloc(struct device *dev, size_t size, dma_addr_t *addr,
@@ -367,7 +367,7 @@ static void vmd_teardown_dma_ops(struct vmd_dev *vmd)
 {
 	struct dma_domain *domain = &vmd->dma_domain;
 
-	if (vmd->dev->dev.archdata.dma_ops)
+	if (get_dma_ops(&vmd->dev->dev))
 		del_dma_domain(domain);
 }
 
@@ -379,7 +379,7 @@ static void vmd_teardown_dma_ops(struct vmd_dev *vmd)
 
 static void vmd_setup_dma_ops(struct vmd_dev *vmd)
 {
-	const struct dma_map_ops *source = vmd->dev->dev.archdata.dma_ops;
+	const struct dma_map_ops *source = get_dma_ops(&vmd->dev->dev);
 	struct dma_map_ops *dest = &vmd->dma_ops;
 	struct dma_domain *domain = &vmd->dma_domain;
 
-- 
2.7.2

[PATCH 2/2] x86/vmd: Initialize list item in irq disable

[Keith Busch]

Multiple calls to disable an IRQ would have caused the driver to
dereference a poisoned list item. This re-initializes the list to
allow multiple requests to disable the irq.

Signed-off-by: Keith Busch <keith.busch@intel.com>
---
 arch/x86/pci/vmd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/pci/vmd.c b/arch/x86/pci/vmd.c
index b1662bf..e9e461b 100644
--- a/arch/x86/pci/vmd.c
+++ b/arch/x86/pci/vmd.c
@@ -135,6 +135,7 @@ static void vmd_irq_disable(struct irq_data *data)
 
 	raw_spin_lock(&list_lock);
 	list_del_rcu(&vmdirq->node);
+	LIST_HEAD_INIT_RCU(&vmdirq->node);
 	raw_spin_unlock(&list_lock);
 }
 
-- 
2.7.2

Re: [PATCH 2/2] x86/vmd: Initialize list item in irq disable

[Keith Busch]

On Tue, May 17, 2016 at 11:13:25AM -0600, Keith Busch wrote:
>  	raw_spin_lock(&list_lock);
>  	list_del_rcu(&vmdirq->node);
> +	LIST_HEAD_INIT_RCU(&vmdirq->node);
>  	raw_spin_unlock(&list_lock);

Sorry, please disregard PATCH 2/2. I'll have to resend with the correct
patch using a real macro instead of the mistyped one above.

Re: [PATCH 1/2] x86/vmd: Select device dma ops to override

[Jon Derrick]

Looks fine

Acked-by Jon Derrick: <jonathan.derrick@intel.com>

On Tue, May 17, 2016 at 11:13:24AM -0600, Keith Busch wrote:
> VMD device doesn't usually have device archdata specific dma_ops, so we
> need to override the default ops for VMD devices.
> 
> Signed-off-by: Keith Busch <keith.busch@intel.com>
> ---
>  arch/x86/pci/vmd.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/pci/vmd.c b/arch/x86/pci/vmd.c
> index 7792aba..b1662bf 100644
> --- a/arch/x86/pci/vmd.c
> +++ b/arch/x86/pci/vmd.c
> @@ -261,7 +261,7 @@ static struct device *to_vmd_dev(struct device *dev)
>  
>  static struct dma_map_ops *vmd_dma_ops(struct device *dev)
>  {
> -	return to_vmd_dev(dev)->archdata.dma_ops;
> +	return get_dma_ops(to_vmd_dev(dev));
>  }
>  
>  static void *vmd_alloc(struct device *dev, size_t size, dma_addr_t *addr,
> @@ -367,7 +367,7 @@ static void vmd_teardown_dma_ops(struct vmd_dev *vmd)
>  {
>  	struct dma_domain *domain = &vmd->dma_domain;
>  
> -	if (vmd->dev->dev.archdata.dma_ops)
> +	if (get_dma_ops(&vmd->dev->dev))
>  		del_dma_domain(domain);
>  }
>  
> @@ -379,7 +379,7 @@ static void vmd_teardown_dma_ops(struct vmd_dev *vmd)
>  
>  static void vmd_setup_dma_ops(struct vmd_dev *vmd)
>  {
> -	const struct dma_map_ops *source = vmd->dev->dev.archdata.dma_ops;
> +	const struct dma_map_ops *source = get_dma_ops(&vmd->dev->dev);
>  	struct dma_map_ops *dest = &vmd->dma_ops;
>  	struct dma_domain *domain = &vmd->dma_domain;
>  
> -- 
> 2.7.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] x86/vmd: Select device dma ops to override

[Bjorn Helgaas]

On Tue, May 17, 2016 at 11:13:24AM -0600, Keith Busch wrote:
> VMD device doesn't usually have device archdata specific dma_ops, so we
> need to override the default ops for VMD devices.
> 
> Signed-off-by: Keith Busch <keith.busch@intel.com>

I applied this and the v2 2/2 patch with Jon's acks to pci/host-vmd for
v4.8, thanks!

> ---
>  arch/x86/pci/vmd.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/pci/vmd.c b/arch/x86/pci/vmd.c
> index 7792aba..b1662bf 100644
> --- a/arch/x86/pci/vmd.c
> +++ b/arch/x86/pci/vmd.c
> @@ -261,7 +261,7 @@ static struct device *to_vmd_dev(struct device *dev)
>  
>  static struct dma_map_ops *vmd_dma_ops(struct device *dev)
>  {
> -	return to_vmd_dev(dev)->archdata.dma_ops;
> +	return get_dma_ops(to_vmd_dev(dev));
>  }
>  
>  static void *vmd_alloc(struct device *dev, size_t size, dma_addr_t *addr,
> @@ -367,7 +367,7 @@ static void vmd_teardown_dma_ops(struct vmd_dev *vmd)
>  {
>  	struct dma_domain *domain = &vmd->dma_domain;
>  
> -	if (vmd->dev->dev.archdata.dma_ops)
> +	if (get_dma_ops(&vmd->dev->dev))
>  		del_dma_domain(domain);
>  }
>  
> @@ -379,7 +379,7 @@ static void vmd_teardown_dma_ops(struct vmd_dev *vmd)
>  
>  static void vmd_setup_dma_ops(struct vmd_dev *vmd)
>  {
> -	const struct dma_map_ops *source = vmd->dev->dev.archdata.dma_ops;
> +	const struct dma_map_ops *source = get_dma_ops(&vmd->dev->dev);
>  	struct dma_map_ops *dest = &vmd->dma_ops;
>  	struct dma_domain *domain = &vmd->dma_domain;
>  
> -- 
> 2.7.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html