Hi, Julien
I noticed there was already a panic() in iommu_setup() just in case
the user
force the use of IOMMU but they were not initialized. I was
half-tempted to set
iommu_force to true for Arm, but I think this is a different issue.
So here my take (not tested nor compiled).
Thank you. I will check it and come back with results.
I have preliminary tested it with my IPMMU series including new
modification of "deferred probing" patch (attached). Being honest my
series is not based on the *current* staging, but not too outdated.
So, your patch works as expected in the following scenarios:
1. [No panic] Without IOMMU driver in Xen (#CONFIG_IPMMU_VMSA is not set).
2. [No panic] IOMMU driver is present, but reports it is cannot be used
in Xen (P2M sharing not supported, etc) by returning -ENODEV.
3. [No panic] IOMMU is globally disabled in command line "iommu=0".
4. [No panic] IOMMU driver requests deferred probing until the last
device in DT is initialized, after that all deferred devices get
initialized.
5. [Panic] IOMMU driver returns an error (other than -EBADF and -ENODEV)
at the very beginning/when a part of devices are already initialized.
6. [Panic] IOMMU driver always returns deferred probing/returns an error
other than -EAGAIN after deferred probing.
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 2c5d1372c0..8f94f618b0 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -755,6 +755,7 @@ void __init start_xen(unsigned long
boot_phys_offset,
.max_grant_frames = gnttab_dom0_frames(),
.max_maptrack_frames = opt_max_maptrack_frames,
};
+ int rc;
dcache_line_bytes = read_dcache_line_bytes();
@@ -890,7 +891,9 @@ void __init start_xen(unsigned long
boot_phys_offset,
setup_virt_paging();
- iommu_setup();
+ rc = iommu_setup();
+ if ( !iommu_enabled && rc != -ENODEV )
+ panic("Couldn't configure correctly all the IOMMUs.");
"\n" should be added.
--
Regards,
Oleksandr Tyshchenko
>From ff0af4d3d332a4b7b1b9b7edd4dbd1b3a263cb70 Mon Sep 17 00:00:00 2001
From: Oleksandr Tyshchenko <oleksandr_tyshche...@epam.com>
Date: Thu, 15 Aug 2019 16:56:04 +0300
Subject: [PATCH] iommu/arm: Add ability to handle deferred probing request
This patch adds minimal required support to General IOMMU framework
to be able to handle a case when IOMMU driver requesting deferred
probing for a device.
In order not to pull Linux's error code (-EPROBE_DEFER) to Xen
we have chosen -EAGAIN to be used for indicating that device
probing is deferred.
This is needed for the upcoming IPMMU driver which may request
deferred probing depending on what device will be probed the first
(there is some dependency between these devices, Root device must be
registered before Cache devices. If not the case, driver will deny
further Cache device probes until Root device is registered).
As we can't guarantee a fixed pre-defined order for the device nodes
in DT, we need to be ready for the situation where devices being
probed in "any" order.
While here, order the headers alphabetically.
Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshche...@epam.com>
---
Changes V2 -> V3:
- removed deferred_probe field from struct dt_device_node,
re-used domain_list instead
- documented domain_list usage
- added ASSERT to check that np->domain_list is empty
before re-using it
- put deferred_probe_list to init section
- used more strict logic regarding processing devices in
the deferred list
- added more comments to code
- put headers in alphabetical order
---
xen/drivers/passthrough/arm/iommu.c | 55 ++++++++++++++++++++++++++++++++++---
xen/include/asm-arm/device.h | 6 +++-
xen/include/xen/device_tree.h | 7 +++++
3 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/xen/drivers/passthrough/arm/iommu.c b/xen/drivers/passthrough/arm/iommu.c
index f8bb2c3..8569d2e 100644
--- a/xen/drivers/passthrough/arm/iommu.c
+++ b/xen/drivers/passthrough/arm/iommu.c
@@ -15,11 +15,20 @@
* GNU General Public License for more details.
*/
-#include <xen/lib.h>
-#include <xen/iommu.h>
#include <xen/device_tree.h>
+#include <xen/iommu.h>
+#include <xen/lib.h>
+
#include <asm/device.h>
+/*
+ * Deferred probe list is used to keep track of devices for which driver
+ * requested deferred probing (returned -EAGAIN).
+ *
+ * We re-use device's domain_list to link the device in the deferred list.
+ */
+static __initdata LIST_HEAD(deferred_probe_list);
+
static const struct iommu_ops *iommu_ops;
const struct iommu_ops *iommu_get_ops(void)
@@ -42,7 +51,7 @@ void __init iommu_set_ops(const struct iommu_ops *ops)
int __init iommu_hardware_setup(void)
{
- struct dt_device_node *np;
+ struct dt_device_node *np, *tmp;
int rc;
unsigned int num_iommus = 0;
@@ -51,6 +60,17 @@ int __init iommu_hardware_setup(void)
rc = device_init(np, DEVICE_IOMMU, NULL);
if ( !rc )
num_iommus++;
+ else if ( rc == -EAGAIN )
+ {
+ /* We expect nobody uses domain_list at such early stage. */
+ ASSERT(list_empty(&np->domain_list));
+
+ /*
+ * Driver requested deferred probing, so add this device to
+ * the deferred list for further processing.
+ */
+ list_add(&np->domain_list, &deferred_probe_list);
+ }
/*
* Ignore the following error codes:
* - EBADF: Indicate the current is not an IOMMU
@@ -60,7 +80,34 @@ int __init iommu_hardware_setup(void)
return rc;
}
- return ( num_iommus > 0 ) ? 0 : -ENODEV;
+ rc = ( num_iommus > 0 ) ? 0 : -ENODEV;
+
+ /*
+ * Process devices in the deferred list if it is not empty and at least one
+ * successfully probed device is present. Check that at least one device
+ * is added at each loop, otherwise we may get an infinite loop. Also stop
+ * processing if we got an error other than -EAGAIN.
+ */
+ while ( !list_empty(&deferred_probe_list) && num_iommus )
+ {
+ num_iommus = 0;
+
+ list_for_each_entry_safe ( np, tmp, &deferred_probe_list, domain_list )
+ {
+ rc = device_init(np, DEVICE_IOMMU, NULL);
+ if ( !rc )
+ {
+ num_iommus++;
+
+ /* Remove successfully probed device from the deferred list. */
+ list_del_init(&np->domain_list);
+ }
+ else if ( rc != -EAGAIN )
+ return rc;
+ }
+ }
+
+ return rc;
}
void __hwdom_init arch_iommu_check_autotranslated_hwdom(struct domain *d)
diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h
index 63a0f36..ee1c3bc 100644
--- a/xen/include/asm-arm/device.h
+++ b/xen/include/asm-arm/device.h
@@ -44,7 +44,11 @@ struct device_desc {
enum device_class class;
/* List of devices supported by this driver */
const struct dt_device_match *dt_match;
- /* Device initialization */
+ /*
+ * Device initialization.
+ *
+ * -EAGAIN is used to indicate that device probing is deferred.
+ */
int (*init)(struct dt_device_node *dev, const void *data);
};
diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h
index e1ec6cb..60ae99c 100644
--- a/xen/include/xen/device_tree.h
+++ b/xen/include/xen/device_tree.h
@@ -92,6 +92,13 @@ struct dt_device_node {
/* IOMMU specific fields */
bool is_protected;
+ /*
+ * The main purpose of this list node is to link the structure in the list
+ * of devices assigned to domain.
+ *
+ * Boot code (iommu_hardware_setup) re-uses this list to link the structure
+ * in the list of devices for which driver requested deferred probing.
+ */
struct list_head domain_list;
struct device dev;
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
