From: Joerg Roedel <joro@8bytes.org>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
David Woodhouse <dwmw2@infradead.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Rob Clark <robdclark@gmail.com>, Heiko Stuebner <heiko@sntech.de>,
Gerald Schaefer <gerald.schaefer@de.ibm.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Jean-Philippe Brucker <jean-philippe@linaro.org>
Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
linux-samsung-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-mediatek@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-s390@vger.kernel.org,
linux-tegra@vger.kernel.org,
virtualization@lists.linux-foundation.org,
Joerg Roedel <jroedel@suse.de>
Subject: [PATCH v2 12/33] iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device()
Date: Tue, 14 Apr 2020 15:15:21 +0200 [thread overview]
Message-ID: <20200414131542.25608-13-joro@8bytes.org> (raw)
In-Reply-To: <20200414131542.25608-1-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
After the previous changes the iommu group may not have a default
domain when iommu_group_add_device() is called. With no default domain
iommu_group_create_direct_mappings() will do nothing and no direct
mappings will be created.
Rename iommu_group_create_direct_mappings() to
iommu_create_device_direct_mappings() to better reflect that the
function creates direct mappings only for one device and not for all
devices in the group. Then move the call to the places where a default
domain actually exists.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 35 ++++++++++++++++++++++++++++++-----
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 7de0e29db333..834a45da0ed0 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -89,6 +89,8 @@ static int __iommu_attach_group(struct iommu_domain *domain,
struct iommu_group *group);
static void __iommu_detach_group(struct iommu_domain *domain,
struct iommu_group *group);
+static int iommu_create_device_direct_mappings(struct iommu_group *group,
+ struct device *dev);
#define IOMMU_GROUP_ATTR(_name, _mode, _show, _store) \
struct iommu_group_attribute iommu_group_attr_##_name = \
@@ -243,6 +245,8 @@ static int __iommu_probe_device_helper(struct device *dev)
if (group->default_domain)
ret = __iommu_attach_device(group->default_domain, dev);
+ iommu_create_device_direct_mappings(group, dev);
+
iommu_group_put(group);
if (ret)
@@ -263,6 +267,7 @@ static int __iommu_probe_device_helper(struct device *dev)
int iommu_probe_device(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct iommu_group *group;
int ret;
WARN_ON(dev->iommu_group);
@@ -285,6 +290,10 @@ int iommu_probe_device(struct device *dev)
if (ret)
goto err_module_put;
+ group = iommu_group_get(dev);
+ iommu_create_device_direct_mappings(group, dev);
+ iommu_group_put(group);
+
if (ops->probe_finalize)
ops->probe_finalize(dev);
@@ -736,8 +745,8 @@ int iommu_group_set_name(struct iommu_group *group, const char *name)
}
EXPORT_SYMBOL_GPL(iommu_group_set_name);
-static int iommu_group_create_direct_mappings(struct iommu_group *group,
- struct device *dev)
+static int iommu_create_device_direct_mappings(struct iommu_group *group,
+ struct device *dev)
{
struct iommu_domain *domain = group->default_domain;
struct iommu_resv_region *entry;
@@ -841,8 +850,6 @@ int iommu_group_add_device(struct iommu_group *group, struct device *dev)
dev->iommu_group = group;
- iommu_group_create_direct_mappings(group, dev);
-
mutex_lock(&group->mutex);
list_add_tail(&device->list, &group->devices);
if (group->domain)
@@ -1736,6 +1743,7 @@ static void probe_alloc_default_domain(struct bus_type *bus,
gtype.type = iommu_def_domain_type;
iommu_group_alloc_default_domain(bus, group, gtype.type);
+
}
static int iommu_group_do_dma_attach(struct device *dev, void *data)
@@ -1760,6 +1768,21 @@ static int __iommu_group_dma_attach(struct iommu_group *group)
iommu_group_do_dma_attach);
}
+static int iommu_do_create_direct_mappings(struct device *dev, void *data)
+{
+ struct iommu_group *group = data;
+
+ iommu_create_device_direct_mappings(group, dev);
+
+ return 0;
+}
+
+static int iommu_group_create_direct_mappings(struct iommu_group *group)
+{
+ return __iommu_group_for_each_dev(group, group,
+ iommu_do_create_direct_mappings);
+}
+
static int bus_iommu_probe(struct bus_type *bus)
{
const struct iommu_ops *ops = bus->iommu_ops;
@@ -1792,6 +1815,8 @@ static int bus_iommu_probe(struct bus_type *bus)
continue;
}
+ iommu_group_create_direct_mappings(group);
+
ret = __iommu_group_dma_attach(group);
mutex_unlock(&group->mutex);
@@ -2632,7 +2657,7 @@ request_default_domain_for_dev(struct device *dev, unsigned long type)
iommu_domain_free(group->default_domain);
group->default_domain = domain;
- iommu_group_create_direct_mappings(group, dev);
+ iommu_create_device_direct_mappings(group, dev);
dev_info(dev, "Using iommu %s mapping\n",
type == IOMMU_DOMAIN_DMA ? "dma" : "direct");
--
2.17.1
next prev parent reply other threads:[~2020-04-14 13:24 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 ` Joerg Roedel [this message]
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
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=20200414131542.25608-13-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=agross@kernel.org \
--cc=baolu.lu@linux.intel.com \
--cc=bjorn.andersson@linaro.org \
--cc=dwmw2@infradead.org \
--cc=gerald.schaefer@de.ibm.com \
--cc=heiko@sntech.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=jonathanh@nvidia.com \
--cc=jroedel@suse.de \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=matthias.bgg@gmail.com \
--cc=robdclark@gmail.com \
--cc=robin.murphy@arm.com \
--cc=thierry.reding@gmail.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=will@kernel.org \
/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).