* [PATCH v2 03/33] iommu/amd: Implement iommu_ops->def_domain_type call-back
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
Implement the new def_domain_type call-back for the AMD IOMMU driver.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/amd_iommu.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 20cce366e951..73b4f84cf449 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2661,6 +2661,20 @@ static void amd_iommu_iotlb_sync(struct iommu_domain *domain,
amd_iommu_flush_iotlb_all(domain);
}
+static int amd_iommu_def_domain_type(struct device *dev)
+{
+ struct iommu_dev_data *dev_data;
+
+ dev_data = get_dev_data(dev);
+ if (!dev_data)
+ return 0;
+
+ if (dev_data->iommu_v2)
+ return IOMMU_DOMAIN_IDENTITY;
+
+ return 0;
+}
+
const struct iommu_ops amd_iommu_ops = {
.capable = amd_iommu_capable,
.domain_alloc = amd_iommu_domain_alloc,
@@ -2680,6 +2694,7 @@ const struct iommu_ops amd_iommu_ops = {
.pgsize_bitmap = AMD_IOMMU_PGSIZES,
.flush_iotlb_all = amd_iommu_flush_iotlb_all,
.iotlb_sync = amd_iommu_iotlb_sync,
+ .def_domain_type = amd_iommu_def_domain_type,
};
/*****************************************************************************
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 03/33] iommu/amd: Implement iommu_ops->def_domain_type call-back
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Implement the new def_domain_type call-back for the AMD IOMMU driver.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 20cce366e951..73b4f84cf449 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2661,6 +2661,20 @@ static void amd_iommu_iotlb_sync(struct iommu_domain *domain,
amd_iommu_flush_iotlb_all(domain);
}
+static int amd_iommu_def_domain_type(struct device *dev)
+{
+ struct iommu_dev_data *dev_data;
+
+ dev_data = get_dev_data(dev);
+ if (!dev_data)
+ return 0;
+
+ if (dev_data->iommu_v2)
+ return IOMMU_DOMAIN_IDENTITY;
+
+ return 0;
+}
+
const struct iommu_ops amd_iommu_ops = {
.capable = amd_iommu_capable,
.domain_alloc = amd_iommu_domain_alloc,
@@ -2680,6 +2694,7 @@ const struct iommu_ops amd_iommu_ops = {
.pgsize_bitmap = AMD_IOMMU_PGSIZES,
.flush_iotlb_all = amd_iommu_flush_iotlb_all,
.iotlb_sync = amd_iommu_iotlb_sync,
+ .def_domain_type = amd_iommu_def_domain_type,
};
/*****************************************************************************
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 03/33] iommu/amd: Implement iommu_ops->def_domain_type call-back
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Implement the new def_domain_type call-back for the AMD IOMMU driver.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 20cce366e951..73b4f84cf449 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2661,6 +2661,20 @@ static void amd_iommu_iotlb_sync(struct iommu_domain *domain,
amd_iommu_flush_iotlb_all(domain);
}
+static int amd_iommu_def_domain_type(struct device *dev)
+{
+ struct iommu_dev_data *dev_data;
+
+ dev_data = get_dev_data(dev);
+ if (!dev_data)
+ return 0;
+
+ if (dev_data->iommu_v2)
+ return IOMMU_DOMAIN_IDENTITY;
+
+ return 0;
+}
+
const struct iommu_ops amd_iommu_ops = {
.capable = amd_iommu_capable,
.domain_alloc = amd_iommu_domain_alloc,
@@ -2680,6 +2694,7 @@ const struct iommu_ops amd_iommu_ops = {
.pgsize_bitmap = AMD_IOMMU_PGSIZES,
.flush_iotlb_all = amd_iommu_flush_iotlb_all,
.iotlb_sync = amd_iommu_iotlb_sync,
+ .def_domain_type = amd_iommu_def_domain_type,
};
/*****************************************************************************
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 03/33] iommu/amd: Implement iommu_ops->def_domain_type call-back
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
Implement the new def_domain_type call-back for the AMD IOMMU driver.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 20cce366e951..73b4f84cf449 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2661,6 +2661,20 @@ static void amd_iommu_iotlb_sync(struct iommu_domain *domain,
amd_iommu_flush_iotlb_all(domain);
}
+static int amd_iommu_def_domain_type(struct device *dev)
+{
+ struct iommu_dev_data *dev_data;
+
+ dev_data = get_dev_data(dev);
+ if (!dev_data)
+ return 0;
+
+ if (dev_data->iommu_v2)
+ return IOMMU_DOMAIN_IDENTITY;
+
+ return 0;
+}
+
const struct iommu_ops amd_iommu_ops = {
.capable = amd_iommu_capable,
.domain_alloc = amd_iommu_domain_alloc,
@@ -2680,6 +2694,7 @@ const struct iommu_ops amd_iommu_ops = {
.pgsize_bitmap = AMD_IOMMU_PGSIZES,
.flush_iotlb_all = amd_iommu_flush_iotlb_all,
.iotlb_sync = amd_iommu_iotlb_sync,
+ .def_domain_type = amd_iommu_def_domain_type,
};
/*****************************************************************************
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 06/33] iommu/amd: Return -ENODEV in add_device when device is not handled by IOMMU
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
When check_device() fails on the device, it is not handled by the
IOMMU and amd_iommu_add_device() needs to return -ENODEV.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/amd_iommu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 504f2db75eda..3e0d27f7622e 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2157,9 +2157,12 @@ static int amd_iommu_add_device(struct device *dev)
struct amd_iommu *iommu;
int ret, devid;
- if (!check_device(dev) || get_dev_data(dev))
+ if (get_dev_data(dev))
return 0;
+ if (!check_device(dev))
+ return -ENODEV;
+
devid = get_device_id(dev);
if (devid < 0)
return devid;
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 06/33] iommu/amd: Return -ENODEV in add_device when device is not handled by IOMMU
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
When check_device() fails on the device, it is not handled by the
IOMMU and amd_iommu_add_device() needs to return -ENODEV.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 504f2db75eda..3e0d27f7622e 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2157,9 +2157,12 @@ static int amd_iommu_add_device(struct device *dev)
struct amd_iommu *iommu;
int ret, devid;
- if (!check_device(dev) || get_dev_data(dev))
+ if (get_dev_data(dev))
return 0;
+ if (!check_device(dev))
+ return -ENODEV;
+
devid = get_device_id(dev);
if (devid < 0)
return devid;
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 06/33] iommu/amd: Return -ENODEV in add_device when device is not handled by IOMMU
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
When check_device() fails on the device, it is not handled by the
IOMMU and amd_iommu_add_device() needs to return -ENODEV.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 504f2db75eda..3e0d27f7622e 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2157,9 +2157,12 @@ static int amd_iommu_add_device(struct device *dev)
struct amd_iommu *iommu;
int ret, devid;
- if (!check_device(dev) || get_dev_data(dev))
+ if (get_dev_data(dev))
return 0;
+ if (!check_device(dev))
+ return -ENODEV;
+
devid = get_device_id(dev);
if (devid < 0)
return devid;
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 06/33] iommu/amd: Return -ENODEV in add_device when device is not handled by IOMMU
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
When check_device() fails on the device, it is not handled by the
IOMMU and amd_iommu_add_device() needs to return -ENODEV.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 504f2db75eda..3e0d27f7622e 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2157,9 +2157,12 @@ static int amd_iommu_add_device(struct device *dev)
struct amd_iommu *iommu;
int ret, devid;
- if (!check_device(dev) || get_dev_data(dev))
+ if (get_dev_data(dev))
return 0;
+ if (!check_device(dev))
+ return -ENODEV;
+
devid = get_device_id(dev);
if (devid < 0)
return devid;
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 08/33] iommu: Move default domain allocation to iommu_probe_device()
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
Well, not really. The call to iommu_alloc_default_domain() in
iommu_group_get_for_dev() has to stay around as long as there are
IOMMU drivers using the add/remove_device() call-backs instead of
probe/release_device().
Those drivers expect that iommu_group_get_for_dev() returns the device
attached to a group and the group set up with a default domain (and
the device attached to the groups current domain).
But when all drivers are converted this compatability mess can be
removed.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/iommu.c | 102 +++++++++++++++++++++++++++++-------------
1 file changed, 71 insertions(+), 31 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 6cfe7799dc8c..7a385c18e1a5 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -79,6 +79,16 @@ static bool iommu_cmd_line_dma_api(void)
return !!(iommu_cmd_line & IOMMU_CMD_LINE_DMA_API);
}
+static int iommu_alloc_default_domain(struct device *dev);
+static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
+ unsigned type);
+static int __iommu_attach_device(struct iommu_domain *domain,
+ struct device *dev);
+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);
+
#define IOMMU_GROUP_ATTR(_name, _mode, _show, _store) \
struct iommu_group_attribute iommu_group_attr_##_name = \
__ATTR(_name, _mode, _show, _store)
@@ -221,10 +231,29 @@ int iommu_probe_device(struct device *dev)
goto err_free_dev_param;
}
- if (ops->probe_device)
+ if (ops->probe_device) {
+ struct iommu_group *group;
+
ret = __iommu_probe_device(dev);
- else
+
+ /*
+ * Try to allocate a default domain - needs support from the
+ * IOMMU driver. There are still some drivers which don't
+ * support default domains, so the return value is not yet
+ * checked.
+ */
+ if (!ret)
+ iommu_alloc_default_domain(dev);
+
+ group = iommu_group_get(dev);
+ if (group && group->default_domain) {
+ ret = __iommu_attach_device(group->default_domain, dev);
+ iommu_group_put(group);
+ }
+
+ } else {
ret = ops->add_device(dev);
+ }
if (ret)
goto err_module_put;
@@ -268,15 +297,6 @@ void iommu_release_device(struct device *dev)
dev_iommu_free(dev);
}
-static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
- unsigned type);
-static int __iommu_attach_device(struct iommu_domain *domain,
- struct device *dev);
-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 __init iommu_set_def_domain_type(char *str)
{
bool pt;
@@ -1423,25 +1443,18 @@ static int iommu_get_def_domain_type(struct device *dev)
return (type == 0) ? iommu_def_domain_type : type;
}
-static int iommu_alloc_default_domain(struct device *dev,
- struct iommu_group *group)
+static int iommu_group_alloc_default_domain(struct bus_type *bus,
+ struct iommu_group *group,
+ unsigned int type)
{
struct iommu_domain *dom;
- unsigned int type;
-
- if (group->default_domain)
- return 0;
- type = iommu_get_def_domain_type(dev);
-
- dom = __iommu_domain_alloc(dev->bus, type);
+ dom = __iommu_domain_alloc(bus, type);
if (!dom && type != IOMMU_DOMAIN_DMA) {
- dom = __iommu_domain_alloc(dev->bus, IOMMU_DOMAIN_DMA);
- if (dom) {
- dev_warn(dev,
- "failed to allocate default IOMMU domain of type %u; falling back to IOMMU_DOMAIN_DMA",
- type);
- }
+ dom = __iommu_domain_alloc(bus, IOMMU_DOMAIN_DMA);
+ if (dom)
+ pr_warn("Failed to allocate default IOMMU domain of type %u for group %s - Falling back to IOMMU_DOMAIN_DMA",
+ type, group->name);
}
if (!dom)
@@ -1461,6 +1474,23 @@ static int iommu_alloc_default_domain(struct device *dev,
return 0;
}
+static int iommu_alloc_default_domain(struct device *dev)
+{
+ struct iommu_group *group;
+ unsigned int type;
+
+ group = iommu_group_get(dev);
+ if (!group)
+ return -ENODEV;
+
+ if (group->default_domain)
+ return 0;
+
+ type = iommu_get_def_domain_type(dev);
+
+ return iommu_group_alloc_default_domain(dev->bus, group, type);
+}
+
/**
* iommu_group_get_for_dev - Find or create the IOMMU group for a device
* @dev: target device
@@ -1491,16 +1521,26 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
if (IS_ERR(group))
return group;
+ ret = iommu_group_add_device(group, dev);
+ if (ret)
+ goto out_put_group;
+
/*
* Try to allocate a default domain - needs support from the
* IOMMU driver. There are still some drivers which don't support
- * default domains, so the return value is not yet checked.
+ * default domains, so the return value is not yet checked. Only
+ * allocate the domain here when the driver still has the
+ * add_device/remove_device call-backs implemented.
*/
- iommu_alloc_default_domain(dev, group);
+ if (!ops->probe_device) {
+ iommu_alloc_default_domain(dev);
- ret = iommu_group_add_device(group, dev);
- if (ret)
- goto out_put_group;
+ if (group->default_domain)
+ ret = __iommu_attach_device(group->default_domain, dev);
+
+ if (ret)
+ goto out_put_group;
+ }
return group;
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 08/33] iommu: Move default domain allocation to iommu_probe_device()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Well, not really. The call to iommu_alloc_default_domain() in
iommu_group_get_for_dev() has to stay around as long as there are
IOMMU drivers using the add/remove_device() call-backs instead of
probe/release_device().
Those drivers expect that iommu_group_get_for_dev() returns the device
attached to a group and the group set up with a default domain (and
the device attached to the groups current domain).
But when all drivers are converted this compatability mess can be
removed.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 102 +++++++++++++++++++++++++++++-------------
1 file changed, 71 insertions(+), 31 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 6cfe7799dc8c..7a385c18e1a5 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -79,6 +79,16 @@ static bool iommu_cmd_line_dma_api(void)
return !!(iommu_cmd_line & IOMMU_CMD_LINE_DMA_API);
}
+static int iommu_alloc_default_domain(struct device *dev);
+static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
+ unsigned type);
+static int __iommu_attach_device(struct iommu_domain *domain,
+ struct device *dev);
+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);
+
#define IOMMU_GROUP_ATTR(_name, _mode, _show, _store) \
struct iommu_group_attribute iommu_group_attr_##_name = \
__ATTR(_name, _mode, _show, _store)
@@ -221,10 +231,29 @@ int iommu_probe_device(struct device *dev)
goto err_free_dev_param;
}
- if (ops->probe_device)
+ if (ops->probe_device) {
+ struct iommu_group *group;
+
ret = __iommu_probe_device(dev);
- else
+
+ /*
+ * Try to allocate a default domain - needs support from the
+ * IOMMU driver. There are still some drivers which don't
+ * support default domains, so the return value is not yet
+ * checked.
+ */
+ if (!ret)
+ iommu_alloc_default_domain(dev);
+
+ group = iommu_group_get(dev);
+ if (group && group->default_domain) {
+ ret = __iommu_attach_device(group->default_domain, dev);
+ iommu_group_put(group);
+ }
+
+ } else {
ret = ops->add_device(dev);
+ }
if (ret)
goto err_module_put;
@@ -268,15 +297,6 @@ void iommu_release_device(struct device *dev)
dev_iommu_free(dev);
}
-static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
- unsigned type);
-static int __iommu_attach_device(struct iommu_domain *domain,
- struct device *dev);
-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 __init iommu_set_def_domain_type(char *str)
{
bool pt;
@@ -1423,25 +1443,18 @@ static int iommu_get_def_domain_type(struct device *dev)
return (type == 0) ? iommu_def_domain_type : type;
}
-static int iommu_alloc_default_domain(struct device *dev,
- struct iommu_group *group)
+static int iommu_group_alloc_default_domain(struct bus_type *bus,
+ struct iommu_group *group,
+ unsigned int type)
{
struct iommu_domain *dom;
- unsigned int type;
-
- if (group->default_domain)
- return 0;
- type = iommu_get_def_domain_type(dev);
-
- dom = __iommu_domain_alloc(dev->bus, type);
+ dom = __iommu_domain_alloc(bus, type);
if (!dom && type != IOMMU_DOMAIN_DMA) {
- dom = __iommu_domain_alloc(dev->bus, IOMMU_DOMAIN_DMA);
- if (dom) {
- dev_warn(dev,
- "failed to allocate default IOMMU domain of type %u; falling back to IOMMU_DOMAIN_DMA",
- type);
- }
+ dom = __iommu_domain_alloc(bus, IOMMU_DOMAIN_DMA);
+ if (dom)
+ pr_warn("Failed to allocate default IOMMU domain of type %u for group %s - Falling back to IOMMU_DOMAIN_DMA",
+ type, group->name);
}
if (!dom)
@@ -1461,6 +1474,23 @@ static int iommu_alloc_default_domain(struct device *dev,
return 0;
}
+static int iommu_alloc_default_domain(struct device *dev)
+{
+ struct iommu_group *group;
+ unsigned int type;
+
+ group = iommu_group_get(dev);
+ if (!group)
+ return -ENODEV;
+
+ if (group->default_domain)
+ return 0;
+
+ type = iommu_get_def_domain_type(dev);
+
+ return iommu_group_alloc_default_domain(dev->bus, group, type);
+}
+
/**
* iommu_group_get_for_dev - Find or create the IOMMU group for a device
* @dev: target device
@@ -1491,16 +1521,26 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
if (IS_ERR(group))
return group;
+ ret = iommu_group_add_device(group, dev);
+ if (ret)
+ goto out_put_group;
+
/*
* Try to allocate a default domain - needs support from the
* IOMMU driver. There are still some drivers which don't support
- * default domains, so the return value is not yet checked.
+ * default domains, so the return value is not yet checked. Only
+ * allocate the domain here when the driver still has the
+ * add_device/remove_device call-backs implemented.
*/
- iommu_alloc_default_domain(dev, group);
+ if (!ops->probe_device) {
+ iommu_alloc_default_domain(dev);
- ret = iommu_group_add_device(group, dev);
- if (ret)
- goto out_put_group;
+ if (group->default_domain)
+ ret = __iommu_attach_device(group->default_domain, dev);
+
+ if (ret)
+ goto out_put_group;
+ }
return group;
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 08/33] iommu: Move default domain allocation to iommu_probe_device()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Well, not really. The call to iommu_alloc_default_domain() in
iommu_group_get_for_dev() has to stay around as long as there are
IOMMU drivers using the add/remove_device() call-backs instead of
probe/release_device().
Those drivers expect that iommu_group_get_for_dev() returns the device
attached to a group and the group set up with a default domain (and
the device attached to the groups current domain).
But when all drivers are converted this compatability mess can be
removed.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 102 +++++++++++++++++++++++++++++-------------
1 file changed, 71 insertions(+), 31 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 6cfe7799dc8c..7a385c18e1a5 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -79,6 +79,16 @@ static bool iommu_cmd_line_dma_api(void)
return !!(iommu_cmd_line & IOMMU_CMD_LINE_DMA_API);
}
+static int iommu_alloc_default_domain(struct device *dev);
+static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
+ unsigned type);
+static int __iommu_attach_device(struct iommu_domain *domain,
+ struct device *dev);
+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);
+
#define IOMMU_GROUP_ATTR(_name, _mode, _show, _store) \
struct iommu_group_attribute iommu_group_attr_##_name = \
__ATTR(_name, _mode, _show, _store)
@@ -221,10 +231,29 @@ int iommu_probe_device(struct device *dev)
goto err_free_dev_param;
}
- if (ops->probe_device)
+ if (ops->probe_device) {
+ struct iommu_group *group;
+
ret = __iommu_probe_device(dev);
- else
+
+ /*
+ * Try to allocate a default domain - needs support from the
+ * IOMMU driver. There are still some drivers which don't
+ * support default domains, so the return value is not yet
+ * checked.
+ */
+ if (!ret)
+ iommu_alloc_default_domain(dev);
+
+ group = iommu_group_get(dev);
+ if (group && group->default_domain) {
+ ret = __iommu_attach_device(group->default_domain, dev);
+ iommu_group_put(group);
+ }
+
+ } else {
ret = ops->add_device(dev);
+ }
if (ret)
goto err_module_put;
@@ -268,15 +297,6 @@ void iommu_release_device(struct device *dev)
dev_iommu_free(dev);
}
-static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
- unsigned type);
-static int __iommu_attach_device(struct iommu_domain *domain,
- struct device *dev);
-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 __init iommu_set_def_domain_type(char *str)
{
bool pt;
@@ -1423,25 +1443,18 @@ static int iommu_get_def_domain_type(struct device *dev)
return (type == 0) ? iommu_def_domain_type : type;
}
-static int iommu_alloc_default_domain(struct device *dev,
- struct iommu_group *group)
+static int iommu_group_alloc_default_domain(struct bus_type *bus,
+ struct iommu_group *group,
+ unsigned int type)
{
struct iommu_domain *dom;
- unsigned int type;
-
- if (group->default_domain)
- return 0;
- type = iommu_get_def_domain_type(dev);
-
- dom = __iommu_domain_alloc(dev->bus, type);
+ dom = __iommu_domain_alloc(bus, type);
if (!dom && type != IOMMU_DOMAIN_DMA) {
- dom = __iommu_domain_alloc(dev->bus, IOMMU_DOMAIN_DMA);
- if (dom) {
- dev_warn(dev,
- "failed to allocate default IOMMU domain of type %u; falling back to IOMMU_DOMAIN_DMA",
- type);
- }
+ dom = __iommu_domain_alloc(bus, IOMMU_DOMAIN_DMA);
+ if (dom)
+ pr_warn("Failed to allocate default IOMMU domain of type %u for group %s - Falling back to IOMMU_DOMAIN_DMA",
+ type, group->name);
}
if (!dom)
@@ -1461,6 +1474,23 @@ static int iommu_alloc_default_domain(struct device *dev,
return 0;
}
+static int iommu_alloc_default_domain(struct device *dev)
+{
+ struct iommu_group *group;
+ unsigned int type;
+
+ group = iommu_group_get(dev);
+ if (!group)
+ return -ENODEV;
+
+ if (group->default_domain)
+ return 0;
+
+ type = iommu_get_def_domain_type(dev);
+
+ return iommu_group_alloc_default_domain(dev->bus, group, type);
+}
+
/**
* iommu_group_get_for_dev - Find or create the IOMMU group for a device
* @dev: target device
@@ -1491,16 +1521,26 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
if (IS_ERR(group))
return group;
+ ret = iommu_group_add_device(group, dev);
+ if (ret)
+ goto out_put_group;
+
/*
* Try to allocate a default domain - needs support from the
* IOMMU driver. There are still some drivers which don't support
- * default domains, so the return value is not yet checked.
+ * default domains, so the return value is not yet checked. Only
+ * allocate the domain here when the driver still has the
+ * add_device/remove_device call-backs implemented.
*/
- iommu_alloc_default_domain(dev, group);
+ if (!ops->probe_device) {
+ iommu_alloc_default_domain(dev);
- ret = iommu_group_add_device(group, dev);
- if (ret)
- goto out_put_group;
+ if (group->default_domain)
+ ret = __iommu_attach_device(group->default_domain, dev);
+
+ if (ret)
+ goto out_put_group;
+ }
return group;
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 08/33] iommu: Move default domain allocation to iommu_probe_device()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
Well, not really. The call to iommu_alloc_default_domain() in
iommu_group_get_for_dev() has to stay around as long as there are
IOMMU drivers using the add/remove_device() call-backs instead of
probe/release_device().
Those drivers expect that iommu_group_get_for_dev() returns the device
attached to a group and the group set up with a default domain (and
the device attached to the groups current domain).
But when all drivers are converted this compatability mess can be
removed.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 102 +++++++++++++++++++++++++++++-------------
1 file changed, 71 insertions(+), 31 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 6cfe7799dc8c..7a385c18e1a5 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -79,6 +79,16 @@ static bool iommu_cmd_line_dma_api(void)
return !!(iommu_cmd_line & IOMMU_CMD_LINE_DMA_API);
}
+static int iommu_alloc_default_domain(struct device *dev);
+static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
+ unsigned type);
+static int __iommu_attach_device(struct iommu_domain *domain,
+ struct device *dev);
+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);
+
#define IOMMU_GROUP_ATTR(_name, _mode, _show, _store) \
struct iommu_group_attribute iommu_group_attr_##_name = \
__ATTR(_name, _mode, _show, _store)
@@ -221,10 +231,29 @@ int iommu_probe_device(struct device *dev)
goto err_free_dev_param;
}
- if (ops->probe_device)
+ if (ops->probe_device) {
+ struct iommu_group *group;
+
ret = __iommu_probe_device(dev);
- else
+
+ /*
+ * Try to allocate a default domain - needs support from the
+ * IOMMU driver. There are still some drivers which don't
+ * support default domains, so the return value is not yet
+ * checked.
+ */
+ if (!ret)
+ iommu_alloc_default_domain(dev);
+
+ group = iommu_group_get(dev);
+ if (group && group->default_domain) {
+ ret = __iommu_attach_device(group->default_domain, dev);
+ iommu_group_put(group);
+ }
+
+ } else {
ret = ops->add_device(dev);
+ }
if (ret)
goto err_module_put;
@@ -268,15 +297,6 @@ void iommu_release_device(struct device *dev)
dev_iommu_free(dev);
}
-static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
- unsigned type);
-static int __iommu_attach_device(struct iommu_domain *domain,
- struct device *dev);
-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 __init iommu_set_def_domain_type(char *str)
{
bool pt;
@@ -1423,25 +1443,18 @@ static int iommu_get_def_domain_type(struct device *dev)
return (type == 0) ? iommu_def_domain_type : type;
}
-static int iommu_alloc_default_domain(struct device *dev,
- struct iommu_group *group)
+static int iommu_group_alloc_default_domain(struct bus_type *bus,
+ struct iommu_group *group,
+ unsigned int type)
{
struct iommu_domain *dom;
- unsigned int type;
-
- if (group->default_domain)
- return 0;
- type = iommu_get_def_domain_type(dev);
-
- dom = __iommu_domain_alloc(dev->bus, type);
+ dom = __iommu_domain_alloc(bus, type);
if (!dom && type != IOMMU_DOMAIN_DMA) {
- dom = __iommu_domain_alloc(dev->bus, IOMMU_DOMAIN_DMA);
- if (dom) {
- dev_warn(dev,
- "failed to allocate default IOMMU domain of type %u; falling back to IOMMU_DOMAIN_DMA",
- type);
- }
+ dom = __iommu_domain_alloc(bus, IOMMU_DOMAIN_DMA);
+ if (dom)
+ pr_warn("Failed to allocate default IOMMU domain of type %u for group %s - Falling back to IOMMU_DOMAIN_DMA",
+ type, group->name);
}
if (!dom)
@@ -1461,6 +1474,23 @@ static int iommu_alloc_default_domain(struct device *dev,
return 0;
}
+static int iommu_alloc_default_domain(struct device *dev)
+{
+ struct iommu_group *group;
+ unsigned int type;
+
+ group = iommu_group_get(dev);
+ if (!group)
+ return -ENODEV;
+
+ if (group->default_domain)
+ return 0;
+
+ type = iommu_get_def_domain_type(dev);
+
+ return iommu_group_alloc_default_domain(dev->bus, group, type);
+}
+
/**
* iommu_group_get_for_dev - Find or create the IOMMU group for a device
* @dev: target device
@@ -1491,16 +1521,26 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
if (IS_ERR(group))
return group;
+ ret = iommu_group_add_device(group, dev);
+ if (ret)
+ goto out_put_group;
+
/*
* Try to allocate a default domain - needs support from the
* IOMMU driver. There are still some drivers which don't support
- * default domains, so the return value is not yet checked.
+ * default domains, so the return value is not yet checked. Only
+ * allocate the domain here when the driver still has the
+ * add_device/remove_device call-backs implemented.
*/
- iommu_alloc_default_domain(dev, group);
+ if (!ops->probe_device) {
+ iommu_alloc_default_domain(dev);
- ret = iommu_group_add_device(group, dev);
- if (ret)
- goto out_put_group;
+ if (group->default_domain)
+ ret = __iommu_attach_device(group->default_domain, dev);
+
+ if (ret)
+ goto out_put_group;
+ }
return group;
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 09/33] iommu: Keep a list of allocated groups in __iommu_probe_device()
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
This is needed to defer default_domain allocation for new IOMMU groups
until all devices have been added to the group.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/iommu.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 7a385c18e1a5..18eb3623bd00 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -44,6 +44,7 @@ struct iommu_group {
int id;
struct iommu_domain *default_domain;
struct iommu_domain *domain;
+ struct list_head entry;
};
struct group_device {
@@ -184,7 +185,7 @@ static void dev_iommu_free(struct device *dev)
dev->iommu = NULL;
}
-static int __iommu_probe_device(struct device *dev)
+static int __iommu_probe_device(struct device *dev, struct list_head *group_list)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
struct iommu_device *iommu_dev;
@@ -204,6 +205,9 @@ static int __iommu_probe_device(struct device *dev)
}
iommu_group_put(group);
+ if (group_list && !group->default_domain && list_empty(&group->entry))
+ list_add_tail(&group->entry, group_list);
+
iommu_device_link(iommu_dev, dev);
return 0;
@@ -234,7 +238,7 @@ int iommu_probe_device(struct device *dev)
if (ops->probe_device) {
struct iommu_group *group;
- ret = __iommu_probe_device(dev);
+ ret = __iommu_probe_device(dev, NULL);
/*
* Try to allocate a default domain - needs support from the
@@ -567,6 +571,7 @@ struct iommu_group *iommu_group_alloc(void)
group->kobj.kset = iommu_group_kset;
mutex_init(&group->mutex);
INIT_LIST_HEAD(&group->devices);
+ INIT_LIST_HEAD(&group->entry);
BLOCKING_INIT_NOTIFIER_HEAD(&group->notifier);
ret = ida_simple_get(&iommu_group_ida, 0, 0, GFP_KERNEL);
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 09/33] iommu: Keep a list of allocated groups in __iommu_probe_device()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
This is needed to defer default_domain allocation for new IOMMU groups
until all devices have been added to the group.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 7a385c18e1a5..18eb3623bd00 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -44,6 +44,7 @@ struct iommu_group {
int id;
struct iommu_domain *default_domain;
struct iommu_domain *domain;
+ struct list_head entry;
};
struct group_device {
@@ -184,7 +185,7 @@ static void dev_iommu_free(struct device *dev)
dev->iommu = NULL;
}
-static int __iommu_probe_device(struct device *dev)
+static int __iommu_probe_device(struct device *dev, struct list_head *group_list)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
struct iommu_device *iommu_dev;
@@ -204,6 +205,9 @@ static int __iommu_probe_device(struct device *dev)
}
iommu_group_put(group);
+ if (group_list && !group->default_domain && list_empty(&group->entry))
+ list_add_tail(&group->entry, group_list);
+
iommu_device_link(iommu_dev, dev);
return 0;
@@ -234,7 +238,7 @@ int iommu_probe_device(struct device *dev)
if (ops->probe_device) {
struct iommu_group *group;
- ret = __iommu_probe_device(dev);
+ ret = __iommu_probe_device(dev, NULL);
/*
* Try to allocate a default domain - needs support from the
@@ -567,6 +571,7 @@ struct iommu_group *iommu_group_alloc(void)
group->kobj.kset = iommu_group_kset;
mutex_init(&group->mutex);
INIT_LIST_HEAD(&group->devices);
+ INIT_LIST_HEAD(&group->entry);
BLOCKING_INIT_NOTIFIER_HEAD(&group->notifier);
ret = ida_simple_get(&iommu_group_ida, 0, 0, GFP_KERNEL);
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 09/33] iommu: Keep a list of allocated groups in __iommu_probe_device()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
This is needed to defer default_domain allocation for new IOMMU groups
until all devices have been added to the group.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 7a385c18e1a5..18eb3623bd00 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -44,6 +44,7 @@ struct iommu_group {
int id;
struct iommu_domain *default_domain;
struct iommu_domain *domain;
+ struct list_head entry;
};
struct group_device {
@@ -184,7 +185,7 @@ static void dev_iommu_free(struct device *dev)
dev->iommu = NULL;
}
-static int __iommu_probe_device(struct device *dev)
+static int __iommu_probe_device(struct device *dev, struct list_head *group_list)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
struct iommu_device *iommu_dev;
@@ -204,6 +205,9 @@ static int __iommu_probe_device(struct device *dev)
}
iommu_group_put(group);
+ if (group_list && !group->default_domain && list_empty(&group->entry))
+ list_add_tail(&group->entry, group_list);
+
iommu_device_link(iommu_dev, dev);
return 0;
@@ -234,7 +238,7 @@ int iommu_probe_device(struct device *dev)
if (ops->probe_device) {
struct iommu_group *group;
- ret = __iommu_probe_device(dev);
+ ret = __iommu_probe_device(dev, NULL);
/*
* Try to allocate a default domain - needs support from the
@@ -567,6 +571,7 @@ struct iommu_group *iommu_group_alloc(void)
group->kobj.kset = iommu_group_kset;
mutex_init(&group->mutex);
INIT_LIST_HEAD(&group->devices);
+ INIT_LIST_HEAD(&group->entry);
BLOCKING_INIT_NOTIFIER_HEAD(&group->notifier);
ret = ida_simple_get(&iommu_group_ida, 0, 0, GFP_KERNEL);
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 09/33] iommu: Keep a list of allocated groups in __iommu_probe_device()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
This is needed to defer default_domain allocation for new IOMMU groups
until all devices have been added to the group.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 7a385c18e1a5..18eb3623bd00 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -44,6 +44,7 @@ struct iommu_group {
int id;
struct iommu_domain *default_domain;
struct iommu_domain *domain;
+ struct list_head entry;
};
struct group_device {
@@ -184,7 +185,7 @@ static void dev_iommu_free(struct device *dev)
dev->iommu = NULL;
}
-static int __iommu_probe_device(struct device *dev)
+static int __iommu_probe_device(struct device *dev, struct list_head *group_list)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
struct iommu_device *iommu_dev;
@@ -204,6 +205,9 @@ static int __iommu_probe_device(struct device *dev)
}
iommu_group_put(group);
+ if (group_list && !group->default_domain && list_empty(&group->entry))
+ list_add_tail(&group->entry, group_list);
+
iommu_device_link(iommu_dev, dev);
return 0;
@@ -234,7 +238,7 @@ int iommu_probe_device(struct device *dev)
if (ops->probe_device) {
struct iommu_group *group;
- ret = __iommu_probe_device(dev);
+ ret = __iommu_probe_device(dev, NULL);
/*
* Try to allocate a default domain - needs support from the
@@ -567,6 +571,7 @@ struct iommu_group *iommu_group_alloc(void)
group->kobj.kset = iommu_group_kset;
mutex_init(&group->mutex);
INIT_LIST_HEAD(&group->devices);
+ INIT_LIST_HEAD(&group->entry);
BLOCKING_INIT_NOTIFIER_HEAD(&group->notifier);
ret = ida_simple_get(&iommu_group_ida, 0, 0, GFP_KERNEL);
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 10/33] iommu: Move new probe_device path to separate function
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
This makes it easier to remove to old code-path when all drivers are
converted. As a side effect that it also fixes the error cleanup
path.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/iommu.c | 69 ++++++++++++++++++++++++++++---------------
1 file changed, 46 insertions(+), 23 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 18eb3623bd00..8be047a4808f 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -218,12 +218,55 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
return ret;
}
+static int __iommu_probe_device_helper(struct device *dev)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct iommu_group *group;
+ int ret;
+
+ ret = __iommu_probe_device(dev, NULL);
+ if (ret)
+ goto err_out;
+
+ /*
+ * Try to allocate a default domain - needs support from the
+ * IOMMU driver. There are still some drivers which don't
+ * support default domains, so the return value is not yet
+ * checked.
+ */
+ iommu_alloc_default_domain(dev);
+
+ group = iommu_group_get(dev);
+ if (!group)
+ goto err_release;
+
+ if (group->default_domain)
+ ret = __iommu_attach_device(group->default_domain, dev);
+
+ iommu_group_put(group);
+
+ if (ret)
+ goto err_release;
+
+ if (ops->probe_finalize)
+ ops->probe_finalize(dev);
+
+ return 0;
+
+err_release:
+ iommu_release_device(dev);
+err_out:
+ return ret;
+
+}
+
int iommu_probe_device(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
int ret;
WARN_ON(dev->iommu_group);
+
if (!ops)
return -EINVAL;
@@ -235,30 +278,10 @@ int iommu_probe_device(struct device *dev)
goto err_free_dev_param;
}
- if (ops->probe_device) {
- struct iommu_group *group;
-
- ret = __iommu_probe_device(dev, NULL);
-
- /*
- * Try to allocate a default domain - needs support from the
- * IOMMU driver. There are still some drivers which don't
- * support default domains, so the return value is not yet
- * checked.
- */
- if (!ret)
- iommu_alloc_default_domain(dev);
-
- group = iommu_group_get(dev);
- if (group && group->default_domain) {
- ret = __iommu_attach_device(group->default_domain, dev);
- iommu_group_put(group);
- }
-
- } else {
- ret = ops->add_device(dev);
- }
+ if (ops->probe_device)
+ return __iommu_probe_device_helper(dev);
+ ret = ops->add_device(dev);
if (ret)
goto err_module_put;
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 10/33] iommu: Move new probe_device path to separate function
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
This makes it easier to remove to old code-path when all drivers are
converted. As a side effect that it also fixes the error cleanup
path.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 69 ++++++++++++++++++++++++++++---------------
1 file changed, 46 insertions(+), 23 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 18eb3623bd00..8be047a4808f 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -218,12 +218,55 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
return ret;
}
+static int __iommu_probe_device_helper(struct device *dev)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct iommu_group *group;
+ int ret;
+
+ ret = __iommu_probe_device(dev, NULL);
+ if (ret)
+ goto err_out;
+
+ /*
+ * Try to allocate a default domain - needs support from the
+ * IOMMU driver. There are still some drivers which don't
+ * support default domains, so the return value is not yet
+ * checked.
+ */
+ iommu_alloc_default_domain(dev);
+
+ group = iommu_group_get(dev);
+ if (!group)
+ goto err_release;
+
+ if (group->default_domain)
+ ret = __iommu_attach_device(group->default_domain, dev);
+
+ iommu_group_put(group);
+
+ if (ret)
+ goto err_release;
+
+ if (ops->probe_finalize)
+ ops->probe_finalize(dev);
+
+ return 0;
+
+err_release:
+ iommu_release_device(dev);
+err_out:
+ return ret;
+
+}
+
int iommu_probe_device(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
int ret;
WARN_ON(dev->iommu_group);
+
if (!ops)
return -EINVAL;
@@ -235,30 +278,10 @@ int iommu_probe_device(struct device *dev)
goto err_free_dev_param;
}
- if (ops->probe_device) {
- struct iommu_group *group;
-
- ret = __iommu_probe_device(dev, NULL);
-
- /*
- * Try to allocate a default domain - needs support from the
- * IOMMU driver. There are still some drivers which don't
- * support default domains, so the return value is not yet
- * checked.
- */
- if (!ret)
- iommu_alloc_default_domain(dev);
-
- group = iommu_group_get(dev);
- if (group && group->default_domain) {
- ret = __iommu_attach_device(group->default_domain, dev);
- iommu_group_put(group);
- }
-
- } else {
- ret = ops->add_device(dev);
- }
+ if (ops->probe_device)
+ return __iommu_probe_device_helper(dev);
+ ret = ops->add_device(dev);
if (ret)
goto err_module_put;
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 10/33] iommu: Move new probe_device path to separate function
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
This makes it easier to remove to old code-path when all drivers are
converted. As a side effect that it also fixes the error cleanup
path.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 69 ++++++++++++++++++++++++++++---------------
1 file changed, 46 insertions(+), 23 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 18eb3623bd00..8be047a4808f 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -218,12 +218,55 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
return ret;
}
+static int __iommu_probe_device_helper(struct device *dev)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct iommu_group *group;
+ int ret;
+
+ ret = __iommu_probe_device(dev, NULL);
+ if (ret)
+ goto err_out;
+
+ /*
+ * Try to allocate a default domain - needs support from the
+ * IOMMU driver. There are still some drivers which don't
+ * support default domains, so the return value is not yet
+ * checked.
+ */
+ iommu_alloc_default_domain(dev);
+
+ group = iommu_group_get(dev);
+ if (!group)
+ goto err_release;
+
+ if (group->default_domain)
+ ret = __iommu_attach_device(group->default_domain, dev);
+
+ iommu_group_put(group);
+
+ if (ret)
+ goto err_release;
+
+ if (ops->probe_finalize)
+ ops->probe_finalize(dev);
+
+ return 0;
+
+err_release:
+ iommu_release_device(dev);
+err_out:
+ return ret;
+
+}
+
int iommu_probe_device(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
int ret;
WARN_ON(dev->iommu_group);
+
if (!ops)
return -EINVAL;
@@ -235,30 +278,10 @@ int iommu_probe_device(struct device *dev)
goto err_free_dev_param;
}
- if (ops->probe_device) {
- struct iommu_group *group;
-
- ret = __iommu_probe_device(dev, NULL);
-
- /*
- * Try to allocate a default domain - needs support from the
- * IOMMU driver. There are still some drivers which don't
- * support default domains, so the return value is not yet
- * checked.
- */
- if (!ret)
- iommu_alloc_default_domain(dev);
-
- group = iommu_group_get(dev);
- if (group && group->default_domain) {
- ret = __iommu_attach_device(group->default_domain, dev);
- iommu_group_put(group);
- }
-
- } else {
- ret = ops->add_device(dev);
- }
+ if (ops->probe_device)
+ return __iommu_probe_device_helper(dev);
+ ret = ops->add_device(dev);
if (ret)
goto err_module_put;
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 10/33] iommu: Move new probe_device path to separate function
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
This makes it easier to remove to old code-path when all drivers are
converted. As a side effect that it also fixes the error cleanup
path.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 69 ++++++++++++++++++++++++++++---------------
1 file changed, 46 insertions(+), 23 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 18eb3623bd00..8be047a4808f 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -218,12 +218,55 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
return ret;
}
+static int __iommu_probe_device_helper(struct device *dev)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct iommu_group *group;
+ int ret;
+
+ ret = __iommu_probe_device(dev, NULL);
+ if (ret)
+ goto err_out;
+
+ /*
+ * Try to allocate a default domain - needs support from the
+ * IOMMU driver. There are still some drivers which don't
+ * support default domains, so the return value is not yet
+ * checked.
+ */
+ iommu_alloc_default_domain(dev);
+
+ group = iommu_group_get(dev);
+ if (!group)
+ goto err_release;
+
+ if (group->default_domain)
+ ret = __iommu_attach_device(group->default_domain, dev);
+
+ iommu_group_put(group);
+
+ if (ret)
+ goto err_release;
+
+ if (ops->probe_finalize)
+ ops->probe_finalize(dev);
+
+ return 0;
+
+err_release:
+ iommu_release_device(dev);
+err_out:
+ return ret;
+
+}
+
int iommu_probe_device(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
int ret;
WARN_ON(dev->iommu_group);
+
if (!ops)
return -EINVAL;
@@ -235,30 +278,10 @@ int iommu_probe_device(struct device *dev)
goto err_free_dev_param;
}
- if (ops->probe_device) {
- struct iommu_group *group;
-
- ret = __iommu_probe_device(dev, NULL);
-
- /*
- * Try to allocate a default domain - needs support from the
- * IOMMU driver. There are still some drivers which don't
- * support default domains, so the return value is not yet
- * checked.
- */
- if (!ret)
- iommu_alloc_default_domain(dev);
-
- group = iommu_group_get(dev);
- if (group && group->default_domain) {
- ret = __iommu_attach_device(group->default_domain, dev);
- iommu_group_put(group);
- }
-
- } else {
- ret = ops->add_device(dev);
- }
+ if (ops->probe_device)
+ return __iommu_probe_device_helper(dev);
+ ret = ops->add_device(dev);
if (ret)
goto err_module_put;
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 11/33] iommu: Split off default domain allocation from group assignment
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
When a bus is initialized with iommu-ops, all devices on the bus are
scanned and iommu-groups are allocated for them, and each groups will
also get a default domain allocated.
Until now this happened as soon as the group was created and the first
device added to it. When other devices with different default domain
requirements were added to the group later on, the default domain was
re-allocated, if possible.
This resulted in some back and forth and unnecessary allocations, so
change the flow to defer default domain allocation until all devices
have been added to their respective IOMMU groups.
The default domains are allocated for newly allocated groups after
each device on the bus is handled and was probed by the IOMMU driver.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/iommu.c | 154 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 151 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 8be047a4808f..7de0e29db333 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -199,7 +199,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
dev->iommu->iommu_dev = iommu_dev;
group = iommu_group_get_for_dev(dev);
- if (!IS_ERR(group)) {
+ if (IS_ERR(group)) {
ret = PTR_ERR(group);
goto out_release;
}
@@ -1599,6 +1599,37 @@ static int add_iommu_group(struct device *dev, void *data)
return ret;
}
+static int probe_iommu_group(struct device *dev, void *data)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct list_head *group_list = data;
+ int ret;
+
+ if (!dev_iommu_get(dev))
+ return -ENOMEM;
+
+ if (!try_module_get(ops->owner)) {
+ ret = -EINVAL;
+ goto err_free_dev_iommu;
+ }
+
+ ret = __iommu_probe_device(dev, group_list);
+ if (ret)
+ goto err_module_put;
+
+ return 0;
+
+err_module_put:
+ module_put(ops->owner);
+err_free_dev_iommu:
+ dev_iommu_free(dev);
+
+ if (ret == -ENODEV)
+ ret = 0;
+
+ return ret;
+}
+
static int remove_iommu_group(struct device *dev, void *data)
{
iommu_release_device(dev);
@@ -1658,10 +1689,127 @@ static int iommu_bus_notifier(struct notifier_block *nb,
return 0;
}
+struct __group_domain_type {
+ struct device *dev;
+ unsigned int type;
+};
+
+static int probe_get_default_domain_type(struct device *dev, void *data)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct __group_domain_type *gtype = data;
+ unsigned int type = 0;
+
+ if (ops->def_domain_type)
+ type = ops->def_domain_type(dev);
+
+ if (type) {
+ if (gtype->type && gtype->type != type) {
+ dev_warn(dev, "Device needs domain type %s, but device %s in the same iommu group requires type %s - using default\n",
+ iommu_domain_type_str(type),
+ dev_name(gtype->dev),
+ iommu_domain_type_str(gtype->type));
+ gtype->type = 0;
+ }
+
+ if (!gtype->dev) {
+ gtype->dev = dev;
+ gtype->type = type;
+ }
+ }
+
+ return 0;
+}
+
+static void probe_alloc_default_domain(struct bus_type *bus,
+ struct iommu_group *group)
+{
+ struct __group_domain_type gtype;
+
+ memset(>ype, 0, sizeof(gtype));
+
+ /* Ask for default domain requirements of all devices in the group */
+ __iommu_group_for_each_dev(group, >ype,
+ probe_get_default_domain_type);
+
+ if (!gtype.type)
+ 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)
+{
+ struct iommu_domain *domain = data;
+ const struct iommu_ops *ops;
+ int ret;
+
+ ret = __iommu_attach_device(domain, dev);
+
+ ops = domain->ops;
+
+ if (ret == 0 && ops->probe_finalize)
+ ops->probe_finalize(dev);
+
+ return ret;
+}
+
+static int __iommu_group_dma_attach(struct iommu_group *group)
+{
+ return __iommu_group_for_each_dev(group, group->default_domain,
+ iommu_group_do_dma_attach);
+}
+
+static int bus_iommu_probe(struct bus_type *bus)
+{
+ const struct iommu_ops *ops = bus->iommu_ops;
+ int ret;
+
+ if (ops->probe_device) {
+ struct iommu_group *group, *next;
+ LIST_HEAD(group_list);
+
+ /*
+ * This code-path does not allocate the default domain when
+ * creating the iommu group, so do it after the groups are
+ * created.
+ */
+ ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
+ if (ret)
+ return ret;
+
+ list_for_each_entry_safe(group, next, &group_list, entry) {
+ /* Remove item from the list */
+ list_del_init(&group->entry);
+
+ mutex_lock(&group->mutex);
+
+ /* Try to allocate default domain */
+ probe_alloc_default_domain(bus, group);
+
+ if (!group->default_domain) {
+ mutex_unlock(&group->mutex);
+ continue;
+ }
+
+ ret = __iommu_group_dma_attach(group);
+
+ mutex_unlock(&group->mutex);
+
+ if (ret)
+ break;
+ }
+ } else {
+ ret = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ }
+
+ return ret;
+}
+
static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
{
- int err;
struct notifier_block *nb;
+ int err;
nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL);
if (!nb)
@@ -1673,7 +1821,7 @@ static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
if (err)
goto out_free;
- err = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ err = bus_iommu_probe(bus);
if (err)
goto out_err;
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 11/33] iommu: Split off default domain allocation from group assignment
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
When a bus is initialized with iommu-ops, all devices on the bus are
scanned and iommu-groups are allocated for them, and each groups will
also get a default domain allocated.
Until now this happened as soon as the group was created and the first
device added to it. When other devices with different default domain
requirements were added to the group later on, the default domain was
re-allocated, if possible.
This resulted in some back and forth and unnecessary allocations, so
change the flow to defer default domain allocation until all devices
have been added to their respective IOMMU groups.
The default domains are allocated for newly allocated groups after
each device on the bus is handled and was probed by the IOMMU driver.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 154 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 151 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 8be047a4808f..7de0e29db333 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -199,7 +199,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
dev->iommu->iommu_dev = iommu_dev;
group = iommu_group_get_for_dev(dev);
- if (!IS_ERR(group)) {
+ if (IS_ERR(group)) {
ret = PTR_ERR(group);
goto out_release;
}
@@ -1599,6 +1599,37 @@ static int add_iommu_group(struct device *dev, void *data)
return ret;
}
+static int probe_iommu_group(struct device *dev, void *data)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct list_head *group_list = data;
+ int ret;
+
+ if (!dev_iommu_get(dev))
+ return -ENOMEM;
+
+ if (!try_module_get(ops->owner)) {
+ ret = -EINVAL;
+ goto err_free_dev_iommu;
+ }
+
+ ret = __iommu_probe_device(dev, group_list);
+ if (ret)
+ goto err_module_put;
+
+ return 0;
+
+err_module_put:
+ module_put(ops->owner);
+err_free_dev_iommu:
+ dev_iommu_free(dev);
+
+ if (ret == -ENODEV)
+ ret = 0;
+
+ return ret;
+}
+
static int remove_iommu_group(struct device *dev, void *data)
{
iommu_release_device(dev);
@@ -1658,10 +1689,127 @@ static int iommu_bus_notifier(struct notifier_block *nb,
return 0;
}
+struct __group_domain_type {
+ struct device *dev;
+ unsigned int type;
+};
+
+static int probe_get_default_domain_type(struct device *dev, void *data)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct __group_domain_type *gtype = data;
+ unsigned int type = 0;
+
+ if (ops->def_domain_type)
+ type = ops->def_domain_type(dev);
+
+ if (type) {
+ if (gtype->type && gtype->type != type) {
+ dev_warn(dev, "Device needs domain type %s, but device %s in the same iommu group requires type %s - using default\n",
+ iommu_domain_type_str(type),
+ dev_name(gtype->dev),
+ iommu_domain_type_str(gtype->type));
+ gtype->type = 0;
+ }
+
+ if (!gtype->dev) {
+ gtype->dev = dev;
+ gtype->type = type;
+ }
+ }
+
+ return 0;
+}
+
+static void probe_alloc_default_domain(struct bus_type *bus,
+ struct iommu_group *group)
+{
+ struct __group_domain_type gtype;
+
+ memset(>ype, 0, sizeof(gtype));
+
+ /* Ask for default domain requirements of all devices in the group */
+ __iommu_group_for_each_dev(group, >ype,
+ probe_get_default_domain_type);
+
+ if (!gtype.type)
+ 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)
+{
+ struct iommu_domain *domain = data;
+ const struct iommu_ops *ops;
+ int ret;
+
+ ret = __iommu_attach_device(domain, dev);
+
+ ops = domain->ops;
+
+ if (ret == 0 && ops->probe_finalize)
+ ops->probe_finalize(dev);
+
+ return ret;
+}
+
+static int __iommu_group_dma_attach(struct iommu_group *group)
+{
+ return __iommu_group_for_each_dev(group, group->default_domain,
+ iommu_group_do_dma_attach);
+}
+
+static int bus_iommu_probe(struct bus_type *bus)
+{
+ const struct iommu_ops *ops = bus->iommu_ops;
+ int ret;
+
+ if (ops->probe_device) {
+ struct iommu_group *group, *next;
+ LIST_HEAD(group_list);
+
+ /*
+ * This code-path does not allocate the default domain when
+ * creating the iommu group, so do it after the groups are
+ * created.
+ */
+ ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
+ if (ret)
+ return ret;
+
+ list_for_each_entry_safe(group, next, &group_list, entry) {
+ /* Remove item from the list */
+ list_del_init(&group->entry);
+
+ mutex_lock(&group->mutex);
+
+ /* Try to allocate default domain */
+ probe_alloc_default_domain(bus, group);
+
+ if (!group->default_domain) {
+ mutex_unlock(&group->mutex);
+ continue;
+ }
+
+ ret = __iommu_group_dma_attach(group);
+
+ mutex_unlock(&group->mutex);
+
+ if (ret)
+ break;
+ }
+ } else {
+ ret = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ }
+
+ return ret;
+}
+
static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
{
- int err;
struct notifier_block *nb;
+ int err;
nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL);
if (!nb)
@@ -1673,7 +1821,7 @@ static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
if (err)
goto out_free;
- err = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ err = bus_iommu_probe(bus);
if (err)
goto out_err;
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 11/33] iommu: Split off default domain allocation from group assignment
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
When a bus is initialized with iommu-ops, all devices on the bus are
scanned and iommu-groups are allocated for them, and each groups will
also get a default domain allocated.
Until now this happened as soon as the group was created and the first
device added to it. When other devices with different default domain
requirements were added to the group later on, the default domain was
re-allocated, if possible.
This resulted in some back and forth and unnecessary allocations, so
change the flow to defer default domain allocation until all devices
have been added to their respective IOMMU groups.
The default domains are allocated for newly allocated groups after
each device on the bus is handled and was probed by the IOMMU driver.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 154 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 151 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 8be047a4808f..7de0e29db333 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -199,7 +199,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
dev->iommu->iommu_dev = iommu_dev;
group = iommu_group_get_for_dev(dev);
- if (!IS_ERR(group)) {
+ if (IS_ERR(group)) {
ret = PTR_ERR(group);
goto out_release;
}
@@ -1599,6 +1599,37 @@ static int add_iommu_group(struct device *dev, void *data)
return ret;
}
+static int probe_iommu_group(struct device *dev, void *data)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct list_head *group_list = data;
+ int ret;
+
+ if (!dev_iommu_get(dev))
+ return -ENOMEM;
+
+ if (!try_module_get(ops->owner)) {
+ ret = -EINVAL;
+ goto err_free_dev_iommu;
+ }
+
+ ret = __iommu_probe_device(dev, group_list);
+ if (ret)
+ goto err_module_put;
+
+ return 0;
+
+err_module_put:
+ module_put(ops->owner);
+err_free_dev_iommu:
+ dev_iommu_free(dev);
+
+ if (ret == -ENODEV)
+ ret = 0;
+
+ return ret;
+}
+
static int remove_iommu_group(struct device *dev, void *data)
{
iommu_release_device(dev);
@@ -1658,10 +1689,127 @@ static int iommu_bus_notifier(struct notifier_block *nb,
return 0;
}
+struct __group_domain_type {
+ struct device *dev;
+ unsigned int type;
+};
+
+static int probe_get_default_domain_type(struct device *dev, void *data)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct __group_domain_type *gtype = data;
+ unsigned int type = 0;
+
+ if (ops->def_domain_type)
+ type = ops->def_domain_type(dev);
+
+ if (type) {
+ if (gtype->type && gtype->type != type) {
+ dev_warn(dev, "Device needs domain type %s, but device %s in the same iommu group requires type %s - using default\n",
+ iommu_domain_type_str(type),
+ dev_name(gtype->dev),
+ iommu_domain_type_str(gtype->type));
+ gtype->type = 0;
+ }
+
+ if (!gtype->dev) {
+ gtype->dev = dev;
+ gtype->type = type;
+ }
+ }
+
+ return 0;
+}
+
+static void probe_alloc_default_domain(struct bus_type *bus,
+ struct iommu_group *group)
+{
+ struct __group_domain_type gtype;
+
+ memset(>ype, 0, sizeof(gtype));
+
+ /* Ask for default domain requirements of all devices in the group */
+ __iommu_group_for_each_dev(group, >ype,
+ probe_get_default_domain_type);
+
+ if (!gtype.type)
+ 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)
+{
+ struct iommu_domain *domain = data;
+ const struct iommu_ops *ops;
+ int ret;
+
+ ret = __iommu_attach_device(domain, dev);
+
+ ops = domain->ops;
+
+ if (ret == 0 && ops->probe_finalize)
+ ops->probe_finalize(dev);
+
+ return ret;
+}
+
+static int __iommu_group_dma_attach(struct iommu_group *group)
+{
+ return __iommu_group_for_each_dev(group, group->default_domain,
+ iommu_group_do_dma_attach);
+}
+
+static int bus_iommu_probe(struct bus_type *bus)
+{
+ const struct iommu_ops *ops = bus->iommu_ops;
+ int ret;
+
+ if (ops->probe_device) {
+ struct iommu_group *group, *next;
+ LIST_HEAD(group_list);
+
+ /*
+ * This code-path does not allocate the default domain when
+ * creating the iommu group, so do it after the groups are
+ * created.
+ */
+ ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
+ if (ret)
+ return ret;
+
+ list_for_each_entry_safe(group, next, &group_list, entry) {
+ /* Remove item from the list */
+ list_del_init(&group->entry);
+
+ mutex_lock(&group->mutex);
+
+ /* Try to allocate default domain */
+ probe_alloc_default_domain(bus, group);
+
+ if (!group->default_domain) {
+ mutex_unlock(&group->mutex);
+ continue;
+ }
+
+ ret = __iommu_group_dma_attach(group);
+
+ mutex_unlock(&group->mutex);
+
+ if (ret)
+ break;
+ }
+ } else {
+ ret = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ }
+
+ return ret;
+}
+
static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
{
- int err;
struct notifier_block *nb;
+ int err;
nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL);
if (!nb)
@@ -1673,7 +1821,7 @@ static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
if (err)
goto out_free;
- err = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ err = bus_iommu_probe(bus);
if (err)
goto out_err;
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 11/33] iommu: Split off default domain allocation from group assignment
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
When a bus is initialized with iommu-ops, all devices on the bus are
scanned and iommu-groups are allocated for them, and each groups will
also get a default domain allocated.
Until now this happened as soon as the group was created and the first
device added to it. When other devices with different default domain
requirements were added to the group later on, the default domain was
re-allocated, if possible.
This resulted in some back and forth and unnecessary allocations, so
change the flow to defer default domain allocation until all devices
have been added to their respective IOMMU groups.
The default domains are allocated for newly allocated groups after
each device on the bus is handled and was probed by the IOMMU driver.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 154 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 151 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 8be047a4808f..7de0e29db333 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -199,7 +199,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
dev->iommu->iommu_dev = iommu_dev;
group = iommu_group_get_for_dev(dev);
- if (!IS_ERR(group)) {
+ if (IS_ERR(group)) {
ret = PTR_ERR(group);
goto out_release;
}
@@ -1599,6 +1599,37 @@ static int add_iommu_group(struct device *dev, void *data)
return ret;
}
+static int probe_iommu_group(struct device *dev, void *data)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct list_head *group_list = data;
+ int ret;
+
+ if (!dev_iommu_get(dev))
+ return -ENOMEM;
+
+ if (!try_module_get(ops->owner)) {
+ ret = -EINVAL;
+ goto err_free_dev_iommu;
+ }
+
+ ret = __iommu_probe_device(dev, group_list);
+ if (ret)
+ goto err_module_put;
+
+ return 0;
+
+err_module_put:
+ module_put(ops->owner);
+err_free_dev_iommu:
+ dev_iommu_free(dev);
+
+ if (ret == -ENODEV)
+ ret = 0;
+
+ return ret;
+}
+
static int remove_iommu_group(struct device *dev, void *data)
{
iommu_release_device(dev);
@@ -1658,10 +1689,127 @@ static int iommu_bus_notifier(struct notifier_block *nb,
return 0;
}
+struct __group_domain_type {
+ struct device *dev;
+ unsigned int type;
+};
+
+static int probe_get_default_domain_type(struct device *dev, void *data)
+{
+ const struct iommu_ops *ops = dev->bus->iommu_ops;
+ struct __group_domain_type *gtype = data;
+ unsigned int type = 0;
+
+ if (ops->def_domain_type)
+ type = ops->def_domain_type(dev);
+
+ if (type) {
+ if (gtype->type && gtype->type != type) {
+ dev_warn(dev, "Device needs domain type %s, but device %s in the same iommu group requires type %s - using default\n",
+ iommu_domain_type_str(type),
+ dev_name(gtype->dev),
+ iommu_domain_type_str(gtype->type));
+ gtype->type = 0;
+ }
+
+ if (!gtype->dev) {
+ gtype->dev = dev;
+ gtype->type = type;
+ }
+ }
+
+ return 0;
+}
+
+static void probe_alloc_default_domain(struct bus_type *bus,
+ struct iommu_group *group)
+{
+ struct __group_domain_type gtype;
+
+ memset(>ype, 0, sizeof(gtype));
+
+ /* Ask for default domain requirements of all devices in the group */
+ __iommu_group_for_each_dev(group, >ype,
+ probe_get_default_domain_type);
+
+ if (!gtype.type)
+ 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)
+{
+ struct iommu_domain *domain = data;
+ const struct iommu_ops *ops;
+ int ret;
+
+ ret = __iommu_attach_device(domain, dev);
+
+ ops = domain->ops;
+
+ if (ret == 0 && ops->probe_finalize)
+ ops->probe_finalize(dev);
+
+ return ret;
+}
+
+static int __iommu_group_dma_attach(struct iommu_group *group)
+{
+ return __iommu_group_for_each_dev(group, group->default_domain,
+ iommu_group_do_dma_attach);
+}
+
+static int bus_iommu_probe(struct bus_type *bus)
+{
+ const struct iommu_ops *ops = bus->iommu_ops;
+ int ret;
+
+ if (ops->probe_device) {
+ struct iommu_group *group, *next;
+ LIST_HEAD(group_list);
+
+ /*
+ * This code-path does not allocate the default domain when
+ * creating the iommu group, so do it after the groups are
+ * created.
+ */
+ ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
+ if (ret)
+ return ret;
+
+ list_for_each_entry_safe(group, next, &group_list, entry) {
+ /* Remove item from the list */
+ list_del_init(&group->entry);
+
+ mutex_lock(&group->mutex);
+
+ /* Try to allocate default domain */
+ probe_alloc_default_domain(bus, group);
+
+ if (!group->default_domain) {
+ mutex_unlock(&group->mutex);
+ continue;
+ }
+
+ ret = __iommu_group_dma_attach(group);
+
+ mutex_unlock(&group->mutex);
+
+ if (ret)
+ break;
+ }
+ } else {
+ ret = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ }
+
+ return ret;
+}
+
static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
{
- int err;
struct notifier_block *nb;
+ int err;
nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL);
if (!nb)
@@ -1673,7 +1821,7 @@ static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
if (err)
goto out_free;
- err = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ err = bus_iommu_probe(bus);
if (err)
goto out_err;
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 12/33] iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device()
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
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-l3A5Bk7waGM@public.gmane.org>
---
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
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 12/33] iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
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
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 12/33] iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
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
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 12/33] iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
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
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 15/33] iommu/amd: Convert to probe/release_device() call-backs
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
Convert the AMD IOMMU Driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/amd_iommu.c | 71 ++++++++++++---------------------------
1 file changed, 22 insertions(+), 49 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 0b4b4faa876d..c30367413683 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -343,21 +343,9 @@ static bool check_device(struct device *dev)
return true;
}
-static void init_iommu_group(struct device *dev)
-{
- struct iommu_group *group;
-
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return;
-
- iommu_group_put(group);
-}
-
static int iommu_init_device(struct device *dev)
{
struct iommu_dev_data *dev_data;
- struct amd_iommu *iommu;
int devid;
if (dev->archdata.iommu)
@@ -367,8 +355,6 @@ static int iommu_init_device(struct device *dev)
if (devid < 0)
return devid;
- iommu = amd_iommu_rlookup_table[devid];
-
dev_data = find_dev_data(devid);
if (!dev_data)
return -ENOMEM;
@@ -391,8 +377,6 @@ static int iommu_init_device(struct device *dev)
dev->archdata.iommu = dev_data;
- iommu_device_link(&iommu->iommu, dev);
-
return 0;
}
@@ -410,7 +394,7 @@ static void iommu_ignore_device(struct device *dev)
setup_aliases(dev);
}
-static void iommu_uninit_device(struct device *dev)
+static void amd_iommu_uninit_device(struct device *dev)
{
struct iommu_dev_data *dev_data;
struct amd_iommu *iommu;
@@ -429,13 +413,6 @@ static void iommu_uninit_device(struct device *dev)
if (dev_data->domain)
detach_device(dev);
- iommu_device_unlink(&iommu->iommu, dev);
-
- iommu_group_remove_device(dev);
-
- /* Remove dma-ops */
- dev->dma_ops = NULL;
-
/*
* We keep dev_data around for unplugged devices and reuse it when the
* device is re-plugged - not doing so would introduce a ton of races.
@@ -2152,55 +2129,50 @@ static void detach_device(struct device *dev)
spin_unlock_irqrestore(&domain->lock, flags);
}
-static int amd_iommu_add_device(struct device *dev)
+static struct iommu_device *amd_iommu_probe_device(struct device *dev)
{
- struct iommu_dev_data *dev_data;
- struct iommu_domain *domain;
+ struct iommu_device *iommu_dev;
struct amd_iommu *iommu;
int ret, devid;
- if (get_dev_data(dev))
- return 0;
-
if (!check_device(dev))
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
devid = get_device_id(dev);
if (devid < 0)
- return devid;
+ return ERR_PTR(devid);
iommu = amd_iommu_rlookup_table[devid];
+ if (get_dev_data(dev))
+ return &iommu->iommu;
+
ret = iommu_init_device(dev);
if (ret) {
if (ret != -ENOTSUPP)
dev_err(dev, "Failed to initialize - trying to proceed anyway\n");
-
+ iommu_dev = ERR_PTR(ret);
iommu_ignore_device(dev);
- dev->dma_ops = NULL;
- goto out;
+ } else {
+ iommu_dev = &iommu->iommu;
}
- init_iommu_group(dev);
- dev_data = get_dev_data(dev);
+ iommu_completion_wait(iommu);
- BUG_ON(!dev_data);
+ return iommu_dev;
+}
- if (dev_data->iommu_v2)
- iommu_request_dm_for_dev(dev);
+static void amd_iommu_probe_finalize(struct device *dev)
+{
+ struct iommu_domain *domain;
/* Domains are initialized for this device - have a look what we ended up with */
domain = iommu_get_domain_for_dev(dev);
if (domain->type == IOMMU_DOMAIN_DMA)
iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, 0);
-
-out:
- iommu_completion_wait(iommu);
-
- return 0;
}
-static void amd_iommu_remove_device(struct device *dev)
+static void amd_iommu_release_device(struct device *dev)
{
struct amd_iommu *iommu;
int devid;
@@ -2214,7 +2186,7 @@ static void amd_iommu_remove_device(struct device *dev)
iommu = amd_iommu_rlookup_table[devid];
- iommu_uninit_device(dev);
+ amd_iommu_uninit_device(dev);
iommu_completion_wait(iommu);
}
@@ -2687,8 +2659,9 @@ const struct iommu_ops amd_iommu_ops = {
.map = amd_iommu_map,
.unmap = amd_iommu_unmap,
.iova_to_phys = amd_iommu_iova_to_phys,
- .add_device = amd_iommu_add_device,
- .remove_device = amd_iommu_remove_device,
+ .probe_device = amd_iommu_probe_device,
+ .release_device = amd_iommu_release_device,
+ .probe_finalize = amd_iommu_probe_finalize,
.device_group = amd_iommu_device_group,
.domain_get_attr = amd_iommu_domain_get_attr,
.get_resv_regions = amd_iommu_get_resv_regions,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 15/33] iommu/amd: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the AMD IOMMU Driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 71 ++++++++++++---------------------------
1 file changed, 22 insertions(+), 49 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 0b4b4faa876d..c30367413683 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -343,21 +343,9 @@ static bool check_device(struct device *dev)
return true;
}
-static void init_iommu_group(struct device *dev)
-{
- struct iommu_group *group;
-
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return;
-
- iommu_group_put(group);
-}
-
static int iommu_init_device(struct device *dev)
{
struct iommu_dev_data *dev_data;
- struct amd_iommu *iommu;
int devid;
if (dev->archdata.iommu)
@@ -367,8 +355,6 @@ static int iommu_init_device(struct device *dev)
if (devid < 0)
return devid;
- iommu = amd_iommu_rlookup_table[devid];
-
dev_data = find_dev_data(devid);
if (!dev_data)
return -ENOMEM;
@@ -391,8 +377,6 @@ static int iommu_init_device(struct device *dev)
dev->archdata.iommu = dev_data;
- iommu_device_link(&iommu->iommu, dev);
-
return 0;
}
@@ -410,7 +394,7 @@ static void iommu_ignore_device(struct device *dev)
setup_aliases(dev);
}
-static void iommu_uninit_device(struct device *dev)
+static void amd_iommu_uninit_device(struct device *dev)
{
struct iommu_dev_data *dev_data;
struct amd_iommu *iommu;
@@ -429,13 +413,6 @@ static void iommu_uninit_device(struct device *dev)
if (dev_data->domain)
detach_device(dev);
- iommu_device_unlink(&iommu->iommu, dev);
-
- iommu_group_remove_device(dev);
-
- /* Remove dma-ops */
- dev->dma_ops = NULL;
-
/*
* We keep dev_data around for unplugged devices and reuse it when the
* device is re-plugged - not doing so would introduce a ton of races.
@@ -2152,55 +2129,50 @@ static void detach_device(struct device *dev)
spin_unlock_irqrestore(&domain->lock, flags);
}
-static int amd_iommu_add_device(struct device *dev)
+static struct iommu_device *amd_iommu_probe_device(struct device *dev)
{
- struct iommu_dev_data *dev_data;
- struct iommu_domain *domain;
+ struct iommu_device *iommu_dev;
struct amd_iommu *iommu;
int ret, devid;
- if (get_dev_data(dev))
- return 0;
-
if (!check_device(dev))
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
devid = get_device_id(dev);
if (devid < 0)
- return devid;
+ return ERR_PTR(devid);
iommu = amd_iommu_rlookup_table[devid];
+ if (get_dev_data(dev))
+ return &iommu->iommu;
+
ret = iommu_init_device(dev);
if (ret) {
if (ret != -ENOTSUPP)
dev_err(dev, "Failed to initialize - trying to proceed anyway\n");
-
+ iommu_dev = ERR_PTR(ret);
iommu_ignore_device(dev);
- dev->dma_ops = NULL;
- goto out;
+ } else {
+ iommu_dev = &iommu->iommu;
}
- init_iommu_group(dev);
- dev_data = get_dev_data(dev);
+ iommu_completion_wait(iommu);
- BUG_ON(!dev_data);
+ return iommu_dev;
+}
- if (dev_data->iommu_v2)
- iommu_request_dm_for_dev(dev);
+static void amd_iommu_probe_finalize(struct device *dev)
+{
+ struct iommu_domain *domain;
/* Domains are initialized for this device - have a look what we ended up with */
domain = iommu_get_domain_for_dev(dev);
if (domain->type == IOMMU_DOMAIN_DMA)
iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, 0);
-
-out:
- iommu_completion_wait(iommu);
-
- return 0;
}
-static void amd_iommu_remove_device(struct device *dev)
+static void amd_iommu_release_device(struct device *dev)
{
struct amd_iommu *iommu;
int devid;
@@ -2214,7 +2186,7 @@ static void amd_iommu_remove_device(struct device *dev)
iommu = amd_iommu_rlookup_table[devid];
- iommu_uninit_device(dev);
+ amd_iommu_uninit_device(dev);
iommu_completion_wait(iommu);
}
@@ -2687,8 +2659,9 @@ const struct iommu_ops amd_iommu_ops = {
.map = amd_iommu_map,
.unmap = amd_iommu_unmap,
.iova_to_phys = amd_iommu_iova_to_phys,
- .add_device = amd_iommu_add_device,
- .remove_device = amd_iommu_remove_device,
+ .probe_device = amd_iommu_probe_device,
+ .release_device = amd_iommu_release_device,
+ .probe_finalize = amd_iommu_probe_finalize,
.device_group = amd_iommu_device_group,
.domain_get_attr = amd_iommu_domain_get_attr,
.get_resv_regions = amd_iommu_get_resv_regions,
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 15/33] iommu/amd: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the AMD IOMMU Driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 71 ++++++++++++---------------------------
1 file changed, 22 insertions(+), 49 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 0b4b4faa876d..c30367413683 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -343,21 +343,9 @@ static bool check_device(struct device *dev)
return true;
}
-static void init_iommu_group(struct device *dev)
-{
- struct iommu_group *group;
-
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return;
-
- iommu_group_put(group);
-}
-
static int iommu_init_device(struct device *dev)
{
struct iommu_dev_data *dev_data;
- struct amd_iommu *iommu;
int devid;
if (dev->archdata.iommu)
@@ -367,8 +355,6 @@ static int iommu_init_device(struct device *dev)
if (devid < 0)
return devid;
- iommu = amd_iommu_rlookup_table[devid];
-
dev_data = find_dev_data(devid);
if (!dev_data)
return -ENOMEM;
@@ -391,8 +377,6 @@ static int iommu_init_device(struct device *dev)
dev->archdata.iommu = dev_data;
- iommu_device_link(&iommu->iommu, dev);
-
return 0;
}
@@ -410,7 +394,7 @@ static void iommu_ignore_device(struct device *dev)
setup_aliases(dev);
}
-static void iommu_uninit_device(struct device *dev)
+static void amd_iommu_uninit_device(struct device *dev)
{
struct iommu_dev_data *dev_data;
struct amd_iommu *iommu;
@@ -429,13 +413,6 @@ static void iommu_uninit_device(struct device *dev)
if (dev_data->domain)
detach_device(dev);
- iommu_device_unlink(&iommu->iommu, dev);
-
- iommu_group_remove_device(dev);
-
- /* Remove dma-ops */
- dev->dma_ops = NULL;
-
/*
* We keep dev_data around for unplugged devices and reuse it when the
* device is re-plugged - not doing so would introduce a ton of races.
@@ -2152,55 +2129,50 @@ static void detach_device(struct device *dev)
spin_unlock_irqrestore(&domain->lock, flags);
}
-static int amd_iommu_add_device(struct device *dev)
+static struct iommu_device *amd_iommu_probe_device(struct device *dev)
{
- struct iommu_dev_data *dev_data;
- struct iommu_domain *domain;
+ struct iommu_device *iommu_dev;
struct amd_iommu *iommu;
int ret, devid;
- if (get_dev_data(dev))
- return 0;
-
if (!check_device(dev))
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
devid = get_device_id(dev);
if (devid < 0)
- return devid;
+ return ERR_PTR(devid);
iommu = amd_iommu_rlookup_table[devid];
+ if (get_dev_data(dev))
+ return &iommu->iommu;
+
ret = iommu_init_device(dev);
if (ret) {
if (ret != -ENOTSUPP)
dev_err(dev, "Failed to initialize - trying to proceed anyway\n");
-
+ iommu_dev = ERR_PTR(ret);
iommu_ignore_device(dev);
- dev->dma_ops = NULL;
- goto out;
+ } else {
+ iommu_dev = &iommu->iommu;
}
- init_iommu_group(dev);
- dev_data = get_dev_data(dev);
+ iommu_completion_wait(iommu);
- BUG_ON(!dev_data);
+ return iommu_dev;
+}
- if (dev_data->iommu_v2)
- iommu_request_dm_for_dev(dev);
+static void amd_iommu_probe_finalize(struct device *dev)
+{
+ struct iommu_domain *domain;
/* Domains are initialized for this device - have a look what we ended up with */
domain = iommu_get_domain_for_dev(dev);
if (domain->type == IOMMU_DOMAIN_DMA)
iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, 0);
-
-out:
- iommu_completion_wait(iommu);
-
- return 0;
}
-static void amd_iommu_remove_device(struct device *dev)
+static void amd_iommu_release_device(struct device *dev)
{
struct amd_iommu *iommu;
int devid;
@@ -2214,7 +2186,7 @@ static void amd_iommu_remove_device(struct device *dev)
iommu = amd_iommu_rlookup_table[devid];
- iommu_uninit_device(dev);
+ amd_iommu_uninit_device(dev);
iommu_completion_wait(iommu);
}
@@ -2687,8 +2659,9 @@ const struct iommu_ops amd_iommu_ops = {
.map = amd_iommu_map,
.unmap = amd_iommu_unmap,
.iova_to_phys = amd_iommu_iova_to_phys,
- .add_device = amd_iommu_add_device,
- .remove_device = amd_iommu_remove_device,
+ .probe_device = amd_iommu_probe_device,
+ .release_device = amd_iommu_release_device,
+ .probe_finalize = amd_iommu_probe_finalize,
.device_group = amd_iommu_device_group,
.domain_get_attr = amd_iommu_domain_get_attr,
.get_resv_regions = amd_iommu_get_resv_regions,
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 15/33] iommu/amd: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
Convert the AMD IOMMU Driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 71 ++++++++++++---------------------------
1 file changed, 22 insertions(+), 49 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 0b4b4faa876d..c30367413683 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -343,21 +343,9 @@ static bool check_device(struct device *dev)
return true;
}
-static void init_iommu_group(struct device *dev)
-{
- struct iommu_group *group;
-
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return;
-
- iommu_group_put(group);
-}
-
static int iommu_init_device(struct device *dev)
{
struct iommu_dev_data *dev_data;
- struct amd_iommu *iommu;
int devid;
if (dev->archdata.iommu)
@@ -367,8 +355,6 @@ static int iommu_init_device(struct device *dev)
if (devid < 0)
return devid;
- iommu = amd_iommu_rlookup_table[devid];
-
dev_data = find_dev_data(devid);
if (!dev_data)
return -ENOMEM;
@@ -391,8 +377,6 @@ static int iommu_init_device(struct device *dev)
dev->archdata.iommu = dev_data;
- iommu_device_link(&iommu->iommu, dev);
-
return 0;
}
@@ -410,7 +394,7 @@ static void iommu_ignore_device(struct device *dev)
setup_aliases(dev);
}
-static void iommu_uninit_device(struct device *dev)
+static void amd_iommu_uninit_device(struct device *dev)
{
struct iommu_dev_data *dev_data;
struct amd_iommu *iommu;
@@ -429,13 +413,6 @@ static void iommu_uninit_device(struct device *dev)
if (dev_data->domain)
detach_device(dev);
- iommu_device_unlink(&iommu->iommu, dev);
-
- iommu_group_remove_device(dev);
-
- /* Remove dma-ops */
- dev->dma_ops = NULL;
-
/*
* We keep dev_data around for unplugged devices and reuse it when the
* device is re-plugged - not doing so would introduce a ton of races.
@@ -2152,55 +2129,50 @@ static void detach_device(struct device *dev)
spin_unlock_irqrestore(&domain->lock, flags);
}
-static int amd_iommu_add_device(struct device *dev)
+static struct iommu_device *amd_iommu_probe_device(struct device *dev)
{
- struct iommu_dev_data *dev_data;
- struct iommu_domain *domain;
+ struct iommu_device *iommu_dev;
struct amd_iommu *iommu;
int ret, devid;
- if (get_dev_data(dev))
- return 0;
-
if (!check_device(dev))
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
devid = get_device_id(dev);
if (devid < 0)
- return devid;
+ return ERR_PTR(devid);
iommu = amd_iommu_rlookup_table[devid];
+ if (get_dev_data(dev))
+ return &iommu->iommu;
+
ret = iommu_init_device(dev);
if (ret) {
if (ret != -ENOTSUPP)
dev_err(dev, "Failed to initialize - trying to proceed anyway\n");
-
+ iommu_dev = ERR_PTR(ret);
iommu_ignore_device(dev);
- dev->dma_ops = NULL;
- goto out;
+ } else {
+ iommu_dev = &iommu->iommu;
}
- init_iommu_group(dev);
- dev_data = get_dev_data(dev);
+ iommu_completion_wait(iommu);
- BUG_ON(!dev_data);
+ return iommu_dev;
+}
- if (dev_data->iommu_v2)
- iommu_request_dm_for_dev(dev);
+static void amd_iommu_probe_finalize(struct device *dev)
+{
+ struct iommu_domain *domain;
/* Domains are initialized for this device - have a look what we ended up with */
domain = iommu_get_domain_for_dev(dev);
if (domain->type == IOMMU_DOMAIN_DMA)
iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, 0);
-
-out:
- iommu_completion_wait(iommu);
-
- return 0;
}
-static void amd_iommu_remove_device(struct device *dev)
+static void amd_iommu_release_device(struct device *dev)
{
struct amd_iommu *iommu;
int devid;
@@ -2214,7 +2186,7 @@ static void amd_iommu_remove_device(struct device *dev)
iommu = amd_iommu_rlookup_table[devid];
- iommu_uninit_device(dev);
+ amd_iommu_uninit_device(dev);
iommu_completion_wait(iommu);
}
@@ -2687,8 +2659,9 @@ const struct iommu_ops amd_iommu_ops = {
.map = amd_iommu_map,
.unmap = amd_iommu_unmap,
.iova_to_phys = amd_iommu_iova_to_phys,
- .add_device = amd_iommu_add_device,
- .remove_device = amd_iommu_remove_device,
+ .probe_device = amd_iommu_probe_device,
+ .release_device = amd_iommu_release_device,
+ .probe_finalize = amd_iommu_probe_finalize,
.device_group = amd_iommu_device_group,
.domain_get_attr = amd_iommu_domain_get_attr,
.get_resv_regions = amd_iommu_get_resv_regions,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 20/33] iommu/virtio: Convert to probe/release_device() call-backs
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
Convert the VirtIO IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/virtio-iommu.c | 41 +++++++++---------------------------
1 file changed, 10 insertions(+), 31 deletions(-)
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
index d5cac4f46ca5..bda300c2a438 100644
--- a/drivers/iommu/virtio-iommu.c
+++ b/drivers/iommu/virtio-iommu.c
@@ -865,24 +865,23 @@ static struct viommu_dev *viommu_get_by_fwnode(struct fwnode_handle *fwnode)
return dev ? dev_to_virtio(dev)->priv : NULL;
}
-static int viommu_add_device(struct device *dev)
+static struct iommu_device *viommu_probe_device(struct device *dev)
{
int ret;
- struct iommu_group *group;
struct viommu_endpoint *vdev;
struct viommu_dev *viommu = NULL;
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
if (!fwspec || fwspec->ops != &viommu_ops)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
viommu = viommu_get_by_fwnode(fwspec->iommu_fwnode);
if (!viommu)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
if (!vdev)
- return -ENOMEM;
+ return ERR_PTR(-ENOMEM);
vdev->dev = dev;
vdev->viommu = viommu;
@@ -896,45 +895,25 @@ static int viommu_add_device(struct device *dev)
goto err_free_dev;
}
- ret = iommu_device_link(&viommu->iommu, dev);
- if (ret)
- goto err_free_dev;
+ return &viommu->iommu;
- /*
- * Last step creates a default domain and attaches to it. Everything
- * must be ready.
- */
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group)) {
- ret = PTR_ERR(group);
- goto err_unlink_dev;
- }
-
- iommu_group_put(group);
-
- return PTR_ERR_OR_ZERO(group);
-
-err_unlink_dev:
- iommu_device_unlink(&viommu->iommu, dev);
err_free_dev:
generic_iommu_put_resv_regions(dev, &vdev->resv_regions);
kfree(vdev);
- return ret;
+ return ERR_PTR(ret);
}
-static void viommu_remove_device(struct device *dev)
+static void viommu_release_device(struct device *dev)
{
- struct viommu_endpoint *vdev;
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+ struct viommu_endpoint *vdev;
if (!fwspec || fwspec->ops != &viommu_ops)
return;
vdev = dev_iommu_priv_get(dev);
- iommu_group_remove_device(dev);
- iommu_device_unlink(&vdev->viommu->iommu, dev);
generic_iommu_put_resv_regions(dev, &vdev->resv_regions);
kfree(vdev);
}
@@ -960,8 +939,8 @@ static struct iommu_ops viommu_ops = {
.unmap = viommu_unmap,
.iova_to_phys = viommu_iova_to_phys,
.iotlb_sync = viommu_iotlb_sync,
- .add_device = viommu_add_device,
- .remove_device = viommu_remove_device,
+ .probe_device = viommu_probe_device,
+ .release_device = viommu_release_device,
.device_group = viommu_device_group,
.get_resv_regions = viommu_get_resv_regions,
.put_resv_regions = generic_iommu_put_resv_regions,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 20/33] iommu/virtio: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the VirtIO IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/virtio-iommu.c | 41 +++++++++---------------------------
1 file changed, 10 insertions(+), 31 deletions(-)
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
index d5cac4f46ca5..bda300c2a438 100644
--- a/drivers/iommu/virtio-iommu.c
+++ b/drivers/iommu/virtio-iommu.c
@@ -865,24 +865,23 @@ static struct viommu_dev *viommu_get_by_fwnode(struct fwnode_handle *fwnode)
return dev ? dev_to_virtio(dev)->priv : NULL;
}
-static int viommu_add_device(struct device *dev)
+static struct iommu_device *viommu_probe_device(struct device *dev)
{
int ret;
- struct iommu_group *group;
struct viommu_endpoint *vdev;
struct viommu_dev *viommu = NULL;
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
if (!fwspec || fwspec->ops != &viommu_ops)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
viommu = viommu_get_by_fwnode(fwspec->iommu_fwnode);
if (!viommu)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
if (!vdev)
- return -ENOMEM;
+ return ERR_PTR(-ENOMEM);
vdev->dev = dev;
vdev->viommu = viommu;
@@ -896,45 +895,25 @@ static int viommu_add_device(struct device *dev)
goto err_free_dev;
}
- ret = iommu_device_link(&viommu->iommu, dev);
- if (ret)
- goto err_free_dev;
+ return &viommu->iommu;
- /*
- * Last step creates a default domain and attaches to it. Everything
- * must be ready.
- */
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group)) {
- ret = PTR_ERR(group);
- goto err_unlink_dev;
- }
-
- iommu_group_put(group);
-
- return PTR_ERR_OR_ZERO(group);
-
-err_unlink_dev:
- iommu_device_unlink(&viommu->iommu, dev);
err_free_dev:
generic_iommu_put_resv_regions(dev, &vdev->resv_regions);
kfree(vdev);
- return ret;
+ return ERR_PTR(ret);
}
-static void viommu_remove_device(struct device *dev)
+static void viommu_release_device(struct device *dev)
{
- struct viommu_endpoint *vdev;
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+ struct viommu_endpoint *vdev;
if (!fwspec || fwspec->ops != &viommu_ops)
return;
vdev = dev_iommu_priv_get(dev);
- iommu_group_remove_device(dev);
- iommu_device_unlink(&vdev->viommu->iommu, dev);
generic_iommu_put_resv_regions(dev, &vdev->resv_regions);
kfree(vdev);
}
@@ -960,8 +939,8 @@ static struct iommu_ops viommu_ops = {
.unmap = viommu_unmap,
.iova_to_phys = viommu_iova_to_phys,
.iotlb_sync = viommu_iotlb_sync,
- .add_device = viommu_add_device,
- .remove_device = viommu_remove_device,
+ .probe_device = viommu_probe_device,
+ .release_device = viommu_release_device,
.device_group = viommu_device_group,
.get_resv_regions = viommu_get_resv_regions,
.put_resv_regions = generic_iommu_put_resv_regions,
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 20/33] iommu/virtio: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the VirtIO IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/virtio-iommu.c | 41 +++++++++---------------------------
1 file changed, 10 insertions(+), 31 deletions(-)
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
index d5cac4f46ca5..bda300c2a438 100644
--- a/drivers/iommu/virtio-iommu.c
+++ b/drivers/iommu/virtio-iommu.c
@@ -865,24 +865,23 @@ static struct viommu_dev *viommu_get_by_fwnode(struct fwnode_handle *fwnode)
return dev ? dev_to_virtio(dev)->priv : NULL;
}
-static int viommu_add_device(struct device *dev)
+static struct iommu_device *viommu_probe_device(struct device *dev)
{
int ret;
- struct iommu_group *group;
struct viommu_endpoint *vdev;
struct viommu_dev *viommu = NULL;
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
if (!fwspec || fwspec->ops != &viommu_ops)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
viommu = viommu_get_by_fwnode(fwspec->iommu_fwnode);
if (!viommu)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
if (!vdev)
- return -ENOMEM;
+ return ERR_PTR(-ENOMEM);
vdev->dev = dev;
vdev->viommu = viommu;
@@ -896,45 +895,25 @@ static int viommu_add_device(struct device *dev)
goto err_free_dev;
}
- ret = iommu_device_link(&viommu->iommu, dev);
- if (ret)
- goto err_free_dev;
+ return &viommu->iommu;
- /*
- * Last step creates a default domain and attaches to it. Everything
- * must be ready.
- */
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group)) {
- ret = PTR_ERR(group);
- goto err_unlink_dev;
- }
-
- iommu_group_put(group);
-
- return PTR_ERR_OR_ZERO(group);
-
-err_unlink_dev:
- iommu_device_unlink(&viommu->iommu, dev);
err_free_dev:
generic_iommu_put_resv_regions(dev, &vdev->resv_regions);
kfree(vdev);
- return ret;
+ return ERR_PTR(ret);
}
-static void viommu_remove_device(struct device *dev)
+static void viommu_release_device(struct device *dev)
{
- struct viommu_endpoint *vdev;
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+ struct viommu_endpoint *vdev;
if (!fwspec || fwspec->ops != &viommu_ops)
return;
vdev = dev_iommu_priv_get(dev);
- iommu_group_remove_device(dev);
- iommu_device_unlink(&vdev->viommu->iommu, dev);
generic_iommu_put_resv_regions(dev, &vdev->resv_regions);
kfree(vdev);
}
@@ -960,8 +939,8 @@ static struct iommu_ops viommu_ops = {
.unmap = viommu_unmap,
.iova_to_phys = viommu_iova_to_phys,
.iotlb_sync = viommu_iotlb_sync,
- .add_device = viommu_add_device,
- .remove_device = viommu_remove_device,
+ .probe_device = viommu_probe_device,
+ .release_device = viommu_release_device,
.device_group = viommu_device_group,
.get_resv_regions = viommu_get_resv_regions,
.put_resv_regions = generic_iommu_put_resv_regions,
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 20/33] iommu/virtio: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
Convert the VirtIO IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/virtio-iommu.c | 41 +++++++++---------------------------
1 file changed, 10 insertions(+), 31 deletions(-)
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
index d5cac4f46ca5..bda300c2a438 100644
--- a/drivers/iommu/virtio-iommu.c
+++ b/drivers/iommu/virtio-iommu.c
@@ -865,24 +865,23 @@ static struct viommu_dev *viommu_get_by_fwnode(struct fwnode_handle *fwnode)
return dev ? dev_to_virtio(dev)->priv : NULL;
}
-static int viommu_add_device(struct device *dev)
+static struct iommu_device *viommu_probe_device(struct device *dev)
{
int ret;
- struct iommu_group *group;
struct viommu_endpoint *vdev;
struct viommu_dev *viommu = NULL;
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
if (!fwspec || fwspec->ops != &viommu_ops)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
viommu = viommu_get_by_fwnode(fwspec->iommu_fwnode);
if (!viommu)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
if (!vdev)
- return -ENOMEM;
+ return ERR_PTR(-ENOMEM);
vdev->dev = dev;
vdev->viommu = viommu;
@@ -896,45 +895,25 @@ static int viommu_add_device(struct device *dev)
goto err_free_dev;
}
- ret = iommu_device_link(&viommu->iommu, dev);
- if (ret)
- goto err_free_dev;
+ return &viommu->iommu;
- /*
- * Last step creates a default domain and attaches to it. Everything
- * must be ready.
- */
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group)) {
- ret = PTR_ERR(group);
- goto err_unlink_dev;
- }
-
- iommu_group_put(group);
-
- return PTR_ERR_OR_ZERO(group);
-
-err_unlink_dev:
- iommu_device_unlink(&viommu->iommu, dev);
err_free_dev:
generic_iommu_put_resv_regions(dev, &vdev->resv_regions);
kfree(vdev);
- return ret;
+ return ERR_PTR(ret);
}
-static void viommu_remove_device(struct device *dev)
+static void viommu_release_device(struct device *dev)
{
- struct viommu_endpoint *vdev;
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+ struct viommu_endpoint *vdev;
if (!fwspec || fwspec->ops != &viommu_ops)
return;
vdev = dev_iommu_priv_get(dev);
- iommu_group_remove_device(dev);
- iommu_device_unlink(&vdev->viommu->iommu, dev);
generic_iommu_put_resv_regions(dev, &vdev->resv_regions);
kfree(vdev);
}
@@ -960,8 +939,8 @@ static struct iommu_ops viommu_ops = {
.unmap = viommu_unmap,
.iova_to_phys = viommu_iova_to_phys,
.iotlb_sync = viommu_iotlb_sync,
- .add_device = viommu_add_device,
- .remove_device = viommu_remove_device,
+ .probe_device = viommu_probe_device,
+ .release_device = viommu_release_device,
.device_group = viommu_device_group,
.get_resv_regions = viommu_get_resv_regions,
.put_resv_regions = generic_iommu_put_resv_regions,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 22/33] iommu/mediatek: Convert to probe/release_device() call-backs
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
Convert the Mediatek IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/mtk_iommu.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 5f4d6df59cf6..2be96f1cdbd2 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -441,38 +441,26 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
return pa;
}
-static int mtk_iommu_add_device(struct device *dev)
+static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data;
- struct iommu_group *group;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
- return -ENODEV; /* Not a iommu client device */
+ return ERR_PTR(-ENODEV); /* Not a iommu client device */
data = dev_iommu_priv_get(dev);
- iommu_device_link(&data->iommu, dev);
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return PTR_ERR(group);
-
- iommu_group_put(group);
- return 0;
+ return &data->iommu;
}
-static void mtk_iommu_remove_device(struct device *dev)
+static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
- struct mtk_iommu_data *data;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return;
- data = dev_iommu_priv_get(dev);
- iommu_device_unlink(&data->iommu, dev);
-
- iommu_group_remove_device(dev);
iommu_fwspec_free(dev);
}
@@ -526,8 +514,8 @@ static const struct iommu_ops mtk_iommu_ops = {
.flush_iotlb_all = mtk_iommu_flush_iotlb_all,
.iotlb_sync = mtk_iommu_iotlb_sync,
.iova_to_phys = mtk_iommu_iova_to_phys,
- .add_device = mtk_iommu_add_device,
- .remove_device = mtk_iommu_remove_device,
+ .probe_device = mtk_iommu_probe_device,
+ .release_device = mtk_iommu_release_device,
.device_group = mtk_iommu_device_group,
.of_xlate = mtk_iommu_of_xlate,
.pgsize_bitmap = SZ_4K | SZ_64K | SZ_1M | SZ_16M,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 22/33] iommu/mediatek: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the Mediatek IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/mtk_iommu.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 5f4d6df59cf6..2be96f1cdbd2 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -441,38 +441,26 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
return pa;
}
-static int mtk_iommu_add_device(struct device *dev)
+static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data;
- struct iommu_group *group;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
- return -ENODEV; /* Not a iommu client device */
+ return ERR_PTR(-ENODEV); /* Not a iommu client device */
data = dev_iommu_priv_get(dev);
- iommu_device_link(&data->iommu, dev);
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return PTR_ERR(group);
-
- iommu_group_put(group);
- return 0;
+ return &data->iommu;
}
-static void mtk_iommu_remove_device(struct device *dev)
+static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
- struct mtk_iommu_data *data;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return;
- data = dev_iommu_priv_get(dev);
- iommu_device_unlink(&data->iommu, dev);
-
- iommu_group_remove_device(dev);
iommu_fwspec_free(dev);
}
@@ -526,8 +514,8 @@ static const struct iommu_ops mtk_iommu_ops = {
.flush_iotlb_all = mtk_iommu_flush_iotlb_all,
.iotlb_sync = mtk_iommu_iotlb_sync,
.iova_to_phys = mtk_iommu_iova_to_phys,
- .add_device = mtk_iommu_add_device,
- .remove_device = mtk_iommu_remove_device,
+ .probe_device = mtk_iommu_probe_device,
+ .release_device = mtk_iommu_release_device,
.device_group = mtk_iommu_device_group,
.of_xlate = mtk_iommu_of_xlate,
.pgsize_bitmap = SZ_4K | SZ_64K | SZ_1M | SZ_16M,
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 22/33] iommu/mediatek: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the Mediatek IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/mtk_iommu.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 5f4d6df59cf6..2be96f1cdbd2 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -441,38 +441,26 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
return pa;
}
-static int mtk_iommu_add_device(struct device *dev)
+static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data;
- struct iommu_group *group;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
- return -ENODEV; /* Not a iommu client device */
+ return ERR_PTR(-ENODEV); /* Not a iommu client device */
data = dev_iommu_priv_get(dev);
- iommu_device_link(&data->iommu, dev);
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return PTR_ERR(group);
-
- iommu_group_put(group);
- return 0;
+ return &data->iommu;
}
-static void mtk_iommu_remove_device(struct device *dev)
+static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
- struct mtk_iommu_data *data;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return;
- data = dev_iommu_priv_get(dev);
- iommu_device_unlink(&data->iommu, dev);
-
- iommu_group_remove_device(dev);
iommu_fwspec_free(dev);
}
@@ -526,8 +514,8 @@ static const struct iommu_ops mtk_iommu_ops = {
.flush_iotlb_all = mtk_iommu_flush_iotlb_all,
.iotlb_sync = mtk_iommu_iotlb_sync,
.iova_to_phys = mtk_iommu_iova_to_phys,
- .add_device = mtk_iommu_add_device,
- .remove_device = mtk_iommu_remove_device,
+ .probe_device = mtk_iommu_probe_device,
+ .release_device = mtk_iommu_release_device,
.device_group = mtk_iommu_device_group,
.of_xlate = mtk_iommu_of_xlate,
.pgsize_bitmap = SZ_4K | SZ_64K | SZ_1M | SZ_16M,
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 22/33] iommu/mediatek: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
Convert the Mediatek IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/mtk_iommu.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 5f4d6df59cf6..2be96f1cdbd2 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -441,38 +441,26 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
return pa;
}
-static int mtk_iommu_add_device(struct device *dev)
+static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data;
- struct iommu_group *group;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
- return -ENODEV; /* Not a iommu client device */
+ return ERR_PTR(-ENODEV); /* Not a iommu client device */
data = dev_iommu_priv_get(dev);
- iommu_device_link(&data->iommu, dev);
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return PTR_ERR(group);
-
- iommu_group_put(group);
- return 0;
+ return &data->iommu;
}
-static void mtk_iommu_remove_device(struct device *dev)
+static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
- struct mtk_iommu_data *data;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return;
- data = dev_iommu_priv_get(dev);
- iommu_device_unlink(&data->iommu, dev);
-
- iommu_group_remove_device(dev);
iommu_fwspec_free(dev);
}
@@ -526,8 +514,8 @@ static const struct iommu_ops mtk_iommu_ops = {
.flush_iotlb_all = mtk_iommu_flush_iotlb_all,
.iotlb_sync = mtk_iommu_iotlb_sync,
.iova_to_phys = mtk_iommu_iova_to_phys,
- .add_device = mtk_iommu_add_device,
- .remove_device = mtk_iommu_remove_device,
+ .probe_device = mtk_iommu_probe_device,
+ .release_device = mtk_iommu_release_device,
.device_group = mtk_iommu_device_group,
.of_xlate = mtk_iommu_of_xlate,
.pgsize_bitmap = SZ_4K | SZ_64K | SZ_1M | SZ_16M,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
Convert the Mediatek-v1 IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/mtk_iommu_v1.c | 50 +++++++++++++++---------------------
1 file changed, 20 insertions(+), 30 deletions(-)
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index a31be05601c9..7bdd74c7cb9f 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -416,14 +416,12 @@ static int mtk_iommu_create_mapping(struct device *dev,
return 0;
}
-static int mtk_iommu_add_device(struct device *dev)
+static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
- struct dma_iommu_mapping *mtk_mapping;
struct of_phandle_args iommu_spec;
struct of_phandle_iterator it;
struct mtk_iommu_data *data;
- struct iommu_group *group;
int err;
of_for_each_phandle(&it, err, dev->of_node, "iommus",
@@ -442,35 +440,28 @@ static int mtk_iommu_add_device(struct device *dev)
}
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
- return -ENODEV; /* Not a iommu client device */
+ return ERR_PTR(-ENODEV); /* Not a iommu client device */
- /*
- * This is a short-term bodge because the ARM DMA code doesn't
- * understand multi-device groups, but we have to call into it
- * successfully (and not just rely on a normal IOMMU API attach
- * here) in order to set the correct DMA API ops on @dev.
- */
- group = iommu_group_alloc();
- if (IS_ERR(group))
- return PTR_ERR(group);
+ data = dev_iommu_priv_get(dev);
- err = iommu_group_add_device(group, dev);
- iommu_group_put(group);
- if (err)
- return err;
+ return &data->iommu;
+}
- data = dev_iommu_priv_get(dev);
+static void mtk_iommu_probe_finalize(struct device *dev)
+{
+ struct dma_iommu_mapping *mtk_mapping;
+ struct mtk_iommu_data *data;
+ int err;
+
+ data = dev_iommu_priv_get(dev);
mtk_mapping = data->dev->archdata.iommu;
- err = arm_iommu_attach_device(dev, mtk_mapping);
- if (err) {
- iommu_group_remove_device(dev);
- return err;
- }
- return iommu_device_link(&data->iommu, dev);
+ err = arm_iommu_attach_device(dev, mtk_mapping);
+ if (err)
+ dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
}
-static void mtk_iommu_remove_device(struct device *dev)
+static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data;
@@ -479,9 +470,6 @@ static void mtk_iommu_remove_device(struct device *dev)
return;
data = dev_iommu_priv_get(dev);
- iommu_device_unlink(&data->iommu, dev);
-
- iommu_group_remove_device(dev);
iommu_fwspec_free(dev);
}
@@ -534,8 +522,10 @@ static const struct iommu_ops mtk_iommu_ops = {
.map = mtk_iommu_map,
.unmap = mtk_iommu_unmap,
.iova_to_phys = mtk_iommu_iova_to_phys,
- .add_device = mtk_iommu_add_device,
- .remove_device = mtk_iommu_remove_device,
+ .probe_device = mtk_iommu_probe_device,
+ .probe_finalize = mtk_iommu_probe_finalize,
+ .release_device = mtk_iommu_release_device,
+ .device_group = generic_device_group,
.pgsize_bitmap = ~0UL << MT2701_IOMMU_PAGE_SHIFT,
};
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the Mediatek-v1 IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/mtk_iommu_v1.c | 50 +++++++++++++++---------------------
1 file changed, 20 insertions(+), 30 deletions(-)
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index a31be05601c9..7bdd74c7cb9f 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -416,14 +416,12 @@ static int mtk_iommu_create_mapping(struct device *dev,
return 0;
}
-static int mtk_iommu_add_device(struct device *dev)
+static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
- struct dma_iommu_mapping *mtk_mapping;
struct of_phandle_args iommu_spec;
struct of_phandle_iterator it;
struct mtk_iommu_data *data;
- struct iommu_group *group;
int err;
of_for_each_phandle(&it, err, dev->of_node, "iommus",
@@ -442,35 +440,28 @@ static int mtk_iommu_add_device(struct device *dev)
}
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
- return -ENODEV; /* Not a iommu client device */
+ return ERR_PTR(-ENODEV); /* Not a iommu client device */
- /*
- * This is a short-term bodge because the ARM DMA code doesn't
- * understand multi-device groups, but we have to call into it
- * successfully (and not just rely on a normal IOMMU API attach
- * here) in order to set the correct DMA API ops on @dev.
- */
- group = iommu_group_alloc();
- if (IS_ERR(group))
- return PTR_ERR(group);
+ data = dev_iommu_priv_get(dev);
- err = iommu_group_add_device(group, dev);
- iommu_group_put(group);
- if (err)
- return err;
+ return &data->iommu;
+}
- data = dev_iommu_priv_get(dev);
+static void mtk_iommu_probe_finalize(struct device *dev)
+{
+ struct dma_iommu_mapping *mtk_mapping;
+ struct mtk_iommu_data *data;
+ int err;
+
+ data = dev_iommu_priv_get(dev);
mtk_mapping = data->dev->archdata.iommu;
- err = arm_iommu_attach_device(dev, mtk_mapping);
- if (err) {
- iommu_group_remove_device(dev);
- return err;
- }
- return iommu_device_link(&data->iommu, dev);
+ err = arm_iommu_attach_device(dev, mtk_mapping);
+ if (err)
+ dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
}
-static void mtk_iommu_remove_device(struct device *dev)
+static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data;
@@ -479,9 +470,6 @@ static void mtk_iommu_remove_device(struct device *dev)
return;
data = dev_iommu_priv_get(dev);
- iommu_device_unlink(&data->iommu, dev);
-
- iommu_group_remove_device(dev);
iommu_fwspec_free(dev);
}
@@ -534,8 +522,10 @@ static const struct iommu_ops mtk_iommu_ops = {
.map = mtk_iommu_map,
.unmap = mtk_iommu_unmap,
.iova_to_phys = mtk_iommu_iova_to_phys,
- .add_device = mtk_iommu_add_device,
- .remove_device = mtk_iommu_remove_device,
+ .probe_device = mtk_iommu_probe_device,
+ .probe_finalize = mtk_iommu_probe_finalize,
+ .release_device = mtk_iommu_release_device,
+ .device_group = generic_device_group,
.pgsize_bitmap = ~0UL << MT2701_IOMMU_PAGE_SHIFT,
};
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the Mediatek-v1 IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/mtk_iommu_v1.c | 50 +++++++++++++++---------------------
1 file changed, 20 insertions(+), 30 deletions(-)
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index a31be05601c9..7bdd74c7cb9f 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -416,14 +416,12 @@ static int mtk_iommu_create_mapping(struct device *dev,
return 0;
}
-static int mtk_iommu_add_device(struct device *dev)
+static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
- struct dma_iommu_mapping *mtk_mapping;
struct of_phandle_args iommu_spec;
struct of_phandle_iterator it;
struct mtk_iommu_data *data;
- struct iommu_group *group;
int err;
of_for_each_phandle(&it, err, dev->of_node, "iommus",
@@ -442,35 +440,28 @@ static int mtk_iommu_add_device(struct device *dev)
}
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
- return -ENODEV; /* Not a iommu client device */
+ return ERR_PTR(-ENODEV); /* Not a iommu client device */
- /*
- * This is a short-term bodge because the ARM DMA code doesn't
- * understand multi-device groups, but we have to call into it
- * successfully (and not just rely on a normal IOMMU API attach
- * here) in order to set the correct DMA API ops on @dev.
- */
- group = iommu_group_alloc();
- if (IS_ERR(group))
- return PTR_ERR(group);
+ data = dev_iommu_priv_get(dev);
- err = iommu_group_add_device(group, dev);
- iommu_group_put(group);
- if (err)
- return err;
+ return &data->iommu;
+}
- data = dev_iommu_priv_get(dev);
+static void mtk_iommu_probe_finalize(struct device *dev)
+{
+ struct dma_iommu_mapping *mtk_mapping;
+ struct mtk_iommu_data *data;
+ int err;
+
+ data = dev_iommu_priv_get(dev);
mtk_mapping = data->dev->archdata.iommu;
- err = arm_iommu_attach_device(dev, mtk_mapping);
- if (err) {
- iommu_group_remove_device(dev);
- return err;
- }
- return iommu_device_link(&data->iommu, dev);
+ err = arm_iommu_attach_device(dev, mtk_mapping);
+ if (err)
+ dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
}
-static void mtk_iommu_remove_device(struct device *dev)
+static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data;
@@ -479,9 +470,6 @@ static void mtk_iommu_remove_device(struct device *dev)
return;
data = dev_iommu_priv_get(dev);
- iommu_device_unlink(&data->iommu, dev);
-
- iommu_group_remove_device(dev);
iommu_fwspec_free(dev);
}
@@ -534,8 +522,10 @@ static const struct iommu_ops mtk_iommu_ops = {
.map = mtk_iommu_map,
.unmap = mtk_iommu_unmap,
.iova_to_phys = mtk_iommu_iova_to_phys,
- .add_device = mtk_iommu_add_device,
- .remove_device = mtk_iommu_remove_device,
+ .probe_device = mtk_iommu_probe_device,
+ .probe_finalize = mtk_iommu_probe_finalize,
+ .release_device = mtk_iommu_release_device,
+ .device_group = generic_device_group,
.pgsize_bitmap = ~0UL << MT2701_IOMMU_PAGE_SHIFT,
};
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
Convert the Mediatek-v1 IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/mtk_iommu_v1.c | 50 +++++++++++++++---------------------
1 file changed, 20 insertions(+), 30 deletions(-)
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index a31be05601c9..7bdd74c7cb9f 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -416,14 +416,12 @@ static int mtk_iommu_create_mapping(struct device *dev,
return 0;
}
-static int mtk_iommu_add_device(struct device *dev)
+static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
- struct dma_iommu_mapping *mtk_mapping;
struct of_phandle_args iommu_spec;
struct of_phandle_iterator it;
struct mtk_iommu_data *data;
- struct iommu_group *group;
int err;
of_for_each_phandle(&it, err, dev->of_node, "iommus",
@@ -442,35 +440,28 @@ static int mtk_iommu_add_device(struct device *dev)
}
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
- return -ENODEV; /* Not a iommu client device */
+ return ERR_PTR(-ENODEV); /* Not a iommu client device */
- /*
- * This is a short-term bodge because the ARM DMA code doesn't
- * understand multi-device groups, but we have to call into it
- * successfully (and not just rely on a normal IOMMU API attach
- * here) in order to set the correct DMA API ops on @dev.
- */
- group = iommu_group_alloc();
- if (IS_ERR(group))
- return PTR_ERR(group);
+ data = dev_iommu_priv_get(dev);
- err = iommu_group_add_device(group, dev);
- iommu_group_put(group);
- if (err)
- return err;
+ return &data->iommu;
+}
- data = dev_iommu_priv_get(dev);
+static void mtk_iommu_probe_finalize(struct device *dev)
+{
+ struct dma_iommu_mapping *mtk_mapping;
+ struct mtk_iommu_data *data;
+ int err;
+
+ data = dev_iommu_priv_get(dev);
mtk_mapping = data->dev->archdata.iommu;
- err = arm_iommu_attach_device(dev, mtk_mapping);
- if (err) {
- iommu_group_remove_device(dev);
- return err;
- }
- return iommu_device_link(&data->iommu, dev);
+ err = arm_iommu_attach_device(dev, mtk_mapping);
+ if (err)
+ dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
}
-static void mtk_iommu_remove_device(struct device *dev)
+static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data;
@@ -479,9 +470,6 @@ static void mtk_iommu_remove_device(struct device *dev)
return;
data = dev_iommu_priv_get(dev);
- iommu_device_unlink(&data->iommu, dev);
-
- iommu_group_remove_device(dev);
iommu_fwspec_free(dev);
}
@@ -534,8 +522,10 @@ static const struct iommu_ops mtk_iommu_ops = {
.map = mtk_iommu_map,
.unmap = mtk_iommu_unmap,
.iova_to_phys = mtk_iommu_iova_to_phys,
- .add_device = mtk_iommu_add_device,
- .remove_device = mtk_iommu_remove_device,
+ .probe_device = mtk_iommu_probe_device,
+ .probe_finalize = mtk_iommu_probe_finalize,
+ .release_device = mtk_iommu_release_device,
+ .device_group = generic_device_group,
.pgsize_bitmap = ~0UL << MT2701_IOMMU_PAGE_SHIFT,
};
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-05-15 7:44 ` Yong Wu
-1 siblings, 0 replies; 233+ messages in thread
From: Yong Wu @ 2020-05-15 7:44 UTC (permalink / raw)
To: Joerg Roedel
Cc: Will Deacon, Robin Murphy, Marek Szyprowski, Matthias Brugger,
linux-kernel, iommu, Joerg Roedel, linux-mediatek
On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
>
> Convert the Mediatek-v1 IOMMU driver to use the probe_device() and
> release_device() call-backs of iommu_ops, so that the iommu core code
> does the group and sysfs setup.
>
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
> ---
> drivers/iommu/mtk_iommu_v1.c | 50 +++++++++++++++---------------------
> 1 file changed, 20 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
> index a31be05601c9..7bdd74c7cb9f 100644
> --- a/drivers/iommu/mtk_iommu_v1.c
> +++ b/drivers/iommu/mtk_iommu_v1.c
> @@ -416,14 +416,12 @@ static int mtk_iommu_create_mapping(struct device *dev,
> return 0;
> }
>
> -static int mtk_iommu_add_device(struct device *dev)
> +static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
> {
> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> - struct dma_iommu_mapping *mtk_mapping;
> struct of_phandle_args iommu_spec;
> struct of_phandle_iterator it;
> struct mtk_iommu_data *data;
> - struct iommu_group *group;
> int err;
>
> of_for_each_phandle(&it, err, dev->of_node, "iommus",
> @@ -442,35 +440,28 @@ static int mtk_iommu_add_device(struct device *dev)
> }
>
> if (!fwspec || fwspec->ops != &mtk_iommu_ops)
> - return -ENODEV; /* Not a iommu client device */
> + return ERR_PTR(-ENODEV); /* Not a iommu client device */
>
> - /*
> - * This is a short-term bodge because the ARM DMA code doesn't
> - * understand multi-device groups, but we have to call into it
> - * successfully (and not just rely on a normal IOMMU API attach
> - * here) in order to set the correct DMA API ops on @dev.
> - */
> - group = iommu_group_alloc();
> - if (IS_ERR(group))
> - return PTR_ERR(group);
> + data = dev_iommu_priv_get(dev);
>
> - err = iommu_group_add_device(group, dev);
> - iommu_group_put(group);
> - if (err)
> - return err;
> + return &data->iommu;
> +}
>
> - data = dev_iommu_priv_get(dev);
> +static void mtk_iommu_probe_finalize(struct device *dev)
> +{
> + struct dma_iommu_mapping *mtk_mapping;
> + struct mtk_iommu_data *data;
> + int err;
> +
> + data = dev_iommu_priv_get(dev);
> mtk_mapping = data->dev->archdata.iommu;
> - err = arm_iommu_attach_device(dev, mtk_mapping);
> - if (err) {
> - iommu_group_remove_device(dev);
> - return err;
> - }
>
> - return iommu_device_link(&data->iommu, dev);
> + err = arm_iommu_attach_device(dev, mtk_mapping);
> + if (err)
> + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
Hi Joerg,
Thanks very much for this patch.
This arm_iommu_attach_device is called just as we expected.
But it will fail in this callstack as the group->mutex was tried to
be re-locked...
[<c0938e8c>] (iommu_attach_device) from [<c0317590>]
(__arm_iommu_attach_device+0x34/0x90)
[<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
(arm_iommu_attach_device+0xc/0x20)
[<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
(mtk_iommu_probe_finalize+0x34/0x50)
[<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
(bus_iommu_probe+0x2a8/0x2c4)
[<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
+0x88/0xd4)
[<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
+0x2f8/0x364)
> }
>
> -static void mtk_iommu_remove_device(struct device *dev)
> +static void mtk_iommu_release_device(struct device *dev)
> {
> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> struct mtk_iommu_data *data;
> @@ -479,9 +470,6 @@ static void mtk_iommu_remove_device(struct device *dev)
> return;
>
> data = dev_iommu_priv_get(dev);
> - iommu_device_unlink(&data->iommu, dev);
> -
> - iommu_group_remove_device(dev);
> iommu_fwspec_free(dev);
> }
>
> @@ -534,8 +522,10 @@ static const struct iommu_ops mtk_iommu_ops = {
> .map = mtk_iommu_map,
> .unmap = mtk_iommu_unmap,
> .iova_to_phys = mtk_iommu_iova_to_phys,
> - .add_device = mtk_iommu_add_device,
> - .remove_device = mtk_iommu_remove_device,
> + .probe_device = mtk_iommu_probe_device,
> + .probe_finalize = mtk_iommu_probe_finalize,
> + .release_device = mtk_iommu_release_device,
> + .device_group = generic_device_group,
> .pgsize_bitmap = ~0UL << MT2701_IOMMU_PAGE_SHIFT,
> };
>
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-05-15 7:44 ` Yong Wu
0 siblings, 0 replies; 233+ messages in thread
From: Yong Wu @ 2020-05-15 7:44 UTC (permalink / raw)
To: Joerg Roedel
Cc: Joerg Roedel, Will Deacon, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Robin Murphy, Marek Szyprowski
On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
>
> Convert the Mediatek-v1 IOMMU driver to use the probe_device() and
> release_device() call-backs of iommu_ops, so that the iommu core code
> does the group and sysfs setup.
>
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
> ---
> drivers/iommu/mtk_iommu_v1.c | 50 +++++++++++++++---------------------
> 1 file changed, 20 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
> index a31be05601c9..7bdd74c7cb9f 100644
> --- a/drivers/iommu/mtk_iommu_v1.c
> +++ b/drivers/iommu/mtk_iommu_v1.c
> @@ -416,14 +416,12 @@ static int mtk_iommu_create_mapping(struct device *dev,
> return 0;
> }
>
> -static int mtk_iommu_add_device(struct device *dev)
> +static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
> {
> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> - struct dma_iommu_mapping *mtk_mapping;
> struct of_phandle_args iommu_spec;
> struct of_phandle_iterator it;
> struct mtk_iommu_data *data;
> - struct iommu_group *group;
> int err;
>
> of_for_each_phandle(&it, err, dev->of_node, "iommus",
> @@ -442,35 +440,28 @@ static int mtk_iommu_add_device(struct device *dev)
> }
>
> if (!fwspec || fwspec->ops != &mtk_iommu_ops)
> - return -ENODEV; /* Not a iommu client device */
> + return ERR_PTR(-ENODEV); /* Not a iommu client device */
>
> - /*
> - * This is a short-term bodge because the ARM DMA code doesn't
> - * understand multi-device groups, but we have to call into it
> - * successfully (and not just rely on a normal IOMMU API attach
> - * here) in order to set the correct DMA API ops on @dev.
> - */
> - group = iommu_group_alloc();
> - if (IS_ERR(group))
> - return PTR_ERR(group);
> + data = dev_iommu_priv_get(dev);
>
> - err = iommu_group_add_device(group, dev);
> - iommu_group_put(group);
> - if (err)
> - return err;
> + return &data->iommu;
> +}
>
> - data = dev_iommu_priv_get(dev);
> +static void mtk_iommu_probe_finalize(struct device *dev)
> +{
> + struct dma_iommu_mapping *mtk_mapping;
> + struct mtk_iommu_data *data;
> + int err;
> +
> + data = dev_iommu_priv_get(dev);
> mtk_mapping = data->dev->archdata.iommu;
> - err = arm_iommu_attach_device(dev, mtk_mapping);
> - if (err) {
> - iommu_group_remove_device(dev);
> - return err;
> - }
>
> - return iommu_device_link(&data->iommu, dev);
> + err = arm_iommu_attach_device(dev, mtk_mapping);
> + if (err)
> + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
Hi Joerg,
Thanks very much for this patch.
This arm_iommu_attach_device is called just as we expected.
But it will fail in this callstack as the group->mutex was tried to
be re-locked...
[<c0938e8c>] (iommu_attach_device) from [<c0317590>]
(__arm_iommu_attach_device+0x34/0x90)
[<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
(arm_iommu_attach_device+0xc/0x20)
[<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
(mtk_iommu_probe_finalize+0x34/0x50)
[<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
(bus_iommu_probe+0x2a8/0x2c4)
[<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
+0x88/0xd4)
[<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
+0x2f8/0x364)
> }
>
> -static void mtk_iommu_remove_device(struct device *dev)
> +static void mtk_iommu_release_device(struct device *dev)
> {
> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> struct mtk_iommu_data *data;
> @@ -479,9 +470,6 @@ static void mtk_iommu_remove_device(struct device *dev)
> return;
>
> data = dev_iommu_priv_get(dev);
> - iommu_device_unlink(&data->iommu, dev);
> -
> - iommu_group_remove_device(dev);
> iommu_fwspec_free(dev);
> }
>
> @@ -534,8 +522,10 @@ static const struct iommu_ops mtk_iommu_ops = {
> .map = mtk_iommu_map,
> .unmap = mtk_iommu_unmap,
> .iova_to_phys = mtk_iommu_iova_to_phys,
> - .add_device = mtk_iommu_add_device,
> - .remove_device = mtk_iommu_remove_device,
> + .probe_device = mtk_iommu_probe_device,
> + .probe_finalize = mtk_iommu_probe_finalize,
> + .release_device = mtk_iommu_release_device,
> + .device_group = generic_device_group,
> .pgsize_bitmap = ~0UL << MT2701_IOMMU_PAGE_SHIFT,
> };
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-05-15 7:44 ` Yong Wu
0 siblings, 0 replies; 233+ messages in thread
From: Yong Wu @ 2020-05-15 7:44 UTC (permalink / raw)
To: Joerg Roedel
Cc: Joerg Roedel, Will Deacon, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Robin Murphy
On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
>
> Convert the Mediatek-v1 IOMMU driver to use the probe_device() and
> release_device() call-backs of iommu_ops, so that the iommu core code
> does the group and sysfs setup.
>
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
> ---
> drivers/iommu/mtk_iommu_v1.c | 50 +++++++++++++++---------------------
> 1 file changed, 20 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
> index a31be05601c9..7bdd74c7cb9f 100644
> --- a/drivers/iommu/mtk_iommu_v1.c
> +++ b/drivers/iommu/mtk_iommu_v1.c
> @@ -416,14 +416,12 @@ static int mtk_iommu_create_mapping(struct device *dev,
> return 0;
> }
>
> -static int mtk_iommu_add_device(struct device *dev)
> +static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
> {
> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> - struct dma_iommu_mapping *mtk_mapping;
> struct of_phandle_args iommu_spec;
> struct of_phandle_iterator it;
> struct mtk_iommu_data *data;
> - struct iommu_group *group;
> int err;
>
> of_for_each_phandle(&it, err, dev->of_node, "iommus",
> @@ -442,35 +440,28 @@ static int mtk_iommu_add_device(struct device *dev)
> }
>
> if (!fwspec || fwspec->ops != &mtk_iommu_ops)
> - return -ENODEV; /* Not a iommu client device */
> + return ERR_PTR(-ENODEV); /* Not a iommu client device */
>
> - /*
> - * This is a short-term bodge because the ARM DMA code doesn't
> - * understand multi-device groups, but we have to call into it
> - * successfully (and not just rely on a normal IOMMU API attach
> - * here) in order to set the correct DMA API ops on @dev.
> - */
> - group = iommu_group_alloc();
> - if (IS_ERR(group))
> - return PTR_ERR(group);
> + data = dev_iommu_priv_get(dev);
>
> - err = iommu_group_add_device(group, dev);
> - iommu_group_put(group);
> - if (err)
> - return err;
> + return &data->iommu;
> +}
>
> - data = dev_iommu_priv_get(dev);
> +static void mtk_iommu_probe_finalize(struct device *dev)
> +{
> + struct dma_iommu_mapping *mtk_mapping;
> + struct mtk_iommu_data *data;
> + int err;
> +
> + data = dev_iommu_priv_get(dev);
> mtk_mapping = data->dev->archdata.iommu;
> - err = arm_iommu_attach_device(dev, mtk_mapping);
> - if (err) {
> - iommu_group_remove_device(dev);
> - return err;
> - }
>
> - return iommu_device_link(&data->iommu, dev);
> + err = arm_iommu_attach_device(dev, mtk_mapping);
> + if (err)
> + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
Hi Joerg,
Thanks very much for this patch.
This arm_iommu_attach_device is called just as we expected.
But it will fail in this callstack as the group->mutex was tried to
be re-locked...
[<c0938e8c>] (iommu_attach_device) from [<c0317590>]
(__arm_iommu_attach_device+0x34/0x90)
[<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
(arm_iommu_attach_device+0xc/0x20)
[<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
(mtk_iommu_probe_finalize+0x34/0x50)
[<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
(bus_iommu_probe+0x2a8/0x2c4)
[<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
+0x88/0xd4)
[<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
+0x2f8/0x364)
> }
>
> -static void mtk_iommu_remove_device(struct device *dev)
> +static void mtk_iommu_release_device(struct device *dev)
> {
> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> struct mtk_iommu_data *data;
> @@ -479,9 +470,6 @@ static void mtk_iommu_remove_device(struct device *dev)
> return;
>
> data = dev_iommu_priv_get(dev);
> - iommu_device_unlink(&data->iommu, dev);
> -
> - iommu_group_remove_device(dev);
> iommu_fwspec_free(dev);
> }
>
> @@ -534,8 +522,10 @@ static const struct iommu_ops mtk_iommu_ops = {
> .map = mtk_iommu_map,
> .unmap = mtk_iommu_unmap,
> .iova_to_phys = mtk_iommu_iova_to_phys,
> - .add_device = mtk_iommu_add_device,
> - .remove_device = mtk_iommu_remove_device,
> + .probe_device = mtk_iommu_probe_device,
> + .probe_finalize = mtk_iommu_probe_finalize,
> + .release_device = mtk_iommu_release_device,
> + .device_group = generic_device_group,
> .pgsize_bitmap = ~0UL << MT2701_IOMMU_PAGE_SHIFT,
> };
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-05-15 7:44 ` Yong Wu
0 siblings, 0 replies; 233+ messages in thread
From: Yong Wu @ 2020-05-15 7:44 UTC (permalink / raw)
To: Joerg Roedel
Cc: Will Deacon, Robin Murphy, Marek Szyprowski, Matthias Brugger,
linux-kernel, iommu, Joerg Roedel, linux-mediatek
On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
>
> Convert the Mediatek-v1 IOMMU driver to use the probe_device() and
> release_device() call-backs of iommu_ops, so that the iommu core code
> does the group and sysfs setup.
>
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
> ---
> drivers/iommu/mtk_iommu_v1.c | 50 +++++++++++++++---------------------
> 1 file changed, 20 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
> index a31be05601c9..7bdd74c7cb9f 100644
> --- a/drivers/iommu/mtk_iommu_v1.c
> +++ b/drivers/iommu/mtk_iommu_v1.c
> @@ -416,14 +416,12 @@ static int mtk_iommu_create_mapping(struct device *dev,
> return 0;
> }
>
> -static int mtk_iommu_add_device(struct device *dev)
> +static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
> {
> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> - struct dma_iommu_mapping *mtk_mapping;
> struct of_phandle_args iommu_spec;
> struct of_phandle_iterator it;
> struct mtk_iommu_data *data;
> - struct iommu_group *group;
> int err;
>
> of_for_each_phandle(&it, err, dev->of_node, "iommus",
> @@ -442,35 +440,28 @@ static int mtk_iommu_add_device(struct device *dev)
> }
>
> if (!fwspec || fwspec->ops != &mtk_iommu_ops)
> - return -ENODEV; /* Not a iommu client device */
> + return ERR_PTR(-ENODEV); /* Not a iommu client device */
>
> - /*
> - * This is a short-term bodge because the ARM DMA code doesn't
> - * understand multi-device groups, but we have to call into it
> - * successfully (and not just rely on a normal IOMMU API attach
> - * here) in order to set the correct DMA API ops on @dev.
> - */
> - group = iommu_group_alloc();
> - if (IS_ERR(group))
> - return PTR_ERR(group);
> + data = dev_iommu_priv_get(dev);
>
> - err = iommu_group_add_device(group, dev);
> - iommu_group_put(group);
> - if (err)
> - return err;
> + return &data->iommu;
> +}
>
> - data = dev_iommu_priv_get(dev);
> +static void mtk_iommu_probe_finalize(struct device *dev)
> +{
> + struct dma_iommu_mapping *mtk_mapping;
> + struct mtk_iommu_data *data;
> + int err;
> +
> + data = dev_iommu_priv_get(dev);
> mtk_mapping = data->dev->archdata.iommu;
> - err = arm_iommu_attach_device(dev, mtk_mapping);
> - if (err) {
> - iommu_group_remove_device(dev);
> - return err;
> - }
>
> - return iommu_device_link(&data->iommu, dev);
> + err = arm_iommu_attach_device(dev, mtk_mapping);
> + if (err)
> + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
Hi Joerg,
Thanks very much for this patch.
This arm_iommu_attach_device is called just as we expected.
But it will fail in this callstack as the group->mutex was tried to
be re-locked...
[<c0938e8c>] (iommu_attach_device) from [<c0317590>]
(__arm_iommu_attach_device+0x34/0x90)
[<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
(arm_iommu_attach_device+0xc/0x20)
[<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
(mtk_iommu_probe_finalize+0x34/0x50)
[<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
(bus_iommu_probe+0x2a8/0x2c4)
[<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
+0x88/0xd4)
[<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
+0x2f8/0x364)
> }
>
> -static void mtk_iommu_remove_device(struct device *dev)
> +static void mtk_iommu_release_device(struct device *dev)
> {
> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> struct mtk_iommu_data *data;
> @@ -479,9 +470,6 @@ static void mtk_iommu_remove_device(struct device *dev)
> return;
>
> data = dev_iommu_priv_get(dev);
> - iommu_device_unlink(&data->iommu, dev);
> -
> - iommu_group_remove_device(dev);
> iommu_fwspec_free(dev);
> }
>
> @@ -534,8 +522,10 @@ static const struct iommu_ops mtk_iommu_ops = {
> .map = mtk_iommu_map,
> .unmap = mtk_iommu_unmap,
> .iova_to_phys = mtk_iommu_iova_to_phys,
> - .add_device = mtk_iommu_add_device,
> - .remove_device = mtk_iommu_remove_device,
> + .probe_device = mtk_iommu_probe_device,
> + .probe_finalize = mtk_iommu_probe_finalize,
> + .release_device = mtk_iommu_release_device,
> + .device_group = generic_device_group,
> .pgsize_bitmap = ~0UL << MT2701_IOMMU_PAGE_SHIFT,
> };
>
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
2020-05-15 7:44 ` Yong Wu
(?)
@ 2020-05-15 10:07 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-05-15 10:07 UTC (permalink / raw)
To: Yong Wu
Cc: Will Deacon, Robin Murphy, Marek Szyprowski, Matthias Brugger,
linux-kernel, iommu, Joerg Roedel, linux-mediatek
Hi,
On Fri, May 15, 2020 at 03:44:59PM +0800, Yong Wu wrote:
> On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> > - return iommu_device_link(&data->iommu, dev);
> > + err = arm_iommu_attach_device(dev, mtk_mapping);
> > + if (err)
> > + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
>
>
> Hi Joerg,
>
> Thanks very much for this patch.
>
> This arm_iommu_attach_device is called just as we expected.
>
> But it will fail in this callstack as the group->mutex was tried to
> be re-locked...
>
> [<c0938e8c>] (iommu_attach_device) from [<c0317590>]
> (__arm_iommu_attach_device+0x34/0x90)
> [<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
> (arm_iommu_attach_device+0xc/0x20)
> [<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
> (mtk_iommu_probe_finalize+0x34/0x50)
> [<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
> (bus_iommu_probe+0x2a8/0x2c4)
> [<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
> +0x88/0xd4)
> [<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
> +0x2f8/0x364)
Thanks for the report, is
https://lore.kernel.org/lkml/1589530123-30240-1-git-send-email-yong.wu@mediatek.com/
The fix for this issue or is something else required?
Thanks,
Joerg
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-05-15 10:07 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-05-15 10:07 UTC (permalink / raw)
To: Yong Wu
Cc: Joerg Roedel, Will Deacon, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Robin Murphy, Marek Szyprowski
Hi,
On Fri, May 15, 2020 at 03:44:59PM +0800, Yong Wu wrote:
> On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> > - return iommu_device_link(&data->iommu, dev);
> > + err = arm_iommu_attach_device(dev, mtk_mapping);
> > + if (err)
> > + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
>
>
> Hi Joerg,
>
> Thanks very much for this patch.
>
> This arm_iommu_attach_device is called just as we expected.
>
> But it will fail in this callstack as the group->mutex was tried to
> be re-locked...
>
> [<c0938e8c>] (iommu_attach_device) from [<c0317590>]
> (__arm_iommu_attach_device+0x34/0x90)
> [<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
> (arm_iommu_attach_device+0xc/0x20)
> [<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
> (mtk_iommu_probe_finalize+0x34/0x50)
> [<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
> (bus_iommu_probe+0x2a8/0x2c4)
> [<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
> +0x88/0xd4)
> [<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
> +0x2f8/0x364)
Thanks for the report, is
https://lore.kernel.org/lkml/1589530123-30240-1-git-send-email-yong.wu@mediatek.com/
The fix for this issue or is something else required?
Thanks,
Joerg
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-05-15 10:07 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-05-15 10:07 UTC (permalink / raw)
To: Yong Wu
Cc: Joerg Roedel, Will Deacon, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Robin Murphy
Hi,
On Fri, May 15, 2020 at 03:44:59PM +0800, Yong Wu wrote:
> On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> > - return iommu_device_link(&data->iommu, dev);
> > + err = arm_iommu_attach_device(dev, mtk_mapping);
> > + if (err)
> > + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
>
>
> Hi Joerg,
>
> Thanks very much for this patch.
>
> This arm_iommu_attach_device is called just as we expected.
>
> But it will fail in this callstack as the group->mutex was tried to
> be re-locked...
>
> [<c0938e8c>] (iommu_attach_device) from [<c0317590>]
> (__arm_iommu_attach_device+0x34/0x90)
> [<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
> (arm_iommu_attach_device+0xc/0x20)
> [<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
> (mtk_iommu_probe_finalize+0x34/0x50)
> [<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
> (bus_iommu_probe+0x2a8/0x2c4)
> [<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
> +0x88/0xd4)
> [<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
> +0x2f8/0x364)
Thanks for the report, is
https://lore.kernel.org/lkml/1589530123-30240-1-git-send-email-yong.wu@mediatek.com/
The fix for this issue or is something else required?
Thanks,
Joerg
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
2020-05-15 10:07 ` Joerg Roedel
(?)
(?)
@ 2020-05-18 6:51 ` Yong Wu
-1 siblings, 0 replies; 233+ messages in thread
From: Yong Wu @ 2020-05-18 6:51 UTC (permalink / raw)
To: Joerg Roedel
Cc: Joerg Roedel, Will Deacon, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Robin Murphy, Marek Szyprowski
On Fri, 2020-05-15 at 12:07 +0200, Joerg Roedel wrote:
> Hi,
>
> On Fri, May 15, 2020 at 03:44:59PM +0800, Yong Wu wrote:
> > On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> > > - return iommu_device_link(&data->iommu, dev);
> > > + err = arm_iommu_attach_device(dev, mtk_mapping);
> > > + if (err)
> > > + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
> >
> >
> > Hi Joerg,
> >
> > Thanks very much for this patch.
> >
> > This arm_iommu_attach_device is called just as we expected.
> >
> > But it will fail in this callstack as the group->mutex was tried to
> > be re-locked...
> >
> > [<c0938e8c>] (iommu_attach_device) from [<c0317590>]
> > (__arm_iommu_attach_device+0x34/0x90)
> > [<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
> > (arm_iommu_attach_device+0xc/0x20)
> > [<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
> > (mtk_iommu_probe_finalize+0x34/0x50)
> > [<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
> > (bus_iommu_probe+0x2a8/0x2c4)
> > [<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
> > +0x88/0xd4)
> > [<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
> > +0x2f8/0x364)
>
> Thanks for the report, is
>
> https://lore.kernel.org/lkml/1589530123-30240-1-git-send-email-yong.wu@mediatek.com/
>
> The fix for this issue or is something else required?
No. That patch only adjust the internal flow to satisfy the latest
framework, it's not for fixing this mutex issue.
Here I only reported this issue.
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;
--
>
>
> Thanks,
>
> Joerg
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-05-18 6:51 ` Yong Wu
0 siblings, 0 replies; 233+ messages in thread
From: Yong Wu @ 2020-05-18 6:51 UTC (permalink / raw)
To: Joerg Roedel
Cc: Joerg Roedel, Robin Murphy, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Will Deacon, Marek Szyprowski
On Fri, 2020-05-15 at 12:07 +0200, Joerg Roedel wrote:
> Hi,
>
> On Fri, May 15, 2020 at 03:44:59PM +0800, Yong Wu wrote:
> > On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> > > - return iommu_device_link(&data->iommu, dev);
> > > + err = arm_iommu_attach_device(dev, mtk_mapping);
> > > + if (err)
> > > + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
> >
> >
> > Hi Joerg,
> >
> > Thanks very much for this patch.
> >
> > This arm_iommu_attach_device is called just as we expected.
> >
> > But it will fail in this callstack as the group->mutex was tried to
> > be re-locked...
> >
> > [<c0938e8c>] (iommu_attach_device) from [<c0317590>]
> > (__arm_iommu_attach_device+0x34/0x90)
> > [<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
> > (arm_iommu_attach_device+0xc/0x20)
> > [<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
> > (mtk_iommu_probe_finalize+0x34/0x50)
> > [<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
> > (bus_iommu_probe+0x2a8/0x2c4)
> > [<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
> > +0x88/0xd4)
> > [<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
> > +0x2f8/0x364)
>
> Thanks for the report, is
>
> https://lore.kernel.org/lkml/1589530123-30240-1-git-send-email-yong.wu@mediatek.com/
>
> The fix for this issue or is something else required?
No. That patch only adjust the internal flow to satisfy the latest
framework, it's not for fixing this mutex issue.
Here I only reported this issue.
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;
--
>
>
> Thanks,
>
> Joerg
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-05-18 6:51 ` Yong Wu
0 siblings, 0 replies; 233+ messages in thread
From: Yong Wu @ 2020-05-18 6:51 UTC (permalink / raw)
To: Joerg Roedel
Cc: Joerg Roedel, Robin Murphy, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Will Deacon
On Fri, 2020-05-15 at 12:07 +0200, Joerg Roedel wrote:
> Hi,
>
> On Fri, May 15, 2020 at 03:44:59PM +0800, Yong Wu wrote:
> > On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> > > - return iommu_device_link(&data->iommu, dev);
> > > + err = arm_iommu_attach_device(dev, mtk_mapping);
> > > + if (err)
> > > + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
> >
> >
> > Hi Joerg,
> >
> > Thanks very much for this patch.
> >
> > This arm_iommu_attach_device is called just as we expected.
> >
> > But it will fail in this callstack as the group->mutex was tried to
> > be re-locked...
> >
> > [<c0938e8c>] (iommu_attach_device) from [<c0317590>]
> > (__arm_iommu_attach_device+0x34/0x90)
> > [<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
> > (arm_iommu_attach_device+0xc/0x20)
> > [<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
> > (mtk_iommu_probe_finalize+0x34/0x50)
> > [<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
> > (bus_iommu_probe+0x2a8/0x2c4)
> > [<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
> > +0x88/0xd4)
> > [<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
> > +0x2f8/0x364)
>
> Thanks for the report, is
>
> https://lore.kernel.org/lkml/1589530123-30240-1-git-send-email-yong.wu@mediatek.com/
>
> The fix for this issue or is something else required?
No. That patch only adjust the internal flow to satisfy the latest
framework, it's not for fixing this mutex issue.
Here I only reported this issue.
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;
--
>
>
> Thanks,
>
> Joerg
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-05-18 6:51 ` Yong Wu
0 siblings, 0 replies; 233+ messages in thread
From: Yong Wu @ 2020-05-18 6:51 UTC (permalink / raw)
To: Joerg Roedel
Cc: Joerg Roedel, Will Deacon, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Robin Murphy, Marek Szyprowski
On Fri, 2020-05-15 at 12:07 +0200, Joerg Roedel wrote:
> Hi,
>
> On Fri, May 15, 2020 at 03:44:59PM +0800, Yong Wu wrote:
> > On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> > > - return iommu_device_link(&data->iommu, dev);
> > > + err = arm_iommu_attach_device(dev, mtk_mapping);
> > > + if (err)
> > > + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
> >
> >
> > Hi Joerg,
> >
> > Thanks very much for this patch.
> >
> > This arm_iommu_attach_device is called just as we expected.
> >
> > But it will fail in this callstack as the group->mutex was tried to
> > be re-locked...
> >
> > [<c0938e8c>] (iommu_attach_device) from [<c0317590>]
> > (__arm_iommu_attach_device+0x34/0x90)
> > [<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
> > (arm_iommu_attach_device+0xc/0x20)
> > [<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
> > (mtk_iommu_probe_finalize+0x34/0x50)
> > [<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
> > (bus_iommu_probe+0x2a8/0x2c4)
> > [<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
> > +0x88/0xd4)
> > [<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
> > +0x2f8/0x364)
>
> Thanks for the report, is
>
> https://lore.kernel.org/lkml/1589530123-30240-1-git-send-email-yong.wu@mediatek.com/
>
> The fix for this issue or is something else required?
No. That patch only adjust the internal flow to satisfy the latest
framework, it's not for fixing this mutex issue.
Here I only reported this issue.
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;
--
>
>
> Thanks,
>
> Joerg
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
2020-05-18 6:51 ` Yong Wu
(?)
@ 2020-05-18 13:55 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-05-18 13:55 UTC (permalink / raw)
To: Yong Wu
Cc: Joerg Roedel, Will Deacon, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Robin Murphy, Marek Szyprowski
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
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-05-18 13:55 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-05-18 13:55 UTC (permalink / raw)
To: Yong Wu
Cc: Joerg Roedel, Robin Murphy, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Will Deacon, Marek Szyprowski
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
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
@ 2020-05-18 13:55 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-05-18 13:55 UTC (permalink / raw)
To: Yong Wu
Cc: Joerg Roedel, Robin Murphy, linux-kernel, iommu, linux-mediatek,
Matthias Brugger, Will Deacon
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
^ permalink raw reply [flat|nested] 233+ messages in thread
* [PATCH v2 25/33] iommu/rockchip: Convert to probe/release_device() call-backs
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
Convert the Rockchip IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/rockchip-iommu.c | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index b33cdd5aad81..d25c2486ca07 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1054,40 +1054,28 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
kfree(rk_domain);
}
-static int rk_iommu_add_device(struct device *dev)
+static struct iommu_device *rk_iommu_probe_device(struct device *dev)
{
- struct iommu_group *group;
- struct rk_iommu *iommu;
struct rk_iommudata *data;
+ struct rk_iommu *iommu;
data = dev->archdata.iommu;
if (!data)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
iommu = rk_iommu_from_dev(dev);
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return PTR_ERR(group);
- iommu_group_put(group);
-
- iommu_device_link(&iommu->iommu, dev);
data->link = device_link_add(dev, iommu->dev,
DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
- return 0;
+ return &iommu->iommu;
}
-static void rk_iommu_remove_device(struct device *dev)
+static void rk_iommu_release_device(struct device *dev)
{
- struct rk_iommu *iommu;
struct rk_iommudata *data = dev->archdata.iommu;
- iommu = rk_iommu_from_dev(dev);
-
device_link_del(data->link);
- iommu_device_unlink(&iommu->iommu, dev);
- iommu_group_remove_device(dev);
}
static struct iommu_group *rk_iommu_device_group(struct device *dev)
@@ -1126,8 +1114,8 @@ static const struct iommu_ops rk_iommu_ops = {
.detach_dev = rk_iommu_detach_device,
.map = rk_iommu_map,
.unmap = rk_iommu_unmap,
- .add_device = rk_iommu_add_device,
- .remove_device = rk_iommu_remove_device,
+ .probe_device = rk_iommu_probe_device,
+ .release_device = rk_iommu_release_device,
.iova_to_phys = rk_iommu_iova_to_phys,
.device_group = rk_iommu_device_group,
.pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 25/33] iommu/rockchip: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the Rockchip IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/rockchip-iommu.c | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index b33cdd5aad81..d25c2486ca07 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1054,40 +1054,28 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
kfree(rk_domain);
}
-static int rk_iommu_add_device(struct device *dev)
+static struct iommu_device *rk_iommu_probe_device(struct device *dev)
{
- struct iommu_group *group;
- struct rk_iommu *iommu;
struct rk_iommudata *data;
+ struct rk_iommu *iommu;
data = dev->archdata.iommu;
if (!data)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
iommu = rk_iommu_from_dev(dev);
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return PTR_ERR(group);
- iommu_group_put(group);
-
- iommu_device_link(&iommu->iommu, dev);
data->link = device_link_add(dev, iommu->dev,
DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
- return 0;
+ return &iommu->iommu;
}
-static void rk_iommu_remove_device(struct device *dev)
+static void rk_iommu_release_device(struct device *dev)
{
- struct rk_iommu *iommu;
struct rk_iommudata *data = dev->archdata.iommu;
- iommu = rk_iommu_from_dev(dev);
-
device_link_del(data->link);
- iommu_device_unlink(&iommu->iommu, dev);
- iommu_group_remove_device(dev);
}
static struct iommu_group *rk_iommu_device_group(struct device *dev)
@@ -1126,8 +1114,8 @@ static const struct iommu_ops rk_iommu_ops = {
.detach_dev = rk_iommu_detach_device,
.map = rk_iommu_map,
.unmap = rk_iommu_unmap,
- .add_device = rk_iommu_add_device,
- .remove_device = rk_iommu_remove_device,
+ .probe_device = rk_iommu_probe_device,
+ .release_device = rk_iommu_release_device,
.iova_to_phys = rk_iommu_iova_to_phys,
.device_group = rk_iommu_device_group,
.pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP,
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 25/33] iommu/rockchip: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the Rockchip IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/rockchip-iommu.c | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index b33cdd5aad81..d25c2486ca07 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1054,40 +1054,28 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
kfree(rk_domain);
}
-static int rk_iommu_add_device(struct device *dev)
+static struct iommu_device *rk_iommu_probe_device(struct device *dev)
{
- struct iommu_group *group;
- struct rk_iommu *iommu;
struct rk_iommudata *data;
+ struct rk_iommu *iommu;
data = dev->archdata.iommu;
if (!data)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
iommu = rk_iommu_from_dev(dev);
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return PTR_ERR(group);
- iommu_group_put(group);
-
- iommu_device_link(&iommu->iommu, dev);
data->link = device_link_add(dev, iommu->dev,
DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
- return 0;
+ return &iommu->iommu;
}
-static void rk_iommu_remove_device(struct device *dev)
+static void rk_iommu_release_device(struct device *dev)
{
- struct rk_iommu *iommu;
struct rk_iommudata *data = dev->archdata.iommu;
- iommu = rk_iommu_from_dev(dev);
-
device_link_del(data->link);
- iommu_device_unlink(&iommu->iommu, dev);
- iommu_group_remove_device(dev);
}
static struct iommu_group *rk_iommu_device_group(struct device *dev)
@@ -1126,8 +1114,8 @@ static const struct iommu_ops rk_iommu_ops = {
.detach_dev = rk_iommu_detach_device,
.map = rk_iommu_map,
.unmap = rk_iommu_unmap,
- .add_device = rk_iommu_add_device,
- .remove_device = rk_iommu_remove_device,
+ .probe_device = rk_iommu_probe_device,
+ .release_device = rk_iommu_release_device,
.iova_to_phys = rk_iommu_iova_to_phys,
.device_group = rk_iommu_device_group,
.pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP,
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 25/33] iommu/rockchip: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
Convert the Rockchip IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/rockchip-iommu.c | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index b33cdd5aad81..d25c2486ca07 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1054,40 +1054,28 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
kfree(rk_domain);
}
-static int rk_iommu_add_device(struct device *dev)
+static struct iommu_device *rk_iommu_probe_device(struct device *dev)
{
- struct iommu_group *group;
- struct rk_iommu *iommu;
struct rk_iommudata *data;
+ struct rk_iommu *iommu;
data = dev->archdata.iommu;
if (!data)
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
iommu = rk_iommu_from_dev(dev);
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return PTR_ERR(group);
- iommu_group_put(group);
-
- iommu_device_link(&iommu->iommu, dev);
data->link = device_link_add(dev, iommu->dev,
DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
- return 0;
+ return &iommu->iommu;
}
-static void rk_iommu_remove_device(struct device *dev)
+static void rk_iommu_release_device(struct device *dev)
{
- struct rk_iommu *iommu;
struct rk_iommudata *data = dev->archdata.iommu;
- iommu = rk_iommu_from_dev(dev);
-
device_link_del(data->link);
- iommu_device_unlink(&iommu->iommu, dev);
- iommu_group_remove_device(dev);
}
static struct iommu_group *rk_iommu_device_group(struct device *dev)
@@ -1126,8 +1114,8 @@ static const struct iommu_ops rk_iommu_ops = {
.detach_dev = rk_iommu_detach_device,
.map = rk_iommu_map,
.unmap = rk_iommu_unmap,
- .add_device = rk_iommu_add_device,
- .remove_device = rk_iommu_remove_device,
+ .probe_device = rk_iommu_probe_device,
+ .release_device = rk_iommu_release_device,
.iova_to_phys = rk_iommu_iova_to_phys,
.device_group = rk_iommu_device_group,
.pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 28/33] iommu/omap: Remove orphan_dev tracking
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
Remove the tracking of device which could not be probed because
their IOMMU is not probed yet. Replace it with a call to
bus_iommu_probe() when a new IOMMU is probed.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/omap-iommu.c | 54 +++-----------------------------------
1 file changed, 4 insertions(+), 50 deletions(-)
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 887fefcb03b4..ecc9d0829a91 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -35,15 +35,6 @@
static const struct iommu_ops omap_iommu_ops;
-struct orphan_dev {
- struct device *dev;
- struct list_head node;
-};
-
-static LIST_HEAD(orphan_dev_list);
-
-static DEFINE_SPINLOCK(orphan_lock);
-
#define to_iommu(dev) ((struct omap_iommu *)dev_get_drvdata(dev))
/* bitmap of the page sizes currently supported */
@@ -62,8 +53,6 @@ static DEFINE_SPINLOCK(orphan_lock);
static struct platform_driver omap_iommu_driver;
static struct kmem_cache *iopte_cachep;
-static int _omap_iommu_add_device(struct device *dev);
-
/**
* to_omap_domain - Get struct omap_iommu_domain from generic iommu_domain
* @dom: generic iommu domain handle
@@ -1177,7 +1166,6 @@ static int omap_iommu_probe(struct platform_device *pdev)
struct omap_iommu *obj;
struct resource *res;
struct device_node *of = pdev->dev.of_node;
- struct orphan_dev *orphan_dev, *tmp;
if (!of) {
pr_err("%s: only DT-based devices are supported\n", __func__);
@@ -1260,13 +1248,8 @@ static int omap_iommu_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "%s registered\n", obj->name);
- list_for_each_entry_safe(orphan_dev, tmp, &orphan_dev_list, node) {
- err = _omap_iommu_add_device(orphan_dev->dev);
- if (!err) {
- list_del(&orphan_dev->node);
- kfree(orphan_dev);
- }
- }
+ /* Re-probe bus to probe device attached to this IOMMU */
+ bus_iommu_probe(&platform_bus_type);
return 0;
@@ -1657,7 +1640,7 @@ static phys_addr_t omap_iommu_iova_to_phys(struct iommu_domain *domain,
return ret;
}
-static int _omap_iommu_add_device(struct device *dev)
+static int omap_iommu_add_device(struct device *dev)
{
struct omap_iommu_arch_data *arch_data, *tmp;
struct omap_iommu *oiommu;
@@ -1666,8 +1649,6 @@ static int _omap_iommu_add_device(struct device *dev)
struct platform_device *pdev;
int num_iommus, i;
int ret;
- struct orphan_dev *orphan_dev;
- unsigned long flags;
/*
* Allocate the archdata iommu structure for DT-based devices.
@@ -1702,23 +1683,7 @@ static int _omap_iommu_add_device(struct device *dev)
if (!pdev) {
of_node_put(np);
kfree(arch_data);
- spin_lock_irqsave(&orphan_lock, flags);
- list_for_each_entry(orphan_dev, &orphan_dev_list,
- node) {
- if (orphan_dev->dev == dev)
- break;
- }
- spin_unlock_irqrestore(&orphan_lock, flags);
-
- if (orphan_dev && orphan_dev->dev == dev)
- return -EPROBE_DEFER;
-
- orphan_dev = kzalloc(sizeof(*orphan_dev), GFP_KERNEL);
- orphan_dev->dev = dev;
- spin_lock_irqsave(&orphan_lock, flags);
- list_add(&orphan_dev->node, &orphan_dev_list);
- spin_unlock_irqrestore(&orphan_lock, flags);
- return -EPROBE_DEFER;
+ return -ENODEV;
}
oiommu = platform_get_drvdata(pdev);
@@ -1764,17 +1729,6 @@ static int _omap_iommu_add_device(struct device *dev)
return 0;
}
-static int omap_iommu_add_device(struct device *dev)
-{
- int ret;
-
- ret = _omap_iommu_add_device(dev);
- if (ret == -EPROBE_DEFER)
- return 0;
-
- return ret;
-}
-
static void omap_iommu_remove_device(struct device *dev)
{
struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 28/33] iommu/omap: Remove orphan_dev tracking
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Remove the tracking of device which could not be probed because
their IOMMU is not probed yet. Replace it with a call to
bus_iommu_probe() when a new IOMMU is probed.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/omap-iommu.c | 54 +++-----------------------------------
1 file changed, 4 insertions(+), 50 deletions(-)
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 887fefcb03b4..ecc9d0829a91 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -35,15 +35,6 @@
static const struct iommu_ops omap_iommu_ops;
-struct orphan_dev {
- struct device *dev;
- struct list_head node;
-};
-
-static LIST_HEAD(orphan_dev_list);
-
-static DEFINE_SPINLOCK(orphan_lock);
-
#define to_iommu(dev) ((struct omap_iommu *)dev_get_drvdata(dev))
/* bitmap of the page sizes currently supported */
@@ -62,8 +53,6 @@ static DEFINE_SPINLOCK(orphan_lock);
static struct platform_driver omap_iommu_driver;
static struct kmem_cache *iopte_cachep;
-static int _omap_iommu_add_device(struct device *dev);
-
/**
* to_omap_domain - Get struct omap_iommu_domain from generic iommu_domain
* @dom: generic iommu domain handle
@@ -1177,7 +1166,6 @@ static int omap_iommu_probe(struct platform_device *pdev)
struct omap_iommu *obj;
struct resource *res;
struct device_node *of = pdev->dev.of_node;
- struct orphan_dev *orphan_dev, *tmp;
if (!of) {
pr_err("%s: only DT-based devices are supported\n", __func__);
@@ -1260,13 +1248,8 @@ static int omap_iommu_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "%s registered\n", obj->name);
- list_for_each_entry_safe(orphan_dev, tmp, &orphan_dev_list, node) {
- err = _omap_iommu_add_device(orphan_dev->dev);
- if (!err) {
- list_del(&orphan_dev->node);
- kfree(orphan_dev);
- }
- }
+ /* Re-probe bus to probe device attached to this IOMMU */
+ bus_iommu_probe(&platform_bus_type);
return 0;
@@ -1657,7 +1640,7 @@ static phys_addr_t omap_iommu_iova_to_phys(struct iommu_domain *domain,
return ret;
}
-static int _omap_iommu_add_device(struct device *dev)
+static int omap_iommu_add_device(struct device *dev)
{
struct omap_iommu_arch_data *arch_data, *tmp;
struct omap_iommu *oiommu;
@@ -1666,8 +1649,6 @@ static int _omap_iommu_add_device(struct device *dev)
struct platform_device *pdev;
int num_iommus, i;
int ret;
- struct orphan_dev *orphan_dev;
- unsigned long flags;
/*
* Allocate the archdata iommu structure for DT-based devices.
@@ -1702,23 +1683,7 @@ static int _omap_iommu_add_device(struct device *dev)
if (!pdev) {
of_node_put(np);
kfree(arch_data);
- spin_lock_irqsave(&orphan_lock, flags);
- list_for_each_entry(orphan_dev, &orphan_dev_list,
- node) {
- if (orphan_dev->dev == dev)
- break;
- }
- spin_unlock_irqrestore(&orphan_lock, flags);
-
- if (orphan_dev && orphan_dev->dev == dev)
- return -EPROBE_DEFER;
-
- orphan_dev = kzalloc(sizeof(*orphan_dev), GFP_KERNEL);
- orphan_dev->dev = dev;
- spin_lock_irqsave(&orphan_lock, flags);
- list_add(&orphan_dev->node, &orphan_dev_list);
- spin_unlock_irqrestore(&orphan_lock, flags);
- return -EPROBE_DEFER;
+ return -ENODEV;
}
oiommu = platform_get_drvdata(pdev);
@@ -1764,17 +1729,6 @@ static int _omap_iommu_add_device(struct device *dev)
return 0;
}
-static int omap_iommu_add_device(struct device *dev)
-{
- int ret;
-
- ret = _omap_iommu_add_device(dev);
- if (ret == -EPROBE_DEFER)
- return 0;
-
- return ret;
-}
-
static void omap_iommu_remove_device(struct device *dev)
{
struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 28/33] iommu/omap: Remove orphan_dev tracking
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Remove the tracking of device which could not be probed because
their IOMMU is not probed yet. Replace it with a call to
bus_iommu_probe() when a new IOMMU is probed.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/omap-iommu.c | 54 +++-----------------------------------
1 file changed, 4 insertions(+), 50 deletions(-)
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 887fefcb03b4..ecc9d0829a91 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -35,15 +35,6 @@
static const struct iommu_ops omap_iommu_ops;
-struct orphan_dev {
- struct device *dev;
- struct list_head node;
-};
-
-static LIST_HEAD(orphan_dev_list);
-
-static DEFINE_SPINLOCK(orphan_lock);
-
#define to_iommu(dev) ((struct omap_iommu *)dev_get_drvdata(dev))
/* bitmap of the page sizes currently supported */
@@ -62,8 +53,6 @@ static DEFINE_SPINLOCK(orphan_lock);
static struct platform_driver omap_iommu_driver;
static struct kmem_cache *iopte_cachep;
-static int _omap_iommu_add_device(struct device *dev);
-
/**
* to_omap_domain - Get struct omap_iommu_domain from generic iommu_domain
* @dom: generic iommu domain handle
@@ -1177,7 +1166,6 @@ static int omap_iommu_probe(struct platform_device *pdev)
struct omap_iommu *obj;
struct resource *res;
struct device_node *of = pdev->dev.of_node;
- struct orphan_dev *orphan_dev, *tmp;
if (!of) {
pr_err("%s: only DT-based devices are supported\n", __func__);
@@ -1260,13 +1248,8 @@ static int omap_iommu_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "%s registered\n", obj->name);
- list_for_each_entry_safe(orphan_dev, tmp, &orphan_dev_list, node) {
- err = _omap_iommu_add_device(orphan_dev->dev);
- if (!err) {
- list_del(&orphan_dev->node);
- kfree(orphan_dev);
- }
- }
+ /* Re-probe bus to probe device attached to this IOMMU */
+ bus_iommu_probe(&platform_bus_type);
return 0;
@@ -1657,7 +1640,7 @@ static phys_addr_t omap_iommu_iova_to_phys(struct iommu_domain *domain,
return ret;
}
-static int _omap_iommu_add_device(struct device *dev)
+static int omap_iommu_add_device(struct device *dev)
{
struct omap_iommu_arch_data *arch_data, *tmp;
struct omap_iommu *oiommu;
@@ -1666,8 +1649,6 @@ static int _omap_iommu_add_device(struct device *dev)
struct platform_device *pdev;
int num_iommus, i;
int ret;
- struct orphan_dev *orphan_dev;
- unsigned long flags;
/*
* Allocate the archdata iommu structure for DT-based devices.
@@ -1702,23 +1683,7 @@ static int _omap_iommu_add_device(struct device *dev)
if (!pdev) {
of_node_put(np);
kfree(arch_data);
- spin_lock_irqsave(&orphan_lock, flags);
- list_for_each_entry(orphan_dev, &orphan_dev_list,
- node) {
- if (orphan_dev->dev == dev)
- break;
- }
- spin_unlock_irqrestore(&orphan_lock, flags);
-
- if (orphan_dev && orphan_dev->dev == dev)
- return -EPROBE_DEFER;
-
- orphan_dev = kzalloc(sizeof(*orphan_dev), GFP_KERNEL);
- orphan_dev->dev = dev;
- spin_lock_irqsave(&orphan_lock, flags);
- list_add(&orphan_dev->node, &orphan_dev_list);
- spin_unlock_irqrestore(&orphan_lock, flags);
- return -EPROBE_DEFER;
+ return -ENODEV;
}
oiommu = platform_get_drvdata(pdev);
@@ -1764,17 +1729,6 @@ static int _omap_iommu_add_device(struct device *dev)
return 0;
}
-static int omap_iommu_add_device(struct device *dev)
-{
- int ret;
-
- ret = _omap_iommu_add_device(dev);
- if (ret == -EPROBE_DEFER)
- return 0;
-
- return ret;
-}
-
static void omap_iommu_remove_device(struct device *dev)
{
struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 28/33] iommu/omap: Remove orphan_dev tracking
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
Remove the tracking of device which could not be probed because
their IOMMU is not probed yet. Replace it with a call to
bus_iommu_probe() when a new IOMMU is probed.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/omap-iommu.c | 54 +++-----------------------------------
1 file changed, 4 insertions(+), 50 deletions(-)
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 887fefcb03b4..ecc9d0829a91 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -35,15 +35,6 @@
static const struct iommu_ops omap_iommu_ops;
-struct orphan_dev {
- struct device *dev;
- struct list_head node;
-};
-
-static LIST_HEAD(orphan_dev_list);
-
-static DEFINE_SPINLOCK(orphan_lock);
-
#define to_iommu(dev) ((struct omap_iommu *)dev_get_drvdata(dev))
/* bitmap of the page sizes currently supported */
@@ -62,8 +53,6 @@ static DEFINE_SPINLOCK(orphan_lock);
static struct platform_driver omap_iommu_driver;
static struct kmem_cache *iopte_cachep;
-static int _omap_iommu_add_device(struct device *dev);
-
/**
* to_omap_domain - Get struct omap_iommu_domain from generic iommu_domain
* @dom: generic iommu domain handle
@@ -1177,7 +1166,6 @@ static int omap_iommu_probe(struct platform_device *pdev)
struct omap_iommu *obj;
struct resource *res;
struct device_node *of = pdev->dev.of_node;
- struct orphan_dev *orphan_dev, *tmp;
if (!of) {
pr_err("%s: only DT-based devices are supported\n", __func__);
@@ -1260,13 +1248,8 @@ static int omap_iommu_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "%s registered\n", obj->name);
- list_for_each_entry_safe(orphan_dev, tmp, &orphan_dev_list, node) {
- err = _omap_iommu_add_device(orphan_dev->dev);
- if (!err) {
- list_del(&orphan_dev->node);
- kfree(orphan_dev);
- }
- }
+ /* Re-probe bus to probe device attached to this IOMMU */
+ bus_iommu_probe(&platform_bus_type);
return 0;
@@ -1657,7 +1640,7 @@ static phys_addr_t omap_iommu_iova_to_phys(struct iommu_domain *domain,
return ret;
}
-static int _omap_iommu_add_device(struct device *dev)
+static int omap_iommu_add_device(struct device *dev)
{
struct omap_iommu_arch_data *arch_data, *tmp;
struct omap_iommu *oiommu;
@@ -1666,8 +1649,6 @@ static int _omap_iommu_add_device(struct device *dev)
struct platform_device *pdev;
int num_iommus, i;
int ret;
- struct orphan_dev *orphan_dev;
- unsigned long flags;
/*
* Allocate the archdata iommu structure for DT-based devices.
@@ -1702,23 +1683,7 @@ static int _omap_iommu_add_device(struct device *dev)
if (!pdev) {
of_node_put(np);
kfree(arch_data);
- spin_lock_irqsave(&orphan_lock, flags);
- list_for_each_entry(orphan_dev, &orphan_dev_list,
- node) {
- if (orphan_dev->dev == dev)
- break;
- }
- spin_unlock_irqrestore(&orphan_lock, flags);
-
- if (orphan_dev && orphan_dev->dev == dev)
- return -EPROBE_DEFER;
-
- orphan_dev = kzalloc(sizeof(*orphan_dev), GFP_KERNEL);
- orphan_dev->dev = dev;
- spin_lock_irqsave(&orphan_lock, flags);
- list_add(&orphan_dev->node, &orphan_dev_list);
- spin_unlock_irqrestore(&orphan_lock, flags);
- return -EPROBE_DEFER;
+ return -ENODEV;
}
oiommu = platform_get_drvdata(pdev);
@@ -1764,17 +1729,6 @@ static int _omap_iommu_add_device(struct device *dev)
return 0;
}
-static int omap_iommu_add_device(struct device *dev)
-{
- int ret;
-
- ret = _omap_iommu_add_device(dev);
- if (ret == -EPROBE_DEFER)
- return 0;
-
- return ret;
-}
-
static void omap_iommu_remove_device(struct device *dev)
{
struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 30/33] iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
On Exynos platforms there can be more than one SYSMMU (IOMMU) for one
DMA master device. Since the IOMMU core code expects only one hardware
IOMMU, use the first SYSMMU in the list.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/exynos-iommu.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 186ff5cc975c..09cdd163560a 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1261,6 +1261,11 @@ static int exynos_iommu_add_device(struct device *dev)
}
iommu_group_put(group);
+ /* There is always at least one entry, see exynos_iommu_of_xlate() */
+ data = list_first_entry(&owner->controllers,
+ struct sysmmu_drvdata, owner_node);
+ iommu_device_link(&data->iommu, dev);
+
return 0;
}
@@ -1286,6 +1291,11 @@ static void exynos_iommu_remove_device(struct device *dev)
list_for_each_entry(data, &owner->controllers, owner_node)
device_link_del(data->link);
+
+ /* There is always at least one entry, see exynos_iommu_of_xlate() */
+ data = list_first_entry(&owner->controllers,
+ struct sysmmu_drvdata, owner_node);
+ iommu_device_unlink(&data->iommu, dev);
}
static int exynos_iommu_of_xlate(struct device *dev,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 30/33] iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
On Exynos platforms there can be more than one SYSMMU (IOMMU) for one
DMA master device. Since the IOMMU core code expects only one hardware
IOMMU, use the first SYSMMU in the list.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/exynos-iommu.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 186ff5cc975c..09cdd163560a 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1261,6 +1261,11 @@ static int exynos_iommu_add_device(struct device *dev)
}
iommu_group_put(group);
+ /* There is always at least one entry, see exynos_iommu_of_xlate() */
+ data = list_first_entry(&owner->controllers,
+ struct sysmmu_drvdata, owner_node);
+ iommu_device_link(&data->iommu, dev);
+
return 0;
}
@@ -1286,6 +1291,11 @@ static void exynos_iommu_remove_device(struct device *dev)
list_for_each_entry(data, &owner->controllers, owner_node)
device_link_del(data->link);
+
+ /* There is always at least one entry, see exynos_iommu_of_xlate() */
+ data = list_first_entry(&owner->controllers,
+ struct sysmmu_drvdata, owner_node);
+ iommu_device_unlink(&data->iommu, dev);
}
static int exynos_iommu_of_xlate(struct device *dev,
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 30/33] iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
On Exynos platforms there can be more than one SYSMMU (IOMMU) for one
DMA master device. Since the IOMMU core code expects only one hardware
IOMMU, use the first SYSMMU in the list.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/exynos-iommu.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 186ff5cc975c..09cdd163560a 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1261,6 +1261,11 @@ static int exynos_iommu_add_device(struct device *dev)
}
iommu_group_put(group);
+ /* There is always at least one entry, see exynos_iommu_of_xlate() */
+ data = list_first_entry(&owner->controllers,
+ struct sysmmu_drvdata, owner_node);
+ iommu_device_link(&data->iommu, dev);
+
return 0;
}
@@ -1286,6 +1291,11 @@ static void exynos_iommu_remove_device(struct device *dev)
list_for_each_entry(data, &owner->controllers, owner_node)
device_link_del(data->link);
+
+ /* There is always at least one entry, see exynos_iommu_of_xlate() */
+ data = list_first_entry(&owner->controllers,
+ struct sysmmu_drvdata, owner_node);
+ iommu_device_unlink(&data->iommu, dev);
}
static int exynos_iommu_of_xlate(struct device *dev,
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 30/33] iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
On Exynos platforms there can be more than one SYSMMU (IOMMU) for one
DMA master device. Since the IOMMU core code expects only one hardware
IOMMU, use the first SYSMMU in the list.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/exynos-iommu.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 186ff5cc975c..09cdd163560a 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1261,6 +1261,11 @@ static int exynos_iommu_add_device(struct device *dev)
}
iommu_group_put(group);
+ /* There is always at least one entry, see exynos_iommu_of_xlate() */
+ data = list_first_entry(&owner->controllers,
+ struct sysmmu_drvdata, owner_node);
+ iommu_device_link(&data->iommu, dev);
+
return 0;
}
@@ -1286,6 +1291,11 @@ static void exynos_iommu_remove_device(struct device *dev)
list_for_each_entry(data, &owner->controllers, owner_node)
device_link_del(data->link);
+
+ /* There is always at least one entry, see exynos_iommu_of_xlate() */
+ data = list_first_entry(&owner->controllers,
+ struct sysmmu_drvdata, owner_node);
+ iommu_device_unlink(&data->iommu, dev);
}
static int exynos_iommu_of_xlate(struct device *dev,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 31/33] iommu/exynos: Convert to probe/release_device() call-backs
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
Joerg Roedel
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
Convert the Exynos IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/exynos-iommu.c | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 09cdd163560a..60c8a56e4a3f 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1235,19 +1235,13 @@ static phys_addr_t exynos_iommu_iova_to_phys(struct iommu_domain *iommu_domain,
return phys;
}
-static int exynos_iommu_add_device(struct device *dev)
+static struct iommu_device *exynos_iommu_probe_device(struct device *dev)
{
struct exynos_iommu_owner *owner = dev->archdata.iommu;
struct sysmmu_drvdata *data;
- struct iommu_group *group;
if (!has_sysmmu(dev))
- return -ENODEV;
-
- group = iommu_group_get_for_dev(dev);
-
- if (IS_ERR(group))
- return PTR_ERR(group);
+ return ERR_PTR(-ENODEV);
list_for_each_entry(data, &owner->controllers, owner_node) {
/*
@@ -1259,17 +1253,15 @@ static int exynos_iommu_add_device(struct device *dev)
DL_FLAG_STATELESS |
DL_FLAG_PM_RUNTIME);
}
- iommu_group_put(group);
/* There is always at least one entry, see exynos_iommu_of_xlate() */
data = list_first_entry(&owner->controllers,
struct sysmmu_drvdata, owner_node);
- iommu_device_link(&data->iommu, dev);
- return 0;
+ return &data->iommu;
}
-static void exynos_iommu_remove_device(struct device *dev)
+static void exynos_iommu_release_device(struct device *dev)
{
struct exynos_iommu_owner *owner = dev->archdata.iommu;
struct sysmmu_drvdata *data;
@@ -1287,15 +1279,9 @@ static void exynos_iommu_remove_device(struct device *dev)
iommu_group_put(group);
}
}
- iommu_group_remove_device(dev);
list_for_each_entry(data, &owner->controllers, owner_node)
device_link_del(data->link);
-
- /* There is always at least one entry, see exynos_iommu_of_xlate() */
- data = list_first_entry(&owner->controllers,
- struct sysmmu_drvdata, owner_node);
- iommu_device_unlink(&data->iommu, dev);
}
static int exynos_iommu_of_xlate(struct device *dev,
@@ -1341,8 +1327,8 @@ static const struct iommu_ops exynos_iommu_ops = {
.unmap = exynos_iommu_unmap,
.iova_to_phys = exynos_iommu_iova_to_phys,
.device_group = generic_device_group,
- .add_device = exynos_iommu_add_device,
- .remove_device = exynos_iommu_remove_device,
+ .probe_device = exynos_iommu_probe_device,
+ .release_device = exynos_iommu_release_device,
.pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,
.of_xlate = exynos_iommu_of_xlate,
};
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 31/33] iommu/exynos: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the Exynos IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/exynos-iommu.c | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 09cdd163560a..60c8a56e4a3f 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1235,19 +1235,13 @@ static phys_addr_t exynos_iommu_iova_to_phys(struct iommu_domain *iommu_domain,
return phys;
}
-static int exynos_iommu_add_device(struct device *dev)
+static struct iommu_device *exynos_iommu_probe_device(struct device *dev)
{
struct exynos_iommu_owner *owner = dev->archdata.iommu;
struct sysmmu_drvdata *data;
- struct iommu_group *group;
if (!has_sysmmu(dev))
- return -ENODEV;
-
- group = iommu_group_get_for_dev(dev);
-
- if (IS_ERR(group))
- return PTR_ERR(group);
+ return ERR_PTR(-ENODEV);
list_for_each_entry(data, &owner->controllers, owner_node) {
/*
@@ -1259,17 +1253,15 @@ static int exynos_iommu_add_device(struct device *dev)
DL_FLAG_STATELESS |
DL_FLAG_PM_RUNTIME);
}
- iommu_group_put(group);
/* There is always at least one entry, see exynos_iommu_of_xlate() */
data = list_first_entry(&owner->controllers,
struct sysmmu_drvdata, owner_node);
- iommu_device_link(&data->iommu, dev);
- return 0;
+ return &data->iommu;
}
-static void exynos_iommu_remove_device(struct device *dev)
+static void exynos_iommu_release_device(struct device *dev)
{
struct exynos_iommu_owner *owner = dev->archdata.iommu;
struct sysmmu_drvdata *data;
@@ -1287,15 +1279,9 @@ static void exynos_iommu_remove_device(struct device *dev)
iommu_group_put(group);
}
}
- iommu_group_remove_device(dev);
list_for_each_entry(data, &owner->controllers, owner_node)
device_link_del(data->link);
-
- /* There is always at least one entry, see exynos_iommu_of_xlate() */
- data = list_first_entry(&owner->controllers,
- struct sysmmu_drvdata, owner_node);
- iommu_device_unlink(&data->iommu, dev);
}
static int exynos_iommu_of_xlate(struct device *dev,
@@ -1341,8 +1327,8 @@ static const struct iommu_ops exynos_iommu_ops = {
.unmap = exynos_iommu_unmap,
.iova_to_phys = exynos_iommu_iova_to_phys,
.device_group = generic_device_group,
- .add_device = exynos_iommu_add_device,
- .remove_device = exynos_iommu_remove_device,
+ .probe_device = exynos_iommu_probe_device,
+ .release_device = exynos_iommu_release_device,
.pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,
.of_xlate = exynos_iommu_of_xlate,
};
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 31/33] iommu/exynos: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
Convert the Exynos IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/exynos-iommu.c | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 09cdd163560a..60c8a56e4a3f 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1235,19 +1235,13 @@ static phys_addr_t exynos_iommu_iova_to_phys(struct iommu_domain *iommu_domain,
return phys;
}
-static int exynos_iommu_add_device(struct device *dev)
+static struct iommu_device *exynos_iommu_probe_device(struct device *dev)
{
struct exynos_iommu_owner *owner = dev->archdata.iommu;
struct sysmmu_drvdata *data;
- struct iommu_group *group;
if (!has_sysmmu(dev))
- return -ENODEV;
-
- group = iommu_group_get_for_dev(dev);
-
- if (IS_ERR(group))
- return PTR_ERR(group);
+ return ERR_PTR(-ENODEV);
list_for_each_entry(data, &owner->controllers, owner_node) {
/*
@@ -1259,17 +1253,15 @@ static int exynos_iommu_add_device(struct device *dev)
DL_FLAG_STATELESS |
DL_FLAG_PM_RUNTIME);
}
- iommu_group_put(group);
/* There is always at least one entry, see exynos_iommu_of_xlate() */
data = list_first_entry(&owner->controllers,
struct sysmmu_drvdata, owner_node);
- iommu_device_link(&data->iommu, dev);
- return 0;
+ return &data->iommu;
}
-static void exynos_iommu_remove_device(struct device *dev)
+static void exynos_iommu_release_device(struct device *dev)
{
struct exynos_iommu_owner *owner = dev->archdata.iommu;
struct sysmmu_drvdata *data;
@@ -1287,15 +1279,9 @@ static void exynos_iommu_remove_device(struct device *dev)
iommu_group_put(group);
}
}
- iommu_group_remove_device(dev);
list_for_each_entry(data, &owner->controllers, owner_node)
device_link_del(data->link);
-
- /* There is always at least one entry, see exynos_iommu_of_xlate() */
- data = list_first_entry(&owner->controllers,
- struct sysmmu_drvdata, owner_node);
- iommu_device_unlink(&data->iommu, dev);
}
static int exynos_iommu_of_xlate(struct device *dev,
@@ -1341,8 +1327,8 @@ static const struct iommu_ops exynos_iommu_ops = {
.unmap = exynos_iommu_unmap,
.iova_to_phys = exynos_iommu_iova_to_phys,
.device_group = generic_device_group,
- .add_device = exynos_iommu_add_device,
- .remove_device = exynos_iommu_remove_device,
+ .probe_device = exynos_iommu_probe_device,
+ .release_device = exynos_iommu_release_device,
.pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,
.of_xlate = exynos_iommu_of_xlate,
};
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 31/33] iommu/exynos: Convert to probe/release_device() call-backs
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
Convert the Exynos IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/exynos-iommu.c | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 09cdd163560a..60c8a56e4a3f 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1235,19 +1235,13 @@ static phys_addr_t exynos_iommu_iova_to_phys(struct iommu_domain *iommu_domain,
return phys;
}
-static int exynos_iommu_add_device(struct device *dev)
+static struct iommu_device *exynos_iommu_probe_device(struct device *dev)
{
struct exynos_iommu_owner *owner = dev->archdata.iommu;
struct sysmmu_drvdata *data;
- struct iommu_group *group;
if (!has_sysmmu(dev))
- return -ENODEV;
-
- group = iommu_group_get_for_dev(dev);
-
- if (IS_ERR(group))
- return PTR_ERR(group);
+ return ERR_PTR(-ENODEV);
list_for_each_entry(data, &owner->controllers, owner_node) {
/*
@@ -1259,17 +1253,15 @@ static int exynos_iommu_add_device(struct device *dev)
DL_FLAG_STATELESS |
DL_FLAG_PM_RUNTIME);
}
- iommu_group_put(group);
/* There is always at least one entry, see exynos_iommu_of_xlate() */
data = list_first_entry(&owner->controllers,
struct sysmmu_drvdata, owner_node);
- iommu_device_link(&data->iommu, dev);
- return 0;
+ return &data->iommu;
}
-static void exynos_iommu_remove_device(struct device *dev)
+static void exynos_iommu_release_device(struct device *dev)
{
struct exynos_iommu_owner *owner = dev->archdata.iommu;
struct sysmmu_drvdata *data;
@@ -1287,15 +1279,9 @@ static void exynos_iommu_remove_device(struct device *dev)
iommu_group_put(group);
}
}
- iommu_group_remove_device(dev);
list_for_each_entry(data, &owner->controllers, owner_node)
device_link_del(data->link);
-
- /* There is always at least one entry, see exynos_iommu_of_xlate() */
- data = list_first_entry(&owner->controllers,
- struct sysmmu_drvdata, owner_node);
- iommu_device_unlink(&data->iommu, dev);
}
static int exynos_iommu_of_xlate(struct device *dev,
@@ -1341,8 +1327,8 @@ static const struct iommu_ops exynos_iommu_ops = {
.unmap = exynos_iommu_unmap,
.iova_to_phys = exynos_iommu_iova_to_phys,
.device_group = generic_device_group,
- .add_device = exynos_iommu_add_device,
- .remove_device = exynos_iommu_remove_device,
+ .probe_device = exynos_iommu_probe_device,
+ .release_device = exynos_iommu_release_device,
.pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,
.of_xlate = exynos_iommu_of_xlate,
};
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 32/33] iommu: Remove add_device()/remove_device() code-paths
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Joerg Roedel,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
All drivers are converted to use the probe/release_device()
call-backs, so the add_device/remove_device() pointers are unused and
the code using them can be removed.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/iommu.c | 149 ++++++++----------------------------------
include/linux/iommu.h | 4 --
2 files changed, 29 insertions(+), 124 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index a2ff95424044..9a7120746b8e 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -220,7 +220,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
return ret;
}
-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;
@@ -264,70 +264,17 @@ static int __iommu_probe_device_helper(struct device *dev)
}
-int iommu_probe_device(struct device *dev)
+void iommu_release_device(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
- struct iommu_group *group;
- int ret;
-
- WARN_ON(dev->iommu_group);
-
- if (!ops)
- return -EINVAL;
-
- if (!dev_iommu_get(dev))
- return -ENOMEM;
-
- if (!try_module_get(ops->owner)) {
- ret = -EINVAL;
- goto err_free_dev_param;
- }
-
- if (ops->probe_device)
- return __iommu_probe_device_helper(dev);
-
- ret = ops->add_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);
- return 0;
-
-err_module_put:
- module_put(ops->owner);
-err_free_dev_param:
- dev_iommu_free(dev);
- return ret;
-}
-
-static void __iommu_release_device(struct device *dev)
-{
- const struct iommu_ops *ops = dev->bus->iommu_ops;
+ if (!dev->iommu)
+ return;
iommu_device_unlink(dev->iommu->iommu_dev, dev);
-
iommu_group_remove_device(dev);
ops->release_device(dev);
-}
-
-void iommu_release_device(struct device *dev)
-{
- const struct iommu_ops *ops = dev->bus->iommu_ops;
-
- if (!dev->iommu)
- return;
-
- if (ops->release_device)
- __iommu_release_device(dev);
- else if (dev->iommu_group)
- ops->remove_device(dev);
module_put(ops->owner);
dev_iommu_free(dev);
@@ -1560,23 +1507,6 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
if (ret)
goto out_put_group;
- /*
- * Try to allocate a default domain - needs support from the
- * IOMMU driver. There are still some drivers which don't support
- * default domains, so the return value is not yet checked. Only
- * allocate the domain here when the driver still has the
- * add_device/remove_device call-backs implemented.
- */
- if (!ops->probe_device) {
- iommu_alloc_default_domain(dev);
-
- if (group->default_domain)
- ret = __iommu_attach_device(group->default_domain, dev);
-
- if (ret)
- goto out_put_group;
- }
-
return group;
out_put_group:
@@ -1591,21 +1521,6 @@ struct iommu_domain *iommu_group_default_domain(struct iommu_group *group)
return group->default_domain;
}
-static int add_iommu_group(struct device *dev, void *data)
-{
- int ret = iommu_probe_device(dev);
-
- /*
- * We ignore -ENODEV errors for now, as they just mean that the
- * device is not translated by an IOMMU. We still care about
- * other errors and fail to initialize when they happen.
- */
- if (ret == -ENODEV)
- ret = 0;
-
- return ret;
-}
-
static int probe_iommu_group(struct device *dev, void *data)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
@@ -1789,47 +1704,41 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group)
int bus_iommu_probe(struct bus_type *bus)
{
- const struct iommu_ops *ops = bus->iommu_ops;
+ struct iommu_group *group, *next;
+ LIST_HEAD(group_list);
int ret;
- if (ops->probe_device) {
- struct iommu_group *group, *next;
- LIST_HEAD(group_list);
-
- /*
- * This code-path does not allocate the default domain when
- * creating the iommu group, so do it after the groups are
- * created.
- */
- ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
- if (ret)
- return ret;
+ /*
+ * This code-path does not allocate the default domain when
+ * creating the iommu group, so do it after the groups are
+ * created.
+ */
+ ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
+ if (ret)
+ return ret;
- list_for_each_entry_safe(group, next, &group_list, entry) {
- /* Remove item from the list */
- list_del_init(&group->entry);
+ list_for_each_entry_safe(group, next, &group_list, entry) {
+ /* Remove item from the list */
+ list_del_init(&group->entry);
- mutex_lock(&group->mutex);
+ mutex_lock(&group->mutex);
- /* Try to allocate default domain */
- probe_alloc_default_domain(bus, group);
+ /* Try to allocate default domain */
+ probe_alloc_default_domain(bus, group);
- if (!group->default_domain) {
- mutex_unlock(&group->mutex);
- continue;
- }
+ if (!group->default_domain) {
+ mutex_unlock(&group->mutex);
+ continue;
+ }
- iommu_group_create_direct_mappings(group);
+ iommu_group_create_direct_mappings(group);
- ret = __iommu_group_dma_attach(group);
+ ret = __iommu_group_dma_attach(group);
- mutex_unlock(&group->mutex);
+ mutex_unlock(&group->mutex);
- if (ret)
- break;
- }
- } else {
- ret = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ if (ret)
+ break;
}
return ret;
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index fea1622408ad..dd076366383f 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -223,8 +223,6 @@ struct iommu_iotlb_gather {
* @iotlb_sync: Flush all queued ranges from the hardware TLBs and empty flush
* queue
* @iova_to_phys: translate iova to physical address
- * @add_device: add device to iommu grouping
- * @remove_device: remove device from iommu grouping
* @probe_device: Add device to iommu driver handling
* @release_device: Remove device from iommu driver handling
* @probe_finalize: Do final setup work after the device is added to an IOMMU
@@ -277,8 +275,6 @@ struct iommu_ops {
void (*iotlb_sync)(struct iommu_domain *domain,
struct iommu_iotlb_gather *iotlb_gather);
phys_addr_t (*iova_to_phys)(struct iommu_domain *domain, dma_addr_t iova);
- int (*add_device)(struct device *dev);
- void (*remove_device)(struct device *dev);
struct iommu_device *(*probe_device)(struct device *dev);
void (*release_device)(struct device *dev);
void (*probe_finalize)(struct device *dev);
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 32/33] iommu: Remove add_device()/remove_device() code-paths
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
All drivers are converted to use the probe/release_device()
call-backs, so the add_device/remove_device() pointers are unused and
the code using them can be removed.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 149 ++++++++----------------------------------
include/linux/iommu.h | 4 --
2 files changed, 29 insertions(+), 124 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index a2ff95424044..9a7120746b8e 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -220,7 +220,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
return ret;
}
-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;
@@ -264,70 +264,17 @@ static int __iommu_probe_device_helper(struct device *dev)
}
-int iommu_probe_device(struct device *dev)
+void iommu_release_device(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
- struct iommu_group *group;
- int ret;
-
- WARN_ON(dev->iommu_group);
-
- if (!ops)
- return -EINVAL;
-
- if (!dev_iommu_get(dev))
- return -ENOMEM;
-
- if (!try_module_get(ops->owner)) {
- ret = -EINVAL;
- goto err_free_dev_param;
- }
-
- if (ops->probe_device)
- return __iommu_probe_device_helper(dev);
-
- ret = ops->add_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);
- return 0;
-
-err_module_put:
- module_put(ops->owner);
-err_free_dev_param:
- dev_iommu_free(dev);
- return ret;
-}
-
-static void __iommu_release_device(struct device *dev)
-{
- const struct iommu_ops *ops = dev->bus->iommu_ops;
+ if (!dev->iommu)
+ return;
iommu_device_unlink(dev->iommu->iommu_dev, dev);
-
iommu_group_remove_device(dev);
ops->release_device(dev);
-}
-
-void iommu_release_device(struct device *dev)
-{
- const struct iommu_ops *ops = dev->bus->iommu_ops;
-
- if (!dev->iommu)
- return;
-
- if (ops->release_device)
- __iommu_release_device(dev);
- else if (dev->iommu_group)
- ops->remove_device(dev);
module_put(ops->owner);
dev_iommu_free(dev);
@@ -1560,23 +1507,6 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
if (ret)
goto out_put_group;
- /*
- * Try to allocate a default domain - needs support from the
- * IOMMU driver. There are still some drivers which don't support
- * default domains, so the return value is not yet checked. Only
- * allocate the domain here when the driver still has the
- * add_device/remove_device call-backs implemented.
- */
- if (!ops->probe_device) {
- iommu_alloc_default_domain(dev);
-
- if (group->default_domain)
- ret = __iommu_attach_device(group->default_domain, dev);
-
- if (ret)
- goto out_put_group;
- }
-
return group;
out_put_group:
@@ -1591,21 +1521,6 @@ struct iommu_domain *iommu_group_default_domain(struct iommu_group *group)
return group->default_domain;
}
-static int add_iommu_group(struct device *dev, void *data)
-{
- int ret = iommu_probe_device(dev);
-
- /*
- * We ignore -ENODEV errors for now, as they just mean that the
- * device is not translated by an IOMMU. We still care about
- * other errors and fail to initialize when they happen.
- */
- if (ret == -ENODEV)
- ret = 0;
-
- return ret;
-}
-
static int probe_iommu_group(struct device *dev, void *data)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
@@ -1789,47 +1704,41 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group)
int bus_iommu_probe(struct bus_type *bus)
{
- const struct iommu_ops *ops = bus->iommu_ops;
+ struct iommu_group *group, *next;
+ LIST_HEAD(group_list);
int ret;
- if (ops->probe_device) {
- struct iommu_group *group, *next;
- LIST_HEAD(group_list);
-
- /*
- * This code-path does not allocate the default domain when
- * creating the iommu group, so do it after the groups are
- * created.
- */
- ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
- if (ret)
- return ret;
+ /*
+ * This code-path does not allocate the default domain when
+ * creating the iommu group, so do it after the groups are
+ * created.
+ */
+ ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
+ if (ret)
+ return ret;
- list_for_each_entry_safe(group, next, &group_list, entry) {
- /* Remove item from the list */
- list_del_init(&group->entry);
+ list_for_each_entry_safe(group, next, &group_list, entry) {
+ /* Remove item from the list */
+ list_del_init(&group->entry);
- mutex_lock(&group->mutex);
+ mutex_lock(&group->mutex);
- /* Try to allocate default domain */
- probe_alloc_default_domain(bus, group);
+ /* Try to allocate default domain */
+ probe_alloc_default_domain(bus, group);
- if (!group->default_domain) {
- mutex_unlock(&group->mutex);
- continue;
- }
+ if (!group->default_domain) {
+ mutex_unlock(&group->mutex);
+ continue;
+ }
- iommu_group_create_direct_mappings(group);
+ iommu_group_create_direct_mappings(group);
- ret = __iommu_group_dma_attach(group);
+ ret = __iommu_group_dma_attach(group);
- mutex_unlock(&group->mutex);
+ mutex_unlock(&group->mutex);
- if (ret)
- break;
- }
- } else {
- ret = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ if (ret)
+ break;
}
return ret;
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index fea1622408ad..dd076366383f 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -223,8 +223,6 @@ struct iommu_iotlb_gather {
* @iotlb_sync: Flush all queued ranges from the hardware TLBs and empty flush
* queue
* @iova_to_phys: translate iova to physical address
- * @add_device: add device to iommu grouping
- * @remove_device: remove device from iommu grouping
* @probe_device: Add device to iommu driver handling
* @release_device: Remove device from iommu driver handling
* @probe_finalize: Do final setup work after the device is added to an IOMMU
@@ -277,8 +275,6 @@ struct iommu_ops {
void (*iotlb_sync)(struct iommu_domain *domain,
struct iommu_iotlb_gather *iotlb_gather);
phys_addr_t (*iova_to_phys)(struct iommu_domain *domain, dma_addr_t iova);
- int (*add_device)(struct device *dev);
- void (*remove_device)(struct device *dev);
struct iommu_device *(*probe_device)(struct device *dev);
void (*release_device)(struct device *dev);
void (*probe_finalize)(struct device *dev);
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 32/33] iommu: Remove add_device()/remove_device() code-paths
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
All drivers are converted to use the probe/release_device()
call-backs, so the add_device/remove_device() pointers are unused and
the code using them can be removed.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 149 ++++++++----------------------------------
include/linux/iommu.h | 4 --
2 files changed, 29 insertions(+), 124 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index a2ff95424044..9a7120746b8e 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -220,7 +220,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
return ret;
}
-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;
@@ -264,70 +264,17 @@ static int __iommu_probe_device_helper(struct device *dev)
}
-int iommu_probe_device(struct device *dev)
+void iommu_release_device(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
- struct iommu_group *group;
- int ret;
-
- WARN_ON(dev->iommu_group);
-
- if (!ops)
- return -EINVAL;
-
- if (!dev_iommu_get(dev))
- return -ENOMEM;
-
- if (!try_module_get(ops->owner)) {
- ret = -EINVAL;
- goto err_free_dev_param;
- }
-
- if (ops->probe_device)
- return __iommu_probe_device_helper(dev);
-
- ret = ops->add_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);
- return 0;
-
-err_module_put:
- module_put(ops->owner);
-err_free_dev_param:
- dev_iommu_free(dev);
- return ret;
-}
-
-static void __iommu_release_device(struct device *dev)
-{
- const struct iommu_ops *ops = dev->bus->iommu_ops;
+ if (!dev->iommu)
+ return;
iommu_device_unlink(dev->iommu->iommu_dev, dev);
-
iommu_group_remove_device(dev);
ops->release_device(dev);
-}
-
-void iommu_release_device(struct device *dev)
-{
- const struct iommu_ops *ops = dev->bus->iommu_ops;
-
- if (!dev->iommu)
- return;
-
- if (ops->release_device)
- __iommu_release_device(dev);
- else if (dev->iommu_group)
- ops->remove_device(dev);
module_put(ops->owner);
dev_iommu_free(dev);
@@ -1560,23 +1507,6 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
if (ret)
goto out_put_group;
- /*
- * Try to allocate a default domain - needs support from the
- * IOMMU driver. There are still some drivers which don't support
- * default domains, so the return value is not yet checked. Only
- * allocate the domain here when the driver still has the
- * add_device/remove_device call-backs implemented.
- */
- if (!ops->probe_device) {
- iommu_alloc_default_domain(dev);
-
- if (group->default_domain)
- ret = __iommu_attach_device(group->default_domain, dev);
-
- if (ret)
- goto out_put_group;
- }
-
return group;
out_put_group:
@@ -1591,21 +1521,6 @@ struct iommu_domain *iommu_group_default_domain(struct iommu_group *group)
return group->default_domain;
}
-static int add_iommu_group(struct device *dev, void *data)
-{
- int ret = iommu_probe_device(dev);
-
- /*
- * We ignore -ENODEV errors for now, as they just mean that the
- * device is not translated by an IOMMU. We still care about
- * other errors and fail to initialize when they happen.
- */
- if (ret == -ENODEV)
- ret = 0;
-
- return ret;
-}
-
static int probe_iommu_group(struct device *dev, void *data)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
@@ -1789,47 +1704,41 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group)
int bus_iommu_probe(struct bus_type *bus)
{
- const struct iommu_ops *ops = bus->iommu_ops;
+ struct iommu_group *group, *next;
+ LIST_HEAD(group_list);
int ret;
- if (ops->probe_device) {
- struct iommu_group *group, *next;
- LIST_HEAD(group_list);
-
- /*
- * This code-path does not allocate the default domain when
- * creating the iommu group, so do it after the groups are
- * created.
- */
- ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
- if (ret)
- return ret;
+ /*
+ * This code-path does not allocate the default domain when
+ * creating the iommu group, so do it after the groups are
+ * created.
+ */
+ ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
+ if (ret)
+ return ret;
- list_for_each_entry_safe(group, next, &group_list, entry) {
- /* Remove item from the list */
- list_del_init(&group->entry);
+ list_for_each_entry_safe(group, next, &group_list, entry) {
+ /* Remove item from the list */
+ list_del_init(&group->entry);
- mutex_lock(&group->mutex);
+ mutex_lock(&group->mutex);
- /* Try to allocate default domain */
- probe_alloc_default_domain(bus, group);
+ /* Try to allocate default domain */
+ probe_alloc_default_domain(bus, group);
- if (!group->default_domain) {
- mutex_unlock(&group->mutex);
- continue;
- }
+ if (!group->default_domain) {
+ mutex_unlock(&group->mutex);
+ continue;
+ }
- iommu_group_create_direct_mappings(group);
+ iommu_group_create_direct_mappings(group);
- ret = __iommu_group_dma_attach(group);
+ ret = __iommu_group_dma_attach(group);
- mutex_unlock(&group->mutex);
+ mutex_unlock(&group->mutex);
- if (ret)
- break;
- }
- } else {
- ret = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ if (ret)
+ break;
}
return ret;
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index fea1622408ad..dd076366383f 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -223,8 +223,6 @@ struct iommu_iotlb_gather {
* @iotlb_sync: Flush all queued ranges from the hardware TLBs and empty flush
* queue
* @iova_to_phys: translate iova to physical address
- * @add_device: add device to iommu grouping
- * @remove_device: remove device from iommu grouping
* @probe_device: Add device to iommu driver handling
* @release_device: Remove device from iommu driver handling
* @probe_finalize: Do final setup work after the device is added to an IOMMU
@@ -277,8 +275,6 @@ struct iommu_ops {
void (*iotlb_sync)(struct iommu_domain *domain,
struct iommu_iotlb_gather *iotlb_gather);
phys_addr_t (*iova_to_phys)(struct iommu_domain *domain, dma_addr_t iova);
- int (*add_device)(struct device *dev);
- void (*remove_device)(struct device *dev);
struct iommu_device *(*probe_device)(struct device *dev);
void (*release_device)(struct device *dev);
void (*probe_finalize)(struct device *dev);
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 32/33] iommu: Remove add_device()/remove_device() code-paths
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
All drivers are converted to use the probe/release_device()
call-backs, so the add_device/remove_device() pointers are unused and
the code using them can be removed.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 149 ++++++++----------------------------------
include/linux/iommu.h | 4 --
2 files changed, 29 insertions(+), 124 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index a2ff95424044..9a7120746b8e 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -220,7 +220,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
return ret;
}
-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;
@@ -264,70 +264,17 @@ static int __iommu_probe_device_helper(struct device *dev)
}
-int iommu_probe_device(struct device *dev)
+void iommu_release_device(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
- struct iommu_group *group;
- int ret;
-
- WARN_ON(dev->iommu_group);
-
- if (!ops)
- return -EINVAL;
-
- if (!dev_iommu_get(dev))
- return -ENOMEM;
-
- if (!try_module_get(ops->owner)) {
- ret = -EINVAL;
- goto err_free_dev_param;
- }
-
- if (ops->probe_device)
- return __iommu_probe_device_helper(dev);
-
- ret = ops->add_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);
- return 0;
-
-err_module_put:
- module_put(ops->owner);
-err_free_dev_param:
- dev_iommu_free(dev);
- return ret;
-}
-
-static void __iommu_release_device(struct device *dev)
-{
- const struct iommu_ops *ops = dev->bus->iommu_ops;
+ if (!dev->iommu)
+ return;
iommu_device_unlink(dev->iommu->iommu_dev, dev);
-
iommu_group_remove_device(dev);
ops->release_device(dev);
-}
-
-void iommu_release_device(struct device *dev)
-{
- const struct iommu_ops *ops = dev->bus->iommu_ops;
-
- if (!dev->iommu)
- return;
-
- if (ops->release_device)
- __iommu_release_device(dev);
- else if (dev->iommu_group)
- ops->remove_device(dev);
module_put(ops->owner);
dev_iommu_free(dev);
@@ -1560,23 +1507,6 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
if (ret)
goto out_put_group;
- /*
- * Try to allocate a default domain - needs support from the
- * IOMMU driver. There are still some drivers which don't support
- * default domains, so the return value is not yet checked. Only
- * allocate the domain here when the driver still has the
- * add_device/remove_device call-backs implemented.
- */
- if (!ops->probe_device) {
- iommu_alloc_default_domain(dev);
-
- if (group->default_domain)
- ret = __iommu_attach_device(group->default_domain, dev);
-
- if (ret)
- goto out_put_group;
- }
-
return group;
out_put_group:
@@ -1591,21 +1521,6 @@ struct iommu_domain *iommu_group_default_domain(struct iommu_group *group)
return group->default_domain;
}
-static int add_iommu_group(struct device *dev, void *data)
-{
- int ret = iommu_probe_device(dev);
-
- /*
- * We ignore -ENODEV errors for now, as they just mean that the
- * device is not translated by an IOMMU. We still care about
- * other errors and fail to initialize when they happen.
- */
- if (ret == -ENODEV)
- ret = 0;
-
- return ret;
-}
-
static int probe_iommu_group(struct device *dev, void *data)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
@@ -1789,47 +1704,41 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group)
int bus_iommu_probe(struct bus_type *bus)
{
- const struct iommu_ops *ops = bus->iommu_ops;
+ struct iommu_group *group, *next;
+ LIST_HEAD(group_list);
int ret;
- if (ops->probe_device) {
- struct iommu_group *group, *next;
- LIST_HEAD(group_list);
-
- /*
- * This code-path does not allocate the default domain when
- * creating the iommu group, so do it after the groups are
- * created.
- */
- ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
- if (ret)
- return ret;
+ /*
+ * This code-path does not allocate the default domain when
+ * creating the iommu group, so do it after the groups are
+ * created.
+ */
+ ret = bus_for_each_dev(bus, NULL, &group_list, probe_iommu_group);
+ if (ret)
+ return ret;
- list_for_each_entry_safe(group, next, &group_list, entry) {
- /* Remove item from the list */
- list_del_init(&group->entry);
+ list_for_each_entry_safe(group, next, &group_list, entry) {
+ /* Remove item from the list */
+ list_del_init(&group->entry);
- mutex_lock(&group->mutex);
+ mutex_lock(&group->mutex);
- /* Try to allocate default domain */
- probe_alloc_default_domain(bus, group);
+ /* Try to allocate default domain */
+ probe_alloc_default_domain(bus, group);
- if (!group->default_domain) {
- mutex_unlock(&group->mutex);
- continue;
- }
+ if (!group->default_domain) {
+ mutex_unlock(&group->mutex);
+ continue;
+ }
- iommu_group_create_direct_mappings(group);
+ iommu_group_create_direct_mappings(group);
- ret = __iommu_group_dma_attach(group);
+ ret = __iommu_group_dma_attach(group);
- mutex_unlock(&group->mutex);
+ mutex_unlock(&group->mutex);
- if (ret)
- break;
- }
- } else {
- ret = bus_for_each_dev(bus, NULL, NULL, add_iommu_group);
+ if (ret)
+ break;
}
return ret;
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index fea1622408ad..dd076366383f 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -223,8 +223,6 @@ struct iommu_iotlb_gather {
* @iotlb_sync: Flush all queued ranges from the hardware TLBs and empty flush
* queue
* @iova_to_phys: translate iova to physical address
- * @add_device: add device to iommu grouping
- * @remove_device: remove device from iommu grouping
* @probe_device: Add device to iommu driver handling
* @release_device: Remove device from iommu driver handling
* @probe_finalize: Do final setup work after the device is added to an IOMMU
@@ -277,8 +275,6 @@ struct iommu_ops {
void (*iotlb_sync)(struct iommu_domain *domain,
struct iommu_iotlb_gather *iotlb_gather);
phys_addr_t (*iova_to_phys)(struct iommu_domain *domain, dma_addr_t iova);
- int (*add_device)(struct device *dev);
- void (*remove_device)(struct device *dev);
struct iommu_device *(*probe_device)(struct device *dev);
void (*release_device)(struct device *dev);
void (*probe_finalize)(struct device *dev);
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* [PATCH v2 33/33] iommu: Unexport iommu_group_get_for_dev()
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-14 13:15 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
Joerg Roedel
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
The function is now only used in IOMMU core code and shouldn't be used
outside of it anyway, so remove the export for it.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/iommu.c | 4 ++--
include/linux/iommu.h | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 9a7120746b8e..e9413732c61e 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -91,6 +91,7 @@ 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);
+static struct iommu_group *iommu_group_get_for_dev(struct device *dev);
#define IOMMU_GROUP_ATTR(_name, _mode, _show, _store) \
struct iommu_group_attribute iommu_group_attr_##_name = \
@@ -1483,7 +1484,7 @@ static int iommu_alloc_default_domain(struct device *dev)
* to the returned IOMMU group, which will already include the provided
* device. The reference should be released with iommu_group_put().
*/
-struct iommu_group *iommu_group_get_for_dev(struct device *dev)
+static struct iommu_group *iommu_group_get_for_dev(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
struct iommu_group *group;
@@ -1514,7 +1515,6 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
return ERR_PTR(ret);
}
-EXPORT_SYMBOL(iommu_group_get_for_dev);
struct iommu_domain *iommu_group_default_domain(struct iommu_group *group)
{
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index dd076366383f..7cfd2dddb49d 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -527,7 +527,6 @@ extern int iommu_page_response(struct device *dev,
struct iommu_page_response *msg);
extern int iommu_group_id(struct iommu_group *group);
-extern struct iommu_group *iommu_group_get_for_dev(struct device *dev);
extern struct iommu_domain *iommu_group_default_domain(struct iommu_group *);
extern int iommu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 33/33] iommu: Unexport iommu_group_get_for_dev()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
The function is now only used in IOMMU core code and shouldn't be used
outside of it anyway, so remove the export for it.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 4 ++--
include/linux/iommu.h | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 9a7120746b8e..e9413732c61e 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -91,6 +91,7 @@ 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);
+static struct iommu_group *iommu_group_get_for_dev(struct device *dev);
#define IOMMU_GROUP_ATTR(_name, _mode, _show, _store) \
struct iommu_group_attribute iommu_group_attr_##_name = \
@@ -1483,7 +1484,7 @@ static int iommu_alloc_default_domain(struct device *dev)
* to the returned IOMMU group, which will already include the provided
* device. The reference should be released with iommu_group_put().
*/
-struct iommu_group *iommu_group_get_for_dev(struct device *dev)
+static struct iommu_group *iommu_group_get_for_dev(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
struct iommu_group *group;
@@ -1514,7 +1515,6 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
return ERR_PTR(ret);
}
-EXPORT_SYMBOL(iommu_group_get_for_dev);
struct iommu_domain *iommu_group_default_domain(struct iommu_group *group)
{
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index dd076366383f..7cfd2dddb49d 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -527,7 +527,6 @@ extern int iommu_page_response(struct device *dev,
struct iommu_page_response *msg);
extern int iommu_group_id(struct iommu_group *group);
-extern struct iommu_group *iommu_group_get_for_dev(struct device *dev);
extern struct iommu_domain *iommu_group_default_domain(struct iommu_group *);
extern int iommu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr,
--
2.17.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 33/33] iommu: Unexport iommu_group_get_for_dev()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, Joerg Roedel,
linux-mediatek, linux-tegra
From: Joerg Roedel <jroedel@suse.de>
The function is now only used in IOMMU core code and shouldn't be used
outside of it anyway, so remove the export for it.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 4 ++--
include/linux/iommu.h | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 9a7120746b8e..e9413732c61e 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -91,6 +91,7 @@ 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);
+static struct iommu_group *iommu_group_get_for_dev(struct device *dev);
#define IOMMU_GROUP_ATTR(_name, _mode, _show, _store) \
struct iommu_group_attribute iommu_group_attr_##_name = \
@@ -1483,7 +1484,7 @@ static int iommu_alloc_default_domain(struct device *dev)
* to the returned IOMMU group, which will already include the provided
* device. The reference should be released with iommu_group_put().
*/
-struct iommu_group *iommu_group_get_for_dev(struct device *dev)
+static struct iommu_group *iommu_group_get_for_dev(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
struct iommu_group *group;
@@ -1514,7 +1515,6 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
return ERR_PTR(ret);
}
-EXPORT_SYMBOL(iommu_group_get_for_dev);
struct iommu_domain *iommu_group_default_domain(struct iommu_group *group)
{
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index dd076366383f..7cfd2dddb49d 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -527,7 +527,6 @@ extern int iommu_page_response(struct device *dev,
struct iommu_page_response *msg);
extern int iommu_group_id(struct iommu_group *group);
-extern struct iommu_group *iommu_group_get_for_dev(struct device *dev);
extern struct iommu_domain *iommu_group_default_domain(struct iommu_group *);
extern int iommu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr,
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* [PATCH v2 33/33] iommu: Unexport iommu_group_get_for_dev()
@ 2020-04-14 13:15 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-04-14 13:15 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization, Joerg Roedel
From: Joerg Roedel <jroedel@suse.de>
The function is now only used in IOMMU core code and shouldn't be used
outside of it anyway, so remove the export for it.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/iommu.c | 4 ++--
include/linux/iommu.h | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 9a7120746b8e..e9413732c61e 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -91,6 +91,7 @@ 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);
+static struct iommu_group *iommu_group_get_for_dev(struct device *dev);
#define IOMMU_GROUP_ATTR(_name, _mode, _show, _store) \
struct iommu_group_attribute iommu_group_attr_##_name = \
@@ -1483,7 +1484,7 @@ static int iommu_alloc_default_domain(struct device *dev)
* to the returned IOMMU group, which will already include the provided
* device. The reference should be released with iommu_group_put().
*/
-struct iommu_group *iommu_group_get_for_dev(struct device *dev)
+static struct iommu_group *iommu_group_get_for_dev(struct device *dev)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
struct iommu_group *group;
@@ -1514,7 +1515,6 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
return ERR_PTR(ret);
}
-EXPORT_SYMBOL(iommu_group_get_for_dev);
struct iommu_domain *iommu_group_default_domain(struct iommu_group *group)
{
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index dd076366383f..7cfd2dddb49d 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -527,7 +527,6 @@ extern int iommu_page_response(struct device *dev,
struct iommu_page_response *msg);
extern int iommu_group_id(struct iommu_group *group);
-extern struct iommu_group *iommu_group_get_for_dev(struct device *dev);
extern struct iommu_domain *iommu_group_default_domain(struct iommu_group *);
extern int iommu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr,
--
2.17.1
^ permalink raw reply related [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-16 11:48 ` Marek Szyprowski
-1 siblings, 0 replies; 233+ messages in thread
From: Marek Szyprowski @ 2020-04-16 11:48 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Kukjin Kim,
Krzysztof Kozlowski, David Woodhouse, Lu Baolu, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
Hi Joerg,
On 14.04.2020 15:15, Joerg Roedel wrote:
> here is the second version of this patch-set. The first version with
> some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>
> Changes v1->v2:
>
> * Rebased to v5.7-rc1
>
> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>
> * Re-worked the Exynos patches to hopefully not break the
> driver anymore
Thanks for this rework. This version is much better. Works fine on
various Exynos-based boards (ARM and ARM64).
Tested-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
Acked-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> (for Exynos and
core changes)
> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
> thanks for that.
>
> There is also a git-branch available with these patches applied:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>
> Please review.
>
> Thanks,
>
> Joerg
>
> Joerg Roedel (32):
> iommu: Move default domain allocation to separate function
> iommu/amd: Implement iommu_ops->def_domain_type call-back
> iommu/vt-d: Wire up iommu_ops->def_domain_type
> iommu/amd: Remove dma_mask check from check_device()
> iommu/amd: Return -ENODEV in add_device when device is not handled by
> IOMMU
> iommu: Add probe_device() and remove_device() call-backs
> iommu: Move default domain allocation to iommu_probe_device()
> iommu: Keep a list of allocated groups in __iommu_probe_device()
> iommu: Move new probe_device path to separate function
> iommu: Split off default domain allocation from group assignment
> iommu: Move iommu_group_create_direct_mappings() out of
> iommu_group_add_device()
> iommu: Export bus_iommu_probe() and make is safe for re-probing
> iommu/amd: Remove dev_data->passthrough
> iommu/amd: Convert to probe/release_device() call-backs
> iommu/vt-d: Convert to probe/release_device() call-backs
> iommu/arm-smmu: Convert to probe/release_device() call-backs
> iommu/pamu: Convert to probe/release_device() call-backs
> iommu/s390: Convert to probe/release_device() call-backs
> iommu/virtio: Convert to probe/release_device() call-backs
> iommu/msm: Convert to probe/release_device() call-backs
> iommu/mediatek: Convert to probe/release_device() call-backs
> iommu/mediatek-v1 Convert to probe/release_device() call-backs
> iommu/qcom: Convert to probe/release_device() call-backs
> iommu/rockchip: Convert to probe/release_device() call-backs
> iommu/tegra: Convert to probe/release_device() call-backs
> iommu/renesas: Convert to probe/release_device() call-backs
> iommu/omap: Remove orphan_dev tracking
> iommu/omap: Convert to probe/release_device() call-backs
> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
> iommu/exynos: Convert to probe/release_device() call-backs
> iommu: Remove add_device()/remove_device() code-paths
> iommu: Unexport iommu_group_get_for_dev()
>
> Sai Praneeth Prakhya (1):
> iommu: Add def_domain_type() callback in iommu_ops
>
> drivers/iommu/amd_iommu.c | 97 ++++----
> drivers/iommu/amd_iommu_types.h | 1 -
> drivers/iommu/arm-smmu-v3.c | 38 +--
> drivers/iommu/arm-smmu.c | 39 ++--
> drivers/iommu/exynos-iommu.c | 24 +-
> drivers/iommu/fsl_pamu_domain.c | 22 +-
> drivers/iommu/intel-iommu.c | 68 +-----
> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
> drivers/iommu/ipmmu-vmsa.c | 60 ++---
> drivers/iommu/msm_iommu.c | 34 +--
> drivers/iommu/mtk_iommu.c | 24 +-
> drivers/iommu/mtk_iommu_v1.c | 50 ++--
> drivers/iommu/omap-iommu.c | 99 ++------
> drivers/iommu/qcom_iommu.c | 24 +-
> drivers/iommu/rockchip-iommu.c | 26 +--
> drivers/iommu/s390-iommu.c | 22 +-
> drivers/iommu/tegra-gart.c | 24 +-
> drivers/iommu/tegra-smmu.c | 31 +--
> drivers/iommu/virtio-iommu.c | 41 +---
> include/linux/iommu.h | 21 +-
> 20 files changed, 533 insertions(+), 605 deletions(-)
>
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-16 11:48 ` Marek Szyprowski
0 siblings, 0 replies; 233+ messages in thread
From: Marek Szyprowski @ 2020-04-16 11:48 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Kukjin Kim,
Krzysztof Kozlowski, David Woodhouse, Lu Baolu, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, linux-mediatek,
linux-tegra
Hi Joerg,
On 14.04.2020 15:15, Joerg Roedel wrote:
> here is the second version of this patch-set. The first version with
> some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
> Changes v1->v2:
>
> * Rebased to v5.7-rc1
>
> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>
> * Re-worked the Exynos patches to hopefully not break the
> driver anymore
Thanks for this rework. This version is much better. Works fine on
various Exynos-based boards (ARM and ARM64).
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> (for Exynos and
core changes)
> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
> thanks for that.
>
> There is also a git-branch available with these patches applied:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>
> Please review.
>
> Thanks,
>
> Joerg
>
> Joerg Roedel (32):
> iommu: Move default domain allocation to separate function
> iommu/amd: Implement iommu_ops->def_domain_type call-back
> iommu/vt-d: Wire up iommu_ops->def_domain_type
> iommu/amd: Remove dma_mask check from check_device()
> iommu/amd: Return -ENODEV in add_device when device is not handled by
> IOMMU
> iommu: Add probe_device() and remove_device() call-backs
> iommu: Move default domain allocation to iommu_probe_device()
> iommu: Keep a list of allocated groups in __iommu_probe_device()
> iommu: Move new probe_device path to separate function
> iommu: Split off default domain allocation from group assignment
> iommu: Move iommu_group_create_direct_mappings() out of
> iommu_group_add_device()
> iommu: Export bus_iommu_probe() and make is safe for re-probing
> iommu/amd: Remove dev_data->passthrough
> iommu/amd: Convert to probe/release_device() call-backs
> iommu/vt-d: Convert to probe/release_device() call-backs
> iommu/arm-smmu: Convert to probe/release_device() call-backs
> iommu/pamu: Convert to probe/release_device() call-backs
> iommu/s390: Convert to probe/release_device() call-backs
> iommu/virtio: Convert to probe/release_device() call-backs
> iommu/msm: Convert to probe/release_device() call-backs
> iommu/mediatek: Convert to probe/release_device() call-backs
> iommu/mediatek-v1 Convert to probe/release_device() call-backs
> iommu/qcom: Convert to probe/release_device() call-backs
> iommu/rockchip: Convert to probe/release_device() call-backs
> iommu/tegra: Convert to probe/release_device() call-backs
> iommu/renesas: Convert to probe/release_device() call-backs
> iommu/omap: Remove orphan_dev tracking
> iommu/omap: Convert to probe/release_device() call-backs
> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
> iommu/exynos: Convert to probe/release_device() call-backs
> iommu: Remove add_device()/remove_device() code-paths
> iommu: Unexport iommu_group_get_for_dev()
>
> Sai Praneeth Prakhya (1):
> iommu: Add def_domain_type() callback in iommu_ops
>
> drivers/iommu/amd_iommu.c | 97 ++++----
> drivers/iommu/amd_iommu_types.h | 1 -
> drivers/iommu/arm-smmu-v3.c | 38 +--
> drivers/iommu/arm-smmu.c | 39 ++--
> drivers/iommu/exynos-iommu.c | 24 +-
> drivers/iommu/fsl_pamu_domain.c | 22 +-
> drivers/iommu/intel-iommu.c | 68 +-----
> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
> drivers/iommu/ipmmu-vmsa.c | 60 ++---
> drivers/iommu/msm_iommu.c | 34 +--
> drivers/iommu/mtk_iommu.c | 24 +-
> drivers/iommu/mtk_iommu_v1.c | 50 ++--
> drivers/iommu/omap-iommu.c | 99 ++------
> drivers/iommu/qcom_iommu.c | 24 +-
> drivers/iommu/rockchip-iommu.c | 26 +--
> drivers/iommu/s390-iommu.c | 22 +-
> drivers/iommu/tegra-gart.c | 24 +-
> drivers/iommu/tegra-smmu.c | 31 +--
> drivers/iommu/virtio-iommu.c | 41 +---
> include/linux/iommu.h | 21 +-
> 20 files changed, 533 insertions(+), 605 deletions(-)
>
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-16 11:48 ` Marek Szyprowski
0 siblings, 0 replies; 233+ messages in thread
From: Marek Szyprowski @ 2020-04-16 11:48 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Kukjin Kim,
Krzysztof Kozlowski, David Woodhouse, Lu Baolu, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: linux-s390, linux-samsung-soc, linux-arm-msm, linux-kernel,
virtualization, linux-rockchip, iommu, linux-mediatek,
linux-tegra
Hi Joerg,
On 14.04.2020 15:15, Joerg Roedel wrote:
> here is the second version of this patch-set. The first version with
> some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
> Changes v1->v2:
>
> * Rebased to v5.7-rc1
>
> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>
> * Re-worked the Exynos patches to hopefully not break the
> driver anymore
Thanks for this rework. This version is much better. Works fine on
various Exynos-based boards (ARM and ARM64).
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> (for Exynos and
core changes)
> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
> thanks for that.
>
> There is also a git-branch available with these patches applied:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>
> Please review.
>
> Thanks,
>
> Joerg
>
> Joerg Roedel (32):
> iommu: Move default domain allocation to separate function
> iommu/amd: Implement iommu_ops->def_domain_type call-back
> iommu/vt-d: Wire up iommu_ops->def_domain_type
> iommu/amd: Remove dma_mask check from check_device()
> iommu/amd: Return -ENODEV in add_device when device is not handled by
> IOMMU
> iommu: Add probe_device() and remove_device() call-backs
> iommu: Move default domain allocation to iommu_probe_device()
> iommu: Keep a list of allocated groups in __iommu_probe_device()
> iommu: Move new probe_device path to separate function
> iommu: Split off default domain allocation from group assignment
> iommu: Move iommu_group_create_direct_mappings() out of
> iommu_group_add_device()
> iommu: Export bus_iommu_probe() and make is safe for re-probing
> iommu/amd: Remove dev_data->passthrough
> iommu/amd: Convert to probe/release_device() call-backs
> iommu/vt-d: Convert to probe/release_device() call-backs
> iommu/arm-smmu: Convert to probe/release_device() call-backs
> iommu/pamu: Convert to probe/release_device() call-backs
> iommu/s390: Convert to probe/release_device() call-backs
> iommu/virtio: Convert to probe/release_device() call-backs
> iommu/msm: Convert to probe/release_device() call-backs
> iommu/mediatek: Convert to probe/release_device() call-backs
> iommu/mediatek-v1 Convert to probe/release_device() call-backs
> iommu/qcom: Convert to probe/release_device() call-backs
> iommu/rockchip: Convert to probe/release_device() call-backs
> iommu/tegra: Convert to probe/release_device() call-backs
> iommu/renesas: Convert to probe/release_device() call-backs
> iommu/omap: Remove orphan_dev tracking
> iommu/omap: Convert to probe/release_device() call-backs
> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
> iommu/exynos: Convert to probe/release_device() call-backs
> iommu: Remove add_device()/remove_device() code-paths
> iommu: Unexport iommu_group_get_for_dev()
>
> Sai Praneeth Prakhya (1):
> iommu: Add def_domain_type() callback in iommu_ops
>
> drivers/iommu/amd_iommu.c | 97 ++++----
> drivers/iommu/amd_iommu_types.h | 1 -
> drivers/iommu/arm-smmu-v3.c | 38 +--
> drivers/iommu/arm-smmu.c | 39 ++--
> drivers/iommu/exynos-iommu.c | 24 +-
> drivers/iommu/fsl_pamu_domain.c | 22 +-
> drivers/iommu/intel-iommu.c | 68 +-----
> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
> drivers/iommu/ipmmu-vmsa.c | 60 ++---
> drivers/iommu/msm_iommu.c | 34 +--
> drivers/iommu/mtk_iommu.c | 24 +-
> drivers/iommu/mtk_iommu_v1.c | 50 ++--
> drivers/iommu/omap-iommu.c | 99 ++------
> drivers/iommu/qcom_iommu.c | 24 +-
> drivers/iommu/rockchip-iommu.c | 26 +--
> drivers/iommu/s390-iommu.c | 22 +-
> drivers/iommu/tegra-gart.c | 24 +-
> drivers/iommu/tegra-smmu.c | 31 +--
> drivers/iommu/virtio-iommu.c | 41 +---
> include/linux/iommu.h | 21 +-
> 20 files changed, 533 insertions(+), 605 deletions(-)
>
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-16 11:48 ` Marek Szyprowski
0 siblings, 0 replies; 233+ messages in thread
From: Marek Szyprowski @ 2020-04-16 11:48 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Kukjin Kim,
Krzysztof Kozlowski, David Woodhouse, Lu Baolu, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker
Cc: iommu, linux-kernel, linux-samsung-soc, linux-arm-msm,
linux-mediatek, linux-rockchip, linux-s390, linux-tegra,
virtualization
Hi Joerg,
On 14.04.2020 15:15, Joerg Roedel wrote:
> here is the second version of this patch-set. The first version with
> some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
> Changes v1->v2:
>
> * Rebased to v5.7-rc1
>
> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>
> * Re-worked the Exynos patches to hopefully not break the
> driver anymore
Thanks for this rework. This version is much better. Works fine on
various Exynos-based boards (ARM and ARM64).
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> (for Exynos and
core changes)
> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
> thanks for that.
>
> There is also a git-branch available with these patches applied:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>
> Please review.
>
> Thanks,
>
> Joerg
>
> Joerg Roedel (32):
> iommu: Move default domain allocation to separate function
> iommu/amd: Implement iommu_ops->def_domain_type call-back
> iommu/vt-d: Wire up iommu_ops->def_domain_type
> iommu/amd: Remove dma_mask check from check_device()
> iommu/amd: Return -ENODEV in add_device when device is not handled by
> IOMMU
> iommu: Add probe_device() and remove_device() call-backs
> iommu: Move default domain allocation to iommu_probe_device()
> iommu: Keep a list of allocated groups in __iommu_probe_device()
> iommu: Move new probe_device path to separate function
> iommu: Split off default domain allocation from group assignment
> iommu: Move iommu_group_create_direct_mappings() out of
> iommu_group_add_device()
> iommu: Export bus_iommu_probe() and make is safe for re-probing
> iommu/amd: Remove dev_data->passthrough
> iommu/amd: Convert to probe/release_device() call-backs
> iommu/vt-d: Convert to probe/release_device() call-backs
> iommu/arm-smmu: Convert to probe/release_device() call-backs
> iommu/pamu: Convert to probe/release_device() call-backs
> iommu/s390: Convert to probe/release_device() call-backs
> iommu/virtio: Convert to probe/release_device() call-backs
> iommu/msm: Convert to probe/release_device() call-backs
> iommu/mediatek: Convert to probe/release_device() call-backs
> iommu/mediatek-v1 Convert to probe/release_device() call-backs
> iommu/qcom: Convert to probe/release_device() call-backs
> iommu/rockchip: Convert to probe/release_device() call-backs
> iommu/tegra: Convert to probe/release_device() call-backs
> iommu/renesas: Convert to probe/release_device() call-backs
> iommu/omap: Remove orphan_dev tracking
> iommu/omap: Convert to probe/release_device() call-backs
> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
> iommu/exynos: Convert to probe/release_device() call-backs
> iommu: Remove add_device()/remove_device() code-paths
> iommu: Unexport iommu_group_get_for_dev()
>
> Sai Praneeth Prakhya (1):
> iommu: Add def_domain_type() callback in iommu_ops
>
> drivers/iommu/amd_iommu.c | 97 ++++----
> drivers/iommu/amd_iommu_types.h | 1 -
> drivers/iommu/arm-smmu-v3.c | 38 +--
> drivers/iommu/arm-smmu.c | 39 ++--
> drivers/iommu/exynos-iommu.c | 24 +-
> drivers/iommu/fsl_pamu_domain.c | 22 +-
> drivers/iommu/intel-iommu.c | 68 +-----
> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
> drivers/iommu/ipmmu-vmsa.c | 60 ++---
> drivers/iommu/msm_iommu.c | 34 +--
> drivers/iommu/mtk_iommu.c | 24 +-
> drivers/iommu/mtk_iommu_v1.c | 50 ++--
> drivers/iommu/omap-iommu.c | 99 ++------
> drivers/iommu/qcom_iommu.c | 24 +-
> drivers/iommu/rockchip-iommu.c | 26 +--
> drivers/iommu/s390-iommu.c | 22 +-
> drivers/iommu/tegra-gart.c | 24 +-
> drivers/iommu/tegra-smmu.c | 31 +--
> drivers/iommu/virtio-iommu.c | 41 +---
> include/linux/iommu.h | 21 +-
> 20 files changed, 533 insertions(+), 605 deletions(-)
>
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-04-17 1:03 ` Daniel Drake
-1 siblings, 0 replies; 233+ messages in thread
From: Daniel Drake @ 2020-04-17 1:03 UTC (permalink / raw)
To: joro-zLv9SwRftAIdnm+yROfE0A
Cc: agross-DgEjT+Ai2ygdnm+yROfE0A, baolu.lu-VuQAYsv1563Yd54FQh9/CA,
bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A,
dwmw2-wEGCiKHe2LqWVfeAwA7xHQ,
gerald.schaefer-tA70FqPdS9bQT0dZR+AlfA,
heiko-4mtYJXux2i+zQB+pC5nmwQ,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
jean-philippe-QSEj5FYQhm4dnm+yROfE0A,
jonathanh-DDmLM1+adcrQT0dZR+AlfA, kgene-DgEjT+Ai2ygdnm+yROfE0A,
krzk-DgEjT+Ai2ygdnm+yROfE0A,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
robdclark-Re5JQEeQqe8AvxtiuMwx3w, robin.murphy-5wv7dgnIgG8,
thierry.reding-Re5JQEeQqe8AvxtiuMwx3w,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
will-DgEjT+Ai2ygdnm+yROfE0A,
jonathan.derrick-ral2JQCrhuEAvxtiuMwx3w
Hi Joerg,
> Hi,
>
> here is the second version of this patch-set. The first version with
> some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
Thanks for the continued improvements in this area!
I may have spotted a problem with setups like VMD.
The core PCI bus is set up during early boot.
Then, for the PCI bus, we reach iommu_bus_init() -> bus_iommu_probe().
In there, we call probe_iommu_group() -> dev_iommu_get() for each PCI
device, which allocates dev->iommu in each case. So far so good.
The problem is that this is the last time that we'll call dev_iommu_get().
If any PCI bus devices get added after this point, they do not get passed
to dev_iommu_get().
So when the vmd module gets loaded later, and creates more PCI devices,
we end up in iommu_bus_notifier() -> iommu_probe_device()
-> __iommu_probe_device() which does:
dev->iommu->iommu_dev = iommu_dev;
dev->iommu-> is a NULL dereference because dev_iommu_get() was never
called for this new device.
Daniel
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-17 1:03 ` Daniel Drake
0 siblings, 0 replies; 233+ messages in thread
From: Daniel Drake @ 2020-04-17 1:03 UTC (permalink / raw)
To: joro
Cc: heiko, bjorn.andersson, linux-tegra, thierry.reding, will,
m.szyprowski, jean-philippe, linux-samsung-soc, robdclark, krzk,
jonathanh, linux-rockchip, agross, jonathan.derrick, linux-s390,
linux-arm-msm, linux-mediatek, matthias.bgg, virtualization,
gerald.schaefer, dwmw2, linux-kernel, iommu, kgene, robin.murphy,
baolu.lu
Hi Joerg,
> Hi,
>
> here is the second version of this patch-set. The first version with
> some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
Thanks for the continued improvements in this area!
I may have spotted a problem with setups like VMD.
The core PCI bus is set up during early boot.
Then, for the PCI bus, we reach iommu_bus_init() -> bus_iommu_probe().
In there, we call probe_iommu_group() -> dev_iommu_get() for each PCI
device, which allocates dev->iommu in each case. So far so good.
The problem is that this is the last time that we'll call dev_iommu_get().
If any PCI bus devices get added after this point, they do not get passed
to dev_iommu_get().
So when the vmd module gets loaded later, and creates more PCI devices,
we end up in iommu_bus_notifier() -> iommu_probe_device()
-> __iommu_probe_device() which does:
dev->iommu->iommu_dev = iommu_dev;
dev->iommu-> is a NULL dereference because dev_iommu_get() was never
called for this new device.
Daniel
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-17 1:03 ` Daniel Drake
0 siblings, 0 replies; 233+ messages in thread
From: Daniel Drake @ 2020-04-17 1:03 UTC (permalink / raw)
To: joro
Cc: heiko, bjorn.andersson, linux-tegra, thierry.reding, will,
jean-philippe, linux-samsung-soc, krzk, jonathanh,
linux-rockchip, agross, jonathan.derrick, linux-s390,
linux-arm-msm, linux-mediatek, matthias.bgg, virtualization,
gerald.schaefer, dwmw2, linux-kernel, iommu, kgene, robin.murphy
Hi Joerg,
> Hi,
>
> here is the second version of this patch-set. The first version with
> some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
Thanks for the continued improvements in this area!
I may have spotted a problem with setups like VMD.
The core PCI bus is set up during early boot.
Then, for the PCI bus, we reach iommu_bus_init() -> bus_iommu_probe().
In there, we call probe_iommu_group() -> dev_iommu_get() for each PCI
device, which allocates dev->iommu in each case. So far so good.
The problem is that this is the last time that we'll call dev_iommu_get().
If any PCI bus devices get added after this point, they do not get passed
to dev_iommu_get().
So when the vmd module gets loaded later, and creates more PCI devices,
we end up in iommu_bus_notifier() -> iommu_probe_device()
-> __iommu_probe_device() which does:
dev->iommu->iommu_dev = iommu_dev;
dev->iommu-> is a NULL dereference because dev_iommu_get() was never
called for this new device.
Daniel
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-17 1:03 ` Daniel Drake
0 siblings, 0 replies; 233+ messages in thread
From: Daniel Drake @ 2020-04-17 1:03 UTC (permalink / raw)
To: joro
Cc: agross, baolu.lu, bjorn.andersson, dwmw2, gerald.schaefer, heiko,
iommu, jean-philippe, jonathanh, kgene, krzk, linux-arm-msm,
linux-kernel, linux-mediatek, linux-rockchip, linux-s390,
linux-samsung-soc, linux-tegra, m.szyprowski, matthias.bgg,
robdclark, robin.murphy, thierry.reding, virtualization, will,
jonathan.derrick
Hi Joerg,
> Hi,
>
> here is the second version of this patch-set. The first version with
> some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
Thanks for the continued improvements in this area!
I may have spotted a problem with setups like VMD.
The core PCI bus is set up during early boot.
Then, for the PCI bus, we reach iommu_bus_init() -> bus_iommu_probe().
In there, we call probe_iommu_group() -> dev_iommu_get() for each PCI
device, which allocates dev->iommu in each case. So far so good.
The problem is that this is the last time that we'll call dev_iommu_get().
If any PCI bus devices get added after this point, they do not get passed
to dev_iommu_get().
So when the vmd module gets loaded later, and creates more PCI devices,
we end up in iommu_bus_notifier() -> iommu_probe_device()
-> __iommu_probe_device() which does:
dev->iommu->iommu_dev = iommu_dev;
dev->iommu-> is a NULL dereference because dev_iommu_get() was never
called for this new device.
Daniel
^ permalink raw reply [flat|nested] 233+ messages in thread
[parent not found: <20200417010335.31739-1-drake-6IF/jdPJHihWk0Htik3J/w@public.gmane.org>]
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-04-17 1:03 ` Daniel Drake
` (2 preceding siblings ...)
(?)
@ 2020-04-17 1:14 ` Derrick, Jonathan
-1 siblings, 0 replies; 233+ messages in thread
From: Derrick, Jonathan @ 2020-04-17 1:14 UTC (permalink / raw)
To: joro-zLv9SwRftAIdnm+yROfE0A, drake-6IF/jdPJHihWk0Htik3J/w
Cc: heiko-4mtYJXux2i+zQB+pC5nmwQ, kgene-DgEjT+Ai2ygdnm+yROfE0A,
jonathanh-DDmLM1+adcrQT0dZR+AlfA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
baolu.lu-VuQAYsv1563Yd54FQh9/CA, robin.murphy-5wv7dgnIgG8,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A,
thierry.reding-Re5JQEeQqe8AvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
dwmw2-wEGCiKHe2LqWVfeAwA7xHQ
Hi Daniel,
On Fri, 2020-04-17 at 09:03 +0800, Daniel Drake wrote:
> Hi Joerg,
>
> > Hi,
> >
> > here is the second version of this patch-set. The first version with
> > some more introductory text can be found here:
> >
> > https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
> Thanks for the continued improvements in this area!
>
> I may have spotted a problem with setups like VMD.
>
> The core PCI bus is set up during early boot.
> Then, for the PCI bus, we reach iommu_bus_init() -> bus_iommu_probe().
> In there, we call probe_iommu_group() -> dev_iommu_get() for each PCI
> device, which allocates dev->iommu in each case. So far so good.
>
> The problem is that this is the last time that we'll call dev_iommu_get().
> If any PCI bus devices get added after this point, they do not get passed
> to dev_iommu_get().
>
> So when the vmd module gets loaded later, and creates more PCI devices,
> we end up in iommu_bus_notifier() -> iommu_probe_device()
> -> __iommu_probe_device() which does:
>
> dev->iommu->iommu_dev = iommu_dev;
>
> dev->iommu-> is a NULL dereference because dev_iommu_get() was never
> called for this new device.
>
> Daniel
>
I should have CCed you on this, but it should temporarily resolve that
issue:
https://lists.linuxfoundation.org/pipermail/iommu/2020-April/043253.html
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-17 1:14 ` Derrick, Jonathan
0 siblings, 0 replies; 233+ messages in thread
From: Derrick, Jonathan @ 2020-04-17 1:14 UTC (permalink / raw)
To: joro, drake
Cc: heiko, bjorn.andersson, linux-tegra, thierry.reding, will,
m.szyprowski, linux-s390, linux-samsung-soc, robdclark, krzk,
jonathanh, linux-rockchip, kgene, agross, jean-philippe,
linux-arm-msm, linux-mediatek, matthias.bgg, virtualization,
gerald.schaefer, dwmw2, linux-kernel, iommu, robin.murphy,
baolu.lu
Hi Daniel,
On Fri, 2020-04-17 at 09:03 +0800, Daniel Drake wrote:
> Hi Joerg,
>
> > Hi,
> >
> > here is the second version of this patch-set. The first version with
> > some more introductory text can be found here:
> >
> > https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
> Thanks for the continued improvements in this area!
>
> I may have spotted a problem with setups like VMD.
>
> The core PCI bus is set up during early boot.
> Then, for the PCI bus, we reach iommu_bus_init() -> bus_iommu_probe().
> In there, we call probe_iommu_group() -> dev_iommu_get() for each PCI
> device, which allocates dev->iommu in each case. So far so good.
>
> The problem is that this is the last time that we'll call dev_iommu_get().
> If any PCI bus devices get added after this point, they do not get passed
> to dev_iommu_get().
>
> So when the vmd module gets loaded later, and creates more PCI devices,
> we end up in iommu_bus_notifier() -> iommu_probe_device()
> -> __iommu_probe_device() which does:
>
> dev->iommu->iommu_dev = iommu_dev;
>
> dev->iommu-> is a NULL dereference because dev_iommu_get() was never
> called for this new device.
>
> Daniel
>
I should have CCed you on this, but it should temporarily resolve that
issue:
https://lists.linuxfoundation.org/pipermail/iommu/2020-April/043253.html
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-17 1:14 ` Derrick, Jonathan
0 siblings, 0 replies; 233+ messages in thread
From: Derrick, Jonathan @ 2020-04-17 1:14 UTC (permalink / raw)
To: joro, drake
Cc: heiko, bjorn.andersson, linux-tegra, thierry.reding, will,
linux-s390, linux-samsung-soc, krzk, jonathanh, linux-rockchip,
kgene, agross, jean-philippe, linux-arm-msm, linux-mediatek,
matthias.bgg, virtualization, gerald.schaefer, dwmw2,
linux-kernel, iommu, robin.murphy
Hi Daniel,
On Fri, 2020-04-17 at 09:03 +0800, Daniel Drake wrote:
> Hi Joerg,
>
> > Hi,
> >
> > here is the second version of this patch-set. The first version with
> > some more introductory text can be found here:
> >
> > https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
> Thanks for the continued improvements in this area!
>
> I may have spotted a problem with setups like VMD.
>
> The core PCI bus is set up during early boot.
> Then, for the PCI bus, we reach iommu_bus_init() -> bus_iommu_probe().
> In there, we call probe_iommu_group() -> dev_iommu_get() for each PCI
> device, which allocates dev->iommu in each case. So far so good.
>
> The problem is that this is the last time that we'll call dev_iommu_get().
> If any PCI bus devices get added after this point, they do not get passed
> to dev_iommu_get().
>
> So when the vmd module gets loaded later, and creates more PCI devices,
> we end up in iommu_bus_notifier() -> iommu_probe_device()
> -> __iommu_probe_device() which does:
>
> dev->iommu->iommu_dev = iommu_dev;
>
> dev->iommu-> is a NULL dereference because dev_iommu_get() was never
> called for this new device.
>
> Daniel
>
I should have CCed you on this, but it should temporarily resolve that
issue:
https://lists.linuxfoundation.org/pipermail/iommu/2020-April/043253.html
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-17 1:14 ` Derrick, Jonathan
0 siblings, 0 replies; 233+ messages in thread
From: Derrick, Jonathan @ 2020-04-17 1:14 UTC (permalink / raw)
To: joro, drake
Cc: heiko, kgene, jonathanh, virtualization, matthias.bgg,
linux-arm-msm, baolu.lu, robin.murphy, iommu, linux-mediatek,
bjorn.andersson, thierry.reding, linux-kernel, dwmw2, linux-s390,
m.szyprowski, jean-philippe, will, krzk, linux-samsung-soc,
robdclark, gerald.schaefer, linux-rockchip, agross, linux-tegra
Hi Daniel,
On Fri, 2020-04-17 at 09:03 +0800, Daniel Drake wrote:
> Hi Joerg,
>
> > Hi,
> >
> > here is the second version of this patch-set. The first version with
> > some more introductory text can be found here:
> >
> > https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
> Thanks for the continued improvements in this area!
>
> I may have spotted a problem with setups like VMD.
>
> The core PCI bus is set up during early boot.
> Then, for the PCI bus, we reach iommu_bus_init() -> bus_iommu_probe().
> In there, we call probe_iommu_group() -> dev_iommu_get() for each PCI
> device, which allocates dev->iommu in each case. So far so good.
>
> The problem is that this is the last time that we'll call dev_iommu_get().
> If any PCI bus devices get added after this point, they do not get passed
> to dev_iommu_get().
>
> So when the vmd module gets loaded later, and creates more PCI devices,
> we end up in iommu_bus_notifier() -> iommu_probe_device()
> -> __iommu_probe_device() which does:
>
> dev->iommu->iommu_dev = iommu_dev;
>
> dev->iommu-> is a NULL dereference because dev_iommu_get() was never
> called for this new device.
>
> Daniel
>
I should have CCed you on this, but it should temporarily resolve that
issue:
https://lists.linuxfoundation.org/pipermail/iommu/2020-April/043253.html
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-17 1:14 ` Derrick, Jonathan
0 siblings, 0 replies; 233+ messages in thread
From: Derrick, Jonathan @ 2020-04-17 1:14 UTC (permalink / raw)
To: joro, drake
Cc: heiko, kgene, jonathanh, virtualization, matthias.bgg,
linux-arm-msm, baolu.lu, robin.murphy, iommu, linux-mediatek,
bjorn.andersson, thierry.reding, linux-kernel, dwmw2, linux-s390,
m.szyprowski, jean-philippe, will, krzk, linux-samsung-soc,
robdclark, gerald.schaefer, linux-rockchip, agross, linux-tegra
Hi Daniel,
On Fri, 2020-04-17 at 09:03 +0800, Daniel Drake wrote:
> Hi Joerg,
>
> > Hi,
> >
> > here is the second version of this patch-set. The first version with
> > some more introductory text can be found here:
> >
> > https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
> Thanks for the continued improvements in this area!
>
> I may have spotted a problem with setups like VMD.
>
> The core PCI bus is set up during early boot.
> Then, for the PCI bus, we reach iommu_bus_init() -> bus_iommu_probe().
> In there, we call probe_iommu_group() -> dev_iommu_get() for each PCI
> device, which allocates dev->iommu in each case. So far so good.
>
> The problem is that this is the last time that we'll call dev_iommu_get().
> If any PCI bus devices get added after this point, they do not get passed
> to dev_iommu_get().
>
> So when the vmd module gets loaded later, and creates more PCI devices,
> we end up in iommu_bus_notifier() -> iommu_probe_device()
> -> __iommu_probe_device() which does:
>
> dev->iommu->iommu_dev = iommu_dev;
>
> dev->iommu-> is a NULL dereference because dev_iommu_get() was never
> called for this new device.
>
> Daniel
>
I should have CCed you on this, but it should temporarily resolve that
issue:
https://lists.linuxfoundation.org/pipermail/iommu/2020-April/043253.html
^ permalink raw reply [flat|nested] 233+ messages in thread
[parent not found: <aafed865c0254934986528b3ce9c4d34ff2fccad.camel-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-04-17 1:14 ` Derrick, Jonathan
` (2 preceding siblings ...)
(?)
@ 2020-04-18 12:44 ` joro
-1 siblings, 0 replies; 233+ messages in thread
From: joro-zLv9SwRftAIdnm+yROfE0A @ 2020-04-18 12:44 UTC (permalink / raw)
To: Derrick, Jonathan
Cc: drake-6IF/jdPJHihWk0Htik3J/w, heiko-4mtYJXux2i+zQB+pC5nmwQ,
kgene-DgEjT+Ai2ygdnm+yROfE0A, jonathanh-DDmLM1+adcrQT0dZR+AlfA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
baolu.lu-VuQAYsv1563Yd54FQh9/CA, robin.murphy-5wv7dgnIgG8,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A,
thierry.reding-Re5JQEeQqe8AvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Hi Jonathan, Hi Daniel,
On Fri, Apr 17, 2020 at 01:14:30AM +0000, Derrick, Jonathan wrote:
> Hi Daniel> I should have CCed you on this, but it should temporarily resolve that
> issue:
> https://lists.linuxfoundation.org/pipermail/iommu/2020-April/043253.html
Yes, this is an issue in the hotplug handling path which I already fixed
in my branch. With next post of this series it should work.
Regards,
Joerg
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-18 12:44 ` joro
0 siblings, 0 replies; 233+ messages in thread
From: joro @ 2020-04-18 12:44 UTC (permalink / raw)
To: Derrick, Jonathan
Cc: heiko, bjorn.andersson, linux-tegra, thierry.reding, drake, will,
m.szyprowski, linux-s390, linux-samsung-soc, robdclark, krzk,
jonathanh, linux-rockchip, kgene, agross, jean-philippe,
linux-arm-msm, linux-mediatek, matthias.bgg, virtualization,
gerald.schaefer, robin.murphy, linux-kernel, iommu, dwmw2,
baolu.lu
Hi Jonathan, Hi Daniel,
On Fri, Apr 17, 2020 at 01:14:30AM +0000, Derrick, Jonathan wrote:
> Hi Daniel> I should have CCed you on this, but it should temporarily resolve that
> issue:
> https://lists.linuxfoundation.org/pipermail/iommu/2020-April/043253.html
Yes, this is an issue in the hotplug handling path which I already fixed
in my branch. With next post of this series it should work.
Regards,
Joerg
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-18 12:44 ` joro
0 siblings, 0 replies; 233+ messages in thread
From: joro @ 2020-04-18 12:44 UTC (permalink / raw)
To: Derrick, Jonathan
Cc: heiko, bjorn.andersson, linux-tegra, thierry.reding, drake, will,
linux-s390, linux-samsung-soc, krzk, jonathanh, linux-rockchip,
kgene, agross, jean-philippe, linux-arm-msm, linux-mediatek,
matthias.bgg, virtualization, gerald.schaefer, robin.murphy,
linux-kernel, iommu, dwmw2
Hi Jonathan, Hi Daniel,
On Fri, Apr 17, 2020 at 01:14:30AM +0000, Derrick, Jonathan wrote:
> Hi Daniel> I should have CCed you on this, but it should temporarily resolve that
> issue:
> https://lists.linuxfoundation.org/pipermail/iommu/2020-April/043253.html
Yes, this is an issue in the hotplug handling path which I already fixed
in my branch. With next post of this series it should work.
Regards,
Joerg
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-18 12:44 ` joro
0 siblings, 0 replies; 233+ messages in thread
From: joro @ 2020-04-18 12:44 UTC (permalink / raw)
To: Derrick, Jonathan
Cc: drake, heiko, kgene, jonathanh, virtualization, matthias.bgg,
linux-arm-msm, baolu.lu, robin.murphy, iommu, linux-mediatek,
bjorn.andersson, thierry.reding, linux-kernel, dwmw2, linux-s390,
m.szyprowski, jean-philippe, will, krzk, linux-samsung-soc,
robdclark, gerald.schaefer, linux-rockchip, agross, linux-tegra
Hi Jonathan, Hi Daniel,
On Fri, Apr 17, 2020 at 01:14:30AM +0000, Derrick, Jonathan wrote:
> Hi Daniel> I should have CCed you on this, but it should temporarily resolve that
> issue:
> https://lists.linuxfoundation.org/pipermail/iommu/2020-April/043253.html
Yes, this is an issue in the hotplug handling path which I already fixed
in my branch. With next post of this series it should work.
Regards,
Joerg
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-04-18 12:44 ` joro
0 siblings, 0 replies; 233+ messages in thread
From: joro @ 2020-04-18 12:44 UTC (permalink / raw)
To: Derrick, Jonathan
Cc: drake, heiko, kgene, jonathanh, virtualization, matthias.bgg,
linux-arm-msm, baolu.lu, robin.murphy, iommu, linux-mediatek,
bjorn.andersson, thierry.reding, linux-kernel, dwmw2, linux-s390,
m.szyprowski, jean-philippe, will, krzk, linux-samsung-soc,
robdclark, gerald.schaefer, linux-rockchip, agross, linux-tegra
Hi Jonathan, Hi Daniel,
On Fri, Apr 17, 2020 at 01:14:30AM +0000, Derrick, Jonathan wrote:
> Hi Daniel> I should have CCed you on this, but it should temporarily resolve that
> issue:
> https://lists.linuxfoundation.org/pipermail/iommu/2020-April/043253.html
Yes, this is an issue in the hotplug handling path which I already fixed
in my branch. With next post of this series it should work.
Regards,
Joerg
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-04-14 13:15 ` Joerg Roedel
(?)
(?)
@ 2020-05-29 22:16 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-05-29 22:16 UTC (permalink / raw)
To: Joerg Roedel
Cc: Will Deacon, Robin Murphy, Marek Szyprowski, Kukjin Kim,
Krzysztof Kozlowski, David Woodhouse, Lu Baolu, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, virtualiza
On Tue Apr 14 20, Joerg Roedel wrote:
>Hi,
>
>here is the second version of this patch-set. The first version with
>some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>
>Changes v1->v2:
>
> * Rebased to v5.7-rc1
>
> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>
> * Re-worked the Exynos patches to hopefully not break the
> driver anymore
>
> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
> thanks for that.
>
>There is also a git-branch available with these patches applied:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>
>Please review.
>
>Thanks,
>
> Joerg
>
>Joerg Roedel (32):
> iommu: Move default domain allocation to separate function
> iommu/amd: Implement iommu_ops->def_domain_type call-back
> iommu/vt-d: Wire up iommu_ops->def_domain_type
> iommu/amd: Remove dma_mask check from check_device()
> iommu/amd: Return -ENODEV in add_device when device is not handled by
> IOMMU
> iommu: Add probe_device() and remove_device() call-backs
> iommu: Move default domain allocation to iommu_probe_device()
> iommu: Keep a list of allocated groups in __iommu_probe_device()
> iommu: Move new probe_device path to separate function
> iommu: Split off default domain allocation from group assignment
> iommu: Move iommu_group_create_direct_mappings() out of
> iommu_group_add_device()
> iommu: Export bus_iommu_probe() and make is safe for re-probing
> iommu/amd: Remove dev_data->passthrough
> iommu/amd: Convert to probe/release_device() call-backs
> iommu/vt-d: Convert to probe/release_device() call-backs
> iommu/arm-smmu: Convert to probe/release_device() call-backs
> iommu/pamu: Convert to probe/release_device() call-backs
> iommu/s390: Convert to probe/release_device() call-backs
> iommu/virtio: Convert to probe/release_device() call-backs
> iommu/msm: Convert to probe/release_device() call-backs
> iommu/mediatek: Convert to probe/release_device() call-backs
> iommu/mediatek-v1 Convert to probe/release_device() call-backs
> iommu/qcom: Convert to probe/release_device() call-backs
> iommu/rockchip: Convert to probe/release_device() call-backs
> iommu/tegra: Convert to probe/release_device() call-backs
> iommu/renesas: Convert to probe/release_device() call-backs
> iommu/omap: Remove orphan_dev tracking
> iommu/omap: Convert to probe/release_device() call-backs
> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
> iommu/exynos: Convert to probe/release_device() call-backs
> iommu: Remove add_device()/remove_device() code-paths
> iommu: Unexport iommu_group_get_for_dev()
>
>Sai Praneeth Prakhya (1):
> iommu: Add def_domain_type() callback in iommu_ops
>
> drivers/iommu/amd_iommu.c | 97 ++++----
> drivers/iommu/amd_iommu_types.h | 1 -
> drivers/iommu/arm-smmu-v3.c | 38 +--
> drivers/iommu/arm-smmu.c | 39 ++--
> drivers/iommu/exynos-iommu.c | 24 +-
> drivers/iommu/fsl_pamu_domain.c | 22 +-
> drivers/iommu/intel-iommu.c | 68 +-----
> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
> drivers/iommu/ipmmu-vmsa.c | 60 ++---
> drivers/iommu/msm_iommu.c | 34 +--
> drivers/iommu/mtk_iommu.c | 24 +-
> drivers/iommu/mtk_iommu_v1.c | 50 ++--
> drivers/iommu/omap-iommu.c | 99 ++------
> drivers/iommu/qcom_iommu.c | 24 +-
> drivers/iommu/rockchip-iommu.c | 26 +--
> drivers/iommu/s390-iommu.c | 22 +-
> drivers/iommu/tegra-gart.c | 24 +-
> drivers/iommu/tegra-smmu.c | 31 +--
> drivers/iommu/virtio-iommu.c | 41 +---
> include/linux/iommu.h | 21 +-
> 20 files changed, 533 insertions(+), 605 deletions(-)
>
>--
>2.17.1
>
>_______________________________________________
>iommu mailing list
>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>
Hi Joerg,
With this patchset, I have an epyc system where if I boot with
iommu=nopt and force a dump I will see some io page faults for a nic
on the system. The vmcore is harvested and the system reboots. I
haven't reproduced it on other systems yet, but without the patchset I
don't see the io page faults during the kdump.
Regards,
Jerry
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-05-29 22:16 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-05-29 22:16 UTC (permalink / raw)
To: Joerg Roedel
Cc: Heiko Stuebner, virtualization, linux-tegra, Thierry Reding,
Will Deacon, Marek Szyprowski, Jean-Philippe Brucker,
linux-samsung-soc, iommu, Krzysztof Kozlowski, Jonathan Hunter,
linux-rockchip, Andy Gross, linux-s390, linux-arm-msm,
linux-mediatek, Matthias Brugger, Bjorn Andersson,
Gerald Schaefer, David Woodhouse, linux-kernel, Rob Clark,
Kukjin Kim, Robin Murphy, Lu Baolu
On Tue Apr 14 20, Joerg Roedel wrote:
>Hi,
>
>here is the second version of this patch-set. The first version with
>some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
>Changes v1->v2:
>
> * Rebased to v5.7-rc1
>
> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>
> * Re-worked the Exynos patches to hopefully not break the
> driver anymore
>
> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
> thanks for that.
>
>There is also a git-branch available with these patches applied:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>
>Please review.
>
>Thanks,
>
> Joerg
>
>Joerg Roedel (32):
> iommu: Move default domain allocation to separate function
> iommu/amd: Implement iommu_ops->def_domain_type call-back
> iommu/vt-d: Wire up iommu_ops->def_domain_type
> iommu/amd: Remove dma_mask check from check_device()
> iommu/amd: Return -ENODEV in add_device when device is not handled by
> IOMMU
> iommu: Add probe_device() and remove_device() call-backs
> iommu: Move default domain allocation to iommu_probe_device()
> iommu: Keep a list of allocated groups in __iommu_probe_device()
> iommu: Move new probe_device path to separate function
> iommu: Split off default domain allocation from group assignment
> iommu: Move iommu_group_create_direct_mappings() out of
> iommu_group_add_device()
> iommu: Export bus_iommu_probe() and make is safe for re-probing
> iommu/amd: Remove dev_data->passthrough
> iommu/amd: Convert to probe/release_device() call-backs
> iommu/vt-d: Convert to probe/release_device() call-backs
> iommu/arm-smmu: Convert to probe/release_device() call-backs
> iommu/pamu: Convert to probe/release_device() call-backs
> iommu/s390: Convert to probe/release_device() call-backs
> iommu/virtio: Convert to probe/release_device() call-backs
> iommu/msm: Convert to probe/release_device() call-backs
> iommu/mediatek: Convert to probe/release_device() call-backs
> iommu/mediatek-v1 Convert to probe/release_device() call-backs
> iommu/qcom: Convert to probe/release_device() call-backs
> iommu/rockchip: Convert to probe/release_device() call-backs
> iommu/tegra: Convert to probe/release_device() call-backs
> iommu/renesas: Convert to probe/release_device() call-backs
> iommu/omap: Remove orphan_dev tracking
> iommu/omap: Convert to probe/release_device() call-backs
> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
> iommu/exynos: Convert to probe/release_device() call-backs
> iommu: Remove add_device()/remove_device() code-paths
> iommu: Unexport iommu_group_get_for_dev()
>
>Sai Praneeth Prakhya (1):
> iommu: Add def_domain_type() callback in iommu_ops
>
> drivers/iommu/amd_iommu.c | 97 ++++----
> drivers/iommu/amd_iommu_types.h | 1 -
> drivers/iommu/arm-smmu-v3.c | 38 +--
> drivers/iommu/arm-smmu.c | 39 ++--
> drivers/iommu/exynos-iommu.c | 24 +-
> drivers/iommu/fsl_pamu_domain.c | 22 +-
> drivers/iommu/intel-iommu.c | 68 +-----
> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
> drivers/iommu/ipmmu-vmsa.c | 60 ++---
> drivers/iommu/msm_iommu.c | 34 +--
> drivers/iommu/mtk_iommu.c | 24 +-
> drivers/iommu/mtk_iommu_v1.c | 50 ++--
> drivers/iommu/omap-iommu.c | 99 ++------
> drivers/iommu/qcom_iommu.c | 24 +-
> drivers/iommu/rockchip-iommu.c | 26 +--
> drivers/iommu/s390-iommu.c | 22 +-
> drivers/iommu/tegra-gart.c | 24 +-
> drivers/iommu/tegra-smmu.c | 31 +--
> drivers/iommu/virtio-iommu.c | 41 +---
> include/linux/iommu.h | 21 +-
> 20 files changed, 533 insertions(+), 605 deletions(-)
>
>--
>2.17.1
>
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>
Hi Joerg,
With this patchset, I have an epyc system where if I boot with
iommu=nopt and force a dump I will see some io page faults for a nic
on the system. The vmcore is harvested and the system reboots. I
haven't reproduced it on other systems yet, but without the patchset I
don't see the io page faults during the kdump.
Regards,
Jerry
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-05-29 22:16 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-05-29 22:16 UTC (permalink / raw)
To: Joerg Roedel
Cc: Heiko Stuebner, virtualization, linux-tegra, Thierry Reding,
Will Deacon, Jean-Philippe Brucker, linux-samsung-soc, iommu,
Krzysztof Kozlowski, Jonathan Hunter, linux-rockchip, Andy Gross,
linux-s390, linux-arm-msm, linux-mediatek, Matthias Brugger,
Bjorn Andersson, Gerald Schaefer, David Woodhouse, linux-kernel,
Kukjin Kim, Robin Murphy
On Tue Apr 14 20, Joerg Roedel wrote:
>Hi,
>
>here is the second version of this patch-set. The first version with
>some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
>Changes v1->v2:
>
> * Rebased to v5.7-rc1
>
> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>
> * Re-worked the Exynos patches to hopefully not break the
> driver anymore
>
> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
> thanks for that.
>
>There is also a git-branch available with these patches applied:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>
>Please review.
>
>Thanks,
>
> Joerg
>
>Joerg Roedel (32):
> iommu: Move default domain allocation to separate function
> iommu/amd: Implement iommu_ops->def_domain_type call-back
> iommu/vt-d: Wire up iommu_ops->def_domain_type
> iommu/amd: Remove dma_mask check from check_device()
> iommu/amd: Return -ENODEV in add_device when device is not handled by
> IOMMU
> iommu: Add probe_device() and remove_device() call-backs
> iommu: Move default domain allocation to iommu_probe_device()
> iommu: Keep a list of allocated groups in __iommu_probe_device()
> iommu: Move new probe_device path to separate function
> iommu: Split off default domain allocation from group assignment
> iommu: Move iommu_group_create_direct_mappings() out of
> iommu_group_add_device()
> iommu: Export bus_iommu_probe() and make is safe for re-probing
> iommu/amd: Remove dev_data->passthrough
> iommu/amd: Convert to probe/release_device() call-backs
> iommu/vt-d: Convert to probe/release_device() call-backs
> iommu/arm-smmu: Convert to probe/release_device() call-backs
> iommu/pamu: Convert to probe/release_device() call-backs
> iommu/s390: Convert to probe/release_device() call-backs
> iommu/virtio: Convert to probe/release_device() call-backs
> iommu/msm: Convert to probe/release_device() call-backs
> iommu/mediatek: Convert to probe/release_device() call-backs
> iommu/mediatek-v1 Convert to probe/release_device() call-backs
> iommu/qcom: Convert to probe/release_device() call-backs
> iommu/rockchip: Convert to probe/release_device() call-backs
> iommu/tegra: Convert to probe/release_device() call-backs
> iommu/renesas: Convert to probe/release_device() call-backs
> iommu/omap: Remove orphan_dev tracking
> iommu/omap: Convert to probe/release_device() call-backs
> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
> iommu/exynos: Convert to probe/release_device() call-backs
> iommu: Remove add_device()/remove_device() code-paths
> iommu: Unexport iommu_group_get_for_dev()
>
>Sai Praneeth Prakhya (1):
> iommu: Add def_domain_type() callback in iommu_ops
>
> drivers/iommu/amd_iommu.c | 97 ++++----
> drivers/iommu/amd_iommu_types.h | 1 -
> drivers/iommu/arm-smmu-v3.c | 38 +--
> drivers/iommu/arm-smmu.c | 39 ++--
> drivers/iommu/exynos-iommu.c | 24 +-
> drivers/iommu/fsl_pamu_domain.c | 22 +-
> drivers/iommu/intel-iommu.c | 68 +-----
> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
> drivers/iommu/ipmmu-vmsa.c | 60 ++---
> drivers/iommu/msm_iommu.c | 34 +--
> drivers/iommu/mtk_iommu.c | 24 +-
> drivers/iommu/mtk_iommu_v1.c | 50 ++--
> drivers/iommu/omap-iommu.c | 99 ++------
> drivers/iommu/qcom_iommu.c | 24 +-
> drivers/iommu/rockchip-iommu.c | 26 +--
> drivers/iommu/s390-iommu.c | 22 +-
> drivers/iommu/tegra-gart.c | 24 +-
> drivers/iommu/tegra-smmu.c | 31 +--
> drivers/iommu/virtio-iommu.c | 41 +---
> include/linux/iommu.h | 21 +-
> 20 files changed, 533 insertions(+), 605 deletions(-)
>
>--
>2.17.1
>
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>
Hi Joerg,
With this patchset, I have an epyc system where if I boot with
iommu=nopt and force a dump I will see some io page faults for a nic
on the system. The vmcore is harvested and the system reboots. I
haven't reproduced it on other systems yet, but without the patchset I
don't see the io page faults during the kdump.
Regards,
Jerry
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-05-29 22:16 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-05-29 22:16 UTC (permalink / raw)
To: Joerg Roedel
Cc: Will Deacon, Robin Murphy, Marek Szyprowski, Kukjin Kim,
Krzysztof Kozlowski, David Woodhouse, Lu Baolu, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
On Tue Apr 14 20, Joerg Roedel wrote:
>Hi,
>
>here is the second version of this patch-set. The first version with
>some more introductory text can be found here:
>
> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>
>Changes v1->v2:
>
> * Rebased to v5.7-rc1
>
> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>
> * Re-worked the Exynos patches to hopefully not break the
> driver anymore
>
> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
> thanks for that.
>
>There is also a git-branch available with these patches applied:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>
>Please review.
>
>Thanks,
>
> Joerg
>
>Joerg Roedel (32):
> iommu: Move default domain allocation to separate function
> iommu/amd: Implement iommu_ops->def_domain_type call-back
> iommu/vt-d: Wire up iommu_ops->def_domain_type
> iommu/amd: Remove dma_mask check from check_device()
> iommu/amd: Return -ENODEV in add_device when device is not handled by
> IOMMU
> iommu: Add probe_device() and remove_device() call-backs
> iommu: Move default domain allocation to iommu_probe_device()
> iommu: Keep a list of allocated groups in __iommu_probe_device()
> iommu: Move new probe_device path to separate function
> iommu: Split off default domain allocation from group assignment
> iommu: Move iommu_group_create_direct_mappings() out of
> iommu_group_add_device()
> iommu: Export bus_iommu_probe() and make is safe for re-probing
> iommu/amd: Remove dev_data->passthrough
> iommu/amd: Convert to probe/release_device() call-backs
> iommu/vt-d: Convert to probe/release_device() call-backs
> iommu/arm-smmu: Convert to probe/release_device() call-backs
> iommu/pamu: Convert to probe/release_device() call-backs
> iommu/s390: Convert to probe/release_device() call-backs
> iommu/virtio: Convert to probe/release_device() call-backs
> iommu/msm: Convert to probe/release_device() call-backs
> iommu/mediatek: Convert to probe/release_device() call-backs
> iommu/mediatek-v1 Convert to probe/release_device() call-backs
> iommu/qcom: Convert to probe/release_device() call-backs
> iommu/rockchip: Convert to probe/release_device() call-backs
> iommu/tegra: Convert to probe/release_device() call-backs
> iommu/renesas: Convert to probe/release_device() call-backs
> iommu/omap: Remove orphan_dev tracking
> iommu/omap: Convert to probe/release_device() call-backs
> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
> iommu/exynos: Convert to probe/release_device() call-backs
> iommu: Remove add_device()/remove_device() code-paths
> iommu: Unexport iommu_group_get_for_dev()
>
>Sai Praneeth Prakhya (1):
> iommu: Add def_domain_type() callback in iommu_ops
>
> drivers/iommu/amd_iommu.c | 97 ++++----
> drivers/iommu/amd_iommu_types.h | 1 -
> drivers/iommu/arm-smmu-v3.c | 38 +--
> drivers/iommu/arm-smmu.c | 39 ++--
> drivers/iommu/exynos-iommu.c | 24 +-
> drivers/iommu/fsl_pamu_domain.c | 22 +-
> drivers/iommu/intel-iommu.c | 68 +-----
> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
> drivers/iommu/ipmmu-vmsa.c | 60 ++---
> drivers/iommu/msm_iommu.c | 34 +--
> drivers/iommu/mtk_iommu.c | 24 +-
> drivers/iommu/mtk_iommu_v1.c | 50 ++--
> drivers/iommu/omap-iommu.c | 99 ++------
> drivers/iommu/qcom_iommu.c | 24 +-
> drivers/iommu/rockchip-iommu.c | 26 +--
> drivers/iommu/s390-iommu.c | 22 +-
> drivers/iommu/tegra-gart.c | 24 +-
> drivers/iommu/tegra-smmu.c | 31 +--
> drivers/iommu/virtio-iommu.c | 41 +---
> include/linux/iommu.h | 21 +-
> 20 files changed, 533 insertions(+), 605 deletions(-)
>
>--
>2.17.1
>
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>
Hi Joerg,
With this patchset, I have an epyc system where if I boot with
iommu=nopt and force a dump I will see some io page faults for a nic
on the system. The vmcore is harvested and the system reboots. I
haven't reproduced it on other systems yet, but without the patchset I
don't see the io page faults during the kdump.
Regards,
Jerry
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-05-29 22:16 ` Jerry Snitselaar
(?)
(?)
@ 2020-06-01 10:42 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 10:42 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
On Fri May 29 20, Jerry Snitselaar wrote:
>On Tue Apr 14 20, Joerg Roedel wrote:
>>Hi,
>>
>>here is the second version of this patch-set. The first version with
>>some more introductory text can be found here:
>>
>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>
>>Changes v1->v2:
>>
>> * Rebased to v5.7-rc1
>>
>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>
>> * Re-worked the Exynos patches to hopefully not break the
>> driver anymore
>>
>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>> thanks for that.
>>
>>There is also a git-branch available with these patches applied:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>
>>Please review.
>>
>>Thanks,
>>
>> Joerg
>>
>>Joerg Roedel (32):
>> iommu: Move default domain allocation to separate function
>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>> iommu/amd: Remove dma_mask check from check_device()
>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>> IOMMU
>> iommu: Add probe_device() and remove_device() call-backs
>> iommu: Move default domain allocation to iommu_probe_device()
>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>> iommu: Move new probe_device path to separate function
>> iommu: Split off default domain allocation from group assignment
>> iommu: Move iommu_group_create_direct_mappings() out of
>> iommu_group_add_device()
>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>> iommu/amd: Remove dev_data->passthrough
>> iommu/amd: Convert to probe/release_device() call-backs
>> iommu/vt-d: Convert to probe/release_device() call-backs
>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>> iommu/pamu: Convert to probe/release_device() call-backs
>> iommu/s390: Convert to probe/release_device() call-backs
>> iommu/virtio: Convert to probe/release_device() call-backs
>> iommu/msm: Convert to probe/release_device() call-backs
>> iommu/mediatek: Convert to probe/release_device() call-backs
>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>> iommu/qcom: Convert to probe/release_device() call-backs
>> iommu/rockchip: Convert to probe/release_device() call-backs
>> iommu/tegra: Convert to probe/release_device() call-backs
>> iommu/renesas: Convert to probe/release_device() call-backs
>> iommu/omap: Remove orphan_dev tracking
>> iommu/omap: Convert to probe/release_device() call-backs
>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>> iommu/exynos: Convert to probe/release_device() call-backs
>> iommu: Remove add_device()/remove_device() code-paths
>> iommu: Unexport iommu_group_get_for_dev()
>>
>>Sai Praneeth Prakhya (1):
>> iommu: Add def_domain_type() callback in iommu_ops
>>
>>drivers/iommu/amd_iommu.c | 97 ++++----
>>drivers/iommu/amd_iommu_types.h | 1 -
>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>drivers/iommu/arm-smmu.c | 39 ++--
>>drivers/iommu/exynos-iommu.c | 24 +-
>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>drivers/iommu/intel-iommu.c | 68 +-----
>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>drivers/iommu/msm_iommu.c | 34 +--
>>drivers/iommu/mtk_iommu.c | 24 +-
>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>drivers/iommu/omap-iommu.c | 99 ++------
>>drivers/iommu/qcom_iommu.c | 24 +-
>>drivers/iommu/rockchip-iommu.c | 26 +--
>>drivers/iommu/s390-iommu.c | 22 +-
>>drivers/iommu/tegra-gart.c | 24 +-
>>drivers/iommu/tegra-smmu.c | 31 +--
>>drivers/iommu/virtio-iommu.c | 41 +---
>>include/linux/iommu.h | 21 +-
>>20 files changed, 533 insertions(+), 605 deletions(-)
>>
>>--
>>2.17.1
>>
>>_______________________________________________
>>iommu mailing list
>>iommu@lists.linux-foundation.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
>
>Hi Joerg,
>
>With this patchset, I have an epyc system where if I boot with
>iommu=nopt and force a dump I will see some io page faults for a nic
>on the system. The vmcore is harvested and the system reboots. I
>haven't reproduced it on other systems yet, but without the patchset I
>don't see the io page faults during the kdump.
>
>Regards,
>Jerry
I just hit an issue on a separate intel based system (kdump iommu=nopt),
where it panics in during intel_iommu_attach_device, in is_aux_domain,
due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
get set to a valid address until the domain_add_dev_info call.
Is it as simple as the following?
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 29d3940847d3..f1bbeed46a4c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
{
struct device_domain_info *info = dev->archdata.iommu;
- return info && info->auxd_enabled &&
- domain->type == IOMMU_DOMAIN_UNMANAGED;
+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
}
static void auxiliary_link_device(struct dmar_domain *domain,
Regards,
Jerry
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 10:42 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 10:42 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-ke
On Fri May 29 20, Jerry Snitselaar wrote:
>On Tue Apr 14 20, Joerg Roedel wrote:
>>Hi,
>>
>>here is the second version of this patch-set. The first version with
>>some more introductory text can be found here:
>>
>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>
>>Changes v1->v2:
>>
>> * Rebased to v5.7-rc1
>>
>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>
>> * Re-worked the Exynos patches to hopefully not break the
>> driver anymore
>>
>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>> thanks for that.
>>
>>There is also a git-branch available with these patches applied:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>
>>Please review.
>>
>>Thanks,
>>
>> Joerg
>>
>>Joerg Roedel (32):
>> iommu: Move default domain allocation to separate function
>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>> iommu/amd: Remove dma_mask check from check_device()
>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>> IOMMU
>> iommu: Add probe_device() and remove_device() call-backs
>> iommu: Move default domain allocation to iommu_probe_device()
>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>> iommu: Move new probe_device path to separate function
>> iommu: Split off default domain allocation from group assignment
>> iommu: Move iommu_group_create_direct_mappings() out of
>> iommu_group_add_device()
>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>> iommu/amd: Remove dev_data->passthrough
>> iommu/amd: Convert to probe/release_device() call-backs
>> iommu/vt-d: Convert to probe/release_device() call-backs
>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>> iommu/pamu: Convert to probe/release_device() call-backs
>> iommu/s390: Convert to probe/release_device() call-backs
>> iommu/virtio: Convert to probe/release_device() call-backs
>> iommu/msm: Convert to probe/release_device() call-backs
>> iommu/mediatek: Convert to probe/release_device() call-backs
>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>> iommu/qcom: Convert to probe/release_device() call-backs
>> iommu/rockchip: Convert to probe/release_device() call-backs
>> iommu/tegra: Convert to probe/release_device() call-backs
>> iommu/renesas: Convert to probe/release_device() call-backs
>> iommu/omap: Remove orphan_dev tracking
>> iommu/omap: Convert to probe/release_device() call-backs
>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>> iommu/exynos: Convert to probe/release_device() call-backs
>> iommu: Remove add_device()/remove_device() code-paths
>> iommu: Unexport iommu_group_get_for_dev()
>>
>>Sai Praneeth Prakhya (1):
>> iommu: Add def_domain_type() callback in iommu_ops
>>
>>drivers/iommu/amd_iommu.c | 97 ++++----
>>drivers/iommu/amd_iommu_types.h | 1 -
>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>drivers/iommu/arm-smmu.c | 39 ++--
>>drivers/iommu/exynos-iommu.c | 24 +-
>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>drivers/iommu/intel-iommu.c | 68 +-----
>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>drivers/iommu/msm_iommu.c | 34 +--
>>drivers/iommu/mtk_iommu.c | 24 +-
>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>drivers/iommu/omap-iommu.c | 99 ++------
>>drivers/iommu/qcom_iommu.c | 24 +-
>>drivers/iommu/rockchip-iommu.c | 26 +--
>>drivers/iommu/s390-iommu.c | 22 +-
>>drivers/iommu/tegra-gart.c | 24 +-
>>drivers/iommu/tegra-smmu.c | 31 +--
>>drivers/iommu/virtio-iommu.c | 41 +---
>>include/linux/iommu.h | 21 +-
>>20 files changed, 533 insertions(+), 605 deletions(-)
>>
>>--
>>2.17.1
>>
>>_______________________________________________
>>iommu mailing list
>>iommu@lists.linux-foundation.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
>
>Hi Joerg,
>
>With this patchset, I have an epyc system where if I boot with
>iommu=nopt and force a dump I will see some io page faults for a nic
>on the system. The vmcore is harvested and the system reboots. I
>haven't reproduced it on other systems yet, but without the patchset I
>don't see the io page faults during the kdump.
>
>Regards,
>Jerry
I just hit an issue on a separate intel based system (kdump iommu=nopt),
where it panics in during intel_iommu_attach_device, in is_aux_domain,
due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
get set to a valid address until the domain_add_dev_info call.
Is it as simple as the following?
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 29d3940847d3..f1bbeed46a4c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
{
struct device_domain_info *info = dev->archdata.iommu;
- return info && info->auxd_enabled &&
- domain->type == IOMMU_DOMAIN_UNMANAGED;
+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
}
static void auxiliary_link_device(struct dmar_domain *domain,
Regards,
Jerry
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 10:42 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 10:42 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
On Fri May 29 20, Jerry Snitselaar wrote:
>On Tue Apr 14 20, Joerg Roedel wrote:
>>Hi,
>>
>>here is the second version of this patch-set. The first version with
>>some more introductory text can be found here:
>>
>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>
>>Changes v1->v2:
>>
>> * Rebased to v5.7-rc1
>>
>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>
>> * Re-worked the Exynos patches to hopefully not break the
>> driver anymore
>>
>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>> thanks for that.
>>
>>There is also a git-branch available with these patches applied:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>
>>Please review.
>>
>>Thanks,
>>
>> Joerg
>>
>>Joerg Roedel (32):
>> iommu: Move default domain allocation to separate function
>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>> iommu/amd: Remove dma_mask check from check_device()
>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>> IOMMU
>> iommu: Add probe_device() and remove_device() call-backs
>> iommu: Move default domain allocation to iommu_probe_device()
>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>> iommu: Move new probe_device path to separate function
>> iommu: Split off default domain allocation from group assignment
>> iommu: Move iommu_group_create_direct_mappings() out of
>> iommu_group_add_device()
>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>> iommu/amd: Remove dev_data->passthrough
>> iommu/amd: Convert to probe/release_device() call-backs
>> iommu/vt-d: Convert to probe/release_device() call-backs
>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>> iommu/pamu: Convert to probe/release_device() call-backs
>> iommu/s390: Convert to probe/release_device() call-backs
>> iommu/virtio: Convert to probe/release_device() call-backs
>> iommu/msm: Convert to probe/release_device() call-backs
>> iommu/mediatek: Convert to probe/release_device() call-backs
>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>> iommu/qcom: Convert to probe/release_device() call-backs
>> iommu/rockchip: Convert to probe/release_device() call-backs
>> iommu/tegra: Convert to probe/release_device() call-backs
>> iommu/renesas: Convert to probe/release_device() call-backs
>> iommu/omap: Remove orphan_dev tracking
>> iommu/omap: Convert to probe/release_device() call-backs
>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>> iommu/exynos: Convert to probe/release_device() call-backs
>> iommu: Remove add_device()/remove_device() code-paths
>> iommu: Unexport iommu_group_get_for_dev()
>>
>>Sai Praneeth Prakhya (1):
>> iommu: Add def_domain_type() callback in iommu_ops
>>
>>drivers/iommu/amd_iommu.c | 97 ++++----
>>drivers/iommu/amd_iommu_types.h | 1 -
>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>drivers/iommu/arm-smmu.c | 39 ++--
>>drivers/iommu/exynos-iommu.c | 24 +-
>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>drivers/iommu/intel-iommu.c | 68 +-----
>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>drivers/iommu/msm_iommu.c | 34 +--
>>drivers/iommu/mtk_iommu.c | 24 +-
>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>drivers/iommu/omap-iommu.c | 99 ++------
>>drivers/iommu/qcom_iommu.c | 24 +-
>>drivers/iommu/rockchip-iommu.c | 26 +--
>>drivers/iommu/s390-iommu.c | 22 +-
>>drivers/iommu/tegra-gart.c | 24 +-
>>drivers/iommu/tegra-smmu.c | 31 +--
>>drivers/iommu/virtio-iommu.c | 41 +---
>>include/linux/iommu.h | 21 +-
>>20 files changed, 533 insertions(+), 605 deletions(-)
>>
>>--
>>2.17.1
>>
>>_______________________________________________
>>iommu mailing list
>>iommu@lists.linux-foundation.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
>
>Hi Joerg,
>
>With this patchset, I have an epyc system where if I boot with
>iommu=nopt and force a dump I will see some io page faults for a nic
>on the system. The vmcore is harvested and the system reboots. I
>haven't reproduced it on other systems yet, but without the patchset I
>don't see the io page faults during the kdump.
>
>Regards,
>Jerry
I just hit an issue on a separate intel based system (kdump iommu=nopt),
where it panics in during intel_iommu_attach_device, in is_aux_domain,
due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
get set to a valid address until the domain_add_dev_info call.
Is it as simple as the following?
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 29d3940847d3..f1bbeed46a4c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
{
struct device_domain_info *info = dev->archdata.iommu;
- return info && info->auxd_enabled &&
- domain->type == IOMMU_DOMAIN_UNMANAGED;
+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
}
static void auxiliary_link_device(struct dmar_domain *domain,
Regards,
Jerry
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 10:42 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 10:42 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
On Fri May 29 20, Jerry Snitselaar wrote:
>On Tue Apr 14 20, Joerg Roedel wrote:
>>Hi,
>>
>>here is the second version of this patch-set. The first version with
>>some more introductory text can be found here:
>>
>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>
>>Changes v1->v2:
>>
>> * Rebased to v5.7-rc1
>>
>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>
>> * Re-worked the Exynos patches to hopefully not break the
>> driver anymore
>>
>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>> thanks for that.
>>
>>There is also a git-branch available with these patches applied:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>
>>Please review.
>>
>>Thanks,
>>
>> Joerg
>>
>>Joerg Roedel (32):
>> iommu: Move default domain allocation to separate function
>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>> iommu/amd: Remove dma_mask check from check_device()
>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>> IOMMU
>> iommu: Add probe_device() and remove_device() call-backs
>> iommu: Move default domain allocation to iommu_probe_device()
>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>> iommu: Move new probe_device path to separate function
>> iommu: Split off default domain allocation from group assignment
>> iommu: Move iommu_group_create_direct_mappings() out of
>> iommu_group_add_device()
>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>> iommu/amd: Remove dev_data->passthrough
>> iommu/amd: Convert to probe/release_device() call-backs
>> iommu/vt-d: Convert to probe/release_device() call-backs
>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>> iommu/pamu: Convert to probe/release_device() call-backs
>> iommu/s390: Convert to probe/release_device() call-backs
>> iommu/virtio: Convert to probe/release_device() call-backs
>> iommu/msm: Convert to probe/release_device() call-backs
>> iommu/mediatek: Convert to probe/release_device() call-backs
>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>> iommu/qcom: Convert to probe/release_device() call-backs
>> iommu/rockchip: Convert to probe/release_device() call-backs
>> iommu/tegra: Convert to probe/release_device() call-backs
>> iommu/renesas: Convert to probe/release_device() call-backs
>> iommu/omap: Remove orphan_dev tracking
>> iommu/omap: Convert to probe/release_device() call-backs
>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>> iommu/exynos: Convert to probe/release_device() call-backs
>> iommu: Remove add_device()/remove_device() code-paths
>> iommu: Unexport iommu_group_get_for_dev()
>>
>>Sai Praneeth Prakhya (1):
>> iommu: Add def_domain_type() callback in iommu_ops
>>
>>drivers/iommu/amd_iommu.c | 97 ++++----
>>drivers/iommu/amd_iommu_types.h | 1 -
>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>drivers/iommu/arm-smmu.c | 39 ++--
>>drivers/iommu/exynos-iommu.c | 24 +-
>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>drivers/iommu/intel-iommu.c | 68 +-----
>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>drivers/iommu/msm_iommu.c | 34 +--
>>drivers/iommu/mtk_iommu.c | 24 +-
>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>drivers/iommu/omap-iommu.c | 99 ++------
>>drivers/iommu/qcom_iommu.c | 24 +-
>>drivers/iommu/rockchip-iommu.c | 26 +--
>>drivers/iommu/s390-iommu.c | 22 +-
>>drivers/iommu/tegra-gart.c | 24 +-
>>drivers/iommu/tegra-smmu.c | 31 +--
>>drivers/iommu/virtio-iommu.c | 41 +---
>>include/linux/iommu.h | 21 +-
>>20 files changed, 533 insertions(+), 605 deletions(-)
>>
>>--
>>2.17.1
>>
>>_______________________________________________
>>iommu mailing list
>>iommu@lists.linux-foundation.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
>
>Hi Joerg,
>
>With this patchset, I have an epyc system where if I boot with
>iommu=nopt and force a dump I will see some io page faults for a nic
>on the system. The vmcore is harvested and the system reboots. I
>haven't reproduced it on other systems yet, but without the patchset I
>don't see the io page faults during the kdump.
>
>Regards,
>Jerry
I just hit an issue on a separate intel based system (kdump iommu=nopt),
where it panics in during intel_iommu_attach_device, in is_aux_domain,
due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
get set to a valid address until the domain_add_dev_info call.
Is it as simple as the following?
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 29d3940847d3..f1bbeed46a4c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
{
struct device_domain_info *info = dev->archdata.iommu;
- return info && info->auxd_enabled &&
- domain->type == IOMMU_DOMAIN_UNMANAGED;
+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
}
static void auxiliary_link_device(struct dmar_domain *domain,
Regards,
Jerry
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-01 10:42 ` Jerry Snitselaar
` (2 preceding siblings ...)
(?)
@ 2020-06-01 13:17 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 13:17 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9IKTv4iemRRA
On Mon Jun 01 20, Jerry Snitselaar wrote:
>On Fri May 29 20, Jerry Snitselaar wrote:
>>On Tue Apr 14 20, Joerg Roedel wrote:
>>>Hi,
>>>
>>>here is the second version of this patch-set. The first version with
>>>some more introductory text can be found here:
>>>
>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>>>
>>>Changes v1->v2:
>>>
>>> * Rebased to v5.7-rc1
>>>
>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>
>>> * Re-worked the Exynos patches to hopefully not break the
>>> driver anymore
>>>
>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>> thanks for that.
>>>
>>>There is also a git-branch available with these patches applied:
>>>
>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>
>>>Please review.
>>>
>>>Thanks,
>>>
>>> Joerg
>>>
>>>Joerg Roedel (32):
>>>iommu: Move default domain allocation to separate function
>>>iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>iommu/amd: Remove dma_mask check from check_device()
>>>iommu/amd: Return -ENODEV in add_device when device is not handled by
>>> IOMMU
>>>iommu: Add probe_device() and remove_device() call-backs
>>>iommu: Move default domain allocation to iommu_probe_device()
>>>iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>iommu: Move new probe_device path to separate function
>>>iommu: Split off default domain allocation from group assignment
>>>iommu: Move iommu_group_create_direct_mappings() out of
>>> iommu_group_add_device()
>>>iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>iommu/amd: Remove dev_data->passthrough
>>>iommu/amd: Convert to probe/release_device() call-backs
>>>iommu/vt-d: Convert to probe/release_device() call-backs
>>>iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>iommu/pamu: Convert to probe/release_device() call-backs
>>>iommu/s390: Convert to probe/release_device() call-backs
>>>iommu/virtio: Convert to probe/release_device() call-backs
>>>iommu/msm: Convert to probe/release_device() call-backs
>>>iommu/mediatek: Convert to probe/release_device() call-backs
>>>iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>iommu/qcom: Convert to probe/release_device() call-backs
>>>iommu/rockchip: Convert to probe/release_device() call-backs
>>>iommu/tegra: Convert to probe/release_device() call-backs
>>>iommu/renesas: Convert to probe/release_device() call-backs
>>>iommu/omap: Remove orphan_dev tracking
>>>iommu/omap: Convert to probe/release_device() call-backs
>>>iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>iommu/exynos: Convert to probe/release_device() call-backs
>>>iommu: Remove add_device()/remove_device() code-paths
>>>iommu: Unexport iommu_group_get_for_dev()
>>>
>>>Sai Praneeth Prakhya (1):
>>>iommu: Add def_domain_type() callback in iommu_ops
>>>
>>>drivers/iommu/amd_iommu.c | 97 ++++----
>>>drivers/iommu/amd_iommu_types.h | 1 -
>>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>>drivers/iommu/arm-smmu.c | 39 ++--
>>>drivers/iommu/exynos-iommu.c | 24 +-
>>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>drivers/iommu/intel-iommu.c | 68 +-----
>>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>drivers/iommu/msm_iommu.c | 34 +--
>>>drivers/iommu/mtk_iommu.c | 24 +-
>>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>drivers/iommu/omap-iommu.c | 99 ++------
>>>drivers/iommu/qcom_iommu.c | 24 +-
>>>drivers/iommu/rockchip-iommu.c | 26 +--
>>>drivers/iommu/s390-iommu.c | 22 +-
>>>drivers/iommu/tegra-gart.c | 24 +-
>>>drivers/iommu/tegra-smmu.c | 31 +--
>>>drivers/iommu/virtio-iommu.c | 41 +---
>>>include/linux/iommu.h | 21 +-
>>>20 files changed, 533 insertions(+), 605 deletions(-)
>>>
>>>--
>>>2.17.1
>>>
>>>_______________________________________________
>>>iommu mailing list
>>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>
>>
>>Hi Joerg,
>>
>>With this patchset, I have an epyc system where if I boot with
>>iommu=nopt and force a dump I will see some io page faults for a nic
>>on the system. The vmcore is harvested and the system reboots. I
>>haven't reproduced it on other systems yet, but without the patchset I
>>don't see the io page faults during the kdump.
>>
>>Regards,
>>Jerry
>
>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>get set to a valid address until the domain_add_dev_info call.
>
>Is it as simple as the following?
>
>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>index 29d3940847d3..f1bbeed46a4c 100644
>--- a/drivers/iommu/intel-iommu.c
>+++ b/drivers/iommu/intel-iommu.c
>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>- return info && info->auxd_enabled &&
>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
> }
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
>Regards,
>Jerry
>
With the patch, I avoid the panic, but I'm seeing an issue similar to the epyc system.
I'm getting dmar faults from a couple of nics and the hp ilo. The addresses in question
were in e820 reserved sections, but there aren't rmrr covering those addresses. The system
manages to harvest the vmcore and reboot like the epyc. Without the patches I don't see
the dmar faults. I needed to give this system back, but I'll try to poke at it some more
in the next couple of days.
Regards,
Jerry
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-01 10:42 ` Jerry Snitselaar
` (3 preceding siblings ...)
(?)
@ 2020-06-01 13:17 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 13:17 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9IKTv4iemRRA
On Mon Jun 01 20, Jerry Snitselaar wrote:
>On Fri May 29 20, Jerry Snitselaar wrote:
>>On Tue Apr 14 20, Joerg Roedel wrote:
>>>Hi,
>>>
>>>here is the second version of this patch-set. The first version with
>>>some more introductory text can be found here:
>>>
>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>>>
>>>Changes v1->v2:
>>>
>>> * Rebased to v5.7-rc1
>>>
>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>
>>> * Re-worked the Exynos patches to hopefully not break the
>>> driver anymore
>>>
>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>> thanks for that.
>>>
>>>There is also a git-branch available with these patches applied:
>>>
>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>
>>>Please review.
>>>
>>>Thanks,
>>>
>>> Joerg
>>>
>>>Joerg Roedel (32):
>>>iommu: Move default domain allocation to separate function
>>>iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>iommu/amd: Remove dma_mask check from check_device()
>>>iommu/amd: Return -ENODEV in add_device when device is not handled by
>>> IOMMU
>>>iommu: Add probe_device() and remove_device() call-backs
>>>iommu: Move default domain allocation to iommu_probe_device()
>>>iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>iommu: Move new probe_device path to separate function
>>>iommu: Split off default domain allocation from group assignment
>>>iommu: Move iommu_group_create_direct_mappings() out of
>>> iommu_group_add_device()
>>>iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>iommu/amd: Remove dev_data->passthrough
>>>iommu/amd: Convert to probe/release_device() call-backs
>>>iommu/vt-d: Convert to probe/release_device() call-backs
>>>iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>iommu/pamu: Convert to probe/release_device() call-backs
>>>iommu/s390: Convert to probe/release_device() call-backs
>>>iommu/virtio: Convert to probe/release_device() call-backs
>>>iommu/msm: Convert to probe/release_device() call-backs
>>>iommu/mediatek: Convert to probe/release_device() call-backs
>>>iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>iommu/qcom: Convert to probe/release_device() call-backs
>>>iommu/rockchip: Convert to probe/release_device() call-backs
>>>iommu/tegra: Convert to probe/release_device() call-backs
>>>iommu/renesas: Convert to probe/release_device() call-backs
>>>iommu/omap: Remove orphan_dev tracking
>>>iommu/omap: Convert to probe/release_device() call-backs
>>>iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>iommu/exynos: Convert to probe/release_device() call-backs
>>>iommu: Remove add_device()/remove_device() code-paths
>>>iommu: Unexport iommu_group_get_for_dev()
>>>
>>>Sai Praneeth Prakhya (1):
>>>iommu: Add def_domain_type() callback in iommu_ops
>>>
>>>drivers/iommu/amd_iommu.c | 97 ++++----
>>>drivers/iommu/amd_iommu_types.h | 1 -
>>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>>drivers/iommu/arm-smmu.c | 39 ++--
>>>drivers/iommu/exynos-iommu.c | 24 +-
>>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>drivers/iommu/intel-iommu.c | 68 +-----
>>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>drivers/iommu/msm_iommu.c | 34 +--
>>>drivers/iommu/mtk_iommu.c | 24 +-
>>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>drivers/iommu/omap-iommu.c | 99 ++------
>>>drivers/iommu/qcom_iommu.c | 24 +-
>>>drivers/iommu/rockchip-iommu.c | 26 +--
>>>drivers/iommu/s390-iommu.c | 22 +-
>>>drivers/iommu/tegra-gart.c | 24 +-
>>>drivers/iommu/tegra-smmu.c | 31 +--
>>>drivers/iommu/virtio-iommu.c | 41 +---
>>>include/linux/iommu.h | 21 +-
>>>20 files changed, 533 insertions(+), 605 deletions(-)
>>>
>>>--
>>>2.17.1
>>>
>>>_______________________________________________
>>>iommu mailing list
>>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>
>>
>>Hi Joerg,
>>
>>With this patchset, I have an epyc system where if I boot with
>>iommu=nopt and force a dump I will see some io page faults for a nic
>>on the system. The vmcore is harvested and the system reboots. I
>>haven't reproduced it on other systems yet, but without the patchset I
>>don't see the io page faults during the kdump.
>>
>>Regards,
>>Jerry
>
>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>get set to a valid address until the domain_add_dev_info call.
>
>Is it as simple as the following?
>
>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>index 29d3940847d3..f1bbeed46a4c 100644
>--- a/drivers/iommu/intel-iommu.c
>+++ b/drivers/iommu/intel-iommu.c
>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>- return info && info->auxd_enabled &&
>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
> }
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
>Regards,
>Jerry
>
With the patch, I avoid the panic, but I'm seeing an issue similar to the epyc system.
I'm getting dmar faults from a couple of nics and the hp ilo. The addresses in question
were in e820 reserved sections, but there aren't rmrr covering those addresses. The system
manages to harvest the vmcore and reboot like the epyc. Without the patches I don't see
the dmar faults. I needed to give this system back, but I'll try to poke at it some more
in the next couple of days.
Regards,
Jerry
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-01 10:42 ` Jerry Snitselaar
` (4 preceding siblings ...)
(?)
@ 2020-06-01 13:17 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 13:17 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9IKTv4iemRRA
On Mon Jun 01 20, Jerry Snitselaar wrote:
>On Fri May 29 20, Jerry Snitselaar wrote:
>>On Tue Apr 14 20, Joerg Roedel wrote:
>>>Hi,
>>>
>>>here is the second version of this patch-set. The first version with
>>>some more introductory text can be found here:
>>>
>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>>>
>>>Changes v1->v2:
>>>
>>> * Rebased to v5.7-rc1
>>>
>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>
>>> * Re-worked the Exynos patches to hopefully not break the
>>> driver anymore
>>>
>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>> thanks for that.
>>>
>>>There is also a git-branch available with these patches applied:
>>>
>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>
>>>Please review.
>>>
>>>Thanks,
>>>
>>> Joerg
>>>
>>>Joerg Roedel (32):
>>>iommu: Move default domain allocation to separate function
>>>iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>iommu/amd: Remove dma_mask check from check_device()
>>>iommu/amd: Return -ENODEV in add_device when device is not handled by
>>> IOMMU
>>>iommu: Add probe_device() and remove_device() call-backs
>>>iommu: Move default domain allocation to iommu_probe_device()
>>>iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>iommu: Move new probe_device path to separate function
>>>iommu: Split off default domain allocation from group assignment
>>>iommu: Move iommu_group_create_direct_mappings() out of
>>> iommu_group_add_device()
>>>iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>iommu/amd: Remove dev_data->passthrough
>>>iommu/amd: Convert to probe/release_device() call-backs
>>>iommu/vt-d: Convert to probe/release_device() call-backs
>>>iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>iommu/pamu: Convert to probe/release_device() call-backs
>>>iommu/s390: Convert to probe/release_device() call-backs
>>>iommu/virtio: Convert to probe/release_device() call-backs
>>>iommu/msm: Convert to probe/release_device() call-backs
>>>iommu/mediatek: Convert to probe/release_device() call-backs
>>>iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>iommu/qcom: Convert to probe/release_device() call-backs
>>>iommu/rockchip: Convert to probe/release_device() call-backs
>>>iommu/tegra: Convert to probe/release_device() call-backs
>>>iommu/renesas: Convert to probe/release_device() call-backs
>>>iommu/omap: Remove orphan_dev tracking
>>>iommu/omap: Convert to probe/release_device() call-backs
>>>iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>iommu/exynos: Convert to probe/release_device() call-backs
>>>iommu: Remove add_device()/remove_device() code-paths
>>>iommu: Unexport iommu_group_get_for_dev()
>>>
>>>Sai Praneeth Prakhya (1):
>>>iommu: Add def_domain_type() callback in iommu_ops
>>>
>>>drivers/iommu/amd_iommu.c | 97 ++++----
>>>drivers/iommu/amd_iommu_types.h | 1 -
>>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>>drivers/iommu/arm-smmu.c | 39 ++--
>>>drivers/iommu/exynos-iommu.c | 24 +-
>>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>drivers/iommu/intel-iommu.c | 68 +-----
>>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>drivers/iommu/msm_iommu.c | 34 +--
>>>drivers/iommu/mtk_iommu.c | 24 +-
>>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>drivers/iommu/omap-iommu.c | 99 ++------
>>>drivers/iommu/qcom_iommu.c | 24 +-
>>>drivers/iommu/rockchip-iommu.c | 26 +--
>>>drivers/iommu/s390-iommu.c | 22 +-
>>>drivers/iommu/tegra-gart.c | 24 +-
>>>drivers/iommu/tegra-smmu.c | 31 +--
>>>drivers/iommu/virtio-iommu.c | 41 +---
>>>include/linux/iommu.h | 21 +-
>>>20 files changed, 533 insertions(+), 605 deletions(-)
>>>
>>>--
>>>2.17.1
>>>
>>>_______________________________________________
>>>iommu mailing list
>>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>
>>
>>Hi Joerg,
>>
>>With this patchset, I have an epyc system where if I boot with
>>iommu=nopt and force a dump I will see some io page faults for a nic
>>on the system. The vmcore is harvested and the system reboots. I
>>haven't reproduced it on other systems yet, but without the patchset I
>>don't see the io page faults during the kdump.
>>
>>Regards,
>>Jerry
>
>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>get set to a valid address until the domain_add_dev_info call.
>
>Is it as simple as the following?
>
>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>index 29d3940847d3..f1bbeed46a4c 100644
>--- a/drivers/iommu/intel-iommu.c
>+++ b/drivers/iommu/intel-iommu.c
>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>- return info && info->auxd_enabled &&
>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
> }
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
>Regards,
>Jerry
>
With the patch, I avoid the panic, but I'm seeing an issue similar to the epyc system.
I'm getting dmar faults from a couple of nics and the hp ilo. The addresses in question
were in e820 reserved sections, but there aren't rmrr covering those addresses. The system
manages to harvest the vmcore and reboot like the epyc. Without the patches I don't see
the dmar faults. I needed to give this system back, but I'll try to poke at it some more
in the next couple of days.
Regards,
Jerry
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-01 10:42 ` Jerry Snitselaar
(?)
(?)
@ 2020-06-01 13:17 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 13:17 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, linux-ke
On Mon Jun 01 20, Jerry Snitselaar wrote:
>On Fri May 29 20, Jerry Snitselaar wrote:
>>On Tue Apr 14 20, Joerg Roedel wrote:
>>>Hi,
>>>
>>>here is the second version of this patch-set. The first version with
>>>some more introductory text can be found here:
>>>
>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>>>
>>>Changes v1->v2:
>>>
>>> * Rebased to v5.7-rc1
>>>
>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>
>>> * Re-worked the Exynos patches to hopefully not break the
>>> driver anymore
>>>
>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>> thanks for that.
>>>
>>>There is also a git-branch available with these patches applied:
>>>
>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>
>>>Please review.
>>>
>>>Thanks,
>>>
>>> Joerg
>>>
>>>Joerg Roedel (32):
>>>iommu: Move default domain allocation to separate function
>>>iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>iommu/amd: Remove dma_mask check from check_device()
>>>iommu/amd: Return -ENODEV in add_device when device is not handled by
>>> IOMMU
>>>iommu: Add probe_device() and remove_device() call-backs
>>>iommu: Move default domain allocation to iommu_probe_device()
>>>iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>iommu: Move new probe_device path to separate function
>>>iommu: Split off default domain allocation from group assignment
>>>iommu: Move iommu_group_create_direct_mappings() out of
>>> iommu_group_add_device()
>>>iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>iommu/amd: Remove dev_data->passthrough
>>>iommu/amd: Convert to probe/release_device() call-backs
>>>iommu/vt-d: Convert to probe/release_device() call-backs
>>>iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>iommu/pamu: Convert to probe/release_device() call-backs
>>>iommu/s390: Convert to probe/release_device() call-backs
>>>iommu/virtio: Convert to probe/release_device() call-backs
>>>iommu/msm: Convert to probe/release_device() call-backs
>>>iommu/mediatek: Convert to probe/release_device() call-backs
>>>iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>iommu/qcom: Convert to probe/release_device() call-backs
>>>iommu/rockchip: Convert to probe/release_device() call-backs
>>>iommu/tegra: Convert to probe/release_device() call-backs
>>>iommu/renesas: Convert to probe/release_device() call-backs
>>>iommu/omap: Remove orphan_dev tracking
>>>iommu/omap: Convert to probe/release_device() call-backs
>>>iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>iommu/exynos: Convert to probe/release_device() call-backs
>>>iommu: Remove add_device()/remove_device() code-paths
>>>iommu: Unexport iommu_group_get_for_dev()
>>>
>>>Sai Praneeth Prakhya (1):
>>>iommu: Add def_domain_type() callback in iommu_ops
>>>
>>>drivers/iommu/amd_iommu.c | 97 ++++----
>>>drivers/iommu/amd_iommu_types.h | 1 -
>>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>>drivers/iommu/arm-smmu.c | 39 ++--
>>>drivers/iommu/exynos-iommu.c | 24 +-
>>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>drivers/iommu/intel-iommu.c | 68 +-----
>>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>drivers/iommu/msm_iommu.c | 34 +--
>>>drivers/iommu/mtk_iommu.c | 24 +-
>>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>drivers/iommu/omap-iommu.c | 99 ++------
>>>drivers/iommu/qcom_iommu.c | 24 +-
>>>drivers/iommu/rockchip-iommu.c | 26 +--
>>>drivers/iommu/s390-iommu.c | 22 +-
>>>drivers/iommu/tegra-gart.c | 24 +-
>>>drivers/iommu/tegra-smmu.c | 31 +--
>>>drivers/iommu/virtio-iommu.c | 41 +---
>>>include/linux/iommu.h | 21 +-
>>>20 files changed, 533 insertions(+), 605 deletions(-)
>>>
>>>--
>>>2.17.1
>>>
>>>_______________________________________________
>>>iommu mailing list
>>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>
>>
>>Hi Joerg,
>>
>>With this patchset, I have an epyc system where if I boot with
>>iommu=nopt and force a dump I will see some io page faults for a nic
>>on the system. The vmcore is harvested and the system reboots. I
>>haven't reproduced it on other systems yet, but without the patchset I
>>don't see the io page faults during the kdump.
>>
>>Regards,
>>Jerry
>
>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>get set to a valid address until the domain_add_dev_info call.
>
>Is it as simple as the following?
>
>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>index 29d3940847d3..f1bbeed46a4c 100644
>--- a/drivers/iommu/intel-iommu.c
>+++ b/drivers/iommu/intel-iommu.c
>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>- return info && info->auxd_enabled &&
>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
> }
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
>Regards,
>Jerry
>
With the patch, I avoid the panic, but I'm seeing an issue similar to the epyc system.
I'm getting dmar faults from a couple of nics and the hp ilo. The addresses in question
were in e820 reserved sections, but there aren't rmrr covering those addresses. The system
manages to harvest the vmcore and reboot like the epyc. Without the patches I don't see
the dmar faults. I needed to give this system back, but I'll try to poke at it some more
in the next couple of days.
Regards,
Jerry
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 13:17 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 13:17 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
On Mon Jun 01 20, Jerry Snitselaar wrote:
>On Fri May 29 20, Jerry Snitselaar wrote:
>>On Tue Apr 14 20, Joerg Roedel wrote:
>>>Hi,
>>>
>>>here is the second version of this patch-set. The first version with
>>>some more introductory text can be found here:
>>>
>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>>
>>>Changes v1->v2:
>>>
>>> * Rebased to v5.7-rc1
>>>
>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>
>>> * Re-worked the Exynos patches to hopefully not break the
>>> driver anymore
>>>
>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>> thanks for that.
>>>
>>>There is also a git-branch available with these patches applied:
>>>
>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>
>>>Please review.
>>>
>>>Thanks,
>>>
>>> Joerg
>>>
>>>Joerg Roedel (32):
>>>iommu: Move default domain allocation to separate function
>>>iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>iommu/amd: Remove dma_mask check from check_device()
>>>iommu/amd: Return -ENODEV in add_device when device is not handled by
>>> IOMMU
>>>iommu: Add probe_device() and remove_device() call-backs
>>>iommu: Move default domain allocation to iommu_probe_device()
>>>iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>iommu: Move new probe_device path to separate function
>>>iommu: Split off default domain allocation from group assignment
>>>iommu: Move iommu_group_create_direct_mappings() out of
>>> iommu_group_add_device()
>>>iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>iommu/amd: Remove dev_data->passthrough
>>>iommu/amd: Convert to probe/release_device() call-backs
>>>iommu/vt-d: Convert to probe/release_device() call-backs
>>>iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>iommu/pamu: Convert to probe/release_device() call-backs
>>>iommu/s390: Convert to probe/release_device() call-backs
>>>iommu/virtio: Convert to probe/release_device() call-backs
>>>iommu/msm: Convert to probe/release_device() call-backs
>>>iommu/mediatek: Convert to probe/release_device() call-backs
>>>iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>iommu/qcom: Convert to probe/release_device() call-backs
>>>iommu/rockchip: Convert to probe/release_device() call-backs
>>>iommu/tegra: Convert to probe/release_device() call-backs
>>>iommu/renesas: Convert to probe/release_device() call-backs
>>>iommu/omap: Remove orphan_dev tracking
>>>iommu/omap: Convert to probe/release_device() call-backs
>>>iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>iommu/exynos: Convert to probe/release_device() call-backs
>>>iommu: Remove add_device()/remove_device() code-paths
>>>iommu: Unexport iommu_group_get_for_dev()
>>>
>>>Sai Praneeth Prakhya (1):
>>>iommu: Add def_domain_type() callback in iommu_ops
>>>
>>>drivers/iommu/amd_iommu.c | 97 ++++----
>>>drivers/iommu/amd_iommu_types.h | 1 -
>>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>>drivers/iommu/arm-smmu.c | 39 ++--
>>>drivers/iommu/exynos-iommu.c | 24 +-
>>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>drivers/iommu/intel-iommu.c | 68 +-----
>>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>drivers/iommu/msm_iommu.c | 34 +--
>>>drivers/iommu/mtk_iommu.c | 24 +-
>>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>drivers/iommu/omap-iommu.c | 99 ++------
>>>drivers/iommu/qcom_iommu.c | 24 +-
>>>drivers/iommu/rockchip-iommu.c | 26 +--
>>>drivers/iommu/s390-iommu.c | 22 +-
>>>drivers/iommu/tegra-gart.c | 24 +-
>>>drivers/iommu/tegra-smmu.c | 31 +--
>>>drivers/iommu/virtio-iommu.c | 41 +---
>>>include/linux/iommu.h | 21 +-
>>>20 files changed, 533 insertions(+), 605 deletions(-)
>>>
>>>--
>>>2.17.1
>>>
>>>_______________________________________________
>>>iommu mailing list
>>>iommu@lists.linux-foundation.org
>>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>
>>
>>Hi Joerg,
>>
>>With this patchset, I have an epyc system where if I boot with
>>iommu=nopt and force a dump I will see some io page faults for a nic
>>on the system. The vmcore is harvested and the system reboots. I
>>haven't reproduced it on other systems yet, but without the patchset I
>>don't see the io page faults during the kdump.
>>
>>Regards,
>>Jerry
>
>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>get set to a valid address until the domain_add_dev_info call.
>
>Is it as simple as the following?
>
>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>index 29d3940847d3..f1bbeed46a4c 100644
>--- a/drivers/iommu/intel-iommu.c
>+++ b/drivers/iommu/intel-iommu.c
>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>- return info && info->auxd_enabled &&
>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
> }
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
>Regards,
>Jerry
>
With the patch, I avoid the panic, but I'm seeing an issue similar to the epyc system.
I'm getting dmar faults from a couple of nics and the hp ilo. The addresses in question
were in e820 reserved sections, but there aren't rmrr covering those addresses. The system
manages to harvest the vmcore and reboot like the epyc. Without the patches I don't see
the dmar faults. I needed to give this system back, but I'll try to poke at it some more
in the next couple of days.
Regards,
Jerry
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 13:17 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 13:17 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
On Mon Jun 01 20, Jerry Snitselaar wrote:
>On Fri May 29 20, Jerry Snitselaar wrote:
>>On Tue Apr 14 20, Joerg Roedel wrote:
>>>Hi,
>>>
>>>here is the second version of this patch-set. The first version with
>>>some more introductory text can be found here:
>>>
>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>>
>>>Changes v1->v2:
>>>
>>> * Rebased to v5.7-rc1
>>>
>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>
>>> * Re-worked the Exynos patches to hopefully not break the
>>> driver anymore
>>>
>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>> thanks for that.
>>>
>>>There is also a git-branch available with these patches applied:
>>>
>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>
>>>Please review.
>>>
>>>Thanks,
>>>
>>> Joerg
>>>
>>>Joerg Roedel (32):
>>>iommu: Move default domain allocation to separate function
>>>iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>iommu/amd: Remove dma_mask check from check_device()
>>>iommu/amd: Return -ENODEV in add_device when device is not handled by
>>> IOMMU
>>>iommu: Add probe_device() and remove_device() call-backs
>>>iommu: Move default domain allocation to iommu_probe_device()
>>>iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>iommu: Move new probe_device path to separate function
>>>iommu: Split off default domain allocation from group assignment
>>>iommu: Move iommu_group_create_direct_mappings() out of
>>> iommu_group_add_device()
>>>iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>iommu/amd: Remove dev_data->passthrough
>>>iommu/amd: Convert to probe/release_device() call-backs
>>>iommu/vt-d: Convert to probe/release_device() call-backs
>>>iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>iommu/pamu: Convert to probe/release_device() call-backs
>>>iommu/s390: Convert to probe/release_device() call-backs
>>>iommu/virtio: Convert to probe/release_device() call-backs
>>>iommu/msm: Convert to probe/release_device() call-backs
>>>iommu/mediatek: Convert to probe/release_device() call-backs
>>>iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>iommu/qcom: Convert to probe/release_device() call-backs
>>>iommu/rockchip: Convert to probe/release_device() call-backs
>>>iommu/tegra: Convert to probe/release_device() call-backs
>>>iommu/renesas: Convert to probe/release_device() call-backs
>>>iommu/omap: Remove orphan_dev tracking
>>>iommu/omap: Convert to probe/release_device() call-backs
>>>iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>iommu/exynos: Convert to probe/release_device() call-backs
>>>iommu: Remove add_device()/remove_device() code-paths
>>>iommu: Unexport iommu_group_get_for_dev()
>>>
>>>Sai Praneeth Prakhya (1):
>>>iommu: Add def_domain_type() callback in iommu_ops
>>>
>>>drivers/iommu/amd_iommu.c | 97 ++++----
>>>drivers/iommu/amd_iommu_types.h | 1 -
>>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>>drivers/iommu/arm-smmu.c | 39 ++--
>>>drivers/iommu/exynos-iommu.c | 24 +-
>>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>drivers/iommu/intel-iommu.c | 68 +-----
>>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>drivers/iommu/msm_iommu.c | 34 +--
>>>drivers/iommu/mtk_iommu.c | 24 +-
>>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>drivers/iommu/omap-iommu.c | 99 ++------
>>>drivers/iommu/qcom_iommu.c | 24 +-
>>>drivers/iommu/rockchip-iommu.c | 26 +--
>>>drivers/iommu/s390-iommu.c | 22 +-
>>>drivers/iommu/tegra-gart.c | 24 +-
>>>drivers/iommu/tegra-smmu.c | 31 +--
>>>drivers/iommu/virtio-iommu.c | 41 +---
>>>include/linux/iommu.h | 21 +-
>>>20 files changed, 533 insertions(+), 605 deletions(-)
>>>
>>>--
>>>2.17.1
>>>
>>>_______________________________________________
>>>iommu mailing list
>>>iommu@lists.linux-foundation.org
>>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>
>>
>>Hi Joerg,
>>
>>With this patchset, I have an epyc system where if I boot with
>>iommu=nopt and force a dump I will see some io page faults for a nic
>>on the system. The vmcore is harvested and the system reboots. I
>>haven't reproduced it on other systems yet, but without the patchset I
>>don't see the io page faults during the kdump.
>>
>>Regards,
>>Jerry
>
>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>get set to a valid address until the domain_add_dev_info call.
>
>Is it as simple as the following?
>
>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>index 29d3940847d3..f1bbeed46a4c 100644
>--- a/drivers/iommu/intel-iommu.c
>+++ b/drivers/iommu/intel-iommu.c
>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>- return info && info->auxd_enabled &&
>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
> }
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
>Regards,
>Jerry
>
With the patch, I avoid the panic, but I'm seeing an issue similar to the epyc system.
I'm getting dmar faults from a couple of nics and the hp ilo. The addresses in question
were in e820 reserved sections, but there aren't rmrr covering those addresses. The system
manages to harvest the vmcore and reboot like the epyc. Without the patches I don't see
the dmar faults. I needed to give this system back, but I'll try to poke at it some more
in the next couple of days.
Regards,
Jerry
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 13:17 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 13:17 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
On Mon Jun 01 20, Jerry Snitselaar wrote:
>On Fri May 29 20, Jerry Snitselaar wrote:
>>On Tue Apr 14 20, Joerg Roedel wrote:
>>>Hi,
>>>
>>>here is the second version of this patch-set. The first version with
>>>some more introductory text can be found here:
>>>
>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>>
>>>Changes v1->v2:
>>>
>>> * Rebased to v5.7-rc1
>>>
>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>
>>> * Re-worked the Exynos patches to hopefully not break the
>>> driver anymore
>>>
>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>> thanks for that.
>>>
>>>There is also a git-branch available with these patches applied:
>>>
>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>
>>>Please review.
>>>
>>>Thanks,
>>>
>>> Joerg
>>>
>>>Joerg Roedel (32):
>>>iommu: Move default domain allocation to separate function
>>>iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>iommu/amd: Remove dma_mask check from check_device()
>>>iommu/amd: Return -ENODEV in add_device when device is not handled by
>>> IOMMU
>>>iommu: Add probe_device() and remove_device() call-backs
>>>iommu: Move default domain allocation to iommu_probe_device()
>>>iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>iommu: Move new probe_device path to separate function
>>>iommu: Split off default domain allocation from group assignment
>>>iommu: Move iommu_group_create_direct_mappings() out of
>>> iommu_group_add_device()
>>>iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>iommu/amd: Remove dev_data->passthrough
>>>iommu/amd: Convert to probe/release_device() call-backs
>>>iommu/vt-d: Convert to probe/release_device() call-backs
>>>iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>iommu/pamu: Convert to probe/release_device() call-backs
>>>iommu/s390: Convert to probe/release_device() call-backs
>>>iommu/virtio: Convert to probe/release_device() call-backs
>>>iommu/msm: Convert to probe/release_device() call-backs
>>>iommu/mediatek: Convert to probe/release_device() call-backs
>>>iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>iommu/qcom: Convert to probe/release_device() call-backs
>>>iommu/rockchip: Convert to probe/release_device() call-backs
>>>iommu/tegra: Convert to probe/release_device() call-backs
>>>iommu/renesas: Convert to probe/release_device() call-backs
>>>iommu/omap: Remove orphan_dev tracking
>>>iommu/omap: Convert to probe/release_device() call-backs
>>>iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>iommu/exynos: Convert to probe/release_device() call-backs
>>>iommu: Remove add_device()/remove_device() code-paths
>>>iommu: Unexport iommu_group_get_for_dev()
>>>
>>>Sai Praneeth Prakhya (1):
>>>iommu: Add def_domain_type() callback in iommu_ops
>>>
>>>drivers/iommu/amd_iommu.c | 97 ++++----
>>>drivers/iommu/amd_iommu_types.h | 1 -
>>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>>drivers/iommu/arm-smmu.c | 39 ++--
>>>drivers/iommu/exynos-iommu.c | 24 +-
>>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>drivers/iommu/intel-iommu.c | 68 +-----
>>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>drivers/iommu/msm_iommu.c | 34 +--
>>>drivers/iommu/mtk_iommu.c | 24 +-
>>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>drivers/iommu/omap-iommu.c | 99 ++------
>>>drivers/iommu/qcom_iommu.c | 24 +-
>>>drivers/iommu/rockchip-iommu.c | 26 +--
>>>drivers/iommu/s390-iommu.c | 22 +-
>>>drivers/iommu/tegra-gart.c | 24 +-
>>>drivers/iommu/tegra-smmu.c | 31 +--
>>>drivers/iommu/virtio-iommu.c | 41 +---
>>>include/linux/iommu.h | 21 +-
>>>20 files changed, 533 insertions(+), 605 deletions(-)
>>>
>>>--
>>>2.17.1
>>>
>>>_______________________________________________
>>>iommu mailing list
>>>iommu@lists.linux-foundation.org
>>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>
>>
>>Hi Joerg,
>>
>>With this patchset, I have an epyc system where if I boot with
>>iommu=nopt and force a dump I will see some io page faults for a nic
>>on the system. The vmcore is harvested and the system reboots. I
>>haven't reproduced it on other systems yet, but without the patchset I
>>don't see the io page faults during the kdump.
>>
>>Regards,
>>Jerry
>
>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>get set to a valid address until the domain_add_dev_info call.
>
>Is it as simple as the following?
>
>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>index 29d3940847d3..f1bbeed46a4c 100644
>--- a/drivers/iommu/intel-iommu.c
>+++ b/drivers/iommu/intel-iommu.c
>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>- return info && info->auxd_enabled &&
>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
> }
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
>Regards,
>Jerry
>
With the patch, I avoid the panic, but I'm seeing an issue similar to the epyc system.
I'm getting dmar faults from a couple of nics and the hp ilo. The addresses in question
were in e820 reserved sections, but there aren't rmrr covering those addresses. The system
manages to harvest the vmcore and reboot like the epyc. Without the patches I don't see
the dmar faults. I needed to give this system back, but I'll try to poke at it some more
in the next couple of days.
Regards,
Jerry
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-01 13:17 ` Jerry Snitselaar
(?)
(?)
@ 2020-06-01 23:20 ` Lu Baolu
-1 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:20 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
Cc: baolu.lu
Hi Jerry,
On 6/1/20 9:17 PM, Jerry Snitselaar wrote:
> On Mon Jun 01 20, Jerry Snitselaar wrote:
>> On Fri May 29 20, Jerry Snitselaar wrote:
>>> On Tue Apr 14 20, Joerg Roedel wrote:
>>>> Hi,
>>>>
>>>> here is the second version of this patch-set. The first version with
>>>> some more introductory text can be found here:
>>>>
>>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>>>
>>>> Changes v1->v2:
>>>>
>>>> * Rebased to v5.7-rc1
>>>>
>>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>>
>>>> * Re-worked the Exynos patches to hopefully not break the
>>>> driver anymore
>>>>
>>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>>> thanks for that.
>>>>
>>>> There is also a git-branch available with these patches applied:
>>>>
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>>
>>>>
>>>> Please review.
>>>>
>>>> Thanks,
>>>>
>>>> Joerg
>>>>
>>>> Joerg Roedel (32):
>>>> iommu: Move default domain allocation to separate function
>>>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>> iommu/amd: Remove dma_mask check from check_device()
>>>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>>>> IOMMU
>>>> iommu: Add probe_device() and remove_device() call-backs
>>>> iommu: Move default domain allocation to iommu_probe_device()
>>>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>> iommu: Move new probe_device path to separate function
>>>> iommu: Split off default domain allocation from group assignment
>>>> iommu: Move iommu_group_create_direct_mappings() out of
>>>> iommu_group_add_device()
>>>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>> iommu/amd: Remove dev_data->passthrough
>>>> iommu/amd: Convert to probe/release_device() call-backs
>>>> iommu/vt-d: Convert to probe/release_device() call-backs
>>>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>> iommu/pamu: Convert to probe/release_device() call-backs
>>>> iommu/s390: Convert to probe/release_device() call-backs
>>>> iommu/virtio: Convert to probe/release_device() call-backs
>>>> iommu/msm: Convert to probe/release_device() call-backs
>>>> iommu/mediatek: Convert to probe/release_device() call-backs
>>>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>> iommu/qcom: Convert to probe/release_device() call-backs
>>>> iommu/rockchip: Convert to probe/release_device() call-backs
>>>> iommu/tegra: Convert to probe/release_device() call-backs
>>>> iommu/renesas: Convert to probe/release_device() call-backs
>>>> iommu/omap: Remove orphan_dev tracking
>>>> iommu/omap: Convert to probe/release_device() call-backs
>>>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>> iommu/exynos: Convert to probe/release_device() call-backs
>>>> iommu: Remove add_device()/remove_device() code-paths
>>>> iommu: Unexport iommu_group_get_for_dev()
>>>>
>>>> Sai Praneeth Prakhya (1):
>>>> iommu: Add def_domain_type() callback in iommu_ops
>>>>
>>>> drivers/iommu/amd_iommu.c | 97 ++++----
>>>> drivers/iommu/amd_iommu_types.h | 1 -
>>>> drivers/iommu/arm-smmu-v3.c | 38 +--
>>>> drivers/iommu/arm-smmu.c | 39 ++--
>>>> drivers/iommu/exynos-iommu.c | 24 +-
>>>> drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>> drivers/iommu/intel-iommu.c | 68 +-----
>>>> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>> drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>> drivers/iommu/msm_iommu.c | 34 +--
>>>> drivers/iommu/mtk_iommu.c | 24 +-
>>>> drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>> drivers/iommu/omap-iommu.c | 99 ++------
>>>> drivers/iommu/qcom_iommu.c | 24 +-
>>>> drivers/iommu/rockchip-iommu.c | 26 +--
>>>> drivers/iommu/s390-iommu.c | 22 +-
>>>> drivers/iommu/tegra-gart.c | 24 +-
>>>> drivers/iommu/tegra-smmu.c | 31 +--
>>>> drivers/iommu/virtio-iommu.c | 41 +---
>>>> include/linux/iommu.h | 21 +-
>>>> 20 files changed, 533 insertions(+), 605 deletions(-)
>>>>
>>>> --
>>>> 2.17.1
>>>>
>>>> _______________________________________________
>>>> iommu mailing list
>>>> iommu@lists.linux-foundation.org
>>>> https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>>
>>>
>>> Hi Joerg,
>>>
>>> With this patchset, I have an epyc system where if I boot with
>>> iommu=nopt and force a dump I will see some io page faults for a nic
>>> on the system. The vmcore is harvested and the system reboots. I
>>> haven't reproduced it on other systems yet, but without the patchset I
>>> don't see the io page faults during the kdump.
>>>
>>> Regards,
>>> Jerry
>>
>> I just hit an issue on a separate intel based system (kdump iommu=nopt),
>> where it panics in during intel_iommu_attach_device, in is_aux_domain,
>> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>> get set to a valid address until the domain_add_dev_info call.
>>
>> Is it as simple as the following?
>>
>> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>> index 29d3940847d3..f1bbeed46a4c 100644
>> --- a/drivers/iommu/intel-iommu.c
>> +++ b/drivers/iommu/intel-iommu.c
>> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>> iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>> - return info && info->auxd_enabled &&
>> - domain->type == IOMMU_DOMAIN_UNMANAGED;
>> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>> + info->auxd_enabled && domain->type ==
>> IOMMU_DOMAIN_UNMANAGED;
>> }
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>> Regards,
>> Jerry
>>
>
> With the patch, I avoid the panic, but I'm seeing an issue similar to
> the epyc system.
> I'm getting dmar faults from a couple of nics and the hp ilo. The
> addresses in question
> were in e820 reserved sections, but there aren't rmrr covering those
> addresses. The system
> manages to harvest the vmcore and reboot like the epyc. Without the
> patches I don't see
> the dmar faults. I needed to give this system back, but I'll try to poke
> at it some more
> in the next couple of days.
Thanks and looking forward to further debugging information.
Best regards,
baolu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 23:20 ` Lu Baolu
0 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:20 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
Cc: baolu.lu
Hi Jerry,
On 6/1/20 9:17 PM, Jerry Snitselaar wrote:
> On Mon Jun 01 20, Jerry Snitselaar wrote:
>> On Fri May 29 20, Jerry Snitselaar wrote:
>>> On Tue Apr 14 20, Joerg Roedel wrote:
>>>> Hi,
>>>>
>>>> here is the second version of this patch-set. The first version with
>>>> some more introductory text can be found here:
>>>>
>>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>>>
>>>> Changes v1->v2:
>>>>
>>>> * Rebased to v5.7-rc1
>>>>
>>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>>
>>>> * Re-worked the Exynos patches to hopefully not break the
>>>> driver anymore
>>>>
>>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>>> thanks for that.
>>>>
>>>> There is also a git-branch available with these patches applied:
>>>>
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>>
>>>>
>>>> Please review.
>>>>
>>>> Thanks,
>>>>
>>>> Joerg
>>>>
>>>> Joerg Roedel (32):
>>>> iommu: Move default domain allocation to separate function
>>>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>> iommu/amd: Remove dma_mask check from check_device()
>>>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>>>> IOMMU
>>>> iommu: Add probe_device() and remove_device() call-backs
>>>> iommu: Move default domain allocation to iommu_probe_device()
>>>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>> iommu: Move new probe_device path to separate function
>>>> iommu: Split off default domain allocation from group assignment
>>>> iommu: Move iommu_group_create_direct_mappings() out of
>>>> iommu_group_add_device()
>>>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>> iommu/amd: Remove dev_data->passthrough
>>>> iommu/amd: Convert to probe/release_device() call-backs
>>>> iommu/vt-d: Convert to probe/release_device() call-backs
>>>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>> iommu/pamu: Convert to probe/release_device() call-backs
>>>> iommu/s390: Convert to probe/release_device() call-backs
>>>> iommu/virtio: Convert to probe/release_device() call-backs
>>>> iommu/msm: Convert to probe/release_device() call-backs
>>>> iommu/mediatek: Convert to probe/release_device() call-backs
>>>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>> iommu/qcom: Convert to probe/release_device() call-backs
>>>> iommu/rockchip: Convert to probe/release_device() call-backs
>>>> iommu/tegra: Convert to probe/release_device() call-backs
>>>> iommu/renesas: Convert to probe/release_device() call-backs
>>>> iommu/omap: Remove orphan_dev tracking
>>>> iommu/omap: Convert to probe/release_device() call-backs
>>>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>> iommu/exynos: Convert to probe/release_device() call-backs
>>>> iommu: Remove add_device()/remove_device() code-paths
>>>> iommu: Unexport iommu_group_get_for_dev()
>>>>
>>>> Sai Praneeth Prakhya (1):
>>>> iommu: Add def_domain_type() callback in iommu_ops
>>>>
>>>> drivers/iommu/amd_iommu.c | 97 ++++----
>>>> drivers/iommu/amd_iommu_types.h | 1 -
>>>> drivers/iommu/arm-smmu-v3.c | 38 +--
>>>> drivers/iommu/arm-smmu.c | 39 ++--
>>>> drivers/iommu/exynos-iommu.c | 24 +-
>>>> drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>> drivers/iommu/intel-iommu.c | 68 +-----
>>>> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>> drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>> drivers/iommu/msm_iommu.c | 34 +--
>>>> drivers/iommu/mtk_iommu.c | 24 +-
>>>> drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>> drivers/iommu/omap-iommu.c | 99 ++------
>>>> drivers/iommu/qcom_iommu.c | 24 +-
>>>> drivers/iommu/rockchip-iommu.c | 26 +--
>>>> drivers/iommu/s390-iommu.c | 22 +-
>>>> drivers/iommu/tegra-gart.c | 24 +-
>>>> drivers/iommu/tegra-smmu.c | 31 +--
>>>> drivers/iommu/virtio-iommu.c | 41 +---
>>>> include/linux/iommu.h | 21 +-
>>>> 20 files changed, 533 insertions(+), 605 deletions(-)
>>>>
>>>> --
>>>> 2.17.1
>>>>
>>>> _______________________________________________
>>>> iommu mailing list
>>>> iommu@lists.linux-foundation.org
>>>> https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>>
>>>
>>> Hi Joerg,
>>>
>>> With this patchset, I have an epyc system where if I boot with
>>> iommu=nopt and force a dump I will see some io page faults for a nic
>>> on the system. The vmcore is harvested and the system reboots. I
>>> haven't reproduced it on other systems yet, but without the patchset I
>>> don't see the io page faults during the kdump.
>>>
>>> Regards,
>>> Jerry
>>
>> I just hit an issue on a separate intel based system (kdump iommu=nopt),
>> where it panics in during intel_iommu_attach_device, in is_aux_domain,
>> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>> get set to a valid address until the domain_add_dev_info call.
>>
>> Is it as simple as the following?
>>
>> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>> index 29d3940847d3..f1bbeed46a4c 100644
>> --- a/drivers/iommu/intel-iommu.c
>> +++ b/drivers/iommu/intel-iommu.c
>> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>> iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>> - return info && info->auxd_enabled &&
>> - domain->type == IOMMU_DOMAIN_UNMANAGED;
>> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>> + info->auxd_enabled && domain->type ==
>> IOMMU_DOMAIN_UNMANAGED;
>> }
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>> Regards,
>> Jerry
>>
>
> With the patch, I avoid the panic, but I'm seeing an issue similar to
> the epyc system.
> I'm getting dmar faults from a couple of nics and the hp ilo. The
> addresses in question
> were in e820 reserved sections, but there aren't rmrr covering those
> addresses. The system
> manages to harvest the vmcore and reboot like the epyc. Without the
> patches I don't see
> the dmar faults. I needed to give this system back, but I'll try to poke
> at it some more
> in the next couple of days.
Thanks and looking forward to further debugging information.
Best regards,
baolu
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 23:20 ` Lu Baolu
0 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:20 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
Hi Jerry,
On 6/1/20 9:17 PM, Jerry Snitselaar wrote:
> On Mon Jun 01 20, Jerry Snitselaar wrote:
>> On Fri May 29 20, Jerry Snitselaar wrote:
>>> On Tue Apr 14 20, Joerg Roedel wrote:
>>>> Hi,
>>>>
>>>> here is the second version of this patch-set. The first version with
>>>> some more introductory text can be found here:
>>>>
>>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>>>
>>>> Changes v1->v2:
>>>>
>>>> * Rebased to v5.7-rc1
>>>>
>>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>>
>>>> * Re-worked the Exynos patches to hopefully not break the
>>>> driver anymore
>>>>
>>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>>> thanks for that.
>>>>
>>>> There is also a git-branch available with these patches applied:
>>>>
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>>
>>>>
>>>> Please review.
>>>>
>>>> Thanks,
>>>>
>>>> Joerg
>>>>
>>>> Joerg Roedel (32):
>>>> iommu: Move default domain allocation to separate function
>>>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>> iommu/amd: Remove dma_mask check from check_device()
>>>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>>>> IOMMU
>>>> iommu: Add probe_device() and remove_device() call-backs
>>>> iommu: Move default domain allocation to iommu_probe_device()
>>>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>> iommu: Move new probe_device path to separate function
>>>> iommu: Split off default domain allocation from group assignment
>>>> iommu: Move iommu_group_create_direct_mappings() out of
>>>> iommu_group_add_device()
>>>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>> iommu/amd: Remove dev_data->passthrough
>>>> iommu/amd: Convert to probe/release_device() call-backs
>>>> iommu/vt-d: Convert to probe/release_device() call-backs
>>>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>> iommu/pamu: Convert to probe/release_device() call-backs
>>>> iommu/s390: Convert to probe/release_device() call-backs
>>>> iommu/virtio: Convert to probe/release_device() call-backs
>>>> iommu/msm: Convert to probe/release_device() call-backs
>>>> iommu/mediatek: Convert to probe/release_device() call-backs
>>>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>> iommu/qcom: Convert to probe/release_device() call-backs
>>>> iommu/rockchip: Convert to probe/release_device() call-backs
>>>> iommu/tegra: Convert to probe/release_device() call-backs
>>>> iommu/renesas: Convert to probe/release_device() call-backs
>>>> iommu/omap: Remove orphan_dev tracking
>>>> iommu/omap: Convert to probe/release_device() call-backs
>>>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>> iommu/exynos: Convert to probe/release_device() call-backs
>>>> iommu: Remove add_device()/remove_device() code-paths
>>>> iommu: Unexport iommu_group_get_for_dev()
>>>>
>>>> Sai Praneeth Prakhya (1):
>>>> iommu: Add def_domain_type() callback in iommu_ops
>>>>
>>>> drivers/iommu/amd_iommu.c | 97 ++++----
>>>> drivers/iommu/amd_iommu_types.h | 1 -
>>>> drivers/iommu/arm-smmu-v3.c | 38 +--
>>>> drivers/iommu/arm-smmu.c | 39 ++--
>>>> drivers/iommu/exynos-iommu.c | 24 +-
>>>> drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>> drivers/iommu/intel-iommu.c | 68 +-----
>>>> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>> drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>> drivers/iommu/msm_iommu.c | 34 +--
>>>> drivers/iommu/mtk_iommu.c | 24 +-
>>>> drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>> drivers/iommu/omap-iommu.c | 99 ++------
>>>> drivers/iommu/qcom_iommu.c | 24 +-
>>>> drivers/iommu/rockchip-iommu.c | 26 +--
>>>> drivers/iommu/s390-iommu.c | 22 +-
>>>> drivers/iommu/tegra-gart.c | 24 +-
>>>> drivers/iommu/tegra-smmu.c | 31 +--
>>>> drivers/iommu/virtio-iommu.c | 41 +---
>>>> include/linux/iommu.h | 21 +-
>>>> 20 files changed, 533 insertions(+), 605 deletions(-)
>>>>
>>>> --
>>>> 2.17.1
>>>>
>>>> _______________________________________________
>>>> iommu mailing list
>>>> iommu@lists.linux-foundation.org
>>>> https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>>
>>>
>>> Hi Joerg,
>>>
>>> With this patchset, I have an epyc system where if I boot with
>>> iommu=nopt and force a dump I will see some io page faults for a nic
>>> on the system. The vmcore is harvested and the system reboots. I
>>> haven't reproduced it on other systems yet, but without the patchset I
>>> don't see the io page faults during the kdump.
>>>
>>> Regards,
>>> Jerry
>>
>> I just hit an issue on a separate intel based system (kdump iommu=nopt),
>> where it panics in during intel_iommu_attach_device, in is_aux_domain,
>> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>> get set to a valid address until the domain_add_dev_info call.
>>
>> Is it as simple as the following?
>>
>> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>> index 29d3940847d3..f1bbeed46a4c 100644
>> --- a/drivers/iommu/intel-iommu.c
>> +++ b/drivers/iommu/intel-iommu.c
>> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>> iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>> - return info && info->auxd_enabled &&
>> - domain->type == IOMMU_DOMAIN_UNMANAGED;
>> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>> + info->auxd_enabled && domain->type ==
>> IOMMU_DOMAIN_UNMANAGED;
>> }
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>> Regards,
>> Jerry
>>
>
> With the patch, I avoid the panic, but I'm seeing an issue similar to
> the epyc system.
> I'm getting dmar faults from a couple of nics and the hp ilo. The
> addresses in question
> were in e820 reserved sections, but there aren't rmrr covering those
> addresses. The system
> manages to harvest the vmcore and reboot like the epyc. Without the
> patches I don't see
> the dmar faults. I needed to give this system back, but I'll try to poke
> at it some more
> in the next couple of days.
Thanks and looking forward to further debugging information.
Best regards,
baolu
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 23:20 ` Lu Baolu
0 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:20 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization
Cc: baolu.lu
Hi Jerry,
On 6/1/20 9:17 PM, Jerry Snitselaar wrote:
> On Mon Jun 01 20, Jerry Snitselaar wrote:
>> On Fri May 29 20, Jerry Snitselaar wrote:
>>> On Tue Apr 14 20, Joerg Roedel wrote:
>>>> Hi,
>>>>
>>>> here is the second version of this patch-set. The first version with
>>>> some more introductory text can be found here:
>>>>
>>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>>>
>>>> Changes v1->v2:
>>>>
>>>> * Rebased to v5.7-rc1
>>>>
>>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>>
>>>> * Re-worked the Exynos patches to hopefully not break the
>>>> driver anymore
>>>>
>>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>>> thanks for that.
>>>>
>>>> There is also a git-branch available with these patches applied:
>>>>
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>>
>>>>
>>>> Please review.
>>>>
>>>> Thanks,
>>>>
>>>> Joerg
>>>>
>>>> Joerg Roedel (32):
>>>> iommu: Move default domain allocation to separate function
>>>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>> iommu/amd: Remove dma_mask check from check_device()
>>>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>>>> IOMMU
>>>> iommu: Add probe_device() and remove_device() call-backs
>>>> iommu: Move default domain allocation to iommu_probe_device()
>>>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>> iommu: Move new probe_device path to separate function
>>>> iommu: Split off default domain allocation from group assignment
>>>> iommu: Move iommu_group_create_direct_mappings() out of
>>>> iommu_group_add_device()
>>>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>> iommu/amd: Remove dev_data->passthrough
>>>> iommu/amd: Convert to probe/release_device() call-backs
>>>> iommu/vt-d: Convert to probe/release_device() call-backs
>>>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>> iommu/pamu: Convert to probe/release_device() call-backs
>>>> iommu/s390: Convert to probe/release_device() call-backs
>>>> iommu/virtio: Convert to probe/release_device() call-backs
>>>> iommu/msm: Convert to probe/release_device() call-backs
>>>> iommu/mediatek: Convert to probe/release_device() call-backs
>>>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>> iommu/qcom: Convert to probe/release_device() call-backs
>>>> iommu/rockchip: Convert to probe/release_device() call-backs
>>>> iommu/tegra: Convert to probe/release_device() call-backs
>>>> iommu/renesas: Convert to probe/release_device() call-backs
>>>> iommu/omap: Remove orphan_dev tracking
>>>> iommu/omap: Convert to probe/release_device() call-backs
>>>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>> iommu/exynos: Convert to probe/release_device() call-backs
>>>> iommu: Remove add_device()/remove_device() code-paths
>>>> iommu: Unexport iommu_group_get_for_dev()
>>>>
>>>> Sai Praneeth Prakhya (1):
>>>> iommu: Add def_domain_type() callback in iommu_ops
>>>>
>>>> drivers/iommu/amd_iommu.c | 97 ++++----
>>>> drivers/iommu/amd_iommu_types.h | 1 -
>>>> drivers/iommu/arm-smmu-v3.c | 38 +--
>>>> drivers/iommu/arm-smmu.c | 39 ++--
>>>> drivers/iommu/exynos-iommu.c | 24 +-
>>>> drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>> drivers/iommu/intel-iommu.c | 68 +-----
>>>> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>> drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>> drivers/iommu/msm_iommu.c | 34 +--
>>>> drivers/iommu/mtk_iommu.c | 24 +-
>>>> drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>> drivers/iommu/omap-iommu.c | 99 ++------
>>>> drivers/iommu/qcom_iommu.c | 24 +-
>>>> drivers/iommu/rockchip-iommu.c | 26 +--
>>>> drivers/iommu/s390-iommu.c | 22 +-
>>>> drivers/iommu/tegra-gart.c | 24 +-
>>>> drivers/iommu/tegra-smmu.c | 31 +--
>>>> drivers/iommu/virtio-iommu.c | 41 +---
>>>> include/linux/iommu.h | 21 +-
>>>> 20 files changed, 533 insertions(+), 605 deletions(-)
>>>>
>>>> --
>>>> 2.17.1
>>>>
>>>> _______________________________________________
>>>> iommu mailing list
>>>> iommu@lists.linux-foundation.org
>>>> https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>>
>>>
>>> Hi Joerg,
>>>
>>> With this patchset, I have an epyc system where if I boot with
>>> iommu=nopt and force a dump I will see some io page faults for a nic
>>> on the system. The vmcore is harvested and the system reboots. I
>>> haven't reproduced it on other systems yet, but without the patchset I
>>> don't see the io page faults during the kdump.
>>>
>>> Regards,
>>> Jerry
>>
>> I just hit an issue on a separate intel based system (kdump iommu=nopt),
>> where it panics in during intel_iommu_attach_device, in is_aux_domain,
>> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>> get set to a valid address until the domain_add_dev_info call.
>>
>> Is it as simple as the following?
>>
>> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>> index 29d3940847d3..f1bbeed46a4c 100644
>> --- a/drivers/iommu/intel-iommu.c
>> +++ b/drivers/iommu/intel-iommu.c
>> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>> iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>> - return info && info->auxd_enabled &&
>> - domain->type == IOMMU_DOMAIN_UNMANAGED;
>> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>> + info->auxd_enabled && domain->type ==
>> IOMMU_DOMAIN_UNMANAGED;
>> }
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>> Regards,
>> Jerry
>>
>
> With the patch, I avoid the panic, but I'm seeing an issue similar to
> the epyc system.
> I'm getting dmar faults from a couple of nics and the hp ilo. The
> addresses in question
> were in e820 reserved sections, but there aren't rmrr covering those
> addresses. The system
> manages to harvest the vmcore and reboot like the epyc. Without the
> patches I don't see
> the dmar faults. I needed to give this system back, but I'll try to poke
> at it some more
> in the next couple of days.
Thanks and looking forward to further debugging information.
Best regards,
baolu
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-01 13:17 ` Jerry Snitselaar
` (3 preceding siblings ...)
(?)
@ 2020-06-01 23:20 ` Lu Baolu
-1 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:20 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-mediatek
Hi Jerry,
On 6/1/20 9:17 PM, Jerry Snitselaar wrote:
> On Mon Jun 01 20, Jerry Snitselaar wrote:
>> On Fri May 29 20, Jerry Snitselaar wrote:
>>> On Tue Apr 14 20, Joerg Roedel wrote:
>>>> Hi,
>>>>
>>>> here is the second version of this patch-set. The first version with
>>>> some more introductory text can be found here:
>>>>
>>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>>>
>>>> Changes v1->v2:
>>>>
>>>> * Rebased to v5.7-rc1
>>>>
>>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>>
>>>> * Re-worked the Exynos patches to hopefully not break the
>>>> driver anymore
>>>>
>>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>>> thanks for that.
>>>>
>>>> There is also a git-branch available with these patches applied:
>>>>
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>>
>>>>
>>>> Please review.
>>>>
>>>> Thanks,
>>>>
>>>> Joerg
>>>>
>>>> Joerg Roedel (32):
>>>> iommu: Move default domain allocation to separate function
>>>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>> iommu/amd: Remove dma_mask check from check_device()
>>>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>>>> IOMMU
>>>> iommu: Add probe_device() and remove_device() call-backs
>>>> iommu: Move default domain allocation to iommu_probe_device()
>>>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>> iommu: Move new probe_device path to separate function
>>>> iommu: Split off default domain allocation from group assignment
>>>> iommu: Move iommu_group_create_direct_mappings() out of
>>>> iommu_group_add_device()
>>>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>> iommu/amd: Remove dev_data->passthrough
>>>> iommu/amd: Convert to probe/release_device() call-backs
>>>> iommu/vt-d: Convert to probe/release_device() call-backs
>>>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>> iommu/pamu: Convert to probe/release_device() call-backs
>>>> iommu/s390: Convert to probe/release_device() call-backs
>>>> iommu/virtio: Convert to probe/release_device() call-backs
>>>> iommu/msm: Convert to probe/release_device() call-backs
>>>> iommu/mediatek: Convert to probe/release_device() call-backs
>>>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>> iommu/qcom: Convert to probe/release_device() call-backs
>>>> iommu/rockchip: Convert to probe/release_device() call-backs
>>>> iommu/tegra: Convert to probe/release_device() call-backs
>>>> iommu/renesas: Convert to probe/release_device() call-backs
>>>> iommu/omap: Remove orphan_dev tracking
>>>> iommu/omap: Convert to probe/release_device() call-backs
>>>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>> iommu/exynos: Convert to probe/release_device() call-backs
>>>> iommu: Remove add_device()/remove_device() code-paths
>>>> iommu: Unexport iommu_group_get_for_dev()
>>>>
>>>> Sai Praneeth Prakhya (1):
>>>> iommu: Add def_domain_type() callback in iommu_ops
>>>>
>>>> drivers/iommu/amd_iommu.c | 97 ++++----
>>>> drivers/iommu/amd_iommu_types.h | 1 -
>>>> drivers/iommu/arm-smmu-v3.c | 38 +--
>>>> drivers/iommu/arm-smmu.c | 39 ++--
>>>> drivers/iommu/exynos-iommu.c | 24 +-
>>>> drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>> drivers/iommu/intel-iommu.c | 68 +-----
>>>> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>> drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>> drivers/iommu/msm_iommu.c | 34 +--
>>>> drivers/iommu/mtk_iommu.c | 24 +-
>>>> drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>> drivers/iommu/omap-iommu.c | 99 ++------
>>>> drivers/iommu/qcom_iommu.c | 24 +-
>>>> drivers/iommu/rockchip-iommu.c | 26 +--
>>>> drivers/iommu/s390-iommu.c | 22 +-
>>>> drivers/iommu/tegra-gart.c | 24 +-
>>>> drivers/iommu/tegra-smmu.c | 31 +--
>>>> drivers/iommu/virtio-iommu.c | 41 +---
>>>> include/linux/iommu.h | 21 +-
>>>> 20 files changed, 533 insertions(+), 605 deletions(-)
>>>>
>>>> --
>>>> 2.17.1
>>>>
>>>> _______________________________________________
>>>> iommu mailing list
>>>> iommu@lists.linux-foundation.org
>>>> https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>>
>>>
>>> Hi Joerg,
>>>
>>> With this patchset, I have an epyc system where if I boot with
>>> iommu=nopt and force a dump I will see some io page faults for a nic
>>> on the system. The vmcore is harvested and the system reboots. I
>>> haven't reproduced it on other systems yet, but without the patchset I
>>> don't see the io page faults during the kdump.
>>>
>>> Regards,
>>> Jerry
>>
>> I just hit an issue on a separate intel based system (kdump iommu=nopt),
>> where it panics in during intel_iommu_attach_device, in is_aux_domain,
>> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>> get set to a valid address until the domain_add_dev_info call.
>>
>> Is it as simple as the following?
>>
>> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>> index 29d3940847d3..f1bbeed46a4c 100644
>> --- a/drivers/iommu/intel-iommu.c
>> +++ b/drivers/iommu/intel-iommu.c
>> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>> iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>> - return info && info->auxd_enabled &&
>> - domain->type == IOMMU_DOMAIN_UNMANAGED;
>> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>> + info->auxd_enabled && domain->type ==
>> IOMMU_DOMAIN_UNMANAGED;
>> }
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>> Regards,
>> Jerry
>>
>
> With the patch, I avoid the panic, but I'm seeing an issue similar to
> the epyc system.
> I'm getting dmar faults from a couple of nics and the hp ilo. The
> addresses in question
> were in e820 reserved sections, but there aren't rmrr covering those
> addresses. The system
> manages to harvest the vmcore and reboot like the epyc. Without the
> patches I don't see
> the dmar faults. I needed to give this system back, but I'll try to poke
> at it some more
> in the next couple of days.
Thanks and looking forward to further debugging information.
Best regards,
baolu
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-01 13:17 ` Jerry Snitselaar
` (4 preceding siblings ...)
(?)
@ 2020-06-01 23:20 ` Lu Baolu
-1 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:20 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-mediatek
Cc: baolu.lu-VuQAYsv1563Yd54FQh9/CA
Hi Jerry,
On 6/1/20 9:17 PM, Jerry Snitselaar wrote:
> On Mon Jun 01 20, Jerry Snitselaar wrote:
>> On Fri May 29 20, Jerry Snitselaar wrote:
>>> On Tue Apr 14 20, Joerg Roedel wrote:
>>>> Hi,
>>>>
>>>> here is the second version of this patch-set. The first version with
>>>> some more introductory text can be found here:
>>>>
>>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro@8bytes.org/
>>>>
>>>> Changes v1->v2:
>>>>
>>>> * Rebased to v5.7-rc1
>>>>
>>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>>
>>>> * Re-worked the Exynos patches to hopefully not break the
>>>> driver anymore
>>>>
>>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>>> thanks for that.
>>>>
>>>> There is also a git-branch available with these patches applied:
>>>>
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>>
>>>>
>>>> Please review.
>>>>
>>>> Thanks,
>>>>
>>>> Joerg
>>>>
>>>> Joerg Roedel (32):
>>>> iommu: Move default domain allocation to separate function
>>>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>> iommu/amd: Remove dma_mask check from check_device()
>>>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>>>> IOMMU
>>>> iommu: Add probe_device() and remove_device() call-backs
>>>> iommu: Move default domain allocation to iommu_probe_device()
>>>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>> iommu: Move new probe_device path to separate function
>>>> iommu: Split off default domain allocation from group assignment
>>>> iommu: Move iommu_group_create_direct_mappings() out of
>>>> iommu_group_add_device()
>>>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>> iommu/amd: Remove dev_data->passthrough
>>>> iommu/amd: Convert to probe/release_device() call-backs
>>>> iommu/vt-d: Convert to probe/release_device() call-backs
>>>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>> iommu/pamu: Convert to probe/release_device() call-backs
>>>> iommu/s390: Convert to probe/release_device() call-backs
>>>> iommu/virtio: Convert to probe/release_device() call-backs
>>>> iommu/msm: Convert to probe/release_device() call-backs
>>>> iommu/mediatek: Convert to probe/release_device() call-backs
>>>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>> iommu/qcom: Convert to probe/release_device() call-backs
>>>> iommu/rockchip: Convert to probe/release_device() call-backs
>>>> iommu/tegra: Convert to probe/release_device() call-backs
>>>> iommu/renesas: Convert to probe/release_device() call-backs
>>>> iommu/omap: Remove orphan_dev tracking
>>>> iommu/omap: Convert to probe/release_device() call-backs
>>>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>> iommu/exynos: Convert to probe/release_device() call-backs
>>>> iommu: Remove add_device()/remove_device() code-paths
>>>> iommu: Unexport iommu_group_get_for_dev()
>>>>
>>>> Sai Praneeth Prakhya (1):
>>>> iommu: Add def_domain_type() callback in iommu_ops
>>>>
>>>> drivers/iommu/amd_iommu.c | 97 ++++----
>>>> drivers/iommu/amd_iommu_types.h | 1 -
>>>> drivers/iommu/arm-smmu-v3.c | 38 +--
>>>> drivers/iommu/arm-smmu.c | 39 ++--
>>>> drivers/iommu/exynos-iommu.c | 24 +-
>>>> drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>> drivers/iommu/intel-iommu.c | 68 +-----
>>>> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>> drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>> drivers/iommu/msm_iommu.c | 34 +--
>>>> drivers/iommu/mtk_iommu.c | 24 +-
>>>> drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>> drivers/iommu/omap-iommu.c | 99 ++------
>>>> drivers/iommu/qcom_iommu.c | 24 +-
>>>> drivers/iommu/rockchip-iommu.c | 26 +--
>>>> drivers/iommu/s390-iommu.c | 22 +-
>>>> drivers/iommu/tegra-gart.c | 24 +-
>>>> drivers/iommu/tegra-smmu.c | 31 +--
>>>> drivers/iommu/virtio-iommu.c | 41 +---
>>>> include/linux/iommu.h | 21 +-
>>>> 20 files changed, 533 insertions(+), 605 deletions(-)
>>>>
>>>> --
>>>> 2.17.1
>>>>
>>>> _______________________________________________
>>>> iommu mailing list
>>>> iommu@lists.linux-foundation.org
>>>> https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>>
>>>
>>> Hi Joerg,
>>>
>>> With this patchset, I have an epyc system where if I boot with
>>> iommu=nopt and force a dump I will see some io page faults for a nic
>>> on the system. The vmcore is harvested and the system reboots. I
>>> haven't reproduced it on other systems yet, but without the patchset I
>>> don't see the io page faults during the kdump.
>>>
>>> Regards,
>>> Jerry
>>
>> I just hit an issue on a separate intel based system (kdump iommu=nopt),
>> where it panics in during intel_iommu_attach_device, in is_aux_domain,
>> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>> get set to a valid address until the domain_add_dev_info call.
>>
>> Is it as simple as the following?
>>
>> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>> index 29d3940847d3..f1bbeed46a4c 100644
>> --- a/drivers/iommu/intel-iommu.c
>> +++ b/drivers/iommu/intel-iommu.c
>> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>> iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>> - return info && info->auxd_enabled &&
>> - domain->type == IOMMU_DOMAIN_UNMANAGED;
>> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>> + info->auxd_enabled && domain->type ==
>> IOMMU_DOMAIN_UNMANAGED;
>> }
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>> Regards,
>> Jerry
>>
>
> With the patch, I avoid the panic, but I'm seeing an issue similar to
> the epyc system.
> I'm getting dmar faults from a couple of nics and the hp ilo. The
> addresses in question
> were in e820 reserved sections, but there aren't rmrr covering those
> addresses. The system
> manages to harvest the vmcore and reboot like the epyc. Without the
> patches I don't see
> the dmar faults. I needed to give this system back, but I'll try to poke
> at it some more
> in the next couple of days.
Thanks and looking forward to further debugging information.
Best regards,
baolu
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-01 13:17 ` Jerry Snitselaar
` (5 preceding siblings ...)
(?)
@ 2020-06-01 23:20 ` Lu Baolu
-1 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:20 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, virtualization
Cc: baolu.lu-VuQAYsv1563Yd54FQh9/CA
Hi Jerry,
On 6/1/20 9:17 PM, Jerry Snitselaar wrote:
> On Mon Jun 01 20, Jerry Snitselaar wrote:
>> On Fri May 29 20, Jerry Snitselaar wrote:
>>> On Tue Apr 14 20, Joerg Roedel wrote:
>>>> Hi,
>>>>
>>>> here is the second version of this patch-set. The first version with
>>>> some more introductory text can be found here:
>>>>
>>>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>>>>
>>>> Changes v1->v2:
>>>>
>>>> * Rebased to v5.7-rc1
>>>>
>>>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>>>
>>>> * Re-worked the Exynos patches to hopefully not break the
>>>> driver anymore
>>>>
>>>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>>>> thanks for that.
>>>>
>>>> There is also a git-branch available with these patches applied:
>>>>
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>>>
>>>>
>>>> Please review.
>>>>
>>>> Thanks,
>>>>
>>>> Joerg
>>>>
>>>> Joerg Roedel (32):
>>>> iommu: Move default domain allocation to separate function
>>>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>>>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>>>> iommu/amd: Remove dma_mask check from check_device()
>>>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>>>> IOMMU
>>>> iommu: Add probe_device() and remove_device() call-backs
>>>> iommu: Move default domain allocation to iommu_probe_device()
>>>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>>>> iommu: Move new probe_device path to separate function
>>>> iommu: Split off default domain allocation from group assignment
>>>> iommu: Move iommu_group_create_direct_mappings() out of
>>>> iommu_group_add_device()
>>>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>>>> iommu/amd: Remove dev_data->passthrough
>>>> iommu/amd: Convert to probe/release_device() call-backs
>>>> iommu/vt-d: Convert to probe/release_device() call-backs
>>>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>>>> iommu/pamu: Convert to probe/release_device() call-backs
>>>> iommu/s390: Convert to probe/release_device() call-backs
>>>> iommu/virtio: Convert to probe/release_device() call-backs
>>>> iommu/msm: Convert to probe/release_device() call-backs
>>>> iommu/mediatek: Convert to probe/release_device() call-backs
>>>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>>>> iommu/qcom: Convert to probe/release_device() call-backs
>>>> iommu/rockchip: Convert to probe/release_device() call-backs
>>>> iommu/tegra: Convert to probe/release_device() call-backs
>>>> iommu/renesas: Convert to probe/release_device() call-backs
>>>> iommu/omap: Remove orphan_dev tracking
>>>> iommu/omap: Convert to probe/release_device() call-backs
>>>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>>>> iommu/exynos: Convert to probe/release_device() call-backs
>>>> iommu: Remove add_device()/remove_device() code-paths
>>>> iommu: Unexport iommu_group_get_for_dev()
>>>>
>>>> Sai Praneeth Prakhya (1):
>>>> iommu: Add def_domain_type() callback in iommu_ops
>>>>
>>>> drivers/iommu/amd_iommu.c | 97 ++++----
>>>> drivers/iommu/amd_iommu_types.h | 1 -
>>>> drivers/iommu/arm-smmu-v3.c | 38 +--
>>>> drivers/iommu/arm-smmu.c | 39 ++--
>>>> drivers/iommu/exynos-iommu.c | 24 +-
>>>> drivers/iommu/fsl_pamu_domain.c | 22 +-
>>>> drivers/iommu/intel-iommu.c | 68 +-----
>>>> drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>>> drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>>> drivers/iommu/msm_iommu.c | 34 +--
>>>> drivers/iommu/mtk_iommu.c | 24 +-
>>>> drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>>> drivers/iommu/omap-iommu.c | 99 ++------
>>>> drivers/iommu/qcom_iommu.c | 24 +-
>>>> drivers/iommu/rockchip-iommu.c | 26 +--
>>>> drivers/iommu/s390-iommu.c | 22 +-
>>>> drivers/iommu/tegra-gart.c | 24 +-
>>>> drivers/iommu/tegra-smmu.c | 31 +--
>>>> drivers/iommu/virtio-iommu.c | 41 +---
>>>> include/linux/iommu.h | 21 +-
>>>> 20 files changed, 533 insertions(+), 605 deletions(-)
>>>>
>>>> --
>>>> 2.17.1
>>>>
>>>> _______________________________________________
>>>> iommu mailing list
>>>> iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>>> https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>>>
>>>
>>> Hi Joerg,
>>>
>>> With this patchset, I have an epyc system where if I boot with
>>> iommu=nopt and force a dump I will see some io page faults for a nic
>>> on the system. The vmcore is harvested and the system reboots. I
>>> haven't reproduced it on other systems yet, but without the patchset I
>>> don't see the io page faults during the kdump.
>>>
>>> Regards,
>>> Jerry
>>
>> I just hit an issue on a separate intel based system (kdump iommu=nopt),
>> where it panics in during intel_iommu_attach_device, in is_aux_domain,
>> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>> get set to a valid address until the domain_add_dev_info call.
>>
>> Is it as simple as the following?
>>
>> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>> index 29d3940847d3..f1bbeed46a4c 100644
>> --- a/drivers/iommu/intel-iommu.c
>> +++ b/drivers/iommu/intel-iommu.c
>> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>> iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>> - return info && info->auxd_enabled &&
>> - domain->type == IOMMU_DOMAIN_UNMANAGED;
>> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>> + info->auxd_enabled && domain->type ==
>> IOMMU_DOMAIN_UNMANAGED;
>> }
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>> Regards,
>> Jerry
>>
>
> With the patch, I avoid the panic, but I'm seeing an issue similar to
> the epyc system.
> I'm getting dmar faults from a couple of nics and the hp ilo. The
> addresses in question
> were in e820 reserved sections, but there aren't rmrr covering those
> addresses. The system
> manages to harvest the vmcore and reboot like the epyc. Without the
> patches I don't see
> the dmar faults. I needed to give this system back, but I'll try to poke
> at it some more
> in the next couple of days.
Thanks and looking forward to further debugging information.
Best regards,
baolu
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-01 10:42 ` Jerry Snitselaar
(?)
(?)
@ 2020-06-01 23:16 ` Lu Baolu
-1 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:16 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, virtualization
Cc: baolu.lu-VuQAYsv1563Yd54FQh9/CA
Hi Jerry,
On 6/1/20 6:42 PM, Jerry Snitselaar wrote:
>>
>> Hi Joerg,
>>
>> With this patchset, I have an epyc system where if I boot with
>> iommu=nopt and force a dump I will see some io page faults for a nic
>> on the system. The vmcore is harvested and the system reboots. I
>> haven't reproduced it on other systems yet, but without the patchset I
>> don't see the io page faults during the kdump.
>>
>> Regards,
>> Jerry
>
> I just hit an issue on a separate intel based system (kdump iommu=nopt),
> where it panics in during intel_iommu_attach_device, in is_aux_domain,
> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
> get set to a valid address until the domain_add_dev_info call.
>
> Is it as simple as the following?
I guess you won't hit this issue if you use iommu/next branch of Joerg's
tree. We've changed to use a generic helper to retrieve the valid per
device iommu data or NULL (if there's no).
Best regards,
baolu
>
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index 29d3940847d3..f1bbeed46a4c 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
> iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>
> - return info && info->auxd_enabled &&
> - domain->type == IOMMU_DOMAIN_UNMANAGED;
> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
> + info->auxd_enabled && domain->type ==
> IOMMU_DOMAIN_UNMANAGED;
> }
>
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
> Regards,
> Jerry
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 23:16 ` Lu Baolu
0 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:16 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
Cc: baolu.lu
Hi Jerry,
On 6/1/20 6:42 PM, Jerry Snitselaar wrote:
>>
>> Hi Joerg,
>>
>> With this patchset, I have an epyc system where if I boot with
>> iommu=nopt and force a dump I will see some io page faults for a nic
>> on the system. The vmcore is harvested and the system reboots. I
>> haven't reproduced it on other systems yet, but without the patchset I
>> don't see the io page faults during the kdump.
>>
>> Regards,
>> Jerry
>
> I just hit an issue on a separate intel based system (kdump iommu=nopt),
> where it panics in during intel_iommu_attach_device, in is_aux_domain,
> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
> get set to a valid address until the domain_add_dev_info call.
>
> Is it as simple as the following?
I guess you won't hit this issue if you use iommu/next branch of Joerg's
tree. We've changed to use a generic helper to retrieve the valid per
device iommu data or NULL (if there's no).
Best regards,
baolu
>
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index 29d3940847d3..f1bbeed46a4c 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
> iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>
> - return info && info->auxd_enabled &&
> - domain->type == IOMMU_DOMAIN_UNMANAGED;
> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
> + info->auxd_enabled && domain->type ==
> IOMMU_DOMAIN_UNMANAGED;
> }
>
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
> Regards,
> Jerry
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 23:16 ` Lu Baolu
0 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:16 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
Hi Jerry,
On 6/1/20 6:42 PM, Jerry Snitselaar wrote:
>>
>> Hi Joerg,
>>
>> With this patchset, I have an epyc system where if I boot with
>> iommu=nopt and force a dump I will see some io page faults for a nic
>> on the system. The vmcore is harvested and the system reboots. I
>> haven't reproduced it on other systems yet, but without the patchset I
>> don't see the io page faults during the kdump.
>>
>> Regards,
>> Jerry
>
> I just hit an issue on a separate intel based system (kdump iommu=nopt),
> where it panics in during intel_iommu_attach_device, in is_aux_domain,
> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
> get set to a valid address until the domain_add_dev_info call.
>
> Is it as simple as the following?
I guess you won't hit this issue if you use iommu/next branch of Joerg's
tree. We've changed to use a generic helper to retrieve the valid per
device iommu data or NULL (if there's no).
Best regards,
baolu
>
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index 29d3940847d3..f1bbeed46a4c 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
> iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>
> - return info && info->auxd_enabled &&
> - domain->type == IOMMU_DOMAIN_UNMANAGED;
> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
> + info->auxd_enabled && domain->type ==
> IOMMU_DOMAIN_UNMANAGED;
> }
>
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
> Regards,
> Jerry
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-01 23:16 ` Lu Baolu
0 siblings, 0 replies; 233+ messages in thread
From: Lu Baolu @ 2020-06-01 23:16 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
Cc: baolu.lu
Hi Jerry,
On 6/1/20 6:42 PM, Jerry Snitselaar wrote:
>>
>> Hi Joerg,
>>
>> With this patchset, I have an epyc system where if I boot with
>> iommu=nopt and force a dump I will see some io page faults for a nic
>> on the system. The vmcore is harvested and the system reboots. I
>> haven't reproduced it on other systems yet, but without the patchset I
>> don't see the io page faults during the kdump.
>>
>> Regards,
>> Jerry
>
> I just hit an issue on a separate intel based system (kdump iommu=nopt),
> where it panics in during intel_iommu_attach_device, in is_aux_domain,
> due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
> get set to a valid address until the domain_add_dev_info call.
>
> Is it as simple as the following?
I guess you won't hit this issue if you use iommu/next branch of Joerg's
tree. We've changed to use a generic helper to retrieve the valid per
device iommu data or NULL (if there's no).
Best regards,
baolu
>
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index 29d3940847d3..f1bbeed46a4c 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
> iommu_domain *domain)
> {
> struct device_domain_info *info = dev->archdata.iommu;
>
> - return info && info->auxd_enabled &&
> - domain->type == IOMMU_DOMAIN_UNMANAGED;
> + return info && info != DEFER_DEVICE_DOMAIN_INFO &&
> + info->auxd_enabled && domain->type ==
> IOMMU_DOMAIN_UNMANAGED;
> }
>
> static void auxiliary_link_device(struct dmar_domain *domain,
>
>
> Regards,
> Jerry
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-01 23:16 ` Lu Baolu
(?)
(?)
@ 2020-06-02 0:02 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 0:02 UTC (permalink / raw)
To: Lu Baolu
Cc: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization
On Tue Jun 02 20, Lu Baolu wrote:
>Hi Jerry,
>
>On 6/1/20 6:42 PM, Jerry Snitselaar wrote:
>>>
>>>Hi Joerg,
>>>
>>>With this patchset, I have an epyc system where if I boot with
>>>iommu=nopt and force a dump I will see some io page faults for a nic
>>>on the system. The vmcore is harvested and the system reboots. I
>>>haven't reproduced it on other systems yet, but without the patchset I
>>>don't see the io page faults during the kdump.
>>>
>>>Regards,
>>>Jerry
>>
>>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>>get set to a valid address until the domain_add_dev_info call.
>>
>>Is it as simple as the following?
>
>I guess you won't hit this issue if you use iommu/next branch of Joerg's
>tree. We've changed to use a generic helper to retrieve the valid per
>device iommu data or NULL (if there's no).
>
>Best regards,
>baolu
>
Yeah, that will solve the panic.
>>
>>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>>index 29d3940847d3..f1bbeed46a4c 100644
>>--- a/drivers/iommu/intel-iommu.c
>>+++ b/drivers/iommu/intel-iommu.c
>>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>>iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>>
>>- return info && info->auxd_enabled &&
>>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>>+ info->auxd_enabled && domain->type ==
>>IOMMU_DOMAIN_UNMANAGED;
>> }
>>
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>>Regards,
>>Jerry
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 0:02 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 0:02 UTC (permalink / raw)
To: Lu Baolu
Cc: Heiko Stuebner, virtualization, linux-tegra, Thierry Reding,
Will Deacon, Marek Szyprowski, Jean-Philippe Brucker,
linux-samsung-soc, Joerg Roedel, iommu, Krzysztof Kozlowski,
Jonathan Hunter, linux-rockchip, Andy Gross, linux-s390,
linux-arm-msm, linux-mediatek, Matthias Brugger, Bjorn Andersson,
Gerald Schaefer, David Woodhouse, linux-kernel, Rob Clark,
Kukjin Kim, Robin Murphy
On Tue Jun 02 20, Lu Baolu wrote:
>Hi Jerry,
>
>On 6/1/20 6:42 PM, Jerry Snitselaar wrote:
>>>
>>>Hi Joerg,
>>>
>>>With this patchset, I have an epyc system where if I boot with
>>>iommu=nopt and force a dump I will see some io page faults for a nic
>>>on the system. The vmcore is harvested and the system reboots. I
>>>haven't reproduced it on other systems yet, but without the patchset I
>>>don't see the io page faults during the kdump.
>>>
>>>Regards,
>>>Jerry
>>
>>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>>get set to a valid address until the domain_add_dev_info call.
>>
>>Is it as simple as the following?
>
>I guess you won't hit this issue if you use iommu/next branch of Joerg's
>tree. We've changed to use a generic helper to retrieve the valid per
>device iommu data or NULL (if there's no).
>
>Best regards,
>baolu
>
Yeah, that will solve the panic.
>>
>>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>>index 29d3940847d3..f1bbeed46a4c 100644
>>--- a/drivers/iommu/intel-iommu.c
>>+++ b/drivers/iommu/intel-iommu.c
>>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>>iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>>
>>- return info && info->auxd_enabled &&
>>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>>+ info->auxd_enabled && domain->type ==
>>IOMMU_DOMAIN_UNMANAGED;
>> }
>>
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>>Regards,
>>Jerry
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 0:02 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 0:02 UTC (permalink / raw)
To: Lu Baolu
Cc: Heiko Stuebner, virtualization, linux-tegra, Thierry Reding,
Will Deacon, Jean-Philippe Brucker, linux-samsung-soc, iommu,
Krzysztof Kozlowski, Jonathan Hunter, linux-rockchip, Andy Gross,
linux-s390, linux-arm-msm, linux-mediatek, Matthias Brugger,
Bjorn Andersson, Gerald Schaefer, David Woodhouse, linux-kernel,
Kukjin Kim, Robin Murphy
On Tue Jun 02 20, Lu Baolu wrote:
>Hi Jerry,
>
>On 6/1/20 6:42 PM, Jerry Snitselaar wrote:
>>>
>>>Hi Joerg,
>>>
>>>With this patchset, I have an epyc system where if I boot with
>>>iommu=nopt and force a dump I will see some io page faults for a nic
>>>on the system. The vmcore is harvested and the system reboots. I
>>>haven't reproduced it on other systems yet, but without the patchset I
>>>don't see the io page faults during the kdump.
>>>
>>>Regards,
>>>Jerry
>>
>>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>>get set to a valid address until the domain_add_dev_info call.
>>
>>Is it as simple as the following?
>
>I guess you won't hit this issue if you use iommu/next branch of Joerg's
>tree. We've changed to use a generic helper to retrieve the valid per
>device iommu data or NULL (if there's no).
>
>Best regards,
>baolu
>
Yeah, that will solve the panic.
>>
>>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>>index 29d3940847d3..f1bbeed46a4c 100644
>>--- a/drivers/iommu/intel-iommu.c
>>+++ b/drivers/iommu/intel-iommu.c
>>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>>iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>>
>>- return info && info->auxd_enabled &&
>>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>>+ info->auxd_enabled && domain->type ==
>>IOMMU_DOMAIN_UNMANAGED;
>> }
>>
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>>Regards,
>>Jerry
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 0:02 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 0:02 UTC (permalink / raw)
To: Lu Baolu
Cc: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
On Tue Jun 02 20, Lu Baolu wrote:
>Hi Jerry,
>
>On 6/1/20 6:42 PM, Jerry Snitselaar wrote:
>>>
>>>Hi Joerg,
>>>
>>>With this patchset, I have an epyc system where if I boot with
>>>iommu=nopt and force a dump I will see some io page faults for a nic
>>>on the system. The vmcore is harvested and the system reboots. I
>>>haven't reproduced it on other systems yet, but without the patchset I
>>>don't see the io page faults during the kdump.
>>>
>>>Regards,
>>>Jerry
>>
>>I just hit an issue on a separate intel based system (kdump iommu=nopt),
>>where it panics in during intel_iommu_attach_device, in is_aux_domain,
>>due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
>>get set to a valid address until the domain_add_dev_info call.
>>
>>Is it as simple as the following?
>
>I guess you won't hit this issue if you use iommu/next branch of Joerg's
>tree. We've changed to use a generic helper to retrieve the valid per
>device iommu data or NULL (if there's no).
>
>Best regards,
>baolu
>
Yeah, that will solve the panic.
>>
>>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
>>index 29d3940847d3..f1bbeed46a4c 100644
>>--- a/drivers/iommu/intel-iommu.c
>>+++ b/drivers/iommu/intel-iommu.c
>>@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct
>>iommu_domain *domain)
>> {
>> struct device_domain_info *info = dev->archdata.iommu;
>>
>>- return info && info->auxd_enabled &&
>>- domain->type == IOMMU_DOMAIN_UNMANAGED;
>>+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
>>+ info->auxd_enabled && domain->type ==
>>IOMMU_DOMAIN_UNMANAGED;
>> }
>>
>> static void auxiliary_link_device(struct dmar_domain *domain,
>>
>>
>>Regards,
>>Jerry
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-02 0:02 ` Jerry Snitselaar
(?)
(?)
@ 2020-06-02 14:23 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-06-02 14:23 UTC (permalink / raw)
To: Lu Baolu, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
Hi Jerry,
On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>
> Yeah, that will solve the panic.
>
If you still see the kdump faults, can you please try with the attached
diff? I was not able to reproduce them in my setup.
Regards,
Joerg
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
+ ret = __iommu_attach_device(group->domain, dev);
+
+ return ret;
}
static int __iommu_group_dma_attach(struct iommu_group *group)
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 14:23 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-06-02 14:23 UTC (permalink / raw)
To: Lu Baolu, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
Hi Jerry,
On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>
> Yeah, that will solve the panic.
>
If you still see the kdump faults, can you please try with the attached
diff? I was not able to reproduce them in my setup.
Regards,
Joerg
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
+ ret = __iommu_attach_device(group->domain, dev);
+
+ return ret;
}
static int __iommu_group_dma_attach(struct iommu_group *group)
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 14:23 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-06-02 14:23 UTC (permalink / raw)
To: Lu Baolu, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
Hi Jerry,
On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>
> Yeah, that will solve the panic.
>
If you still see the kdump faults, can you please try with the attached
diff? I was not able to reproduce them in my setup.
Regards,
Joerg
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
+ ret = __iommu_attach_device(group->domain, dev);
+
+ return ret;
}
static int __iommu_group_dma_attach(struct iommu_group *group)
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 14:23 ` Joerg Roedel
0 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-06-02 14:23 UTC (permalink / raw)
To: Lu Baolu, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualiza
Hi Jerry,
On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>
> Yeah, that will solve the panic.
>
If you still see the kdump faults, can you please try with the attached
diff? I was not able to reproduce them in my setup.
Regards,
Joerg
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
+ ret = __iommu_attach_device(group->domain, dev);
+
+ return ret;
}
static int __iommu_group_dma_attach(struct iommu_group *group)
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-02 14:23 ` Joerg Roedel
(?)
(?)
@ 2020-06-02 16:38 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 16:38 UTC (permalink / raw)
To: Joerg Roedel
Cc: Lu Baolu, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualiza
On Tue Jun 02 20, Joerg Roedel wrote:
>Hi Jerry,
>
>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>
>> Yeah, that will solve the panic.
>>
>
>If you still see the kdump faults, can you please try with the attached
>diff? I was not able to reproduce them in my setup.
>
>Regards,
>
> Joerg
>
I have another hp proliant server now, and reproduced. I will have the
patch below tested shortly. Minor change, I switched group->domain to
domain since group isn't an argument, and *data being passed in comes
from group->domain anyways.
>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>+ ret = __iommu_attach_device(group->domain, dev);
>+
>+ return ret;
> }
>
> static int __iommu_group_dma_attach(struct iommu_group *group)
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 16:38 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 16:38 UTC (permalink / raw)
To: Joerg Roedel
Cc: Heiko Stuebner, virtualization, linux-tegra, Thierry Reding,
Will Deacon, Marek Szyprowski, Jean-Philippe Brucker,
linux-samsung-soc, iommu, Krzysztof Kozlowski, Jonathan Hunter,
linux-rockchip, Andy Gross, linux-s390, linux-arm-msm,
linux-mediatek, Matthias Brugger, Bjorn Andersson,
Gerald Schaefer, David Woodhouse, linux-kernel, Rob Clark,
Kukjin Kim, Robin Murphy, Lu Baolu
On Tue Jun 02 20, Joerg Roedel wrote:
>Hi Jerry,
>
>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>
>> Yeah, that will solve the panic.
>>
>
>If you still see the kdump faults, can you please try with the attached
>diff? I was not able to reproduce them in my setup.
>
>Regards,
>
> Joerg
>
I have another hp proliant server now, and reproduced. I will have the
patch below tested shortly. Minor change, I switched group->domain to
domain since group isn't an argument, and *data being passed in comes
from group->domain anyways.
>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>+ ret = __iommu_attach_device(group->domain, dev);
>+
>+ return ret;
> }
>
> static int __iommu_group_dma_attach(struct iommu_group *group)
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 16:38 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 16:38 UTC (permalink / raw)
To: Joerg Roedel
Cc: Heiko Stuebner, virtualization, linux-tegra, Thierry Reding,
Will Deacon, Jean-Philippe Brucker, linux-samsung-soc, iommu,
Krzysztof Kozlowski, Jonathan Hunter, linux-rockchip, Andy Gross,
linux-s390, linux-arm-msm, linux-mediatek, Matthias Brugger,
Bjorn Andersson, Gerald Schaefer, David Woodhouse, linux-kernel,
Kukjin Kim, Robin Murphy
On Tue Jun 02 20, Joerg Roedel wrote:
>Hi Jerry,
>
>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>
>> Yeah, that will solve the panic.
>>
>
>If you still see the kdump faults, can you please try with the attached
>diff? I was not able to reproduce them in my setup.
>
>Regards,
>
> Joerg
>
I have another hp proliant server now, and reproduced. I will have the
patch below tested shortly. Minor change, I switched group->domain to
domain since group isn't an argument, and *data being passed in comes
from group->domain anyways.
>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>+ ret = __iommu_attach_device(group->domain, dev);
>+
>+ return ret;
> }
>
> static int __iommu_group_dma_attach(struct iommu_group *group)
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 16:38 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 16:38 UTC (permalink / raw)
To: Joerg Roedel
Cc: Lu Baolu, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390, linux-samsung-soc,
linux-arm-msm, linux-kernel, virtualization, linux-rockchip,
iommu, linux-mediatek, linux-tegra
On Tue Jun 02 20, Joerg Roedel wrote:
>Hi Jerry,
>
>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>
>> Yeah, that will solve the panic.
>>
>
>If you still see the kdump faults, can you please try with the attached
>diff? I was not able to reproduce them in my setup.
>
>Regards,
>
> Joerg
>
I have another hp proliant server now, and reproduced. I will have the
patch below tested shortly. Minor change, I switched group->domain to
domain since group isn't an argument, and *data being passed in comes
from group->domain anyways.
>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>+ ret = __iommu_attach_device(group->domain, dev);
>+
>+ return ret;
> }
>
> static int __iommu_group_dma_attach(struct iommu_group *group)
>_______________________________________________
>iommu mailing list
>iommu@lists.linux-foundation.org
>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-02 16:38 ` Jerry Snitselaar
(?)
(?)
@ 2020-06-02 21:17 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 21:17 UTC (permalink / raw)
To: Joerg Roedel, Lu Baolu, Will Deacon, Robin Murphy,
Marek Szyprowski, Kukjin Kim, Krzysztof Kozlowski,
David Woodhouse, Andy Gross, Bjorn Andersson, Matthias Brugger,
Rob Clark, Heiko Stuebner, Gerald Schaefer, Thierry Reding,
Jonathan Hunter, Jean-Philippe Brucker, linux-s390,
linux-samsung-soc, linux-arm-msm, linux-kernel, virtualization,
linux-rockchip, iommu, linux-mediatek, linux-tegra
On Tue Jun 02 20, Jerry Snitselaar wrote:
>On Tue Jun 02 20, Joerg Roedel wrote:
>>Hi Jerry,
>>
>>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>>
>>>Yeah, that will solve the panic.
>>>
>>
>>If you still see the kdump faults, can you please try with the attached
>>diff? I was not able to reproduce them in my setup.
>>
>>Regards,
>>
>> Joerg
>>
>
>I have another hp proliant server now, and reproduced. I will have the
>patch below tested shortly. Minor change, I switched group->domain to
>domain since group isn't an argument, and *data being passed in comes
>from group->domain anyways.
>
Looks like it solves problem for both the epyc system, and the hp proliant
server,
>>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>>+ ret = __iommu_attach_device(group->domain, dev);
>>+
>>+ return ret;
>>}
>>
>>static int __iommu_group_dma_attach(struct iommu_group *group)
>>_______________________________________________
>>iommu mailing list
>>iommu@lists.linux-foundation.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 21:17 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 21:17 UTC (permalink / raw)
To: Joerg Roedel, Lu Baolu, Will Deacon, Robin Murphy,
Marek Szyprowski, Kukjin Kim, Krzysztof Kozlowski,
David Woodhouse, Andy Gross, Bjorn Andersson, Matthias Brugger,
Rob Clark, Heiko Stuebner, Gerald Schaefer, Thierry Reding,
Jonathan Hunter, Jean-Philippe Brucker, linux-s390,
linux-samsung-soc, linux-arm-msm
On Tue Jun 02 20, Jerry Snitselaar wrote:
>On Tue Jun 02 20, Joerg Roedel wrote:
>>Hi Jerry,
>>
>>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>>
>>>Yeah, that will solve the panic.
>>>
>>
>>If you still see the kdump faults, can you please try with the attached
>>diff? I was not able to reproduce them in my setup.
>>
>>Regards,
>>
>> Joerg
>>
>
>I have another hp proliant server now, and reproduced. I will have the
>patch below tested shortly. Minor change, I switched group->domain to
>domain since group isn't an argument, and *data being passed in comes
>from group->domain anyways.
>
Looks like it solves problem for both the epyc system, and the hp proliant
server,
>>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>>+ ret = __iommu_attach_device(group->domain, dev);
>>+
>>+ return ret;
>>}
>>
>>static int __iommu_group_dma_attach(struct iommu_group *group)
>>_______________________________________________
>>iommu mailing list
>>iommu@lists.linux-foundation.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 21:17 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 21:17 UTC (permalink / raw)
To: Joerg Roedel, Lu Baolu, Will Deacon, Robin Murphy,
Marek Szyprowski, Kukjin Kim, Krzysztof Kozlowski,
David Woodhouse, Andy Gross, Bjorn Andersson, Matthias Brugger,
Rob Clark, Heiko Stuebner, Gerald Schaefer, Thierry Reding,
Jonathan Hunter, Jean-Philippe Brucker, linux-s390,
linux-samsung-soc, linux-arm-msm, linux-kernel, virtualization,
linux-rockchip, iommu, linux-mediatek, linux-tegra
On Tue Jun 02 20, Jerry Snitselaar wrote:
>On Tue Jun 02 20, Joerg Roedel wrote:
>>Hi Jerry,
>>
>>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>>
>>>Yeah, that will solve the panic.
>>>
>>
>>If you still see the kdump faults, can you please try with the attached
>>diff? I was not able to reproduce them in my setup.
>>
>>Regards,
>>
>> Joerg
>>
>
>I have another hp proliant server now, and reproduced. I will have the
>patch below tested shortly. Minor change, I switched group->domain to
>domain since group isn't an argument, and *data being passed in comes
>from group->domain anyways.
>
Looks like it solves problem for both the epyc system, and the hp proliant
server,
>>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>>+ ret = __iommu_attach_device(group->domain, dev);
>>+
>>+ return ret;
>>}
>>
>>static int __iommu_group_dma_attach(struct iommu_group *group)
>>_______________________________________________
>>iommu mailing list
>>iommu@lists.linux-foundation.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
@ 2020-06-02 21:17 ` Jerry Snitselaar
0 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 21:17 UTC (permalink / raw)
To: Joerg Roedel, Lu Baolu, Will Deacon, Robin Murphy,
Marek Szyprowski, Kukjin Kim, Krzysztof Kozlowski,
David Woodhouse, Andy Gross, Bjorn Andersson, Matthias Brugger,
Rob Clark, Heiko Stuebner, Gerald Schaefer, Thierry Reding,
Jonathan Hunter, Jean-Philippe Brucker, linux-s390,
linux-samsung-soc, linux-arm-msm, linux-kernel, virtualization,
linux-rockchip, iommu, linux-mediatek, linux-tegra
On Tue Jun 02 20, Jerry Snitselaar wrote:
>On Tue Jun 02 20, Joerg Roedel wrote:
>>Hi Jerry,
>>
>>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>>
>>>Yeah, that will solve the panic.
>>>
>>
>>If you still see the kdump faults, can you please try with the attached
>>diff? I was not able to reproduce them in my setup.
>>
>>Regards,
>>
>> Joerg
>>
>
>I have another hp proliant server now, and reproduced. I will have the
>patch below tested shortly. Minor change, I switched group->domain to
>domain since group isn't an argument, and *data being passed in comes
>from group->domain anyways.
>
Looks like it solves problem for both the epyc system, and the hp proliant
server,
>>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>>+ ret = __iommu_attach_device(group->domain, dev);
>>+
>>+ return ret;
>>}
>>
>>static int __iommu_group_dma_attach(struct iommu_group *group)
>>_______________________________________________
>>iommu mailing list
>>iommu@lists.linux-foundation.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-02 16:38 ` Jerry Snitselaar
` (3 preceding siblings ...)
(?)
@ 2020-06-02 21:17 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 21:17 UTC (permalink / raw)
To: Joerg Roedel, Lu Baolu, Will Deacon, Robin Murphy,
Marek Szyprowski, Kukjin Kim, Krzysztof Kozlowski,
David Woodhouse, Andy Gross, Bjorn Andersson, Matthias Brugger,
Rob Clark, Heiko Stuebner, Gerald Schaefer, Thierry Reding,
Jonathan Hunter, Jean-Philippe Brucker,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs+XwC/5MpYmKg
On Tue Jun 02 20, Jerry Snitselaar wrote:
>On Tue Jun 02 20, Joerg Roedel wrote:
>>Hi Jerry,
>>
>>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>>
>>>Yeah, that will solve the panic.
>>>
>>
>>If you still see the kdump faults, can you please try with the attached
>>diff? I was not able to reproduce them in my setup.
>>
>>Regards,
>>
>> Joerg
>>
>
>I have another hp proliant server now, and reproduced. I will have the
>patch below tested shortly. Minor change, I switched group->domain to
>domain since group isn't an argument, and *data being passed in comes
>from group->domain anyways.
>
Looks like it solves problem for both the epyc system, and the hp proliant
server,
>>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>>+ ret = __iommu_attach_device(group->domain, dev);
>>+
>>+ return ret;
>>}
>>
>>static int __iommu_group_dma_attach(struct iommu_group *group)
>>_______________________________________________
>>iommu mailing list
>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-02 16:38 ` Jerry Snitselaar
` (4 preceding siblings ...)
(?)
@ 2020-06-02 21:17 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 21:17 UTC (permalink / raw)
To: Joerg Roedel, Lu Baolu, Will Deacon, Robin Murphy,
Marek Szyprowski, Kukjin Kim, Krzysztof Kozlowski,
David Woodhouse, Andy Gross, Bjorn Andersson, Matthias Brugger,
Rob Clark, Heiko Stuebner, Gerald Schaefer, Thierry Reding,
Jonathan Hunter, Jean-Philippe Brucker,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs+XwC/5MpYmKg
On Tue Jun 02 20, Jerry Snitselaar wrote:
>On Tue Jun 02 20, Joerg Roedel wrote:
>>Hi Jerry,
>>
>>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>>
>>>Yeah, that will solve the panic.
>>>
>>
>>If you still see the kdump faults, can you please try with the attached
>>diff? I was not able to reproduce them in my setup.
>>
>>Regards,
>>
>> Joerg
>>
>
>I have another hp proliant server now, and reproduced. I will have the
>patch below tested shortly. Minor change, I switched group->domain to
>domain since group isn't an argument, and *data being passed in comes
>from group->domain anyways.
>
Looks like it solves problem for both the epyc system, and the hp proliant
server,
>>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>>+ ret = __iommu_attach_device(group->domain, dev);
>>+
>>+ return ret;
>>}
>>
>>static int __iommu_group_dma_attach(struct iommu_group *group)
>>_______________________________________________
>>iommu mailing list
>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-02 16:38 ` Jerry Snitselaar
` (5 preceding siblings ...)
(?)
@ 2020-06-02 21:17 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 21:17 UTC (permalink / raw)
To: Joerg Roedel, Lu Baolu, Will Deacon, Robin Murphy,
Marek Szyprowski, Kukjin Kim, Krzysztof Kozlowski,
David Woodhouse, Andy Gross, Bjorn Andersson, Matthias Brugger,
Rob Clark, Heiko Stuebner, Gerald Schaefer, Thierry Reding,
Jonathan Hunter, Jean-Philippe Brucker,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs+XwC/5MpYmKg
On Tue Jun 02 20, Jerry Snitselaar wrote:
>On Tue Jun 02 20, Joerg Roedel wrote:
>>Hi Jerry,
>>
>>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>>
>>>Yeah, that will solve the panic.
>>>
>>
>>If you still see the kdump faults, can you please try with the attached
>>diff? I was not able to reproduce them in my setup.
>>
>>Regards,
>>
>> Joerg
>>
>
>I have another hp proliant server now, and reproduced. I will have the
>patch below tested shortly. Minor change, I switched group->domain to
>domain since group isn't an argument, and *data being passed in comes
>from group->domain anyways.
>
Looks like it solves problem for both the epyc system, and the hp proliant
server,
>>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>>+ ret = __iommu_attach_device(group->domain, dev);
>>+
>>+ return ret;
>>}
>>
>>static int __iommu_group_dma_attach(struct iommu_group *group)
>>_______________________________________________
>>iommu mailing list
>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
^ permalink raw reply [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-02 16:38 ` Jerry Snitselaar
` (6 preceding siblings ...)
(?)
@ 2020-06-02 21:17 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-02 21:17 UTC (permalink / raw)
To: Joerg Roedel, Lu Baolu, Will Deacon, Robin Murphy,
Marek Szyprowski, Kukjin Kim, Krzysztof Kozlowski,
David Woodhouse, Andy Gross, Bjorn Andersson, Matthias Brugger,
Rob Clark, Heiko Stuebner, Gerald Schaefer, Thierry Reding,
Jonathan Hunter, Jean-Philippe Brucker,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA
On Tue Jun 02 20, Jerry Snitselaar wrote:
>On Tue Jun 02 20, Joerg Roedel wrote:
>>Hi Jerry,
>>
>>On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>>>
>>>Yeah, that will solve the panic.
>>>
>>
>>If you still see the kdump faults, can you please try with the attached
>>diff? I was not able to reproduce them in my setup.
>>
>>Regards,
>>
>> Joerg
>>
>
>I have another hp proliant server now, and reproduced. I will have the
>patch below tested shortly. Minor change, I switched group->domain to
>domain since group isn't an argument, and *data being passed in comes
>from group->domain anyways.
>
Looks like it solves problem for both the epyc system, and the hp proliant
server,
>>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>>index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
>>+ ret = __iommu_attach_device(group->domain, dev);
>>+
>>+ return ret;
>>}
>>
>>static int __iommu_group_dma_attach(struct iommu_group *group)
>>_______________________________________________
>>iommu mailing list
>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
^ permalink raw reply [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-02 0:02 ` Jerry Snitselaar
` (3 preceding siblings ...)
(?)
@ 2020-06-02 14:23 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-06-02 14:23 UTC (permalink / raw)
To: Lu Baolu, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-mediatek
Hi Jerry,
On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>
> Yeah, that will solve the panic.
>
If you still see the kdump faults, can you please try with the attached
diff? I was not able to reproduce them in my setup.
Regards,
Joerg
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
+ ret = __iommu_attach_device(group->domain, dev);
+
+ return ret;
}
static int __iommu_group_dma_attach(struct iommu_group *group)
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-02 0:02 ` Jerry Snitselaar
` (4 preceding siblings ...)
(?)
@ 2020-06-02 14:23 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-06-02 14:23 UTC (permalink / raw)
To: Lu Baolu, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, virtualiza
Hi Jerry,
On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>
> Yeah, that will solve the panic.
>
If you still see the kdump faults, can you please try with the attached
diff? I was not able to reproduce them in my setup.
Regards,
Joerg
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
+ ret = __iommu_attach_device(group->domain, dev);
+
+ return ret;
}
static int __iommu_group_dma_attach(struct iommu_group *group)
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-06-02 0:02 ` Jerry Snitselaar
` (5 preceding siblings ...)
(?)
@ 2020-06-02 14:23 ` Joerg Roedel
-1 siblings, 0 replies; 233+ messages in thread
From: Joerg Roedel @ 2020-06-02 14:23 UTC (permalink / raw)
To: Lu Baolu, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Andy Gross,
Bjorn Andersson, Matthias Brugger, Rob Clark, Heiko Stuebner,
Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-mediatek
Hi Jerry,
On Mon, Jun 01, 2020 at 05:02:36PM -0700, Jerry Snitselaar wrote:
>
> Yeah, that will solve the panic.
>
If you still see the kdump faults, can you please try with the attached
diff? I was not able to reproduce them in my setup.
Regards,
Joerg
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index b5ea203f6c68..5a6d509f72b6 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(group->domain, dev))
+ ret = __iommu_attach_device(group->domain, dev);
+
+ return ret;
}
static int __iommu_group_dma_attach(struct iommu_group *group)
^ permalink raw reply related [flat|nested] 233+ messages in thread
* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-05-29 22:16 ` Jerry Snitselaar
` (3 preceding siblings ...)
(?)
@ 2020-06-01 10:42 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 10:42 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9IKTv4iemRRA
On Fri May 29 20, Jerry Snitselaar wrote:
>On Tue Apr 14 20, Joerg Roedel wrote:
>>Hi,
>>
>>here is the second version of this patch-set. The first version with
>>some more introductory text can be found here:
>>
>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>>
>>Changes v1->v2:
>>
>> * Rebased to v5.7-rc1
>>
>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>
>> * Re-worked the Exynos patches to hopefully not break the
>> driver anymore
>>
>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>> thanks for that.
>>
>>There is also a git-branch available with these patches applied:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>
>>Please review.
>>
>>Thanks,
>>
>> Joerg
>>
>>Joerg Roedel (32):
>> iommu: Move default domain allocation to separate function
>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>> iommu/amd: Remove dma_mask check from check_device()
>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>> IOMMU
>> iommu: Add probe_device() and remove_device() call-backs
>> iommu: Move default domain allocation to iommu_probe_device()
>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>> iommu: Move new probe_device path to separate function
>> iommu: Split off default domain allocation from group assignment
>> iommu: Move iommu_group_create_direct_mappings() out of
>> iommu_group_add_device()
>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>> iommu/amd: Remove dev_data->passthrough
>> iommu/amd: Convert to probe/release_device() call-backs
>> iommu/vt-d: Convert to probe/release_device() call-backs
>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>> iommu/pamu: Convert to probe/release_device() call-backs
>> iommu/s390: Convert to probe/release_device() call-backs
>> iommu/virtio: Convert to probe/release_device() call-backs
>> iommu/msm: Convert to probe/release_device() call-backs
>> iommu/mediatek: Convert to probe/release_device() call-backs
>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>> iommu/qcom: Convert to probe/release_device() call-backs
>> iommu/rockchip: Convert to probe/release_device() call-backs
>> iommu/tegra: Convert to probe/release_device() call-backs
>> iommu/renesas: Convert to probe/release_device() call-backs
>> iommu/omap: Remove orphan_dev tracking
>> iommu/omap: Convert to probe/release_device() call-backs
>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>> iommu/exynos: Convert to probe/release_device() call-backs
>> iommu: Remove add_device()/remove_device() code-paths
>> iommu: Unexport iommu_group_get_for_dev()
>>
>>Sai Praneeth Prakhya (1):
>> iommu: Add def_domain_type() callback in iommu_ops
>>
>>drivers/iommu/amd_iommu.c | 97 ++++----
>>drivers/iommu/amd_iommu_types.h | 1 -
>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>drivers/iommu/arm-smmu.c | 39 ++--
>>drivers/iommu/exynos-iommu.c | 24 +-
>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>drivers/iommu/intel-iommu.c | 68 +-----
>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>drivers/iommu/msm_iommu.c | 34 +--
>>drivers/iommu/mtk_iommu.c | 24 +-
>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>drivers/iommu/omap-iommu.c | 99 ++------
>>drivers/iommu/qcom_iommu.c | 24 +-
>>drivers/iommu/rockchip-iommu.c | 26 +--
>>drivers/iommu/s390-iommu.c | 22 +-
>>drivers/iommu/tegra-gart.c | 24 +-
>>drivers/iommu/tegra-smmu.c | 31 +--
>>drivers/iommu/virtio-iommu.c | 41 +---
>>include/linux/iommu.h | 21 +-
>>20 files changed, 533 insertions(+), 605 deletions(-)
>>
>>--
>>2.17.1
>>
>>_______________________________________________
>>iommu mailing list
>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
>
>Hi Joerg,
>
>With this patchset, I have an epyc system where if I boot with
>iommu=nopt and force a dump I will see some io page faults for a nic
>on the system. The vmcore is harvested and the system reboots. I
>haven't reproduced it on other systems yet, but without the patchset I
>don't see the io page faults during the kdump.
>
>Regards,
>Jerry
I just hit an issue on a separate intel based system (kdump iommu=nopt),
where it panics in during intel_iommu_attach_device, in is_aux_domain,
due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
get set to a valid address until the domain_add_dev_info call.
Is it as simple as the following?
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 29d3940847d3..f1bbeed46a4c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
{
struct device_domain_info *info = dev->archdata.iommu;
- return info && info->auxd_enabled &&
- domain->type == IOMMU_DOMAIN_UNMANAGED;
+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
}
static void auxiliary_link_device(struct dmar_domain *domain,
Regards,
Jerry
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-05-29 22:16 ` Jerry Snitselaar
` (4 preceding siblings ...)
(?)
@ 2020-06-01 10:42 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 10:42 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9IKTv4iemRRA
On Fri May 29 20, Jerry Snitselaar wrote:
>On Tue Apr 14 20, Joerg Roedel wrote:
>>Hi,
>>
>>here is the second version of this patch-set. The first version with
>>some more introductory text can be found here:
>>
>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>>
>>Changes v1->v2:
>>
>> * Rebased to v5.7-rc1
>>
>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>
>> * Re-worked the Exynos patches to hopefully not break the
>> driver anymore
>>
>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>> thanks for that.
>>
>>There is also a git-branch available with these patches applied:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>
>>Please review.
>>
>>Thanks,
>>
>> Joerg
>>
>>Joerg Roedel (32):
>> iommu: Move default domain allocation to separate function
>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>> iommu/amd: Remove dma_mask check from check_device()
>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>> IOMMU
>> iommu: Add probe_device() and remove_device() call-backs
>> iommu: Move default domain allocation to iommu_probe_device()
>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>> iommu: Move new probe_device path to separate function
>> iommu: Split off default domain allocation from group assignment
>> iommu: Move iommu_group_create_direct_mappings() out of
>> iommu_group_add_device()
>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>> iommu/amd: Remove dev_data->passthrough
>> iommu/amd: Convert to probe/release_device() call-backs
>> iommu/vt-d: Convert to probe/release_device() call-backs
>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>> iommu/pamu: Convert to probe/release_device() call-backs
>> iommu/s390: Convert to probe/release_device() call-backs
>> iommu/virtio: Convert to probe/release_device() call-backs
>> iommu/msm: Convert to probe/release_device() call-backs
>> iommu/mediatek: Convert to probe/release_device() call-backs
>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>> iommu/qcom: Convert to probe/release_device() call-backs
>> iommu/rockchip: Convert to probe/release_device() call-backs
>> iommu/tegra: Convert to probe/release_device() call-backs
>> iommu/renesas: Convert to probe/release_device() call-backs
>> iommu/omap: Remove orphan_dev tracking
>> iommu/omap: Convert to probe/release_device() call-backs
>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>> iommu/exynos: Convert to probe/release_device() call-backs
>> iommu: Remove add_device()/remove_device() code-paths
>> iommu: Unexport iommu_group_get_for_dev()
>>
>>Sai Praneeth Prakhya (1):
>> iommu: Add def_domain_type() callback in iommu_ops
>>
>>drivers/iommu/amd_iommu.c | 97 ++++----
>>drivers/iommu/amd_iommu_types.h | 1 -
>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>drivers/iommu/arm-smmu.c | 39 ++--
>>drivers/iommu/exynos-iommu.c | 24 +-
>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>drivers/iommu/intel-iommu.c | 68 +-----
>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>drivers/iommu/msm_iommu.c | 34 +--
>>drivers/iommu/mtk_iommu.c | 24 +-
>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>drivers/iommu/omap-iommu.c | 99 ++------
>>drivers/iommu/qcom_iommu.c | 24 +-
>>drivers/iommu/rockchip-iommu.c | 26 +--
>>drivers/iommu/s390-iommu.c | 22 +-
>>drivers/iommu/tegra-gart.c | 24 +-
>>drivers/iommu/tegra-smmu.c | 31 +--
>>drivers/iommu/virtio-iommu.c | 41 +---
>>include/linux/iommu.h | 21 +-
>>20 files changed, 533 insertions(+), 605 deletions(-)
>>
>>--
>>2.17.1
>>
>>_______________________________________________
>>iommu mailing list
>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
>
>Hi Joerg,
>
>With this patchset, I have an epyc system where if I boot with
>iommu=nopt and force a dump I will see some io page faults for a nic
>on the system. The vmcore is harvested and the system reboots. I
>haven't reproduced it on other systems yet, but without the patchset I
>don't see the io page faults during the kdump.
>
>Regards,
>Jerry
I just hit an issue on a separate intel based system (kdump iommu=nopt),
where it panics in during intel_iommu_attach_device, in is_aux_domain,
due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
get set to a valid address until the domain_add_dev_info call.
Is it as simple as the following?
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 29d3940847d3..f1bbeed46a4c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
{
struct device_domain_info *info = dev->archdata.iommu;
- return info && info->auxd_enabled &&
- domain->type == IOMMU_DOMAIN_UNMANAGED;
+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
}
static void auxiliary_link_device(struct dmar_domain *domain,
Regards,
Jerry
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-05-29 22:16 ` Jerry Snitselaar
` (5 preceding siblings ...)
(?)
@ 2020-06-01 10:42 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 10:42 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, linux-ke
On Fri May 29 20, Jerry Snitselaar wrote:
>On Tue Apr 14 20, Joerg Roedel wrote:
>>Hi,
>>
>>here is the second version of this patch-set. The first version with
>>some more introductory text can be found here:
>>
>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>>
>>Changes v1->v2:
>>
>> * Rebased to v5.7-rc1
>>
>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>
>> * Re-worked the Exynos patches to hopefully not break the
>> driver anymore
>>
>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>> thanks for that.
>>
>>There is also a git-branch available with these patches applied:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>
>>Please review.
>>
>>Thanks,
>>
>> Joerg
>>
>>Joerg Roedel (32):
>> iommu: Move default domain allocation to separate function
>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>> iommu/amd: Remove dma_mask check from check_device()
>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>> IOMMU
>> iommu: Add probe_device() and remove_device() call-backs
>> iommu: Move default domain allocation to iommu_probe_device()
>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>> iommu: Move new probe_device path to separate function
>> iommu: Split off default domain allocation from group assignment
>> iommu: Move iommu_group_create_direct_mappings() out of
>> iommu_group_add_device()
>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>> iommu/amd: Remove dev_data->passthrough
>> iommu/amd: Convert to probe/release_device() call-backs
>> iommu/vt-d: Convert to probe/release_device() call-backs
>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>> iommu/pamu: Convert to probe/release_device() call-backs
>> iommu/s390: Convert to probe/release_device() call-backs
>> iommu/virtio: Convert to probe/release_device() call-backs
>> iommu/msm: Convert to probe/release_device() call-backs
>> iommu/mediatek: Convert to probe/release_device() call-backs
>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>> iommu/qcom: Convert to probe/release_device() call-backs
>> iommu/rockchip: Convert to probe/release_device() call-backs
>> iommu/tegra: Convert to probe/release_device() call-backs
>> iommu/renesas: Convert to probe/release_device() call-backs
>> iommu/omap: Remove orphan_dev tracking
>> iommu/omap: Convert to probe/release_device() call-backs
>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>> iommu/exynos: Convert to probe/release_device() call-backs
>> iommu: Remove add_device()/remove_device() code-paths
>> iommu: Unexport iommu_group_get_for_dev()
>>
>>Sai Praneeth Prakhya (1):
>> iommu: Add def_domain_type() callback in iommu_ops
>>
>>drivers/iommu/amd_iommu.c | 97 ++++----
>>drivers/iommu/amd_iommu_types.h | 1 -
>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>drivers/iommu/arm-smmu.c | 39 ++--
>>drivers/iommu/exynos-iommu.c | 24 +-
>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>drivers/iommu/intel-iommu.c | 68 +-----
>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>drivers/iommu/msm_iommu.c | 34 +--
>>drivers/iommu/mtk_iommu.c | 24 +-
>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>drivers/iommu/omap-iommu.c | 99 ++------
>>drivers/iommu/qcom_iommu.c | 24 +-
>>drivers/iommu/rockchip-iommu.c | 26 +--
>>drivers/iommu/s390-iommu.c | 22 +-
>>drivers/iommu/tegra-gart.c | 24 +-
>>drivers/iommu/tegra-smmu.c | 31 +--
>>drivers/iommu/virtio-iommu.c | 41 +---
>>include/linux/iommu.h | 21 +-
>>20 files changed, 533 insertions(+), 605 deletions(-)
>>
>>--
>>2.17.1
>>
>>_______________________________________________
>>iommu mailing list
>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
>
>Hi Joerg,
>
>With this patchset, I have an epyc system where if I boot with
>iommu=nopt and force a dump I will see some io page faults for a nic
>on the system. The vmcore is harvested and the system reboots. I
>haven't reproduced it on other systems yet, but without the patchset I
>don't see the io page faults during the kdump.
>
>Regards,
>Jerry
I just hit an issue on a separate intel based system (kdump iommu=nopt),
where it panics in during intel_iommu_attach_device, in is_aux_domain,
due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
get set to a valid address until the domain_add_dev_info call.
Is it as simple as the following?
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 29d3940847d3..f1bbeed46a4c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
{
struct device_domain_info *info = dev->archdata.iommu;
- return info && info->auxd_enabled &&
- domain->type == IOMMU_DOMAIN_UNMANAGED;
+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
}
static void auxiliary_link_device(struct dmar_domain *domain,
Regards,
Jerry
^ permalink raw reply related [flat|nested] 233+ messages in thread* Re: [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code
2020-05-29 22:16 ` Jerry Snitselaar
` (6 preceding siblings ...)
(?)
@ 2020-06-01 10:42 ` Jerry Snitselaar
-1 siblings, 0 replies; 233+ messages in thread
From: Jerry Snitselaar @ 2020-06-01 10:42 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy, Marek Szyprowski,
Kukjin Kim, Krzysztof Kozlowski, David Woodhouse, Lu Baolu,
Andy Gross, Bjorn Andersson, Matthias Brugger, Rob Clark,
Heiko Stuebner, Gerald Schaefer, Thierry Reding, Jonathan Hunter,
Jean-Philippe Brucker, linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
iommu-cunTk1MwBs9IKTv4iemRRA
On Fri May 29 20, Jerry Snitselaar wrote:
>On Tue Apr 14 20, Joerg Roedel wrote:
>>Hi,
>>
>>here is the second version of this patch-set. The first version with
>>some more introductory text can be found here:
>>
>> https://lore.kernel.org/lkml/20200407183742.4344-1-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org/
>>
>>Changes v1->v2:
>>
>> * Rebased to v5.7-rc1
>>
>> * Re-wrote the arm-smmu changes as suggested by Robin Murphy
>>
>> * Re-worked the Exynos patches to hopefully not break the
>> driver anymore
>>
>> * Fixed a missing mutex_unlock() reported by Marek Szyprowski,
>> thanks for that.
>>
>>There is also a git-branch available with these patches applied:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/joro/linux.git/log/?h=iommu-probe-device-v2
>>
>>Please review.
>>
>>Thanks,
>>
>> Joerg
>>
>>Joerg Roedel (32):
>> iommu: Move default domain allocation to separate function
>> iommu/amd: Implement iommu_ops->def_domain_type call-back
>> iommu/vt-d: Wire up iommu_ops->def_domain_type
>> iommu/amd: Remove dma_mask check from check_device()
>> iommu/amd: Return -ENODEV in add_device when device is not handled by
>> IOMMU
>> iommu: Add probe_device() and remove_device() call-backs
>> iommu: Move default domain allocation to iommu_probe_device()
>> iommu: Keep a list of allocated groups in __iommu_probe_device()
>> iommu: Move new probe_device path to separate function
>> iommu: Split off default domain allocation from group assignment
>> iommu: Move iommu_group_create_direct_mappings() out of
>> iommu_group_add_device()
>> iommu: Export bus_iommu_probe() and make is safe for re-probing
>> iommu/amd: Remove dev_data->passthrough
>> iommu/amd: Convert to probe/release_device() call-backs
>> iommu/vt-d: Convert to probe/release_device() call-backs
>> iommu/arm-smmu: Convert to probe/release_device() call-backs
>> iommu/pamu: Convert to probe/release_device() call-backs
>> iommu/s390: Convert to probe/release_device() call-backs
>> iommu/virtio: Convert to probe/release_device() call-backs
>> iommu/msm: Convert to probe/release_device() call-backs
>> iommu/mediatek: Convert to probe/release_device() call-backs
>> iommu/mediatek-v1 Convert to probe/release_device() call-backs
>> iommu/qcom: Convert to probe/release_device() call-backs
>> iommu/rockchip: Convert to probe/release_device() call-backs
>> iommu/tegra: Convert to probe/release_device() call-backs
>> iommu/renesas: Convert to probe/release_device() call-backs
>> iommu/omap: Remove orphan_dev tracking
>> iommu/omap: Convert to probe/release_device() call-backs
>> iommu/exynos: Use first SYSMMU in controllers list for IOMMU core
>> iommu/exynos: Convert to probe/release_device() call-backs
>> iommu: Remove add_device()/remove_device() code-paths
>> iommu: Unexport iommu_group_get_for_dev()
>>
>>Sai Praneeth Prakhya (1):
>> iommu: Add def_domain_type() callback in iommu_ops
>>
>>drivers/iommu/amd_iommu.c | 97 ++++----
>>drivers/iommu/amd_iommu_types.h | 1 -
>>drivers/iommu/arm-smmu-v3.c | 38 +--
>>drivers/iommu/arm-smmu.c | 39 ++--
>>drivers/iommu/exynos-iommu.c | 24 +-
>>drivers/iommu/fsl_pamu_domain.c | 22 +-
>>drivers/iommu/intel-iommu.c | 68 +-----
>>drivers/iommu/iommu.c | 393 +++++++++++++++++++++++++-------
>>drivers/iommu/ipmmu-vmsa.c | 60 ++---
>>drivers/iommu/msm_iommu.c | 34 +--
>>drivers/iommu/mtk_iommu.c | 24 +-
>>drivers/iommu/mtk_iommu_v1.c | 50 ++--
>>drivers/iommu/omap-iommu.c | 99 ++------
>>drivers/iommu/qcom_iommu.c | 24 +-
>>drivers/iommu/rockchip-iommu.c | 26 +--
>>drivers/iommu/s390-iommu.c | 22 +-
>>drivers/iommu/tegra-gart.c | 24 +-
>>drivers/iommu/tegra-smmu.c | 31 +--
>>drivers/iommu/virtio-iommu.c | 41 +---
>>include/linux/iommu.h | 21 +-
>>20 files changed, 533 insertions(+), 605 deletions(-)
>>
>>--
>>2.17.1
>>
>>_______________________________________________
>>iommu mailing list
>>iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>>https://lists.linuxfoundation.org/mailman/listinfo/iommu
>>
>
>Hi Joerg,
>
>With this patchset, I have an epyc system where if I boot with
>iommu=nopt and force a dump I will see some io page faults for a nic
>on the system. The vmcore is harvested and the system reboots. I
>haven't reproduced it on other systems yet, but without the patchset I
>don't see the io page faults during the kdump.
>
>Regards,
>Jerry
I just hit an issue on a separate intel based system (kdump iommu=nopt),
where it panics in during intel_iommu_attach_device, in is_aux_domain,
due to device_domain_info being DEFER_DEVICE_DOMAIN_INFO. That doesn't
get set to a valid address until the domain_add_dev_info call.
Is it as simple as the following?
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 29d3940847d3..f1bbeed46a4c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5053,8 +5053,8 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
{
struct device_domain_info *info = dev->archdata.iommu;
- return info && info->auxd_enabled &&
- domain->type == IOMMU_DOMAIN_UNMANAGED;
+ return info && info != DEFER_DEVICE_DOMAIN_INFO &&
+ info->auxd_enabled && domain->type == IOMMU_DOMAIN_UNMANAGED;
}
static void auxiliary_link_device(struct dmar_domain *domain,
Regards,
Jerry
^ permalink raw reply related [flat|nested] 233+ messages in thread