2020-06-04 07:36:28

by Jerry Snitselaar

Subject: [PATCH] iommu: Don't attach deferred device in iommu_group_do_dma_attach

Attaching a deferred device should be delayed until dma api is called.

Cc: [email protected]
Suggested-by: Joerg Roedel <[email protected]>
Signed-off-by: Jerry Snitselaar <[email protected]>
---
If you already have thrown a patch together, then ignore this. Also
feel free to swap out the signed-off-by with your's since
this is more your patch than mine. You can put a reviewed-by
and tested-by instead for me.

drivers/iommu/iommu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index b5ea203f6c68..d43120eb1dc5 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1680,8 +1680,12 @@ static void probe_alloc_default_domain(struct bus_type *bus,
static int iommu_group_do_dma_attach(struct device *dev, void *data)
{
struct iommu_domain *domain = data;
+ int ret = 0;

- return __iommu_attach_device(domain, dev);
+ if (!iommu_is_attach_deferred(domain, dev))
+ ret = __iommu_attach_device(domain, dev);
+
+ return ret;
}

static int __iommu_group_dma_attach(struct iommu_group *group)
--
2.24.0

2020-06-04 09:28:46

by Jörg Rödel

Subject: Re: [PATCH] iommu: Don't attach deferred device in iommu_group_do_dma_attach

Hi Jerry,

On Thu, Jun 04, 2020 at 12:31:42AM -0700, Jerry Snitselaar wrote:
> Attaching a deferred device should be delayed until dma api is called.
>
> Cc: [email protected]
> Suggested-by: Joerg Roedel <[email protected]>
> Signed-off-by: Jerry Snitselaar <[email protected]>
> ---
> If you already have thrown a patch together, then ignore this. Also
> feel free to swap out the signed-off-by with your's since
> this is more your patch than mine. You can put a reviewed-by
> and tested-by instead for me.

Yeah, I already have a patch, just not sent out yet. I updated it with
your tags and will send it out shortly.

Regards,

Joerg