From: Joerg Roedel <joro@8bytes.org>
To: Yong Wu <yong.wu@mediatek.com>
Cc: Joerg Roedel <jroedel@suse.de>,
Robin Murphy <robin.murphy@arm.com>,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
linux-mediatek@lists.infradead.org,
Matthias Brugger <matthias.bgg@gmail.com>,
Will Deacon <will@kernel.org>
Subject: Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
Date: Mon, 18 May 2020 15:55:02 +0200 [thread overview]
Message-ID: <20200518135502.GE18353@8bytes.org> (raw)
In-Reply-To: <1589784680.15083.19.camel@mhfsdcap03>
Hi,
On Mon, May 18, 2020 at 02:51:20PM +0800, Yong Wu wrote:
> below is my local patch. split "dma_attach" to attach_device and
> probe_finalize. About attach_device, Use the existed
> __iommu_attach_group instead. Then rename from the "dma_attach" to
> "probe_finalize" to do the probe_finalize job. And move it outside of
> the mutex_unlock.
>
> I'm not sure if it is right. and of course I will test if you have any
> other solution. Thanks.
>
>
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -1665,26 +1665,20 @@ static void probe_alloc_default_domain(struct
> bus_type *bus,
>
> }
>
> -static int iommu_group_do_dma_attach(struct device *dev, void *data)
> +static int iommu_group_do_probe_finalize(struct device *dev, void
> *data)
> {
> struct iommu_domain *domain = data;
> - const struct iommu_ops *ops;
> - int ret;
> -
> - ret = __iommu_attach_device(domain, dev);
> -
> - ops = domain->ops;
> + const struct iommu_ops *ops = domain->ops;
>
> - if (ret == 0 && ops->probe_finalize)
> + if (ops->probe_finalize)
> ops->probe_finalize(dev);
> -
> - return ret;
> + return 0;
> }
>
> -static int __iommu_group_dma_attach(struct iommu_group *group)
> +static int iommu_group_probe_finalize(struct iommu_group *group)
> {
> return __iommu_group_for_each_dev(group, group->default_domain,
> - iommu_group_do_dma_attach);
> + iommu_group_do_probe_finalize);
> }
>
> static int iommu_do_create_direct_mappings(struct device *dev, void
> *data)
> @@ -1731,12 +1725,14 @@ int bus_iommu_probe(struct bus_type *bus)
>
> iommu_group_create_direct_mappings(group);
>
> - ret = __iommu_group_dma_attach(group);
> + ret = __iommu_attach_group(group->default_domain, group);
>
> mutex_unlock(&group->mutex);
>
> if (ret)
> break;
> +
> + iommu_group_probe_finalize(group);
> }
>
> return ret;
> --
Yes, I think moving the probe_finalize call out of the group->mutex
section is the right fix for this issue.
Thanks for reporting it and working on a fix.
Regards,
Joerg
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-05-18 13:55 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200414131600eucas1p16f1ff6aedb780eb795a770dc08e5dec5@eucas1p1.samsung.com>
2020-04-14 13:15 ` [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 01/33] iommu: Move default domain allocation to separate function Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 02/33] iommu: Add def_domain_type() callback in iommu_ops Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 03/33] iommu/amd: Implement iommu_ops->def_domain_type call-back Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 04/33] iommu/vt-d: Wire up iommu_ops->def_domain_type Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 05/33] iommu/amd: Remove dma_mask check from check_device() Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 06/33] iommu/amd: Return -ENODEV in add_device when device is not handled by IOMMU Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 07/33] iommu: Add probe_device() and remove_device() call-backs Joerg Roedel
2020-04-15 6:36 ` Lu Baolu
2020-04-15 12:31 ` Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 08/33] iommu: Move default domain allocation to iommu_probe_device() Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 09/33] iommu: Keep a list of allocated groups in __iommu_probe_device() Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 10/33] iommu: Move new probe_device path to separate function Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 11/33] iommu: Split off default domain allocation from group assignment Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 12/33] iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device() Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 13/33] iommu: Export bus_iommu_probe() and make is safe for re-probing Joerg Roedel
2020-04-15 6:10 ` Lu Baolu
2020-04-15 12:29 ` Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 14/33] iommu/amd: Remove dev_data->passthrough Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 15/33] iommu/amd: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 16/33] iommu/vt-d: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 17/33] iommu/arm-smmu: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 18/33] iommu/pamu: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 19/33] iommu/s390: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 20/33] iommu/virtio: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 21/33] iommu/msm: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 22/33] iommu/mediatek: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 23/33] iommu/mediatek-v1 " Joerg Roedel
2020-05-15 7:44 ` Yong Wu
2020-05-15 10:07 ` Joerg Roedel
2020-05-18 6:51 ` Yong Wu
2020-05-18 13:55 ` Joerg Roedel [this message]
2020-04-14 13:15 ` [PATCH v2 24/33] iommu/qcom: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 25/33] iommu/rockchip: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 26/33] iommu/tegra: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 27/33] iommu/renesas: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 28/33] iommu/omap: Remove orphan_dev tracking Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 29/33] iommu/omap: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 30/33] iommu/exynos: Use first SYSMMU in controllers list for IOMMU core Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 31/33] iommu/exynos: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 32/33] iommu: Remove add_device()/remove_device() code-paths Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 33/33] iommu: Unexport iommu_group_get_for_dev() Joerg Roedel
2020-04-16 11:48 ` [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code Marek Szyprowski
2020-04-17 1:03 ` Daniel Drake
2020-04-17 1:14 ` Derrick, Jonathan
2020-04-18 12:44 ` joro
2020-05-29 22:16 ` Jerry Snitselaar
2020-06-01 10:42 ` Jerry Snitselaar
2020-06-01 13:17 ` Jerry Snitselaar
2020-06-01 23:20 ` Lu Baolu
2020-06-01 23:16 ` Lu Baolu
2020-06-02 0:02 ` Jerry Snitselaar
2020-06-02 14:23 ` Joerg Roedel
2020-06-02 16:38 ` Jerry Snitselaar
2020-06-02 21:17 ` Jerry Snitselaar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200518135502.GE18353@8bytes.org \
--to=joro@8bytes.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
--cc=yong.wu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).