* [PATCH v3 01/11] xen/arm: Fix dev_is_dt macro definition
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-09-30 7:13 ` [PATCH v3 02/11] xen/arm: Add new device type for PCI Oleksandr Andrushchenko
` (9 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko, Michal Orzel
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
This macro is not currently used, but still has an error in it:
a missing parenthesis. Fix this, so the macro is properly defined.
Fixes: 6c5d3075d97e ("xen/arm: Introduce a generic way to describe device")
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Michal Orzel <michal.orzel@arm.com>
---
New in v2
---
xen/include/asm-arm/device.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h
index 5ecd5e7bd15e..ebe84ea853cd 100644
--- a/xen/include/asm-arm/device.h
+++ b/xen/include/asm-arm/device.h
@@ -27,7 +27,7 @@ typedef struct device device_t;
/* TODO: Correctly implement dev_is_pci when PCI is supported on ARM */
#define dev_is_pci(dev) ((void)(dev), 0)
-#define dev_is_dt(dev) ((dev->type == DEV_DT)
+#define dev_is_dt(dev) ((dev)->type == DEV_DT)
enum device_class
{
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v3 02/11] xen/arm: Add new device type for PCI
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
2021-09-30 7:13 ` [PATCH v3 01/11] xen/arm: Fix dev_is_dt macro definition Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-10-01 0:27 ` Stefano Stabellini
2021-09-30 7:13 ` [PATCH v3 03/11] xen/arm: Introduce pci_find_host_bridge_node helper Oleksandr Andrushchenko
` (8 subsequent siblings)
10 siblings, 1 reply; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Add new device type (DEV_PCI) to distinguish PCI devices from platform
DT devices, so some drivers, like IOMMU, can handle PCI devices
differently.
Also add a helper which is when given a struct device returns the
corresponding struct pci_dev which this device is a part of.
Because of the header cross-dependencies, e.g. we need both
struct pci_dev and struct arch_pci_dev at the same time, this cannot be
done with an inline.
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
---
Since v2:
- !! dropped Stefano's r-b because of the changes
- simplified dev_to_pci to use a single
container_of(dev, struct pci_dev, arch.dev) (Jan)
Since v1:
- Folded new device type (DEV_PCI) into this patch.
---
xen/arch/arm/pci/pci.c | 7 +++++++
xen/include/asm-arm/device.h | 4 ++--
xen/include/asm-arm/pci.h | 7 +++++++
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c
index 84d8f0d63430..9fc522e566a9 100644
--- a/xen/arch/arm/pci/pci.c
+++ b/xen/arch/arm/pci/pci.c
@@ -27,6 +27,13 @@ int arch_pci_clean_pirqs(struct domain *d)
return 0;
}
+struct pci_dev *dev_to_pci(struct device *dev)
+{
+ ASSERT(dev->type == DEV_PCI);
+
+ return container_of(dev, struct pci_dev, arch.dev);
+}
+
static int __init dt_pci_init(void)
{
struct dt_device_node *np;
diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h
index ebe84ea853cd..7bf040560363 100644
--- a/xen/include/asm-arm/device.h
+++ b/xen/include/asm-arm/device.h
@@ -4,6 +4,7 @@
enum device_type
{
DEV_DT,
+ DEV_PCI,
};
struct dev_archdata {
@@ -25,8 +26,7 @@ typedef struct device device_t;
#include <xen/device_tree.h>
-/* TODO: Correctly implement dev_is_pci when PCI is supported on ARM */
-#define dev_is_pci(dev) ((void)(dev), 0)
+#define dev_is_pci(dev) ((dev)->type == DEV_PCI)
#define dev_is_dt(dev) ((dev)->type == DEV_DT)
enum device_class
diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
index 7cb2e2f1edaf..603a1fc072d1 100644
--- a/xen/include/asm-arm/pci.h
+++ b/xen/include/asm-arm/pci.h
@@ -26,6 +26,13 @@ struct arch_pci_dev {
struct device dev;
};
+/*
+ * Because of the header cross-dependencies, e.g. we need both
+ * struct pci_dev and struct arch_pci_dev at the same time, this cannot be
+ * done with an inline here. Macro can be implemented, but looks scary.
+ */
+struct pci_dev *dev_to_pci(struct device *dev);
+
/* Arch-specific MSI data for vPCI. */
struct vpci_arch_msi {
};
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v3 02/11] xen/arm: Add new device type for PCI
2021-09-30 7:13 ` [PATCH v3 02/11] xen/arm: Add new device type for PCI Oleksandr Andrushchenko
@ 2021-10-01 0:27 ` Stefano Stabellini
0 siblings, 0 replies; 26+ messages in thread
From: Stefano Stabellini @ 2021-10-01 0:27 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: xen-devel, julien, sstabellini, oleksandr_tyshchenko,
volodymyr_babchuk, Artem_Mygaiev, roger.pau, bertrand.marquis,
rahul.singh, Oleksandr Andrushchenko
On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> Add new device type (DEV_PCI) to distinguish PCI devices from platform
> DT devices, so some drivers, like IOMMU, can handle PCI devices
> differently.
>
> Also add a helper which is when given a struct device returns the
> corresponding struct pci_dev which this device is a part of.
>
> Because of the header cross-dependencies, e.g. we need both
> struct pci_dev and struct arch_pci_dev at the same time, this cannot be
> done with an inline.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> Since v2:
> - !! dropped Stefano's r-b because of the changes
> - simplified dev_to_pci to use a single
> container_of(dev, struct pci_dev, arch.dev) (Jan)
> Since v1:
> - Folded new device type (DEV_PCI) into this patch.
> ---
> xen/arch/arm/pci/pci.c | 7 +++++++
> xen/include/asm-arm/device.h | 4 ++--
> xen/include/asm-arm/pci.h | 7 +++++++
> 3 files changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c
> index 84d8f0d63430..9fc522e566a9 100644
> --- a/xen/arch/arm/pci/pci.c
> +++ b/xen/arch/arm/pci/pci.c
> @@ -27,6 +27,13 @@ int arch_pci_clean_pirqs(struct domain *d)
> return 0;
> }
>
> +struct pci_dev *dev_to_pci(struct device *dev)
> +{
> + ASSERT(dev->type == DEV_PCI);
> +
> + return container_of(dev, struct pci_dev, arch.dev);
> +}
> +
> static int __init dt_pci_init(void)
> {
> struct dt_device_node *np;
> diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h
> index ebe84ea853cd..7bf040560363 100644
> --- a/xen/include/asm-arm/device.h
> +++ b/xen/include/asm-arm/device.h
> @@ -4,6 +4,7 @@
> enum device_type
> {
> DEV_DT,
> + DEV_PCI,
> };
>
> struct dev_archdata {
> @@ -25,8 +26,7 @@ typedef struct device device_t;
>
> #include <xen/device_tree.h>
>
> -/* TODO: Correctly implement dev_is_pci when PCI is supported on ARM */
> -#define dev_is_pci(dev) ((void)(dev), 0)
> +#define dev_is_pci(dev) ((dev)->type == DEV_PCI)
> #define dev_is_dt(dev) ((dev)->type == DEV_DT)
>
> enum device_class
> diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
> index 7cb2e2f1edaf..603a1fc072d1 100644
> --- a/xen/include/asm-arm/pci.h
> +++ b/xen/include/asm-arm/pci.h
> @@ -26,6 +26,13 @@ struct arch_pci_dev {
> struct device dev;
> };
>
> +/*
> + * Because of the header cross-dependencies, e.g. we need both
> + * struct pci_dev and struct arch_pci_dev at the same time, this cannot be
> + * done with an inline here. Macro can be implemented, but looks scary.
> + */
> +struct pci_dev *dev_to_pci(struct device *dev);
> +
> /* Arch-specific MSI data for vPCI. */
> struct vpci_arch_msi {
> };
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v3 03/11] xen/arm: Introduce pci_find_host_bridge_node helper
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
2021-09-30 7:13 ` [PATCH v3 01/11] xen/arm: Fix dev_is_dt macro definition Oleksandr Andrushchenko
2021-09-30 7:13 ` [PATCH v3 02/11] xen/arm: Add new device type for PCI Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-10-01 0:29 ` Stefano Stabellini
2021-09-30 7:13 ` [PATCH v3 04/11] xen/device-tree: Make dt_find_node_by_phandle global Oleksandr Andrushchenko
` (7 subsequent siblings)
10 siblings, 1 reply; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Get host bridge node given a PCI device attached to it.
This helper will be re-used for adding PCI devices by the subsequent
patches.
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
---
Since v2:
- !! dropped Stefano's r-b because of the changes
- s/PRI_pci/%pp after rebase onto Arm series
---
xen/arch/arm/pci/pci-host-common.c | 16 ++++++++++++++++
xen/include/asm-arm/pci.h | 1 +
2 files changed, 17 insertions(+)
diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c
index 593beeb48ce4..592c01aae5bb 100644
--- a/xen/arch/arm/pci/pci-host-common.c
+++ b/xen/arch/arm/pci/pci-host-common.c
@@ -276,6 +276,22 @@ int pci_get_host_bridge_segment(const struct dt_device_node *node,
return -EINVAL;
}
+/*
+ * Get host bridge node given a device attached to it.
+ */
+struct dt_device_node *pci_find_host_bridge_node(struct device *dev)
+{
+ struct pci_host_bridge *bridge;
+ struct pci_dev *pdev = dev_to_pci(dev);
+
+ bridge = pci_find_host_bridge(pdev->seg, pdev->bus);
+ if ( unlikely(!bridge) )
+ {
+ printk(XENLOG_ERR "Unable to find PCI bridge for %pp\n", &pdev->sbdf);
+ return NULL;
+ }
+ return bridge->dt_node;
+}
/*
* Local variables:
* mode: C
diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
index 603a1fc072d1..e6d4000e2ac8 100644
--- a/xen/include/asm-arm/pci.h
+++ b/xen/include/asm-arm/pci.h
@@ -99,6 +99,7 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge,
struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus);
int pci_get_host_bridge_segment(const struct dt_device_node *node,
uint16_t *segment);
+struct dt_device_node *pci_find_host_bridge_node(struct device *dev);
static always_inline bool is_pci_passthrough_enabled(void)
{
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v3 03/11] xen/arm: Introduce pci_find_host_bridge_node helper
2021-09-30 7:13 ` [PATCH v3 03/11] xen/arm: Introduce pci_find_host_bridge_node helper Oleksandr Andrushchenko
@ 2021-10-01 0:29 ` Stefano Stabellini
2021-10-01 0:30 ` Stefano Stabellini
0 siblings, 1 reply; 26+ messages in thread
From: Stefano Stabellini @ 2021-10-01 0:29 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: xen-devel, julien, sstabellini, oleksandr_tyshchenko,
volodymyr_babchuk, Artem_Mygaiev, roger.pau, bertrand.marquis,
rahul.singh, Oleksandr Andrushchenko
On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> Get host bridge node given a PCI device attached to it.
>
> This helper will be re-used for adding PCI devices by the subsequent
> patches.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
>
> ---
> Since v2:
> - !! dropped Stefano's r-b because of the changes
> - s/PRI_pci/%pp after rebase onto Arm series
> ---
> xen/arch/arm/pci/pci-host-common.c | 16 ++++++++++++++++
> xen/include/asm-arm/pci.h | 1 +
> 2 files changed, 17 insertions(+)
>
> diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c
> index 593beeb48ce4..592c01aae5bb 100644
> --- a/xen/arch/arm/pci/pci-host-common.c
> +++ b/xen/arch/arm/pci/pci-host-common.c
> @@ -276,6 +276,22 @@ int pci_get_host_bridge_segment(const struct dt_device_node *node,
> return -EINVAL;
> }
>
> +/*
> + * Get host bridge node given a device attached to it.
> + */
> +struct dt_device_node *pci_find_host_bridge_node(struct device *dev)
> +{
> + struct pci_host_bridge *bridge;
> + struct pci_dev *pdev = dev_to_pci(dev);
> +
> + bridge = pci_find_host_bridge(pdev->seg, pdev->bus);
> + if ( unlikely(!bridge) )
> + {
> + printk(XENLOG_ERR "Unable to find PCI bridge for %pp\n", &pdev->sbdf);
> + return NULL;
> + }
> + return bridge->dt_node;
> +}
> /*
> * Local variables:
> * mode: C
> diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
> index 603a1fc072d1..e6d4000e2ac8 100644
> --- a/xen/include/asm-arm/pci.h
> +++ b/xen/include/asm-arm/pci.h
> @@ -99,6 +99,7 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge,
> struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus);
> int pci_get_host_bridge_segment(const struct dt_device_node *node,
> uint16_t *segment);
> +struct dt_device_node *pci_find_host_bridge_node(struct device *dev);
>
> static always_inline bool is_pci_passthrough_enabled(void)
> {
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v3 03/11] xen/arm: Introduce pci_find_host_bridge_node helper
2021-10-01 0:29 ` Stefano Stabellini
@ 2021-10-01 0:30 ` Stefano Stabellini
0 siblings, 0 replies; 26+ messages in thread
From: Stefano Stabellini @ 2021-10-01 0:30 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Oleksandr Andrushchenko, xen-devel, julien, oleksandr_tyshchenko,
volodymyr_babchuk, Artem_Mygaiev, roger.pau, bertrand.marquis,
rahul.singh, Oleksandr Andrushchenko
On Thu, 30 Sep 2021, Stefano Stabellini wrote:
> On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
> > From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> >
> > Get host bridge node given a PCI device attached to it.
> >
> > This helper will be re-used for adding PCI devices by the subsequent
> > patches.
> >
> > Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> > Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
I meant to say:
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> > ---
> > Since v2:
> > - !! dropped Stefano's r-b because of the changes
> > - s/PRI_pci/%pp after rebase onto Arm series
> > ---
> > xen/arch/arm/pci/pci-host-common.c | 16 ++++++++++++++++
> > xen/include/asm-arm/pci.h | 1 +
> > 2 files changed, 17 insertions(+)
> >
> > diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c
> > index 593beeb48ce4..592c01aae5bb 100644
> > --- a/xen/arch/arm/pci/pci-host-common.c
> > +++ b/xen/arch/arm/pci/pci-host-common.c
> > @@ -276,6 +276,22 @@ int pci_get_host_bridge_segment(const struct dt_device_node *node,
> > return -EINVAL;
> > }
> >
> > +/*
> > + * Get host bridge node given a device attached to it.
> > + */
> > +struct dt_device_node *pci_find_host_bridge_node(struct device *dev)
> > +{
> > + struct pci_host_bridge *bridge;
> > + struct pci_dev *pdev = dev_to_pci(dev);
> > +
> > + bridge = pci_find_host_bridge(pdev->seg, pdev->bus);
> > + if ( unlikely(!bridge) )
> > + {
> > + printk(XENLOG_ERR "Unable to find PCI bridge for %pp\n", &pdev->sbdf);
> > + return NULL;
> > + }
> > + return bridge->dt_node;
> > +}
> > /*
> > * Local variables:
> > * mode: C
> > diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
> > index 603a1fc072d1..e6d4000e2ac8 100644
> > --- a/xen/include/asm-arm/pci.h
> > +++ b/xen/include/asm-arm/pci.h
> > @@ -99,6 +99,7 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge,
> > struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus);
> > int pci_get_host_bridge_segment(const struct dt_device_node *node,
> > uint16_t *segment);
> > +struct dt_device_node *pci_find_host_bridge_node(struct device *dev);
> >
> > static always_inline bool is_pci_passthrough_enabled(void)
> > {
> > --
> > 2.25.1
> >
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v3 04/11] xen/device-tree: Make dt_find_node_by_phandle global
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
` (2 preceding siblings ...)
2021-09-30 7:13 ` [PATCH v3 03/11] xen/arm: Introduce pci_find_host_bridge_node helper Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-09-30 7:13 ` [PATCH v3 05/11] xen/arm: Mark device as PCI while creating one Oleksandr Andrushchenko
` (6 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Make dt_find_node_by_phandle globally visible, so it can be re-used by
other frameworks.
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
xen/common/device_tree.c | 2 +-
xen/include/xen/device_tree.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index ea93da1725f6..4aae281e89bf 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -1047,7 +1047,7 @@ int dt_for_each_range(const struct dt_device_node *dev,
*
* Returns a node pointer.
*/
-static struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle)
+struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle)
{
struct dt_device_node *np;
diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h
index 2297c59ce66d..fd6cd00b433a 100644
--- a/xen/include/xen/device_tree.h
+++ b/xen/include/xen/device_tree.h
@@ -849,6 +849,8 @@ int dt_count_phandle_with_args(const struct dt_device_node *np,
*/
int dt_get_pci_domain_nr(struct dt_device_node *node);
+struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle);
+
#ifdef CONFIG_DEVICE_TREE_DEBUG
#define dt_dprintk(fmt, args...) \
printk(XENLOG_DEBUG fmt, ## args)
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v3 05/11] xen/arm: Mark device as PCI while creating one
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
` (3 preceding siblings ...)
2021-09-30 7:13 ` [PATCH v3 04/11] xen/device-tree: Make dt_find_node_by_phandle global Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-09-30 7:52 ` Jan Beulich
2021-10-01 0:34 ` Stefano Stabellini
2021-09-30 7:13 ` [PATCH v3 06/11] xen/domain: Call pci_release_devices() when releasing domain resources Oleksandr Andrushchenko
` (5 subsequent siblings)
10 siblings, 2 replies; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
While adding a PCI device mark it as such, so other frameworks
can distinguish it from DT devices.
For that introduce an architecture defined helper which may perform
additional initialization of the newly created PCI device.
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
---
Since v2:
- !! dropped Stefano's r-b because of the changes
- introduced arch_pci_init_pdev (Jan)
Since v1:
- moved the assignment from iommu_add_device to alloc_pdev
---
xen/arch/arm/pci/pci.c | 5 +++++
xen/drivers/passthrough/pci.c | 2 ++
xen/include/asm-arm/pci.h | 5 +++++
xen/include/asm-x86/pci.h | 2 ++
4 files changed, 14 insertions(+)
diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c
index 9fc522e566a9..a8d10e869603 100644
--- a/xen/arch/arm/pci/pci.c
+++ b/xen/arch/arm/pci/pci.c
@@ -34,6 +34,11 @@ struct pci_dev *dev_to_pci(struct device *dev)
return container_of(dev, struct pci_dev, arch.dev);
}
+void arch_pci_init_pdev(struct pci_dev *pdev)
+{
+ pci_to_dev(pdev)->type = DEV_PCI;
+}
+
static int __init dt_pci_init(void)
{
struct dt_device_node *np;
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
index 38eb451448a3..9f804a50e780 100644
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -329,6 +329,8 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn)
*((u8*) &pdev->devfn) = devfn;
pdev->domain = NULL;
+ arch_pci_init_pdev(pdev);
+
rc = pdev_msi_init(pdev);
if ( rc )
{
diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
index e6d4000e2ac8..566a9436a18e 100644
--- a/xen/include/asm-arm/pci.h
+++ b/xen/include/asm-arm/pci.h
@@ -105,6 +105,9 @@ static always_inline bool is_pci_passthrough_enabled(void)
{
return pci_passthrough_enabled;
}
+
+void arch_pci_init_pdev(struct pci_dev *pdev);
+
#else /*!CONFIG_HAS_PCI*/
struct arch_pci_dev { };
@@ -121,5 +124,7 @@ static inline int pci_get_host_bridge_segment(const struct dt_device_node *node,
return -EINVAL;
}
+static inline void arch_pci_init_pdev(struct pci_dev *pdev) {}
+
#endif /*!CONFIG_HAS_PCI*/
#endif /* __ARM_PCI_H__ */
diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h
index 61b940c91d4a..e7f10beb4eb8 100644
--- a/xen/include/asm-x86/pci.h
+++ b/xen/include/asm-x86/pci.h
@@ -38,4 +38,6 @@ static always_inline bool is_pci_passthrough_enabled(void)
return true;
}
+static inline void arch_pci_init_pdev(struct pci_dev *pdev) {}
+
#endif /* __X86_PCI_H__ */
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v3 05/11] xen/arm: Mark device as PCI while creating one
2021-09-30 7:13 ` [PATCH v3 05/11] xen/arm: Mark device as PCI while creating one Oleksandr Andrushchenko
@ 2021-09-30 7:52 ` Jan Beulich
2021-10-01 0:34 ` Stefano Stabellini
1 sibling, 0 replies; 26+ messages in thread
From: Jan Beulich @ 2021-09-30 7:52 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko, xen-devel
On 30.09.2021 09:13, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> While adding a PCI device mark it as such, so other frameworks
> can distinguish it from DT devices.
> For that introduce an architecture defined helper which may perform
> additional initialization of the newly created PCI device.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Applicable parts
Acked-by: Jan Beulich <jbeulich@suse.com>
Jan
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v3 05/11] xen/arm: Mark device as PCI while creating one
2021-09-30 7:13 ` [PATCH v3 05/11] xen/arm: Mark device as PCI while creating one Oleksandr Andrushchenko
2021-09-30 7:52 ` Jan Beulich
@ 2021-10-01 0:34 ` Stefano Stabellini
2021-10-01 7:11 ` Oleksandr Andrushchenko
1 sibling, 1 reply; 26+ messages in thread
From: Stefano Stabellini @ 2021-10-01 0:34 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: xen-devel, julien, sstabellini, oleksandr_tyshchenko,
volodymyr_babchuk, Artem_Mygaiev, roger.pau, bertrand.marquis,
rahul.singh, Oleksandr Andrushchenko
[-- Attachment #1: Type: text/plain, Size: 3559 bytes --]
On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> While adding a PCI device mark it as such, so other frameworks
> can distinguish it from DT devices.
> For that introduce an architecture defined helper which may perform
> additional initialization of the newly created PCI device.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
I get a build failure without CONFIG_PCI on ARM64:
In file included from /local/repos/xen-upstream/xen/include/xen/pci.h:66:0,
from /local/repos/xen-upstream/xen/include/xen/iommu.h:25,
from /local/repos/xen-upstream/xen/include/xen/sched.h:12,
from arch/arm/arm64/asm-offsets.c:9:
/local/repos/xen-upstream/xen/include/asm/pci.h:127:46: error: ‘struct pci_dev’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
static inline void arch_pci_init_pdev(struct pci_dev *pdev) {}
^~~~~~~
cc1: all warnings being treated as errors
> ---
> Since v2:
> - !! dropped Stefano's r-b because of the changes
> - introduced arch_pci_init_pdev (Jan)
> Since v1:
> - moved the assignment from iommu_add_device to alloc_pdev
> ---
> xen/arch/arm/pci/pci.c | 5 +++++
> xen/drivers/passthrough/pci.c | 2 ++
> xen/include/asm-arm/pci.h | 5 +++++
> xen/include/asm-x86/pci.h | 2 ++
> 4 files changed, 14 insertions(+)
>
> diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c
> index 9fc522e566a9..a8d10e869603 100644
> --- a/xen/arch/arm/pci/pci.c
> +++ b/xen/arch/arm/pci/pci.c
> @@ -34,6 +34,11 @@ struct pci_dev *dev_to_pci(struct device *dev)
> return container_of(dev, struct pci_dev, arch.dev);
> }
>
> +void arch_pci_init_pdev(struct pci_dev *pdev)
> +{
> + pci_to_dev(pdev)->type = DEV_PCI;
> +}
> +
> static int __init dt_pci_init(void)
> {
> struct dt_device_node *np;
> diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
> index 38eb451448a3..9f804a50e780 100644
> --- a/xen/drivers/passthrough/pci.c
> +++ b/xen/drivers/passthrough/pci.c
> @@ -329,6 +329,8 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn)
> *((u8*) &pdev->devfn) = devfn;
> pdev->domain = NULL;
>
> + arch_pci_init_pdev(pdev);
> +
> rc = pdev_msi_init(pdev);
> if ( rc )
> {
> diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
> index e6d4000e2ac8..566a9436a18e 100644
> --- a/xen/include/asm-arm/pci.h
> +++ b/xen/include/asm-arm/pci.h
> @@ -105,6 +105,9 @@ static always_inline bool is_pci_passthrough_enabled(void)
> {
> return pci_passthrough_enabled;
> }
> +
> +void arch_pci_init_pdev(struct pci_dev *pdev);
> +
> #else /*!CONFIG_HAS_PCI*/
>
> struct arch_pci_dev { };
> @@ -121,5 +124,7 @@ static inline int pci_get_host_bridge_segment(const struct dt_device_node *node,
> return -EINVAL;
> }
>
> +static inline void arch_pci_init_pdev(struct pci_dev *pdev) {}
> +
> #endif /*!CONFIG_HAS_PCI*/
> #endif /* __ARM_PCI_H__ */
> diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h
> index 61b940c91d4a..e7f10beb4eb8 100644
> --- a/xen/include/asm-x86/pci.h
> +++ b/xen/include/asm-x86/pci.h
> @@ -38,4 +38,6 @@ static always_inline bool is_pci_passthrough_enabled(void)
> return true;
> }
>
> +static inline void arch_pci_init_pdev(struct pci_dev *pdev) {}
> +
> #endif /* __X86_PCI_H__ */
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v3 05/11] xen/arm: Mark device as PCI while creating one
2021-10-01 0:34 ` Stefano Stabellini
@ 2021-10-01 7:11 ` Oleksandr Andrushchenko
2021-10-01 7:38 ` Jan Beulich
0 siblings, 1 reply; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-10-01 7:11 UTC (permalink / raw)
To: Stefano Stabellini, Jan Beulich
Cc: xen-devel, julien, Oleksandr Tyshchenko, Volodymyr Babchuk,
Artem Mygaiev, roger.pau, Bertrand Marquis, Rahul Singh,
Oleksandr Andrushchenko
On 01.10.21 03:34, Stefano Stabellini wrote:
> On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
>> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>>
>> While adding a PCI device mark it as such, so other frameworks
>> can distinguish it from DT devices.
>> For that introduce an architecture defined helper which may perform
>> additional initialization of the newly created PCI device.
>>
>> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> I get a build failure without CONFIG_PCI on ARM64:
>
> In file included from /local/repos/xen-upstream/xen/include/xen/pci.h:66:0,
> from /local/repos/xen-upstream/xen/include/xen/iommu.h:25,
> from /local/repos/xen-upstream/xen/include/xen/sched.h:12,
> from arch/arm/arm64/asm-offsets.c:9:
> /local/repos/xen-upstream/xen/include/asm/pci.h:127:46: error: ‘struct pci_dev’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
> static inline void arch_pci_init_pdev(struct pci_dev *pdev) {}
> ^~~~~~~
> cc1: all warnings being treated as errors
Ah, this then needs to be
struct pci_dev;
static inline void arch_pci_init_pdev(struct pci_dev *pdev) {}
Jan, as this is going to be Arm change, so can I keep your Ack please?
Thank you,
Oleksandr
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v3 05/11] xen/arm: Mark device as PCI while creating one
2021-10-01 7:11 ` Oleksandr Andrushchenko
@ 2021-10-01 7:38 ` Jan Beulich
0 siblings, 0 replies; 26+ messages in thread
From: Jan Beulich @ 2021-10-01 7:38 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: xen-devel, julien, Oleksandr Tyshchenko, Volodymyr Babchuk,
Artem Mygaiev, roger.pau, Bertrand Marquis, Rahul Singh,
Stefano Stabellini
On 01.10.2021 09:11, Oleksandr Andrushchenko wrote:
> On 01.10.21 03:34, Stefano Stabellini wrote:
>> On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
>>> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>>>
>>> While adding a PCI device mark it as such, so other frameworks
>>> can distinguish it from DT devices.
>>> For that introduce an architecture defined helper which may perform
>>> additional initialization of the newly created PCI device.
>>>
>>> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>> I get a build failure without CONFIG_PCI on ARM64:
>>
>> In file included from /local/repos/xen-upstream/xen/include/xen/pci.h:66:0,
>> from /local/repos/xen-upstream/xen/include/xen/iommu.h:25,
>> from /local/repos/xen-upstream/xen/include/xen/sched.h:12,
>> from arch/arm/arm64/asm-offsets.c:9:
>> /local/repos/xen-upstream/xen/include/asm/pci.h:127:46: error: ‘struct pci_dev’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>> static inline void arch_pci_init_pdev(struct pci_dev *pdev) {}
>> ^~~~~~~
>> cc1: all warnings being treated as errors
> Ah, this then needs to be
> struct pci_dev;
>
> static inline void arch_pci_init_pdev(struct pci_dev *pdev) {}
>
> Jan, as this is going to be Arm change, so can I keep your Ack please?
Of course you can, and me having said anyway "Applicable parts" makes
me wonder why you ask. The ack clearly doesn't extend to Arm code; I
can't give (valid) acks for code I'm not a maintainer of. This would
be different for R-b, though.
Jan
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v3 06/11] xen/domain: Call pci_release_devices() when releasing domain resources
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
` (4 preceding siblings ...)
2021-09-30 7:13 ` [PATCH v3 05/11] xen/arm: Mark device as PCI while creating one Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-09-30 7:13 ` [PATCH v3 07/11] libxl: Allow removing PCI devices for all types of domains Oleksandr Andrushchenko
` (4 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko
From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
This is the very same that we already do for DT devices. Moreover, x86
already calls pci_release_devices().
Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
Since v1:
- re-wording in the commit message
---
xen/arch/arm/domain.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index fbb52f78f1a6..79012bf77757 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -985,7 +985,8 @@ static int relinquish_memory(struct domain *d, struct page_list_head *list)
* function which may return -ERESTART.
*/
enum {
- PROG_tee = 1,
+ PROG_pci = 1,
+ PROG_tee,
PROG_xen,
PROG_page,
PROG_mapping,
@@ -1022,6 +1023,12 @@ int domain_relinquish_resources(struct domain *d)
#ifdef CONFIG_IOREQ_SERVER
ioreq_server_destroy_all(d);
#endif
+#ifdef CONFIG_HAS_PCI
+ PROGRESS(pci):
+ ret = pci_release_devices(d);
+ if ( ret )
+ return ret;
+#endif
PROGRESS(tee):
ret = tee_relinquish_resources(d);
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v3 07/11] libxl: Allow removing PCI devices for all types of domains
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
` (5 preceding siblings ...)
2021-09-30 7:13 ` [PATCH v3 06/11] xen/domain: Call pci_release_devices() when releasing domain resources Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-10-01 0:38 ` Stefano Stabellini
2021-09-30 7:13 ` [PATCH v3 08/11] libxl: Only map legacy PCI IRQs if they are supported Oleksandr Andrushchenko
` (3 subsequent siblings)
10 siblings, 1 reply; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko, Ian Jackson, Juergen Gross
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
The PCI device remove path may now be used by PVH on ARM, so the
assert is no longer valid.
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Juergen Gross <jgross@suse.com>
---
tools/libs/light/libxl_pci.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 1a1c2630803b..59f3686fc85e 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -1947,8 +1947,6 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs)
goto out_fail;
}
} else {
- assert(type == LIBXL_DOMAIN_TYPE_PV);
-
char *sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->domain,
pci->bus, pci->dev, pci->func);
FILE *f = fopen(sysfs_path, "r");
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v3 07/11] libxl: Allow removing PCI devices for all types of domains
2021-09-30 7:13 ` [PATCH v3 07/11] libxl: Allow removing PCI devices for all types of domains Oleksandr Andrushchenko
@ 2021-10-01 0:38 ` Stefano Stabellini
0 siblings, 0 replies; 26+ messages in thread
From: Stefano Stabellini @ 2021-10-01 0:38 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: xen-devel, julien, sstabellini, oleksandr_tyshchenko,
volodymyr_babchuk, Artem_Mygaiev, roger.pau, bertrand.marquis,
rahul.singh, Oleksandr Andrushchenko, Ian Jackson, Juergen Gross
On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> The PCI device remove path may now be used by PVH on ARM, so the
> assert is no longer valid.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> Cc: Ian Jackson <iwj@xenproject.org>
> Cc: Juergen Gross <jgross@suse.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> tools/libs/light/libxl_pci.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
> index 1a1c2630803b..59f3686fc85e 100644
> --- a/tools/libs/light/libxl_pci.c
> +++ b/tools/libs/light/libxl_pci.c
> @@ -1947,8 +1947,6 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs)
> goto out_fail;
> }
> } else {
> - assert(type == LIBXL_DOMAIN_TYPE_PV);
> -
> char *sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->domain,
> pci->bus, pci->dev, pci->func);
> FILE *f = fopen(sysfs_path, "r");
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v3 08/11] libxl: Only map legacy PCI IRQs if they are supported
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
` (6 preceding siblings ...)
2021-09-30 7:13 ` [PATCH v3 07/11] libxl: Allow removing PCI devices for all types of domains Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-10-01 0:39 ` Stefano Stabellini
2021-09-30 7:13 ` [PATCH v3 09/11] xen/arm: Setup MMIO range trap handlers for hardware domain Oleksandr Andrushchenko
` (2 subsequent siblings)
10 siblings, 1 reply; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko, Ian Jackson, Juergen Gross
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Arm's PCI passthrough implementation doesn't support legacy interrupts,
but MSI/MSI-X. This can be the case for other platforms too.
For that reason introduce a new CONFIG_PCI_SUPP_LEGACY_IRQ and add
it to the CFLAGS and compile the relevant code in the toolstack only if
applicable.
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Juergen Gross <jgross@suse.com>
---
Since v1:
- Minimized #idefery by introducing pci_supp_legacy_irq function
for relevant checks
---
tools/libs/light/Makefile | 4 ++++
tools/libs/light/libxl_pci.c | 13 +++++++++++++
2 files changed, 17 insertions(+)
diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile
index 7d8c51d49242..bd3f6be2a183 100644
--- a/tools/libs/light/Makefile
+++ b/tools/libs/light/Makefile
@@ -46,6 +46,10 @@ CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
-Wno-declaration-after-statement -Wformat-nonliteral
CFLAGS += -I.
+ifeq ($(CONFIG_X86),y)
+CFLAGS += -DCONFIG_PCI_SUPP_LEGACY_IRQ
+endif
+
SRCS-$(CONFIG_X86) += libxl_cpuid.c
SRCS-$(CONFIG_X86) += libxl_x86.c
SRCS-$(CONFIG_X86) += libxl_psr.c
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 59f3686fc85e..4c2d7aeefbb2 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -1364,6 +1364,15 @@ static void pci_add_timeout(libxl__egc *egc, libxl__ev_time *ev,
pci_add_dm_done(egc, pas, rc);
}
+static bool pci_supp_legacy_irq(void)
+{
+#ifdef CONFIG_PCI_SUPP_LEGACY_IRQ
+ return true;
+#else
+ return false;
+#endif
+}
+
static void pci_add_dm_done(libxl__egc *egc,
pci_add_state *pas,
int rc)
@@ -1434,6 +1443,8 @@ static void pci_add_dm_done(libxl__egc *egc,
}
}
fclose(f);
+ if (!pci_supp_legacy_irq())
+ goto out_no_irq;
sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain,
pci->bus, pci->dev, pci->func);
f = fopen(sysfs_path, "r");
@@ -1983,6 +1994,8 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs)
}
fclose(f);
skip1:
+ if (!pci_supp_legacy_irq())
+ goto skip_irq;
sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain,
pci->bus, pci->dev, pci->func);
f = fopen(sysfs_path, "r");
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v3 08/11] libxl: Only map legacy PCI IRQs if they are supported
2021-09-30 7:13 ` [PATCH v3 08/11] libxl: Only map legacy PCI IRQs if they are supported Oleksandr Andrushchenko
@ 2021-10-01 0:39 ` Stefano Stabellini
0 siblings, 0 replies; 26+ messages in thread
From: Stefano Stabellini @ 2021-10-01 0:39 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: xen-devel, julien, sstabellini, oleksandr_tyshchenko,
volodymyr_babchuk, Artem_Mygaiev, roger.pau, bertrand.marquis,
rahul.singh, Oleksandr Andrushchenko, Ian Jackson, Juergen Gross
On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> Arm's PCI passthrough implementation doesn't support legacy interrupts,
> but MSI/MSI-X. This can be the case for other platforms too.
> For that reason introduce a new CONFIG_PCI_SUPP_LEGACY_IRQ and add
> it to the CFLAGS and compile the relevant code in the toolstack only if
> applicable.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> Cc: Ian Jackson <iwj@xenproject.org>
> Cc: Juergen Gross <jgross@suse.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> Since v1:
> - Minimized #idefery by introducing pci_supp_legacy_irq function
> for relevant checks
> ---
> tools/libs/light/Makefile | 4 ++++
> tools/libs/light/libxl_pci.c | 13 +++++++++++++
> 2 files changed, 17 insertions(+)
>
> diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile
> index 7d8c51d49242..bd3f6be2a183 100644
> --- a/tools/libs/light/Makefile
> +++ b/tools/libs/light/Makefile
> @@ -46,6 +46,10 @@ CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
> -Wno-declaration-after-statement -Wformat-nonliteral
> CFLAGS += -I.
>
> +ifeq ($(CONFIG_X86),y)
> +CFLAGS += -DCONFIG_PCI_SUPP_LEGACY_IRQ
> +endif
> +
> SRCS-$(CONFIG_X86) += libxl_cpuid.c
> SRCS-$(CONFIG_X86) += libxl_x86.c
> SRCS-$(CONFIG_X86) += libxl_psr.c
> diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
> index 59f3686fc85e..4c2d7aeefbb2 100644
> --- a/tools/libs/light/libxl_pci.c
> +++ b/tools/libs/light/libxl_pci.c
> @@ -1364,6 +1364,15 @@ static void pci_add_timeout(libxl__egc *egc, libxl__ev_time *ev,
> pci_add_dm_done(egc, pas, rc);
> }
>
> +static bool pci_supp_legacy_irq(void)
> +{
> +#ifdef CONFIG_PCI_SUPP_LEGACY_IRQ
> + return true;
> +#else
> + return false;
> +#endif
> +}
> +
> static void pci_add_dm_done(libxl__egc *egc,
> pci_add_state *pas,
> int rc)
> @@ -1434,6 +1443,8 @@ static void pci_add_dm_done(libxl__egc *egc,
> }
> }
> fclose(f);
> + if (!pci_supp_legacy_irq())
> + goto out_no_irq;
> sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain,
> pci->bus, pci->dev, pci->func);
> f = fopen(sysfs_path, "r");
> @@ -1983,6 +1994,8 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs)
> }
> fclose(f);
> skip1:
> + if (!pci_supp_legacy_irq())
> + goto skip_irq;
> sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain,
> pci->bus, pci->dev, pci->func);
> f = fopen(sysfs_path, "r");
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v3 09/11] xen/arm: Setup MMIO range trap handlers for hardware domain
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
` (7 preceding siblings ...)
2021-09-30 7:13 ` [PATCH v3 08/11] libxl: Only map legacy PCI IRQs if they are supported Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-10-01 0:45 ` Stefano Stabellini
2021-09-30 7:13 ` [PATCH v3 10/11] xen/arm: Do not map PCI ECAM and MMIO space to Domain-0's p2m Oleksandr Andrushchenko
2021-09-30 7:13 ` [PATCH v3 11/11] xen/arm: Process pending vPCI map/unmap operations Oleksandr Andrushchenko
10 siblings, 1 reply; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
In order for vPCI to work it needs to maintain guest and hardware
domain's views of the configuration space. For example, BARs and
COMMAND registers require emulation for guests and the guest view
of the registers needs to be in sync with the real contents of the
relevant registers. For that ECAM address space needs to also be
trapped for the hardware domain, so we need to implement PCI host
bridge specific callbacks to properly setup MMIO handlers for those
ranges depending on particular host bridge implementation.
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
---
Since v2:
- removed unneeded assignment (count = 0)
- removed unneeded header inclusion
- update commit message
Since v1:
- Dynamically calculate the number of MMIO handlers required for vPCI
and update the total number accordingly
- s/clb/cb
- Do not introduce a new callback for MMIO handler setup
---
xen/arch/arm/domain.c | 2 ++
xen/arch/arm/pci/pci-host-common.c | 28 +++++++++++++++++++++++++
xen/arch/arm/vpci.c | 33 ++++++++++++++++++++++++++++++
xen/arch/arm/vpci.h | 6 ++++++
xen/include/asm-arm/pci.h | 5 +++++
5 files changed, 74 insertions(+)
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 79012bf77757..fa6fcc5e467c 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -733,6 +733,8 @@ int arch_domain_create(struct domain *d,
if ( (rc = domain_vgic_register(d, &count)) != 0 )
goto fail;
+ count += domain_vpci_get_num_mmio_handlers(d);
+
if ( (rc = domain_io_init(d, count + MAX_IO_HANDLER)) != 0 )
goto fail;
diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c
index 592c01aae5bb..1eb4daa87365 100644
--- a/xen/arch/arm/pci/pci-host-common.c
+++ b/xen/arch/arm/pci/pci-host-common.c
@@ -292,6 +292,34 @@ struct dt_device_node *pci_find_host_bridge_node(struct device *dev)
}
return bridge->dt_node;
}
+
+int pci_host_iterate_bridges(struct domain *d,
+ int (*cb)(struct domain *d,
+ struct pci_host_bridge *bridge))
+{
+ struct pci_host_bridge *bridge;
+ int err;
+
+ list_for_each_entry( bridge, &pci_host_bridges, node )
+ {
+ err = cb(d, bridge);
+ if ( err )
+ return err;
+ }
+ return 0;
+}
+
+int pci_host_get_num_bridges(void)
+{
+ struct pci_host_bridge *bridge;
+ int count = 0;
+
+ list_for_each_entry( bridge, &pci_host_bridges, node )
+ count++;
+
+ return count;
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c
index 76c12b92814f..5d6c29c8dcd9 100644
--- a/xen/arch/arm/vpci.c
+++ b/xen/arch/arm/vpci.c
@@ -80,17 +80,50 @@ static const struct mmio_handler_ops vpci_mmio_handler = {
.write = vpci_mmio_write,
};
+static int vpci_setup_mmio_handler(struct domain *d,
+ struct pci_host_bridge *bridge)
+{
+ struct pci_config_window *cfg = bridge->cfg;
+
+ register_mmio_handler(d, &vpci_mmio_handler,
+ cfg->phys_addr, cfg->size, NULL);
+ return 0;
+}
+
int domain_vpci_init(struct domain *d)
{
if ( !has_vpci(d) )
return 0;
+ if ( is_hardware_domain(d) )
+ return pci_host_iterate_bridges(d, vpci_setup_mmio_handler);
+
+ /* Guest domains use what is programmed in their device tree. */
register_mmio_handler(d, &vpci_mmio_handler,
GUEST_VPCI_ECAM_BASE, GUEST_VPCI_ECAM_SIZE, NULL);
return 0;
}
+int domain_vpci_get_num_mmio_handlers(struct domain *d)
+{
+ int count;
+
+ if ( is_hardware_domain(d) )
+ /* For each PCI host bridge's configuration space. */
+ count = pci_host_get_num_bridges();
+ else
+ /*
+ * VPCI_MSIX_MEM_NUM handlers for MSI-X tables per each PCI device
+ * being passed through. Maximum number of supported devices
+ * is 32 as virtual bus topology emulates the devices as embedded
+ * endpoints.
+ * +1 for a single emulated host bridge's configuration space. */
+ count = VPCI_MSIX_MEM_NUM * 32 + 1;
+
+ return count;
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/arch/arm/vpci.h b/xen/arch/arm/vpci.h
index d8a7b0e3e802..27a2b069abd2 100644
--- a/xen/arch/arm/vpci.h
+++ b/xen/arch/arm/vpci.h
@@ -17,11 +17,17 @@
#ifdef CONFIG_HAS_VPCI
int domain_vpci_init(struct domain *d);
+int domain_vpci_get_num_mmio_handlers(struct domain *d);
#else
static inline int domain_vpci_init(struct domain *d)
{
return 0;
}
+
+static inline int domain_vpci_get_num_mmio_handlers(struct domain *d)
+{
+ return 0;
+}
#endif
#endif /* __ARCH_ARM_VPCI_H__ */
diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
index 566a9436a18e..0d0266b13cba 100644
--- a/xen/include/asm-arm/pci.h
+++ b/xen/include/asm-arm/pci.h
@@ -108,6 +108,11 @@ static always_inline bool is_pci_passthrough_enabled(void)
void arch_pci_init_pdev(struct pci_dev *pdev);
+int pci_host_iterate_bridges(struct domain *d,
+ int (*clb)(struct domain *d,
+ struct pci_host_bridge *bridge));
+int pci_host_get_num_bridges(void);
+
#else /*!CONFIG_HAS_PCI*/
struct arch_pci_dev { };
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v3 09/11] xen/arm: Setup MMIO range trap handlers for hardware domain
2021-09-30 7:13 ` [PATCH v3 09/11] xen/arm: Setup MMIO range trap handlers for hardware domain Oleksandr Andrushchenko
@ 2021-10-01 0:45 ` Stefano Stabellini
2021-10-01 6:44 ` Oleksandr Andrushchenko
0 siblings, 1 reply; 26+ messages in thread
From: Stefano Stabellini @ 2021-10-01 0:45 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: xen-devel, julien, sstabellini, oleksandr_tyshchenko,
volodymyr_babchuk, Artem_Mygaiev, roger.pau, bertrand.marquis,
rahul.singh, Oleksandr Andrushchenko
On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> In order for vPCI to work it needs to maintain guest and hardware
> domain's views of the configuration space. For example, BARs and
> COMMAND registers require emulation for guests and the guest view
> of the registers needs to be in sync with the real contents of the
> relevant registers. For that ECAM address space needs to also be
> trapped for the hardware domain, so we need to implement PCI host
> bridge specific callbacks to properly setup MMIO handlers for those
> ranges depending on particular host bridge implementation.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> ---
> Since v2:
> - removed unneeded assignment (count = 0)
> - removed unneeded header inclusion
> - update commit message
> Since v1:
> - Dynamically calculate the number of MMIO handlers required for vPCI
> and update the total number accordingly
> - s/clb/cb
> - Do not introduce a new callback for MMIO handler setup
> ---
> xen/arch/arm/domain.c | 2 ++
> xen/arch/arm/pci/pci-host-common.c | 28 +++++++++++++++++++++++++
> xen/arch/arm/vpci.c | 33 ++++++++++++++++++++++++++++++
> xen/arch/arm/vpci.h | 6 ++++++
> xen/include/asm-arm/pci.h | 5 +++++
> 5 files changed, 74 insertions(+)
>
> diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
> index 79012bf77757..fa6fcc5e467c 100644
> --- a/xen/arch/arm/domain.c
> +++ b/xen/arch/arm/domain.c
> @@ -733,6 +733,8 @@ int arch_domain_create(struct domain *d,
> if ( (rc = domain_vgic_register(d, &count)) != 0 )
> goto fail;
>
> + count += domain_vpci_get_num_mmio_handlers(d);
> +
> if ( (rc = domain_io_init(d, count + MAX_IO_HANDLER)) != 0 )
> goto fail;
>
> diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c
> index 592c01aae5bb..1eb4daa87365 100644
> --- a/xen/arch/arm/pci/pci-host-common.c
> +++ b/xen/arch/arm/pci/pci-host-common.c
> @@ -292,6 +292,34 @@ struct dt_device_node *pci_find_host_bridge_node(struct device *dev)
> }
> return bridge->dt_node;
> }
> +
> +int pci_host_iterate_bridges(struct domain *d,
> + int (*cb)(struct domain *d,
> + struct pci_host_bridge *bridge))
> +{
> + struct pci_host_bridge *bridge;
> + int err;
> +
> + list_for_each_entry( bridge, &pci_host_bridges, node )
> + {
> + err = cb(d, bridge);
> + if ( err )
> + return err;
> + }
> + return 0;
> +}
> +
> +int pci_host_get_num_bridges(void)
> +{
> + struct pci_host_bridge *bridge;
> + int count = 0;
> +
> + list_for_each_entry( bridge, &pci_host_bridges, node )
> + count++;
> +
> + return count;
> +}
> +
> /*
> * Local variables:
> * mode: C
> diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c
> index 76c12b92814f..5d6c29c8dcd9 100644
> --- a/xen/arch/arm/vpci.c
> +++ b/xen/arch/arm/vpci.c
> @@ -80,17 +80,50 @@ static const struct mmio_handler_ops vpci_mmio_handler = {
> .write = vpci_mmio_write,
> };
>
> +static int vpci_setup_mmio_handler(struct domain *d,
> + struct pci_host_bridge *bridge)
> +{
> + struct pci_config_window *cfg = bridge->cfg;
> +
> + register_mmio_handler(d, &vpci_mmio_handler,
> + cfg->phys_addr, cfg->size, NULL);
> + return 0;
> +}
> +
> int domain_vpci_init(struct domain *d)
> {
> if ( !has_vpci(d) )
> return 0;
>
> + if ( is_hardware_domain(d) )
> + return pci_host_iterate_bridges(d, vpci_setup_mmio_handler);
> +
> + /* Guest domains use what is programmed in their device tree. */
> register_mmio_handler(d, &vpci_mmio_handler,
> GUEST_VPCI_ECAM_BASE, GUEST_VPCI_ECAM_SIZE, NULL);
>
> return 0;
> }
>
> +int domain_vpci_get_num_mmio_handlers(struct domain *d)
> +{
> + int count;
> +
> + if ( is_hardware_domain(d) )
> + /* For each PCI host bridge's configuration space. */
> + count = pci_host_get_num_bridges();
> + else
> + /*
> + * VPCI_MSIX_MEM_NUM handlers for MSI-X tables per each PCI device
> + * being passed through. Maximum number of supported devices
> + * is 32 as virtual bus topology emulates the devices as embedded
> + * endpoints.
> + * +1 for a single emulated host bridge's configuration space. */
Code style: Xen multiline comments are like this:
/*
* comment
* more comment
*/
Aside from this minor comment:
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> + count = VPCI_MSIX_MEM_NUM * 32 + 1;
> +
> + return count;
> +}
> +
> /*
> * Local variables:
> * mode: C
> diff --git a/xen/arch/arm/vpci.h b/xen/arch/arm/vpci.h
> index d8a7b0e3e802..27a2b069abd2 100644
> --- a/xen/arch/arm/vpci.h
> +++ b/xen/arch/arm/vpci.h
> @@ -17,11 +17,17 @@
>
> #ifdef CONFIG_HAS_VPCI
> int domain_vpci_init(struct domain *d);
> +int domain_vpci_get_num_mmio_handlers(struct domain *d);
> #else
> static inline int domain_vpci_init(struct domain *d)
> {
> return 0;
> }
> +
> +static inline int domain_vpci_get_num_mmio_handlers(struct domain *d)
> +{
> + return 0;
> +}
> #endif
>
> #endif /* __ARCH_ARM_VPCI_H__ */
> diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
> index 566a9436a18e..0d0266b13cba 100644
> --- a/xen/include/asm-arm/pci.h
> +++ b/xen/include/asm-arm/pci.h
> @@ -108,6 +108,11 @@ static always_inline bool is_pci_passthrough_enabled(void)
>
> void arch_pci_init_pdev(struct pci_dev *pdev);
>
> +int pci_host_iterate_bridges(struct domain *d,
> + int (*clb)(struct domain *d,
> + struct pci_host_bridge *bridge));
> +int pci_host_get_num_bridges(void);
> +
> #else /*!CONFIG_HAS_PCI*/
>
> struct arch_pci_dev { };
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v3 09/11] xen/arm: Setup MMIO range trap handlers for hardware domain
2021-10-01 0:45 ` Stefano Stabellini
@ 2021-10-01 6:44 ` Oleksandr Andrushchenko
0 siblings, 0 replies; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-10-01 6:44 UTC (permalink / raw)
To: Stefano Stabellini
Cc: xen-devel, julien, Oleksandr Tyshchenko, Volodymyr Babchuk,
Artem Mygaiev, roger.pau, Bertrand Marquis, Rahul Singh,
Oleksandr Andrushchenko
On 01.10.21 03:45, Stefano Stabellini wrote:
> On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
>> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>>
>> In order for vPCI to work it needs to maintain guest and hardware
>> domain's views of the configuration space. For example, BARs and
>> COMMAND registers require emulation for guests and the guest view
>> of the registers needs to be in sync with the real contents of the
>> relevant registers. For that ECAM address space needs to also be
>> trapped for the hardware domain, so we need to implement PCI host
>> bridge specific callbacks to properly setup MMIO handlers for those
>> ranges depending on particular host bridge implementation.
>>
>> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>>
>> ---
>> Since v2:
>> - removed unneeded assignment (count = 0)
>> - removed unneeded header inclusion
>> - update commit message
>> Since v1:
>> - Dynamically calculate the number of MMIO handlers required for vPCI
>> and update the total number accordingly
>> - s/clb/cb
>> - Do not introduce a new callback for MMIO handler setup
>> ---
>> xen/arch/arm/domain.c | 2 ++
>> xen/arch/arm/pci/pci-host-common.c | 28 +++++++++++++++++++++++++
>> xen/arch/arm/vpci.c | 33 ++++++++++++++++++++++++++++++
>> xen/arch/arm/vpci.h | 6 ++++++
>> xen/include/asm-arm/pci.h | 5 +++++
>> 5 files changed, 74 insertions(+)
>>
>> diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
>> index 79012bf77757..fa6fcc5e467c 100644
>> --- a/xen/arch/arm/domain.c
>> +++ b/xen/arch/arm/domain.c
>> @@ -733,6 +733,8 @@ int arch_domain_create(struct domain *d,
>> if ( (rc = domain_vgic_register(d, &count)) != 0 )
>> goto fail;
>>
>> + count += domain_vpci_get_num_mmio_handlers(d);
>> +
>> if ( (rc = domain_io_init(d, count + MAX_IO_HANDLER)) != 0 )
>> goto fail;
>>
>> diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c
>> index 592c01aae5bb..1eb4daa87365 100644
>> --- a/xen/arch/arm/pci/pci-host-common.c
>> +++ b/xen/arch/arm/pci/pci-host-common.c
>> @@ -292,6 +292,34 @@ struct dt_device_node *pci_find_host_bridge_node(struct device *dev)
>> }
>> return bridge->dt_node;
>> }
>> +
>> +int pci_host_iterate_bridges(struct domain *d,
>> + int (*cb)(struct domain *d,
>> + struct pci_host_bridge *bridge))
>> +{
>> + struct pci_host_bridge *bridge;
>> + int err;
>> +
>> + list_for_each_entry( bridge, &pci_host_bridges, node )
>> + {
>> + err = cb(d, bridge);
>> + if ( err )
>> + return err;
>> + }
>> + return 0;
>> +}
>> +
>> +int pci_host_get_num_bridges(void)
>> +{
>> + struct pci_host_bridge *bridge;
>> + int count = 0;
>> +
>> + list_for_each_entry( bridge, &pci_host_bridges, node )
>> + count++;
>> +
>> + return count;
>> +}
>> +
>> /*
>> * Local variables:
>> * mode: C
>> diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c
>> index 76c12b92814f..5d6c29c8dcd9 100644
>> --- a/xen/arch/arm/vpci.c
>> +++ b/xen/arch/arm/vpci.c
>> @@ -80,17 +80,50 @@ static const struct mmio_handler_ops vpci_mmio_handler = {
>> .write = vpci_mmio_write,
>> };
>>
>> +static int vpci_setup_mmio_handler(struct domain *d,
>> + struct pci_host_bridge *bridge)
>> +{
>> + struct pci_config_window *cfg = bridge->cfg;
>> +
>> + register_mmio_handler(d, &vpci_mmio_handler,
>> + cfg->phys_addr, cfg->size, NULL);
>> + return 0;
>> +}
>> +
>> int domain_vpci_init(struct domain *d)
>> {
>> if ( !has_vpci(d) )
>> return 0;
>>
>> + if ( is_hardware_domain(d) )
>> + return pci_host_iterate_bridges(d, vpci_setup_mmio_handler);
>> +
>> + /* Guest domains use what is programmed in their device tree. */
>> register_mmio_handler(d, &vpci_mmio_handler,
>> GUEST_VPCI_ECAM_BASE, GUEST_VPCI_ECAM_SIZE, NULL);
>>
>> return 0;
>> }
>>
>> +int domain_vpci_get_num_mmio_handlers(struct domain *d)
>> +{
>> + int count;
>> +
>> + if ( is_hardware_domain(d) )
>> + /* For each PCI host bridge's configuration space. */
>> + count = pci_host_get_num_bridges();
>> + else
>> + /*
>> + * VPCI_MSIX_MEM_NUM handlers for MSI-X tables per each PCI device
>> + * being passed through. Maximum number of supported devices
>> + * is 32 as virtual bus topology emulates the devices as embedded
>> + * endpoints.
>> + * +1 for a single emulated host bridge's configuration space. */
> Code style: Xen multiline comments are like this:
Will fix
>
> /*
> * comment
> * more comment
> */
>
> Aside from this minor comment:
>
> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
>
>
>> + count = VPCI_MSIX_MEM_NUM * 32 + 1;
>> +
>> + return count;
>> +}
>> +
>> /*
>> * Local variables:
>> * mode: C
>> diff --git a/xen/arch/arm/vpci.h b/xen/arch/arm/vpci.h
>> index d8a7b0e3e802..27a2b069abd2 100644
>> --- a/xen/arch/arm/vpci.h
>> +++ b/xen/arch/arm/vpci.h
>> @@ -17,11 +17,17 @@
>>
>> #ifdef CONFIG_HAS_VPCI
>> int domain_vpci_init(struct domain *d);
>> +int domain_vpci_get_num_mmio_handlers(struct domain *d);
>> #else
>> static inline int domain_vpci_init(struct domain *d)
>> {
>> return 0;
>> }
>> +
>> +static inline int domain_vpci_get_num_mmio_handlers(struct domain *d)
>> +{
>> + return 0;
>> +}
>> #endif
>>
>> #endif /* __ARCH_ARM_VPCI_H__ */
>> diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
>> index 566a9436a18e..0d0266b13cba 100644
>> --- a/xen/include/asm-arm/pci.h
>> +++ b/xen/include/asm-arm/pci.h
>> @@ -108,6 +108,11 @@ static always_inline bool is_pci_passthrough_enabled(void)
>>
>> void arch_pci_init_pdev(struct pci_dev *pdev);
>>
>> +int pci_host_iterate_bridges(struct domain *d,
>> + int (*clb)(struct domain *d,
>> + struct pci_host_bridge *bridge));
>> +int pci_host_get_num_bridges(void);
>> +
>> #else /*!CONFIG_HAS_PCI*/
>>
>> struct arch_pci_dev { };
>> --
>> 2.25.1
>>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v3 10/11] xen/arm: Do not map PCI ECAM and MMIO space to Domain-0's p2m
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
` (8 preceding siblings ...)
2021-09-30 7:13 ` [PATCH v3 09/11] xen/arm: Setup MMIO range trap handlers for hardware domain Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-10-01 1:09 ` Stefano Stabellini
2021-09-30 7:13 ` [PATCH v3 11/11] xen/arm: Process pending vPCI map/unmap operations Oleksandr Andrushchenko
10 siblings, 1 reply; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
PCI host bridges are special devices in terms of implementing PCI
passthrough. According to [1] the current implementation depends on
Domain-0 to perform the initialization of the relevant PCI host
bridge hardware and perform PCI device enumeration. In order to
achieve that one of the required changes is to not map all the memory
ranges in map_range_to_domain as we traverse the device tree on startup
and perform some additional checks if the range needs to be mapped to
Domain-0.
The generic PCI host controller device tree binding says [2]:
- ranges: As described in IEEE Std 1275-1994, but must provide
at least a definition of non-prefetchable memory. One
or both of prefetchable Memory and IO Space may also
be provided.
- reg : The Configuration Space base address and size, as accessed
from the parent bus. The base address corresponds to
the first bus in the "bus-range" property. If no
"bus-range" is specified, this will be bus 0 (the default).
From the above none of the memory ranges from the "ranges" property
needs to be mapped to Domain-0 at startup as MMIO mapping is going to
be handled dynamically by vPCI as we assign PCI devices, e.g. each
device assigned to Domain-0/guest will have its MMIOs mapped/unmapped
as needed by Xen.
The "reg" property covers not only ECAM space, but may also have other
then the configuration memory ranges described, for example [3]:
- reg: Should contain rc_dbi, config registers location and length.
- reg-names: Must include the following entries:
"rc_dbi": controller configuration registers;
"config": PCIe configuration space registers.
This patch makes it possible to not map all the ranges from the
"ranges" property and also ECAM from the "reg". All the rest from the
"reg" property still needs to be mapped to Domain-0, so the PCI
host bridge remains functional in Domain-0.
[1] https://lists.xenproject.org/archives/html/xen-devel/2020-07/msg00777.html
[2] https://www.kernel.org/doc/Documentation/devicetree/bindings/pci/host-generic-pci.txt
[3] https://www.kernel.org/doc/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
---
Since v2:
- removed check in map_range_to_domain for PCI_DEV
and moved it to handle_device, so the code is
simpler
- s/map_pci_bridge/skip_mapping
- extended comment in pci_host_bridge_mappings
- minor code restructure in construct_dom0
- s/.need_p2m_mapping/.need_p2m_hwdom_mapping and related
callbacks
- unsigned int i; in pci_host_bridge_mappings
Since v1:
- Added better description of why and what needs to be mapped into
Domain-0's p2m and what doesn't
- Do not do any mappings for PCI devices while traversing the DT
- Walk all the bridges and make required mappings in one go
---
xen/arch/arm/domain_build.c | 45 ++++++++++++++-------------
xen/arch/arm/pci/ecam.c | 14 +++++++++
xen/arch/arm/pci/pci-host-common.c | 49 ++++++++++++++++++++++++++++++
xen/arch/arm/pci/pci-host-zynqmp.c | 1 +
xen/include/asm-arm/pci.h | 10 ++++++
xen/include/asm-arm/setup.h | 13 ++++++++
6 files changed, 111 insertions(+), 21 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 026c9e5c6cc4..ed46bcf8e7eb 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -10,7 +10,6 @@
#include <asm/regs.h>
#include <xen/errno.h>
#include <xen/err.h>
-#include <xen/device_tree.h>
#include <xen/libfdt/libfdt.h>
#include <xen/guest_access.h>
#include <xen/iocap.h>
@@ -47,12 +46,6 @@ static int __init parse_dom0_mem(const char *s)
}
custom_param("dom0_mem", parse_dom0_mem);
-struct map_range_data
-{
- struct domain *d;
- p2m_type_t p2mt;
-};
-
/* Override macros from asm/page.h to make them work with mfn_t */
#undef virt_to_mfn
#define virt_to_mfn(va) _mfn(__virt_to_mfn(va))
@@ -1388,13 +1381,13 @@ static int __init map_dt_irq_to_domain(const struct dt_device_node *dev,
return 0;
}
-static int __init map_range_to_domain(const struct dt_device_node *dev,
- u64 addr, u64 len,
- void *data)
+int __init map_range_to_domain(const struct dt_device_node *dev,
+ u64 addr, u64 len, void *data)
{
struct map_range_data *mr_data = data;
struct domain *d = mr_data->d;
- bool need_mapping = !dt_device_for_passthrough(dev);
+ bool need_mapping = !dt_device_for_passthrough(dev) &&
+ !mr_data->skip_mapping;
int res;
/*
@@ -1446,23 +1439,21 @@ static int __init map_range_to_domain(const struct dt_device_node *dev,
* then we may need to perform additional mappings in order to make
* the child resources available to domain 0.
*/
-static int __init map_device_children(struct domain *d,
- const struct dt_device_node *dev,
- p2m_type_t p2mt)
+static int __init map_device_children(const struct dt_device_node *dev,
+ struct map_range_data *mr_data)
{
- struct map_range_data mr_data = { .d = d, .p2mt = p2mt };
- int ret;
-
if ( dt_device_type_is_equal(dev, "pci") )
{
+ int ret;
+
dt_dprintk("Mapping children of %s to guest\n",
dt_node_full_name(dev));
- ret = dt_for_each_irq_map(dev, &map_dt_irq_to_domain, d);
+ ret = dt_for_each_irq_map(dev, &map_dt_irq_to_domain, mr_data->d);
if ( ret < 0 )
return ret;
- ret = dt_for_each_range(dev, &map_range_to_domain, &mr_data);
+ ret = dt_for_each_range(dev, &map_range_to_domain, mr_data);
if ( ret < 0 )
return ret;
}
@@ -1543,6 +1534,12 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev,
int res;
u64 addr, size;
bool need_mapping = !dt_device_for_passthrough(dev);
+ struct map_range_data mr_data = {
+ .d = d,
+ .p2mt = p2mt,
+ .skip_mapping = is_pci_passthrough_enabled() &&
+ (device_get_class(dev) == DEVICE_PCI)
+ };
naddr = dt_number_of_address(dev);
@@ -1582,7 +1579,6 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev,
/* Give permission and map MMIOs */
for ( i = 0; i < naddr; i++ )
{
- struct map_range_data mr_data = { .d = d, .p2mt = p2mt };
res = dt_device_get_address(dev, i, &addr, &size);
if ( res )
{
@@ -1596,7 +1592,7 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev,
return res;
}
- res = map_device_children(d, dev, p2mt);
+ res = map_device_children(dev, &mr_data);
if ( res )
return res;
@@ -2754,7 +2750,14 @@ static int __init construct_dom0(struct domain *d)
return rc;
if ( acpi_disabled )
+ {
rc = prepare_dtb_hwdom(d, &kinfo);
+ if ( rc < 0 )
+ return rc;
+#ifdef CONFIG_HAS_PCI
+ rc = pci_host_bridge_mappings(d, p2m_mmio_direct_c);
+#endif
+ }
else
rc = prepare_acpi(d, &kinfo);
diff --git a/xen/arch/arm/pci/ecam.c b/xen/arch/arm/pci/ecam.c
index 602d00799c8d..b81620074a91 100644
--- a/xen/arch/arm/pci/ecam.c
+++ b/xen/arch/arm/pci/ecam.c
@@ -40,6 +40,19 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge,
return base + (PCI_DEVFN2(sbdf.bdf) << devfn_shift) + where;
}
+bool pci_ecam_need_p2m_hwdom_mapping(struct domain *d,
+ struct pci_host_bridge *bridge,
+ uint64_t addr)
+{
+ struct pci_config_window *cfg = bridge->cfg;
+
+ /*
+ * We do not want ECAM address space to be mapped in Domain-0's p2m,
+ * so we can trap access to it.
+ */
+ return cfg->phys_addr != addr;
+}
+
/* ECAM ops */
const struct pci_ecam_ops pci_generic_ecam_ops = {
.bus_shift = 20,
@@ -47,6 +60,7 @@ const struct pci_ecam_ops pci_generic_ecam_ops = {
.map_bus = pci_ecam_map_bus,
.read = pci_generic_config_read,
.write = pci_generic_config_write,
+ .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping,
}
};
diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c
index 1eb4daa87365..085f08e23e0c 100644
--- a/xen/arch/arm/pci/pci-host-common.c
+++ b/xen/arch/arm/pci/pci-host-common.c
@@ -18,6 +18,7 @@
#include <xen/init.h>
#include <xen/pci.h>
+#include <asm/setup.h>
#include <xen/rwlock.h>
#include <xen/sched.h>
#include <xen/vmap.h>
@@ -320,6 +321,54 @@ int pci_host_get_num_bridges(void)
return count;
}
+int __init pci_host_bridge_mappings(struct domain *d, p2m_type_t p2mt)
+{
+ struct pci_host_bridge *bridge;
+ struct map_range_data mr_data = {
+ .d = d,
+ .p2mt = p2mt,
+ .skip_mapping = false
+ };
+
+ /*
+ * For each PCI host bridge we need to only map those ranges
+ * which are used by Domain-0 to properly initialize the bridge,
+ * e.g. we do not want to map ECAM configuration space which lives in
+ * "reg" or "assigned-addresses" device tree property, but we want to
+ * map other regions of the host bridge. The PCI aperture defined by
+ * the "ranges" device tree property should also be skipped.
+ */
+ list_for_each_entry( bridge, &pci_host_bridges, node )
+ {
+ const struct dt_device_node *dev = bridge->dt_node;
+ unsigned int i;
+
+ for ( i = 0; i < dt_number_of_address(dev); i++ )
+ {
+ uint64_t addr, size;
+ int err;
+
+ err = dt_device_get_address(dev, i, &addr, &size);
+ if ( err )
+ {
+ printk(XENLOG_ERR
+ "Unable to retrieve address range index=%u for %s\n",
+ i, dt_node_full_name(dev));
+ return err;
+ }
+
+ if ( bridge->ops->need_p2m_hwdom_mapping(d, bridge, addr) )
+ {
+ err = map_range_to_domain(dev, addr, size, &mr_data);
+ if ( err )
+ return err;
+ }
+ }
+ }
+
+ return 0;
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c
index 6ccbfd15c968..a57bf0fbc1cc 100644
--- a/xen/arch/arm/pci/pci-host-zynqmp.c
+++ b/xen/arch/arm/pci/pci-host-zynqmp.c
@@ -33,6 +33,7 @@ const struct pci_ecam_ops nwl_pcie_ops = {
.map_bus = pci_ecam_map_bus,
.read = pci_generic_config_read,
.write = pci_generic_config_write,
+ .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping,
}
};
diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
index 0d0266b13cba..1bfba3da8f51 100644
--- a/xen/include/asm-arm/pci.h
+++ b/xen/include/asm-arm/pci.h
@@ -17,6 +17,8 @@
#ifdef CONFIG_HAS_PCI
+#include <asm/p2m.h>
+
#define pci_to_dev(pcidev) (&(pcidev)->arch.dev)
extern bool_t pci_passthrough_enabled;
@@ -73,6 +75,9 @@ struct pci_ops {
uint32_t reg, uint32_t len, uint32_t *value);
int (*write)(struct pci_host_bridge *bridge, pci_sbdf_t sbdf,
uint32_t reg, uint32_t len, uint32_t value);
+ bool (*need_p2m_hwdom_mapping)(struct domain *d,
+ struct pci_host_bridge *bridge,
+ uint64_t addr);
};
/*
@@ -96,6 +101,9 @@ int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf,
uint32_t reg, uint32_t len, uint32_t value);
void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge,
pci_sbdf_t sbdf, uint32_t where);
+bool pci_ecam_need_p2m_hwdom_mapping(struct domain *d,
+ struct pci_host_bridge *bridge,
+ uint64_t addr);
struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus);
int pci_get_host_bridge_segment(const struct dt_device_node *node,
uint16_t *segment);
@@ -113,6 +121,8 @@ int pci_host_iterate_bridges(struct domain *d,
struct pci_host_bridge *bridge));
int pci_host_get_num_bridges(void);
+int pci_host_bridge_mappings(struct domain *d, p2m_type_t p2mt);
+
#else /*!CONFIG_HAS_PCI*/
struct arch_pci_dev { };
diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h
index 95da0b7ab9cd..5b30135fda38 100644
--- a/xen/include/asm-arm/setup.h
+++ b/xen/include/asm-arm/setup.h
@@ -2,6 +2,8 @@
#define __ARM_SETUP_H_
#include <public/version.h>
+#include <asm/p2m.h>
+#include <xen/device_tree.h>
#define MIN_FDT_ALIGN 8
#define MAX_FDT_SIZE SZ_2M
@@ -77,6 +79,14 @@ struct bootinfo {
#endif
};
+struct map_range_data
+{
+ struct domain *d;
+ p2m_type_t p2mt;
+ /* Set if mappings for PCI host bridges must not be skipped. */
+ bool skip_mapping;
+};
+
extern struct bootinfo bootinfo;
extern domid_t max_init_domid;
@@ -124,6 +134,9 @@ void device_tree_get_reg(const __be32 **cell, u32 address_cells,
u32 device_tree_get_u32(const void *fdt, int node,
const char *prop_name, u32 dflt);
+int map_range_to_domain(const struct dt_device_node *dev,
+ u64 addr, u64 len, void *data);
+
#endif
/*
* Local variables:
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v3 10/11] xen/arm: Do not map PCI ECAM and MMIO space to Domain-0's p2m
2021-09-30 7:13 ` [PATCH v3 10/11] xen/arm: Do not map PCI ECAM and MMIO space to Domain-0's p2m Oleksandr Andrushchenko
@ 2021-10-01 1:09 ` Stefano Stabellini
0 siblings, 0 replies; 26+ messages in thread
From: Stefano Stabellini @ 2021-10-01 1:09 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: xen-devel, julien, sstabellini, oleksandr_tyshchenko,
volodymyr_babchuk, Artem_Mygaiev, roger.pau, bertrand.marquis,
rahul.singh, Oleksandr Andrushchenko
On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> PCI host bridges are special devices in terms of implementing PCI
> passthrough. According to [1] the current implementation depends on
> Domain-0 to perform the initialization of the relevant PCI host
> bridge hardware and perform PCI device enumeration. In order to
> achieve that one of the required changes is to not map all the memory
> ranges in map_range_to_domain as we traverse the device tree on startup
> and perform some additional checks if the range needs to be mapped to
> Domain-0.
>
> The generic PCI host controller device tree binding says [2]:
> - ranges: As described in IEEE Std 1275-1994, but must provide
> at least a definition of non-prefetchable memory. One
> or both of prefetchable Memory and IO Space may also
> be provided.
>
> - reg : The Configuration Space base address and size, as accessed
> from the parent bus. The base address corresponds to
> the first bus in the "bus-range" property. If no
> "bus-range" is specified, this will be bus 0 (the default).
>
> >From the above none of the memory ranges from the "ranges" property
> needs to be mapped to Domain-0 at startup as MMIO mapping is going to
> be handled dynamically by vPCI as we assign PCI devices, e.g. each
> device assigned to Domain-0/guest will have its MMIOs mapped/unmapped
> as needed by Xen.
>
> The "reg" property covers not only ECAM space, but may also have other
> then the configuration memory ranges described, for example [3]:
> - reg: Should contain rc_dbi, config registers location and length.
> - reg-names: Must include the following entries:
> "rc_dbi": controller configuration registers;
> "config": PCIe configuration space registers.
>
> This patch makes it possible to not map all the ranges from the
> "ranges" property and also ECAM from the "reg". All the rest from the
> "reg" property still needs to be mapped to Domain-0, so the PCI
> host bridge remains functional in Domain-0.
>
> [1] https://lists.xenproject.org/archives/html/xen-devel/2020-07/msg00777.html
> [2] https://www.kernel.org/doc/Documentation/devicetree/bindings/pci/host-generic-pci.txt
> [3] https://www.kernel.org/doc/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
This is a lot better, we are almost there. I only have a couple of
comments left.
> ---
> Since v2:
> - removed check in map_range_to_domain for PCI_DEV
> and moved it to handle_device, so the code is
> simpler
> - s/map_pci_bridge/skip_mapping
> - extended comment in pci_host_bridge_mappings
> - minor code restructure in construct_dom0
> - s/.need_p2m_mapping/.need_p2m_hwdom_mapping and related
> callbacks
> - unsigned int i; in pci_host_bridge_mappings
> Since v1:
> - Added better description of why and what needs to be mapped into
> Domain-0's p2m and what doesn't
> - Do not do any mappings for PCI devices while traversing the DT
> - Walk all the bridges and make required mappings in one go
> ---
> xen/arch/arm/domain_build.c | 45 ++++++++++++++-------------
> xen/arch/arm/pci/ecam.c | 14 +++++++++
> xen/arch/arm/pci/pci-host-common.c | 49 ++++++++++++++++++++++++++++++
> xen/arch/arm/pci/pci-host-zynqmp.c | 1 +
> xen/include/asm-arm/pci.h | 10 ++++++
> xen/include/asm-arm/setup.h | 13 ++++++++
> 6 files changed, 111 insertions(+), 21 deletions(-)
>
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 026c9e5c6cc4..ed46bcf8e7eb 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -10,7 +10,6 @@
> #include <asm/regs.h>
> #include <xen/errno.h>
> #include <xen/err.h>
> -#include <xen/device_tree.h>
> #include <xen/libfdt/libfdt.h>
> #include <xen/guest_access.h>
> #include <xen/iocap.h>
> @@ -47,12 +46,6 @@ static int __init parse_dom0_mem(const char *s)
> }
> custom_param("dom0_mem", parse_dom0_mem);
>
> -struct map_range_data
> -{
> - struct domain *d;
> - p2m_type_t p2mt;
> -};
> -
> /* Override macros from asm/page.h to make them work with mfn_t */
> #undef virt_to_mfn
> #define virt_to_mfn(va) _mfn(__virt_to_mfn(va))
> @@ -1388,13 +1381,13 @@ static int __init map_dt_irq_to_domain(const struct dt_device_node *dev,
> return 0;
> }
>
> -static int __init map_range_to_domain(const struct dt_device_node *dev,
> - u64 addr, u64 len,
> - void *data)
> +int __init map_range_to_domain(const struct dt_device_node *dev,
> + u64 addr, u64 len, void *data)
> {
> struct map_range_data *mr_data = data;
> struct domain *d = mr_data->d;
> - bool need_mapping = !dt_device_for_passthrough(dev);
> + bool need_mapping = !dt_device_for_passthrough(dev) &&
> + !mr_data->skip_mapping;
This should be just:
bool need_mapping = !mr_data->skip_mapping;
also see below
> int res;
>
> /*
> @@ -1446,23 +1439,21 @@ static int __init map_range_to_domain(const struct dt_device_node *dev,
> * then we may need to perform additional mappings in order to make
> * the child resources available to domain 0.
> */
> -static int __init map_device_children(struct domain *d,
> - const struct dt_device_node *dev,
> - p2m_type_t p2mt)
> +static int __init map_device_children(const struct dt_device_node *dev,
> + struct map_range_data *mr_data)
> {
> - struct map_range_data mr_data = { .d = d, .p2mt = p2mt };
> - int ret;
> -
> if ( dt_device_type_is_equal(dev, "pci") )
> {
> + int ret;
> +
> dt_dprintk("Mapping children of %s to guest\n",
> dt_node_full_name(dev));
>
> - ret = dt_for_each_irq_map(dev, &map_dt_irq_to_domain, d);
> + ret = dt_for_each_irq_map(dev, &map_dt_irq_to_domain, mr_data->d);
I think it would be best if we pass mr_data instead of mr_data->d so
that at the beginning of map_dt_irq_to_domain we can do:
bool need_mapping = !mr_data->skip_mapping;
> if ( ret < 0 )
> return ret;
>
> - ret = dt_for_each_range(dev, &map_range_to_domain, &mr_data);
> + ret = dt_for_each_range(dev, &map_range_to_domain, mr_data);
> if ( ret < 0 )
> return ret;
> }
> @@ -1543,6 +1534,12 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev,
> int res;
> u64 addr, size;
> bool need_mapping = !dt_device_for_passthrough(dev);
> + struct map_range_data mr_data = {
> + .d = d,
> + .p2mt = p2mt,
> + .skip_mapping = is_pci_passthrough_enabled() &&
> + (device_get_class(dev) == DEVICE_PCI)
I think this should be:
.skip_mapping = !need_mapping ||
(is_pci_passthrough_enabled() &&
(device_get_class(dev) == DEVICE_PCI))
> + };
>
> naddr = dt_number_of_address(dev);
>
> @@ -1582,7 +1579,6 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev,
> /* Give permission and map MMIOs */
> for ( i = 0; i < naddr; i++ )
> {
> - struct map_range_data mr_data = { .d = d, .p2mt = p2mt };
> res = dt_device_get_address(dev, i, &addr, &size);
> if ( res )
> {
> @@ -1596,7 +1592,7 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev,
> return res;
> }
>
> - res = map_device_children(d, dev, p2mt);
> + res = map_device_children(dev, &mr_data);
> if ( res )
> return res;
>
> @@ -2754,7 +2750,14 @@ static int __init construct_dom0(struct domain *d)
> return rc;
>
> if ( acpi_disabled )
> + {
> rc = prepare_dtb_hwdom(d, &kinfo);
> + if ( rc < 0 )
> + return rc;
> +#ifdef CONFIG_HAS_PCI
> + rc = pci_host_bridge_mappings(d, p2m_mmio_direct_c);
> +#endif
> + }
> else
> rc = prepare_acpi(d, &kinfo);
>
> diff --git a/xen/arch/arm/pci/ecam.c b/xen/arch/arm/pci/ecam.c
> index 602d00799c8d..b81620074a91 100644
> --- a/xen/arch/arm/pci/ecam.c
> +++ b/xen/arch/arm/pci/ecam.c
> @@ -40,6 +40,19 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge,
> return base + (PCI_DEVFN2(sbdf.bdf) << devfn_shift) + where;
> }
>
> +bool pci_ecam_need_p2m_hwdom_mapping(struct domain *d,
> + struct pci_host_bridge *bridge,
> + uint64_t addr)
> +{
> + struct pci_config_window *cfg = bridge->cfg;
> +
> + /*
> + * We do not want ECAM address space to be mapped in Domain-0's p2m,
> + * so we can trap access to it.
> + */
> + return cfg->phys_addr != addr;
> +}
> +
> /* ECAM ops */
> const struct pci_ecam_ops pci_generic_ecam_ops = {
> .bus_shift = 20,
> @@ -47,6 +60,7 @@ const struct pci_ecam_ops pci_generic_ecam_ops = {
> .map_bus = pci_ecam_map_bus,
> .read = pci_generic_config_read,
> .write = pci_generic_config_write,
> + .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping,
> }
> };
>
> diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c
> index 1eb4daa87365..085f08e23e0c 100644
> --- a/xen/arch/arm/pci/pci-host-common.c
> +++ b/xen/arch/arm/pci/pci-host-common.c
> @@ -18,6 +18,7 @@
>
> #include <xen/init.h>
> #include <xen/pci.h>
> +#include <asm/setup.h>
> #include <xen/rwlock.h>
> #include <xen/sched.h>
> #include <xen/vmap.h>
> @@ -320,6 +321,54 @@ int pci_host_get_num_bridges(void)
> return count;
> }
>
> +int __init pci_host_bridge_mappings(struct domain *d, p2m_type_t p2mt)
> +{
> + struct pci_host_bridge *bridge;
> + struct map_range_data mr_data = {
> + .d = d,
> + .p2mt = p2mt,
> + .skip_mapping = false
> + };
> +
> + /*
> + * For each PCI host bridge we need to only map those ranges
> + * which are used by Domain-0 to properly initialize the bridge,
> + * e.g. we do not want to map ECAM configuration space which lives in
> + * "reg" or "assigned-addresses" device tree property, but we want to
> + * map other regions of the host bridge. The PCI aperture defined by
> + * the "ranges" device tree property should also be skipped.
> + */
> + list_for_each_entry( bridge, &pci_host_bridges, node )
> + {
> + const struct dt_device_node *dev = bridge->dt_node;
> + unsigned int i;
> +
> + for ( i = 0; i < dt_number_of_address(dev); i++ )
> + {
> + uint64_t addr, size;
> + int err;
> +
> + err = dt_device_get_address(dev, i, &addr, &size);
> + if ( err )
> + {
> + printk(XENLOG_ERR
> + "Unable to retrieve address range index=%u for %s\n",
> + i, dt_node_full_name(dev));
> + return err;
> + }
> +
> + if ( bridge->ops->need_p2m_hwdom_mapping(d, bridge, addr) )
> + {
> + err = map_range_to_domain(dev, addr, size, &mr_data);
> + if ( err )
> + return err;
> + }
> + }
> + }
> +
> + return 0;
> +}
> +
> /*
> * Local variables:
> * mode: C
> diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c
> index 6ccbfd15c968..a57bf0fbc1cc 100644
> --- a/xen/arch/arm/pci/pci-host-zynqmp.c
> +++ b/xen/arch/arm/pci/pci-host-zynqmp.c
> @@ -33,6 +33,7 @@ const struct pci_ecam_ops nwl_pcie_ops = {
> .map_bus = pci_ecam_map_bus,
> .read = pci_generic_config_read,
> .write = pci_generic_config_write,
> + .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping,
> }
> };
>
> diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
> index 0d0266b13cba..1bfba3da8f51 100644
> --- a/xen/include/asm-arm/pci.h
> +++ b/xen/include/asm-arm/pci.h
> @@ -17,6 +17,8 @@
>
> #ifdef CONFIG_HAS_PCI
>
> +#include <asm/p2m.h>
> +
> #define pci_to_dev(pcidev) (&(pcidev)->arch.dev)
>
> extern bool_t pci_passthrough_enabled;
> @@ -73,6 +75,9 @@ struct pci_ops {
> uint32_t reg, uint32_t len, uint32_t *value);
> int (*write)(struct pci_host_bridge *bridge, pci_sbdf_t sbdf,
> uint32_t reg, uint32_t len, uint32_t value);
> + bool (*need_p2m_hwdom_mapping)(struct domain *d,
> + struct pci_host_bridge *bridge,
> + uint64_t addr);
> };
>
> /*
> @@ -96,6 +101,9 @@ int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf,
> uint32_t reg, uint32_t len, uint32_t value);
> void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge,
> pci_sbdf_t sbdf, uint32_t where);
> +bool pci_ecam_need_p2m_hwdom_mapping(struct domain *d,
> + struct pci_host_bridge *bridge,
> + uint64_t addr);
> struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus);
> int pci_get_host_bridge_segment(const struct dt_device_node *node,
> uint16_t *segment);
> @@ -113,6 +121,8 @@ int pci_host_iterate_bridges(struct domain *d,
> struct pci_host_bridge *bridge));
> int pci_host_get_num_bridges(void);
>
> +int pci_host_bridge_mappings(struct domain *d, p2m_type_t p2mt);
> +
> #else /*!CONFIG_HAS_PCI*/
>
> struct arch_pci_dev { };
> diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h
> index 95da0b7ab9cd..5b30135fda38 100644
> --- a/xen/include/asm-arm/setup.h
> +++ b/xen/include/asm-arm/setup.h
> @@ -2,6 +2,8 @@
> #define __ARM_SETUP_H_
>
> #include <public/version.h>
> +#include <asm/p2m.h>
> +#include <xen/device_tree.h>
>
> #define MIN_FDT_ALIGN 8
> #define MAX_FDT_SIZE SZ_2M
> @@ -77,6 +79,14 @@ struct bootinfo {
> #endif
> };
>
> +struct map_range_data
> +{
> + struct domain *d;
> + p2m_type_t p2mt;
> + /* Set if mappings for PCI host bridges must not be skipped. */
This comment needs updating
> + bool skip_mapping;
> +};
> +
> extern struct bootinfo bootinfo;
>
> extern domid_t max_init_domid;
> @@ -124,6 +134,9 @@ void device_tree_get_reg(const __be32 **cell, u32 address_cells,
> u32 device_tree_get_u32(const void *fdt, int node,
> const char *prop_name, u32 dflt);
>
> +int map_range_to_domain(const struct dt_device_node *dev,
> + u64 addr, u64 len, void *data);
> +
> #endif
> /*
> * Local variables:
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v3 11/11] xen/arm: Process pending vPCI map/unmap operations
2021-09-30 7:13 [PATCH v3 00/11] PCI devices passthrough on Arm, part 2 Oleksandr Andrushchenko
` (9 preceding siblings ...)
2021-09-30 7:13 ` [PATCH v3 10/11] xen/arm: Do not map PCI ECAM and MMIO space to Domain-0's p2m Oleksandr Andrushchenko
@ 2021-09-30 7:13 ` Oleksandr Andrushchenko
2021-09-30 8:04 ` Jan Beulich
2021-10-01 1:14 ` Stefano Stabellini
10 siblings, 2 replies; 26+ messages in thread
From: Oleksandr Andrushchenko @ 2021-09-30 7:13 UTC (permalink / raw)
To: xen-devel
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
vPCI may map and unmap PCI device memory (BARs) being passed through which
may take a lot of time. For this those operations may be deferred to be
performed later, so that they can be safely preempted.
Currently this deferred processing is happening in common IOREQ code
which doesn't seem to be the right place for x86 and is even more
doubtful because IOREQ may not be enabled for Arm at all.
So, for Arm the pending vPCI work may have no chance to be executed
if the processing is left as is in the common IOREQ code only.
For that reason make vPCI processing happen in arch specific code.
Please be aware that there are a few outstanding TODOs affecting this
code path, see xen/drivers/vpci/header.c:map_range and
xen/drivers/vpci/header.c:vpci_process_pending.
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
---
Since v2:
- update commit message with more insight on x86, IOREQ and Arm
- restored order of invocation for IOREQ and vPCI processing (Jan)
Since v1:
- Moved the check for pending vpci work from the common IOREQ code
to hvm_do_resume on x86
- Re-worked the code for Arm to ensure we don't miss pending vPCI work
---
xen/arch/arm/traps.c | 13 +++++++++++++
xen/arch/x86/hvm/hvm.c | 6 ++++++
xen/common/ioreq.c | 9 ---------
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 219ab3c3fbde..b246f51086e3 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -34,6 +34,7 @@
#include <xen/symbols.h>
#include <xen/version.h>
#include <xen/virtual_region.h>
+#include <xen/vpci.h>
#include <public/sched.h>
#include <public/xen.h>
@@ -2304,6 +2305,18 @@ static bool check_for_vcpu_work(void)
}
#endif
+ if ( has_vpci(v->domain) )
+ {
+ bool pending;
+
+ local_irq_enable();
+ pending = vpci_process_pending(v);
+ local_irq_disable();
+
+ if ( pending )
+ return true;
+ }
+
if ( likely(!v->arch.need_flush_to_ram) )
return false;
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 7b48a1b925bb..38bf697c5b04 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -546,6 +546,12 @@ void hvm_do_resume(struct vcpu *v)
pt_restore_timer(v);
+ if ( has_vpci(v->domain) && vpci_process_pending(v) )
+ {
+ raise_softirq(SCHEDULE_SOFTIRQ);
+ return;
+ }
+
if ( !vcpu_ioreq_handle_completion(v) )
return;
diff --git a/xen/common/ioreq.c b/xen/common/ioreq.c
index d732dc045df9..689d256544c8 100644
--- a/xen/common/ioreq.c
+++ b/xen/common/ioreq.c
@@ -25,9 +25,7 @@
#include <xen/lib.h>
#include <xen/paging.h>
#include <xen/sched.h>
-#include <xen/softirq.h>
#include <xen/trace.h>
-#include <xen/vpci.h>
#include <asm/guest_atomics.h>
#include <asm/ioreq.h>
@@ -212,19 +210,12 @@ static bool wait_for_io(struct ioreq_vcpu *sv, ioreq_t *p)
bool vcpu_ioreq_handle_completion(struct vcpu *v)
{
- struct domain *d = v->domain;
struct vcpu_io *vio = &v->io;
struct ioreq_server *s;
struct ioreq_vcpu *sv;
enum vio_completion completion;
bool res = true;
- if ( has_vpci(d) && vpci_process_pending(v) )
- {
- raise_softirq(SCHEDULE_SOFTIRQ);
- return false;
- }
-
while ( (sv = get_pending_vcpu(v, &s)) != NULL )
if ( !wait_for_io(sv, get_ioreq(s, v)) )
return false;
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v3 11/11] xen/arm: Process pending vPCI map/unmap operations
2021-09-30 7:13 ` [PATCH v3 11/11] xen/arm: Process pending vPCI map/unmap operations Oleksandr Andrushchenko
@ 2021-09-30 8:04 ` Jan Beulich
2021-10-01 1:14 ` Stefano Stabellini
1 sibling, 0 replies; 26+ messages in thread
From: Jan Beulich @ 2021-09-30 8:04 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: julien, sstabellini, oleksandr_tyshchenko, volodymyr_babchuk,
Artem_Mygaiev, roger.pau, bertrand.marquis, rahul.singh,
Oleksandr Andrushchenko, xen-devel, Paul Durrant, Andrew Cooper,
Roger Pau Monné
On 30.09.2021 09:13, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> vPCI may map and unmap PCI device memory (BARs) being passed through which
> may take a lot of time. For this those operations may be deferred to be
> performed later, so that they can be safely preempted.
>
> Currently this deferred processing is happening in common IOREQ code
> which doesn't seem to be the right place for x86 and is even more
> doubtful because IOREQ may not be enabled for Arm at all.
> So, for Arm the pending vPCI work may have no chance to be executed
> if the processing is left as is in the common IOREQ code only.
> For that reason make vPCI processing happen in arch specific code.
>
> Please be aware that there are a few outstanding TODOs affecting this
> code path, see xen/drivers/vpci/header.c:map_range and
> xen/drivers/vpci/header.c:vpci_process_pending.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> ---
> Since v2:
> - update commit message with more insight on x86, IOREQ and Arm
> - restored order of invocation for IOREQ and vPCI processing (Jan)
> Since v1:
> - Moved the check for pending vpci work from the common IOREQ code
> to hvm_do_resume on x86
> - Re-worked the code for Arm to ensure we don't miss pending vPCI work
> ---
> xen/arch/arm/traps.c | 13 +++++++++++++
> xen/arch/x86/hvm/hvm.c | 6 ++++++
This x86 change
Acked-by: Jan Beulich <jbeulich@suse.com>
> xen/common/ioreq.c | 9 ---------
Already on v2 I did indicate that you need to Cc Paul to get an ack for
this part of the change.
> --- a/xen/arch/x86/hvm/hvm.c
> +++ b/xen/arch/x86/hvm/hvm.c
> @@ -546,6 +546,12 @@ void hvm_do_resume(struct vcpu *v)
>
> pt_restore_timer(v);
>
> + if ( has_vpci(v->domain) && vpci_process_pending(v) )
> + {
> + raise_softirq(SCHEDULE_SOFTIRQ);
> + return;
> + }
> +
> if ( !vcpu_ioreq_handle_completion(v) )
> return;
Seeing this movement I'm now wondering whether we shouldn't take the
opportunity and move this further up. I notice that besides Paul you
also failed to Cc the other x86 maintainers, whom I'm now adding.
Jan
> --- a/xen/common/ioreq.c
> +++ b/xen/common/ioreq.c
> @@ -25,9 +25,7 @@
> #include <xen/lib.h>
> #include <xen/paging.h>
> #include <xen/sched.h>
> -#include <xen/softirq.h>
> #include <xen/trace.h>
> -#include <xen/vpci.h>
>
> #include <asm/guest_atomics.h>
> #include <asm/ioreq.h>
> @@ -212,19 +210,12 @@ static bool wait_for_io(struct ioreq_vcpu *sv, ioreq_t *p)
>
> bool vcpu_ioreq_handle_completion(struct vcpu *v)
> {
> - struct domain *d = v->domain;
> struct vcpu_io *vio = &v->io;
> struct ioreq_server *s;
> struct ioreq_vcpu *sv;
> enum vio_completion completion;
> bool res = true;
>
> - if ( has_vpci(d) && vpci_process_pending(v) )
> - {
> - raise_softirq(SCHEDULE_SOFTIRQ);
> - return false;
> - }
> -
> while ( (sv = get_pending_vcpu(v, &s)) != NULL )
> if ( !wait_for_io(sv, get_ioreq(s, v)) )
> return false;
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v3 11/11] xen/arm: Process pending vPCI map/unmap operations
2021-09-30 7:13 ` [PATCH v3 11/11] xen/arm: Process pending vPCI map/unmap operations Oleksandr Andrushchenko
2021-09-30 8:04 ` Jan Beulich
@ 2021-10-01 1:14 ` Stefano Stabellini
1 sibling, 0 replies; 26+ messages in thread
From: Stefano Stabellini @ 2021-10-01 1:14 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: xen-devel, julien, sstabellini, oleksandr_tyshchenko,
volodymyr_babchuk, Artem_Mygaiev, roger.pau, bertrand.marquis,
rahul.singh, Oleksandr Andrushchenko
On Thu, 30 Sep 2021, Oleksandr Andrushchenko wrote:
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> vPCI may map and unmap PCI device memory (BARs) being passed through which
> may take a lot of time. For this those operations may be deferred to be
> performed later, so that they can be safely preempted.
>
> Currently this deferred processing is happening in common IOREQ code
> which doesn't seem to be the right place for x86 and is even more
> doubtful because IOREQ may not be enabled for Arm at all.
> So, for Arm the pending vPCI work may have no chance to be executed
> if the processing is left as is in the common IOREQ code only.
> For that reason make vPCI processing happen in arch specific code.
>
> Please be aware that there are a few outstanding TODOs affecting this
> code path, see xen/drivers/vpci/header.c:map_range and
> xen/drivers/vpci/header.c:vpci_process_pending.
>
> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> Since v2:
> - update commit message with more insight on x86, IOREQ and Arm
> - restored order of invocation for IOREQ and vPCI processing (Jan)
> Since v1:
> - Moved the check for pending vpci work from the common IOREQ code
> to hvm_do_resume on x86
> - Re-worked the code for Arm to ensure we don't miss pending vPCI work
> ---
> xen/arch/arm/traps.c | 13 +++++++++++++
> xen/arch/x86/hvm/hvm.c | 6 ++++++
> xen/common/ioreq.c | 9 ---------
> 3 files changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> index 219ab3c3fbde..b246f51086e3 100644
> --- a/xen/arch/arm/traps.c
> +++ b/xen/arch/arm/traps.c
> @@ -34,6 +34,7 @@
> #include <xen/symbols.h>
> #include <xen/version.h>
> #include <xen/virtual_region.h>
> +#include <xen/vpci.h>
>
> #include <public/sched.h>
> #include <public/xen.h>
> @@ -2304,6 +2305,18 @@ static bool check_for_vcpu_work(void)
> }
> #endif
>
> + if ( has_vpci(v->domain) )
> + {
> + bool pending;
> +
> + local_irq_enable();
> + pending = vpci_process_pending(v);
> + local_irq_disable();
> +
> + if ( pending )
> + return true;
> + }
> +
> if ( likely(!v->arch.need_flush_to_ram) )
> return false;
>
> diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
> index 7b48a1b925bb..38bf697c5b04 100644
> --- a/xen/arch/x86/hvm/hvm.c
> +++ b/xen/arch/x86/hvm/hvm.c
> @@ -546,6 +546,12 @@ void hvm_do_resume(struct vcpu *v)
>
> pt_restore_timer(v);
>
> + if ( has_vpci(v->domain) && vpci_process_pending(v) )
> + {
> + raise_softirq(SCHEDULE_SOFTIRQ);
> + return;
> + }
> +
> if ( !vcpu_ioreq_handle_completion(v) )
> return;
>
> diff --git a/xen/common/ioreq.c b/xen/common/ioreq.c
> index d732dc045df9..689d256544c8 100644
> --- a/xen/common/ioreq.c
> +++ b/xen/common/ioreq.c
> @@ -25,9 +25,7 @@
> #include <xen/lib.h>
> #include <xen/paging.h>
> #include <xen/sched.h>
> -#include <xen/softirq.h>
> #include <xen/trace.h>
> -#include <xen/vpci.h>
>
> #include <asm/guest_atomics.h>
> #include <asm/ioreq.h>
> @@ -212,19 +210,12 @@ static bool wait_for_io(struct ioreq_vcpu *sv, ioreq_t *p)
>
> bool vcpu_ioreq_handle_completion(struct vcpu *v)
> {
> - struct domain *d = v->domain;
> struct vcpu_io *vio = &v->io;
> struct ioreq_server *s;
> struct ioreq_vcpu *sv;
> enum vio_completion completion;
> bool res = true;
>
> - if ( has_vpci(d) && vpci_process_pending(v) )
> - {
> - raise_softirq(SCHEDULE_SOFTIRQ);
> - return false;
> - }
> -
> while ( (sv = get_pending_vcpu(v, &s)) != NULL )
> if ( !wait_for_io(sv, get_ioreq(s, v)) )
> return false;
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 26+ messages in thread