* [XEN][PATCH v6 01/19] xen/arm/device: Remove __init from function type
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-02 23:36 ` [XEN][PATCH v6 02/19] common/device_tree: handle memory allocation failure in __unflatten_device_tree() Vikram Garhwal
` (17 subsequent siblings)
18 siblings, 0 replies; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall,
Bertrand Marquis, Volodymyr Babchuk
Remove __init from following function to access during runtime:
1. map_irq_to_domain()
2. handle_device_interrupts()
3. map_range_to_domain()
4. unflatten_dt_node()
Move map_irq_to_domain() prototype from domain_build.h to setup.h.
To avoid breaking the build, following changes are also done:
1. Move map_irq_to_domain(), handle_device_interrupts() and map_range_to_domain()
to device.c. After removing __init type, these functions are not specific
to domain building, so moving them out of domain_build.c to device.c.
2. Remove static type from handle_device_interrupt().
Overall, these changes are done to support the dynamic programming of a nodes
where an overlay node will be added to fdt and unflattened node will be added to
dt_host. Furthermore, IRQ and mmio mapping will be done for the added node.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Michal Orzel <michal.orzel@amd.com>
---
xen/arch/arm/device.c | 144 ++++++++++++++++++++++++
xen/arch/arm/domain_build.c | 142 -----------------------
xen/arch/arm/include/asm/domain_build.h | 2 -
xen/arch/arm/include/asm/setup.h | 6 +
xen/common/device_tree.c | 12 +-
5 files changed, 156 insertions(+), 150 deletions(-)
diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c
index ca8539dee5..84197981a0 100644
--- a/xen/arch/arm/device.c
+++ b/xen/arch/arm/device.c
@@ -9,8 +9,10 @@
*/
#include <asm/device.h>
+#include <asm/setup.h>
#include <xen/errno.h>
#include <xen/init.h>
+#include <xen/iocap.h>
#include <xen/lib.h>
extern const struct device_desc _sdevice[], _edevice[];
@@ -75,6 +77,148 @@ enum device_class device_get_class(const struct dt_device_node *dev)
return DEVICE_UNKNOWN;
}
+int map_irq_to_domain(struct domain *d, unsigned int irq,
+ bool need_mapping, const char *devname)
+{
+ int res;
+
+ res = irq_permit_access(d, irq);
+ if ( res )
+ {
+ printk(XENLOG_ERR "Unable to permit to dom%u access to IRQ %u\n",
+ d->domain_id, irq);
+ return res;
+ }
+
+ if ( need_mapping )
+ {
+ /*
+ * Checking the return of vgic_reserve_virq is not
+ * necessary. It should not fail except when we try to map
+ * the IRQ twice. This can legitimately happen if the IRQ is shared
+ */
+ vgic_reserve_virq(d, irq);
+
+ res = route_irq_to_guest(d, irq, irq, devname);
+ if ( res < 0 )
+ {
+ printk(XENLOG_ERR "Unable to map IRQ%"PRId32" to dom%d\n",
+ irq, d->domain_id);
+ return res;
+ }
+ }
+
+ dt_dprintk(" - IRQ: %u\n", irq);
+ return 0;
+}
+
+int 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;
+ int res;
+
+ /*
+ * reserved-memory regions are RAM carved out for a special purpose.
+ * They are not MMIO and therefore a domain should not be able to
+ * manage them via the IOMEM interface.
+ */
+ if ( strncasecmp(dt_node_full_name(dev), "/reserved-memory/",
+ strlen("/reserved-memory/")) != 0 )
+ {
+ res = iomem_permit_access(d, paddr_to_pfn(addr),
+ paddr_to_pfn(PAGE_ALIGN(addr + len - 1)));
+ if ( res )
+ {
+ printk(XENLOG_ERR "Unable to permit to dom%d access to"
+ " 0x%"PRIx64" - 0x%"PRIx64"\n",
+ d->domain_id,
+ addr & PAGE_MASK, PAGE_ALIGN(addr + len) - 1);
+ return res;
+ }
+ }
+
+ if ( !mr_data->skip_mapping )
+ {
+ res = map_regions_p2mt(d,
+ gaddr_to_gfn(addr),
+ PFN_UP(len),
+ maddr_to_mfn(addr),
+ mr_data->p2mt);
+
+ if ( res < 0 )
+ {
+ printk(XENLOG_ERR "Unable to map 0x%"PRIx64
+ " - 0x%"PRIx64" in domain %d\n",
+ addr & PAGE_MASK, PAGE_ALIGN(addr + len) - 1,
+ d->domain_id);
+ return res;
+ }
+ }
+
+ dt_dprintk(" - MMIO: %010"PRIx64" - %010"PRIx64" P2MType=%x\n",
+ addr, addr + len, mr_data->p2mt);
+
+ return 0;
+}
+
+/*
+ * handle_device_interrupts retrieves the interrupts configuration from
+ * a device tree node and maps those interrupts to the target domain.
+ *
+ * Returns:
+ * < 0 error
+ * 0 success
+ */
+int handle_device_interrupts(struct domain *d,
+ struct dt_device_node *dev,
+ bool need_mapping)
+{
+ unsigned int i, nirq;
+ int res;
+ struct dt_raw_irq rirq;
+
+ nirq = dt_number_of_irq(dev);
+
+ /* Give permission and map IRQs */
+ for ( i = 0; i < nirq; i++ )
+ {
+ res = dt_device_get_raw_irq(dev, i, &rirq);
+ if ( res )
+ {
+ printk(XENLOG_ERR "Unable to retrieve irq %u for %s\n",
+ i, dt_node_full_name(dev));
+ return res;
+ }
+
+ /*
+ * Don't map IRQ that have no physical meaning
+ * ie: IRQ whose controller is not the GIC
+ */
+ if ( rirq.controller != dt_interrupt_controller )
+ {
+ dt_dprintk("irq %u not connected to primary controller. Connected to %s\n",
+ i, dt_node_full_name(rirq.controller));
+ continue;
+ }
+
+ res = platform_get_irq(dev, i);
+ if ( res < 0 )
+ {
+ printk(XENLOG_ERR "Unable to get irq %u for %s\n",
+ i, dt_node_full_name(dev));
+ return res;
+ }
+
+ res = map_irq_to_domain(d, res, need_mapping, dt_node_name(dev));
+ if ( res )
+ return res;
+ }
+
+ return 0;
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index f80fdd1af2..5e4108a233 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -2257,41 +2257,6 @@ int __init make_chosen_node(const struct kernel_info *kinfo)
return res;
}
-int __init map_irq_to_domain(struct domain *d, unsigned int irq,
- bool need_mapping, const char *devname)
-{
- int res;
-
- res = irq_permit_access(d, irq);
- if ( res )
- {
- printk(XENLOG_ERR "Unable to permit to dom%u access to IRQ %u\n",
- d->domain_id, irq);
- return res;
- }
-
- if ( need_mapping )
- {
- /*
- * Checking the return of vgic_reserve_virq is not
- * necessary. It should not fail except when we try to map
- * the IRQ twice. This can legitimately happen if the IRQ is shared
- */
- vgic_reserve_virq(d, irq);
-
- res = route_irq_to_guest(d, irq, irq, devname);
- if ( res < 0 )
- {
- printk(XENLOG_ERR "Unable to map IRQ%"PRId32" to dom%d\n",
- irq, d->domain_id);
- return res;
- }
- }
-
- dt_dprintk(" - IRQ: %u\n", irq);
- return 0;
-}
-
static int __init map_dt_irq_to_domain(const struct dt_device_node *dev,
const struct dt_irq *dt_irq,
void *data)
@@ -2323,57 +2288,6 @@ static int __init map_dt_irq_to_domain(const struct dt_device_node *dev,
return 0;
}
-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;
- int res;
-
- /*
- * reserved-memory regions are RAM carved out for a special purpose.
- * They are not MMIO and therefore a domain should not be able to
- * manage them via the IOMEM interface.
- */
- if ( strncasecmp(dt_node_full_name(dev), "/reserved-memory/",
- strlen("/reserved-memory/")) != 0 )
- {
- res = iomem_permit_access(d, paddr_to_pfn(addr),
- paddr_to_pfn(PAGE_ALIGN(addr + len - 1)));
- if ( res )
- {
- printk(XENLOG_ERR "Unable to permit to dom%d access to"
- " 0x%"PRIx64" - 0x%"PRIx64"\n",
- d->domain_id,
- addr & PAGE_MASK, PAGE_ALIGN(addr + len) - 1);
- return res;
- }
- }
-
- if ( !mr_data->skip_mapping )
- {
- res = map_regions_p2mt(d,
- gaddr_to_gfn(addr),
- PFN_UP(len),
- maddr_to_mfn(addr),
- mr_data->p2mt);
-
- if ( res < 0 )
- {
- printk(XENLOG_ERR "Unable to map 0x%"PRIx64
- " - 0x%"PRIx64" in domain %d\n",
- addr & PAGE_MASK, PAGE_ALIGN(addr + len) - 1,
- d->domain_id);
- return res;
- }
- }
-
- dt_dprintk(" - MMIO: %010"PRIx64" - %010"PRIx64" P2MType=%x\n",
- addr, addr + len, mr_data->p2mt);
-
- return 0;
-}
-
/*
* For a node which describes a discoverable bus (such as a PCI bus)
* then we may need to perform additional mappings in order to make
@@ -2401,62 +2315,6 @@ static int __init map_device_children(const struct dt_device_node *dev,
return 0;
}
-/*
- * handle_device_interrupts retrieves the interrupts configuration from
- * a device tree node and maps those interrupts to the target domain.
- *
- * Returns:
- * < 0 error
- * 0 success
- */
-static int __init handle_device_interrupts(struct domain *d,
- struct dt_device_node *dev,
- bool need_mapping)
-{
- unsigned int i, nirq;
- int res;
- struct dt_raw_irq rirq;
-
- nirq = dt_number_of_irq(dev);
-
- /* Give permission and map IRQs */
- for ( i = 0; i < nirq; i++ )
- {
- res = dt_device_get_raw_irq(dev, i, &rirq);
- if ( res )
- {
- printk(XENLOG_ERR "Unable to retrieve irq %u for %s\n",
- i, dt_node_full_name(dev));
- return res;
- }
-
- /*
- * Don't map IRQ that have no physical meaning
- * ie: IRQ whose controller is not the GIC
- */
- if ( rirq.controller != dt_interrupt_controller )
- {
- dt_dprintk("irq %u not connected to primary controller. Connected to %s\n",
- i, dt_node_full_name(rirq.controller));
- continue;
- }
-
- res = platform_get_irq(dev, i);
- if ( res < 0 )
- {
- printk(XENLOG_ERR "Unable to get irq %u for %s\n",
- i, dt_node_full_name(dev));
- return res;
- }
-
- res = map_irq_to_domain(d, res, need_mapping, dt_node_name(dev));
- if ( res )
- return res;
- }
-
- return 0;
-}
-
/*
* For a given device node:
* - Give permission to the guest to manage IRQ and MMIO range
diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h
index 34ceddc995..b9329c9ee0 100644
--- a/xen/arch/arm/include/asm/domain_build.h
+++ b/xen/arch/arm/include/asm/domain_build.h
@@ -4,8 +4,6 @@
#include <xen/sched.h>
#include <asm/kernel.h>
-int map_irq_to_domain(struct domain *d, unsigned int irq,
- bool need_mapping, const char *devname);
int make_chosen_node(const struct kernel_info *kinfo);
void evtchn_allocate(struct domain *d);
diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h
index 38e2ce255f..40a30c78b7 100644
--- a/xen/arch/arm/include/asm/setup.h
+++ b/xen/arch/arm/include/asm/setup.h
@@ -165,9 +165,15 @@ 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 handle_device_interrupts(struct domain *d, struct dt_device_node *dev,
+ bool need_mapping);
+
int map_range_to_domain(const struct dt_device_node *dev,
u64 addr, u64 len, void *data);
+int map_irq_to_domain(struct domain *d, unsigned int irq,
+ bool need_mapping, const char *devname);
+
extern DEFINE_BOOT_PAGE_TABLE(boot_pgtable);
#ifdef CONFIG_ARM_64
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 6c9712ab7b..5f7ae45304 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -1811,12 +1811,12 @@ int dt_count_phandle_with_args(const struct dt_device_node *np,
* @allnextpp: pointer to ->allnext from last allocated device_node
* @fpsize: Size of the node path up at the current depth.
*/
-static unsigned long __init unflatten_dt_node(const void *fdt,
- unsigned long mem,
- unsigned long *p,
- struct dt_device_node *dad,
- struct dt_device_node ***allnextpp,
- unsigned long fpsize)
+static unsigned long unflatten_dt_node(const void *fdt,
+ unsigned long mem,
+ unsigned long *p,
+ struct dt_device_node *dad,
+ struct dt_device_node ***allnextpp,
+ unsigned long fpsize)
{
struct dt_device_node *np;
struct dt_property *pp, **prev_pp = NULL;
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [XEN][PATCH v6 02/19] common/device_tree: handle memory allocation failure in __unflatten_device_tree()
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
2023-05-02 23:36 ` [XEN][PATCH v6 01/19] xen/arm/device: Remove __init from function type Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-04 3:54 ` Henry Wang
2023-05-05 9:38 ` Michal Orzel
2023-05-02 23:36 ` [XEN][PATCH v6 03/19] common/device_tree: change __unflatten_device_tree() type Vikram Garhwal
` (16 subsequent siblings)
18 siblings, 2 replies; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel; +Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall
Change __unflatten_device_tree() return type to integer so it can propagate
memory allocation failure. Add panic() in dt_unflatten_host_device_tree() for
memory allocation failure during boot.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
xen/common/device_tree.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 5f7ae45304..fc38a0b3dd 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -2056,8 +2056,8 @@ static unsigned long unflatten_dt_node(const void *fdt,
* @fdt: The fdt to expand
* @mynodes: The device_node tree created by the call
*/
-static void __init __unflatten_device_tree(const void *fdt,
- struct dt_device_node **mynodes)
+static int __init __unflatten_device_tree(const void *fdt,
+ struct dt_device_node **mynodes)
{
unsigned long start, mem, size;
struct dt_device_node **allnextp = mynodes;
@@ -2078,6 +2078,8 @@ static void __init __unflatten_device_tree(const void *fdt,
/* Allocate memory for the expanded device tree */
mem = (unsigned long)_xmalloc (size + 4, __alignof__(struct dt_device_node));
+ if ( !mem )
+ return -ENOMEM;
((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef);
@@ -2095,6 +2097,8 @@ static void __init __unflatten_device_tree(const void *fdt,
*allnextp = NULL;
dt_dprintk(" <- unflatten_device_tree()\n");
+
+ return 0;
}
static void dt_alias_add(struct dt_alias_prop *ap,
@@ -2179,7 +2183,10 @@ dt_find_interrupt_controller(const struct dt_device_match *matches)
void __init dt_unflatten_host_device_tree(void)
{
- __unflatten_device_tree(device_tree_flattened, &dt_host);
+ int error = __unflatten_device_tree(device_tree_flattened, &dt_host);
+ if ( error )
+ panic("__unflatten_device_tree failed with error %d\n", error);
+
dt_alias_scan();
}
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* RE: [XEN][PATCH v6 02/19] common/device_tree: handle memory allocation failure in __unflatten_device_tree()
2023-05-02 23:36 ` [XEN][PATCH v6 02/19] common/device_tree: handle memory allocation failure in __unflatten_device_tree() Vikram Garhwal
@ 2023-05-04 3:54 ` Henry Wang
2023-05-05 9:38 ` Michal Orzel
1 sibling, 0 replies; 46+ messages in thread
From: Henry Wang @ 2023-05-04 3:54 UTC (permalink / raw)
To: Vikram Garhwal, xen-devel; +Cc: sstabellini, michal.orzel, Julien Grall
Hi Vikram,
> -----Original Message-----
> Subject: [XEN][PATCH v6 02/19] common/device_tree: handle memory
> allocation failure in __unflatten_device_tree()
>
> Change __unflatten_device_tree() return type to integer so it can propagate
> memory allocation failure. Add panic() in dt_unflatten_host_device_tree() for
> memory allocation failure during boot.
>
> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Henry Wang <Henry.Wang@arm.com>
Kind regards,
Henry
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [XEN][PATCH v6 02/19] common/device_tree: handle memory allocation failure in __unflatten_device_tree()
2023-05-02 23:36 ` [XEN][PATCH v6 02/19] common/device_tree: handle memory allocation failure in __unflatten_device_tree() Vikram Garhwal
2023-05-04 3:54 ` Henry Wang
@ 2023-05-05 9:38 ` Michal Orzel
[not found] ` <f854bfc4-1f3c-19df-ba22-89c8859cfe6d@amd.com>
1 sibling, 1 reply; 46+ messages in thread
From: Michal Orzel @ 2023-05-05 9:38 UTC (permalink / raw)
To: Vikram Garhwal, xen-devel; +Cc: sstabellini, Julien Grall
On 03/05/2023 01:36, Vikram Garhwal wrote:
>
>
> Change __unflatten_device_tree() return type to integer so it can propagate
> memory allocation failure. Add panic() in dt_unflatten_host_device_tree() for
> memory allocation failure during boot.
>
> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
I think we are missing a Fixes tag.
> ---
> xen/common/device_tree.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
> index 5f7ae45304..fc38a0b3dd 100644
> --- a/xen/common/device_tree.c
> +++ b/xen/common/device_tree.c
> @@ -2056,8 +2056,8 @@ static unsigned long unflatten_dt_node(const void *fdt,
> * @fdt: The fdt to expand
> * @mynodes: The device_node tree created by the call
> */
> -static void __init __unflatten_device_tree(const void *fdt,
> - struct dt_device_node **mynodes)
> +static int __init __unflatten_device_tree(const void *fdt,
> + struct dt_device_node **mynodes)
> {
> unsigned long start, mem, size;
> struct dt_device_node **allnextp = mynodes;
> @@ -2078,6 +2078,8 @@ static void __init __unflatten_device_tree(const void *fdt,
>
> /* Allocate memory for the expanded device tree */
> mem = (unsigned long)_xmalloc (size + 4, __alignof__(struct dt_device_node));
> + if ( !mem )
> + return -ENOMEM;
>
> ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef);
>
> @@ -2095,6 +2097,8 @@ static void __init __unflatten_device_tree(const void *fdt,
> *allnextp = NULL;
>
> dt_dprintk(" <- unflatten_device_tree()\n");
> +
> + return 0;
> }
>
> static void dt_alias_add(struct dt_alias_prop *ap,
> @@ -2179,7 +2183,10 @@ dt_find_interrupt_controller(const struct dt_device_match *matches)
>
> void __init dt_unflatten_host_device_tree(void)
> {
> - __unflatten_device_tree(device_tree_flattened, &dt_host);
> + int error = __unflatten_device_tree(device_tree_flattened, &dt_host);
NIT: there should be a blank line between definitions and rest of the code
> + if ( error )
> + panic("__unflatten_device_tree failed with error %d\n", error);
> +
> dt_alias_scan();
> }
>
> --
> 2.17.1
>
>
FWICS, patches 2 and 4 are not strictly related to DTBO and are fixing issues
and propagating errors which is always good. Therefore by moving them to the start
of the series, they could be merged right away reducing the number of patches to review.
At the moment, they can't be because patch 3 placed in-between is strictly related to the series.
@julien?
~Michal
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 03/19] common/device_tree: change __unflatten_device_tree() type
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
2023-05-02 23:36 ` [XEN][PATCH v6 01/19] xen/arm/device: Remove __init from function type Vikram Garhwal
2023-05-02 23:36 ` [XEN][PATCH v6 02/19] common/device_tree: handle memory allocation failure in __unflatten_device_tree() Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-04 4:02 ` Henry Wang
2023-05-02 23:36 ` [XEN][PATCH v6 04/19] common/device_tree.c: unflatten_device_tree() propagate errors Vikram Garhwal
` (15 subsequent siblings)
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel; +Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall
Following changes are done to __unflatten_device_tree():
1. __unflatten_device_tree() is renamed to unflatten_device_tree().
2. Remove __init and static function type.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
xen/common/device_tree.c | 9 ++++-----
xen/include/xen/device_tree.h | 5 +++++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index fc38a0b3dd..5daf5197bd 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -2047,7 +2047,7 @@ static unsigned long unflatten_dt_node(const void *fdt,
}
/**
- * __unflatten_device_tree - create tree of device_nodes from flat blob
+ * unflatten_device_tree - create tree of device_nodes from flat blob
*
* unflattens a device-tree, creating the
* tree of struct device_node. It also fills the "name" and "type"
@@ -2056,8 +2056,7 @@ static unsigned long unflatten_dt_node(const void *fdt,
* @fdt: The fdt to expand
* @mynodes: The device_node tree created by the call
*/
-static int __init __unflatten_device_tree(const void *fdt,
- struct dt_device_node **mynodes)
+int unflatten_device_tree(const void *fdt, struct dt_device_node **mynodes)
{
unsigned long start, mem, size;
struct dt_device_node **allnextp = mynodes;
@@ -2183,9 +2182,9 @@ dt_find_interrupt_controller(const struct dt_device_match *matches)
void __init dt_unflatten_host_device_tree(void)
{
- int error = __unflatten_device_tree(device_tree_flattened, &dt_host);
+ int error = unflatten_device_tree(device_tree_flattened, &dt_host);
if ( error )
- panic("__unflatten_device_tree failed with error %d\n", error);
+ panic("unflatten_device_tree failed with error %d\n", error);
dt_alias_scan();
}
diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h
index 19a74909ce..eef0335b79 100644
--- a/xen/include/xen/device_tree.h
+++ b/xen/include/xen/device_tree.h
@@ -178,6 +178,11 @@ int device_tree_for_each_node(const void *fdt, int node,
*/
void dt_unflatten_host_device_tree(void);
+/**
+ * unflatten any device tree.
+ */
+int unflatten_device_tree(const void *fdt, struct dt_device_node **mynodes);
+
/**
* IRQ translation callback
* TODO: For the moment we assume that we only have ONE
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* RE: [XEN][PATCH v6 03/19] common/device_tree: change __unflatten_device_tree() type
2023-05-02 23:36 ` [XEN][PATCH v6 03/19] common/device_tree: change __unflatten_device_tree() type Vikram Garhwal
@ 2023-05-04 4:02 ` Henry Wang
0 siblings, 0 replies; 46+ messages in thread
From: Henry Wang @ 2023-05-04 4:02 UTC (permalink / raw)
To: Vikram Garhwal, xen-devel; +Cc: sstabellini, michal.orzel, Julien Grall
Hi Vikram,
> -----Original Message-----
> Subject: [XEN][PATCH v6 03/19] common/device_tree: change
> __unflatten_device_tree() type
>
> Following changes are done to __unflatten_device_tree():
> 1. __unflatten_device_tree() is renamed to unflatten_device_tree().
> 2. Remove __init and static function type.
>
> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
I have a feeling that it may be better to swap the order between patch #2
and patch #3, so you won't need the extra name change in function
dt_unflatten_host_device_tree(). But this is my personal opinion and I think
the Arm maintainers are the people to do the final call.
Anyway this change looks good to me, either with the swap of patch order
or not, you can keep my:
Reviewed-by: Henry Wang <Henry.Wang@arm.com>
Kind regards,
Henry
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 04/19] common/device_tree.c: unflatten_device_tree() propagate errors
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (2 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 03/19] common/device_tree: change __unflatten_device_tree() type Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-04 4:08 ` Henry Wang
2023-05-02 23:36 ` [XEN][PATCH v6 05/19] xen/arm: Add CONFIG_OVERLAY_DTB Vikram Garhwal
` (14 subsequent siblings)
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel; +Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall
This will be useful in dynamic node programming when new dt nodes are unflatten
during runtime. Invalid device tree node related errors should be propagated
back to the caller.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
xen/common/device_tree.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 5daf5197bd..47ab2f7940 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -2071,6 +2071,9 @@ int unflatten_device_tree(const void *fdt, struct dt_device_node **mynodes)
/* First pass, scan for size */
start = ((unsigned long)fdt) + fdt_off_dt_struct(fdt);
size = unflatten_dt_node(fdt, 0, &start, NULL, NULL, 0);
+ if ( !size )
+ return -EINVAL;
+
size = (size | 3) + 1;
dt_dprintk(" size is %#lx allocating...\n", size);
@@ -2088,11 +2091,19 @@ int unflatten_device_tree(const void *fdt, struct dt_device_node **mynodes)
start = ((unsigned long)fdt) + fdt_off_dt_struct(fdt);
unflatten_dt_node(fdt, mem, &start, NULL, &allnextp, 0);
if ( be32_to_cpup((__be32 *)start) != FDT_END )
- printk(XENLOG_WARNING "Weird tag at end of tree: %08x\n",
+ {
+ printk(XENLOG_ERR "Weird tag at end of tree: %08x\n",
*((u32 *)start));
+ return -EINVAL;
+ }
+
if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeef )
- printk(XENLOG_WARNING "End of tree marker overwritten: %08x\n",
+ {
+ printk(XENLOG_ERR "End of tree marker overwritten: %08x\n",
be32_to_cpu(((__be32 *)mem)[size / 4]));
+ return -EINVAL;
+ }
+
*allnextp = NULL;
dt_dprintk(" <- unflatten_device_tree()\n");
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [XEN][PATCH v6 05/19] xen/arm: Add CONFIG_OVERLAY_DTB
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (3 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 04/19] common/device_tree.c: unflatten_device_tree() propagate errors Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-04 4:11 ` Henry Wang
2023-05-02 23:36 ` [XEN][PATCH v6 06/19] libfdt: Keep fdt functions after init for CONFIG_OVERLAY_DTB Vikram Garhwal
` (13 subsequent siblings)
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Andrew Cooper,
George Dunlap, Jan Beulich, Julien Grall, Wei Liu,
Bertrand Marquis, Volodymyr Babchuk
Introduce a config option where the user can enable support for adding/removing
device tree nodes using a device tree binary overlay.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
SUPPORT.md | 6 ++++++
xen/arch/arm/Kconfig | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/SUPPORT.md b/SUPPORT.md
index aa1940e55f..e40ec4fba2 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -822,6 +822,12 @@ No support for QEMU backends in a 16K or 64K domain.
Status: Supported
+### Device Tree Overlays
+
+Add/Remove device tree nodes using a device tree overlay binary(.dtbo).
+
+ Status, ARM: Experimental
+
### ARM: Guest ACPI support
Status: Supported
diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 239d3aed3c..1fe3d698a5 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -53,6 +53,11 @@ config HAS_ITS
bool "GICv3 ITS MSI controller support (UNSUPPORTED)" if UNSUPPORTED
depends on GICV3 && !NEW_VGIC && !ARM_32
+config OVERLAY_DTB
+ bool "DTB overlay support (UNSUPPORTED)" if UNSUPPORTED
+ help
+ Dynamic addition/removal of Xen device tree nodes using a dtbo.
+
config HVM
def_bool y
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* RE: [XEN][PATCH v6 05/19] xen/arm: Add CONFIG_OVERLAY_DTB
2023-05-02 23:36 ` [XEN][PATCH v6 05/19] xen/arm: Add CONFIG_OVERLAY_DTB Vikram Garhwal
@ 2023-05-04 4:11 ` Henry Wang
2023-05-09 10:54 ` Michal Orzel
0 siblings, 1 reply; 46+ messages in thread
From: Henry Wang @ 2023-05-04 4:11 UTC (permalink / raw)
To: Vikram Garhwal, xen-devel
Cc: sstabellini, michal.orzel, Andrew Cooper, George Dunlap,
Jan Beulich, Julien Grall, Wei Liu, Bertrand Marquis,
Volodymyr Babchuk
Hi Vikram,
> -----Original Message-----
> Subject: [XEN][PATCH v6 05/19] xen/arm: Add CONFIG_OVERLAY_DTB
>
> Introduce a config option where the user can enable support for
> adding/removing
> device tree nodes using a device tree binary overlay.
May I please also suggest adding a CHANGELOG entry in the "### Added"
section? I personally think this series deserves a CHANGELOG entry but I
am open to others' opinion though. Thanks!
Kind regards,
Henry
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [XEN][PATCH v6 05/19] xen/arm: Add CONFIG_OVERLAY_DTB
2023-05-04 4:11 ` Henry Wang
@ 2023-05-09 10:54 ` Michal Orzel
0 siblings, 0 replies; 46+ messages in thread
From: Michal Orzel @ 2023-05-09 10:54 UTC (permalink / raw)
To: Henry Wang, Vikram Garhwal, xen-devel
Cc: sstabellini, Andrew Cooper, George Dunlap, Jan Beulich,
Julien Grall, Wei Liu, Bertrand Marquis, Volodymyr Babchuk
On 04/05/2023 06:11, Henry Wang wrote:
>
>
> Hi Vikram,
>
>> -----Original Message-----
>> Subject: [XEN][PATCH v6 05/19] xen/arm: Add CONFIG_OVERLAY_DTB
>>
>> Introduce a config option where the user can enable support for
>> adding/removing
>> device tree nodes using a device tree binary overlay.
>
> May I please also suggest adding a CHANGELOG entry in the "### Added"
> section? I personally think this series deserves a CHANGELOG entry but I
> am open to others' opinion though. Thanks!
Yes, this definitely deserves an entry.
+
please mention the SUPPORT (and CHANGELOG) changes in a commit msg (for now
it only covers the Kconfig option).
~Michal
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 06/19] libfdt: Keep fdt functions after init for CONFIG_OVERLAY_DTB.
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (4 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 05/19] xen/arm: Add CONFIG_OVERLAY_DTB Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-02 23:36 ` [XEN][PATCH v6 07/19] libfdt: overlay: change overlay_get_target() Vikram Garhwal
` (12 subsequent siblings)
18 siblings, 0 replies; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel; +Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall
This is done to access fdt library function which are required for adding device
tree overlay nodes for dynamic programming of nodes.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Acked-by: Julien Grall <jgrall@amazon.com>
---
xen/common/libfdt/Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/xen/common/libfdt/Makefile b/xen/common/libfdt/Makefile
index 75aaefa2e3..d50487aa6e 100644
--- a/xen/common/libfdt/Makefile
+++ b/xen/common/libfdt/Makefile
@@ -1,7 +1,11 @@
include $(src)/Makefile.libfdt
SECTIONS := text data $(SPECIAL_DATA_SECTIONS)
+
+# For CONFIG_OVERLAY_DTB, libfdt functionalities will be needed during runtime.
+ifneq ($(CONFIG_OVERLAY_DTB),y)
OBJCOPYFLAGS := $(foreach s,$(SECTIONS),--rename-section .$(s)=.init.$(s))
+endif
obj-y += libfdt.o
nocov-y += libfdt.o
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [XEN][PATCH v6 07/19] libfdt: overlay: change overlay_get_target()
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (5 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 06/19] libfdt: Keep fdt functions after init for CONFIG_OVERLAY_DTB Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-04 4:13 ` Henry Wang
2023-05-02 23:36 ` [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree Vikram Garhwal
` (11 subsequent siblings)
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall,
Vikram Garhwal, David Gibson
Rename overlay_get_target() to fdt_overlay_target_offset() and remove static
function type.
This is done to get the target path for the overlay nodes which is very useful
in many cases. For example, Xen hypervisor needs it when applying overlays
because Xen needs to do further processing of the overlay nodes, e.g. mapping of
resources(IRQs and IOMMUs) to other VMs, creation of SMMU pagetables, etc.
Signed-off-by: Vikram Garhwal <fnu.vikram@xilinx.com>
Message-Id: <1637204036-382159-2-git-send-email-fnu.vikram@xilinx.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Origin: git://git.kernel.org/pub/scm/utils/dtc/dtc.git 45f3d1a095dd
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Michal Orzel <michal.orzel@amd.com>
---
xen/common/libfdt/fdt_overlay.c | 29 +++++++----------------------
xen/common/libfdt/version.lds | 1 +
xen/include/xen/libfdt/libfdt.h | 18 ++++++++++++++++++
3 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/xen/common/libfdt/fdt_overlay.c b/xen/common/libfdt/fdt_overlay.c
index 7b95e2b639..acf0c4c2a6 100644
--- a/xen/common/libfdt/fdt_overlay.c
+++ b/xen/common/libfdt/fdt_overlay.c
@@ -41,37 +41,22 @@ static uint32_t overlay_get_target_phandle(const void *fdto, int fragment)
return fdt32_to_cpu(*val);
}
-/**
- * overlay_get_target - retrieves the offset of a fragment's target
- * @fdt: Base device tree blob
- * @fdto: Device tree overlay blob
- * @fragment: node offset of the fragment in the overlay
- * @pathp: pointer which receives the path of the target (or NULL)
- *
- * overlay_get_target() retrieves the target offset in the base
- * device tree of a fragment, no matter how the actual targeting is
- * done (through a phandle or a path)
- *
- * returns:
- * the targeted node offset in the base device tree
- * Negative error code on error
- */
-static int overlay_get_target(const void *fdt, const void *fdto,
- int fragment, char const **pathp)
+int fdt_overlay_target_offset(const void *fdt, const void *fdto,
+ int fragment_offset, char const **pathp)
{
uint32_t phandle;
const char *path = NULL;
int path_len = 0, ret;
/* Try first to do a phandle based lookup */
- phandle = overlay_get_target_phandle(fdto, fragment);
+ phandle = overlay_get_target_phandle(fdto, fragment_offset);
if (phandle == (uint32_t)-1)
return -FDT_ERR_BADPHANDLE;
/* no phandle, try path */
if (!phandle) {
/* And then a path based lookup */
- path = fdt_getprop(fdto, fragment, "target-path", &path_len);
+ path = fdt_getprop(fdto, fragment_offset, "target-path", &path_len);
if (path)
ret = fdt_path_offset(fdt, path);
else
@@ -638,7 +623,7 @@ static int overlay_merge(void *fdt, void *fdto)
if (overlay < 0)
return overlay;
- target = overlay_get_target(fdt, fdto, fragment, NULL);
+ target = fdt_overlay_target_offset(fdt, fdto, fragment, NULL);
if (target < 0)
return target;
@@ -781,7 +766,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
return -FDT_ERR_BADOVERLAY;
/* get the target of the fragment */
- ret = overlay_get_target(fdt, fdto, fragment, &target_path);
+ ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path);
if (ret < 0)
return ret;
target = ret;
@@ -803,7 +788,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
if (!target_path) {
/* again in case setprop_placeholder changed it */
- ret = overlay_get_target(fdt, fdto, fragment, &target_path);
+ ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path);
if (ret < 0)
return ret;
target = ret;
diff --git a/xen/common/libfdt/version.lds b/xen/common/libfdt/version.lds
index 7ab85f1d9d..cbce5d4a8b 100644
--- a/xen/common/libfdt/version.lds
+++ b/xen/common/libfdt/version.lds
@@ -77,6 +77,7 @@ LIBFDT_1.2 {
fdt_appendprop_addrrange;
fdt_setprop_inplace_namelen_partial;
fdt_create_with_flags;
+ fdt_overlay_target_offset;
local:
*;
};
diff --git a/xen/include/xen/libfdt/libfdt.h b/xen/include/xen/libfdt/libfdt.h
index c71689e2be..fabddbee8c 100644
--- a/xen/include/xen/libfdt/libfdt.h
+++ b/xen/include/xen/libfdt/libfdt.h
@@ -2109,6 +2109,24 @@ int fdt_del_node(void *fdt, int nodeoffset);
*/
int fdt_overlay_apply(void *fdt, void *fdto);
+/**
+ * fdt_overlay_target_offset - retrieves the offset of a fragment's target
+ * @fdt: Base device tree blob
+ * @fdto: Device tree overlay blob
+ * @fragment_offset: node offset of the fragment in the overlay
+ * @pathp: pointer which receives the path of the target (or NULL)
+ *
+ * fdt_overlay_target_offset() retrieves the target offset in the base
+ * device tree of a fragment, no matter how the actual targeting is
+ * done (through a phandle or a path)
+ *
+ * returns:
+ * the targeted node offset in the base device tree
+ * Negative error code on error
+ */
+int fdt_overlay_target_offset(const void *fdt, const void *fdto,
+ int fragment_offset, char const **pathp);
+
/**********************************************************************/
/* Debugging / informational functions */
/**********************************************************************/
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* RE: [XEN][PATCH v6 07/19] libfdt: overlay: change overlay_get_target()
2023-05-02 23:36 ` [XEN][PATCH v6 07/19] libfdt: overlay: change overlay_get_target() Vikram Garhwal
@ 2023-05-04 4:13 ` Henry Wang
0 siblings, 0 replies; 46+ messages in thread
From: Henry Wang @ 2023-05-04 4:13 UTC (permalink / raw)
To: Vikram Garhwal, xen-devel
Cc: sstabellini, michal.orzel, Julien Grall, Vikram Garhwal, David Gibson
Hi Vikram,
> -----Original Message-----
> Subject: [XEN][PATCH v6 07/19] libfdt: overlay: change overlay_get_target()
>
> Rename overlay_get_target() to fdt_overlay_target_offset() and remove static
> function type.
>
> This is done to get the target path for the overlay nodes which is very useful
> in many cases. For example, Xen hypervisor needs it when applying overlays
> because Xen needs to do further processing of the overlay nodes, e.g.
> mapping of
> resources(IRQs and IOMMUs) to other VMs, creation of SMMU pagetables,
> etc.
>
> Signed-off-by: Vikram Garhwal <fnu.vikram@xilinx.com>
> Message-Id: <1637204036-382159-2-git-send-email-fnu.vikram@xilinx.com>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> Origin: git://git.kernel.org/pub/scm/utils/dtc/dtc.git 45f3d1a095dd
>
> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
> Reviewed-by: Michal Orzel <michal.orzel@amd.com>
Reviewed-by: Henry Wang <Henry.Wang@arm.com>
Kind regards,
Henry
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (6 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 07/19] libfdt: overlay: change overlay_get_target() Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-04 4:23 ` Henry Wang
2023-05-02 23:36 ` [XEN][PATCH v6 09/19] xen/iommu: Move spin_lock from iommu_dt_device_is_assigned to caller Vikram Garhwal
` (10 subsequent siblings)
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel; +Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall
Add device_tree_find_node_by_path() to find a matching node with path for a
dt_device_node.
Reason behind this function:
Each time overlay nodes are added using .dtbo, a new fdt(memcpy of
device_tree_flattened) is created and updated with overlay nodes. This
updated fdt is further unflattened to a dt_host_new. Next, we need to find
the overlay nodes in dt_host_new, find the overlay node's parent in dt_host
and add the nodes as child under their parent in the dt_host. Thus we need
this function to search for node in different unflattened device trees.
Also, make dt_find_node_by_path() static inline.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
xen/common/device_tree.c | 5 +++--
xen/include/xen/device_tree.h | 17 +++++++++++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 47ab2f7940..426a809f42 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -358,11 +358,12 @@ struct dt_device_node *dt_find_node_by_type(struct dt_device_node *from,
return np;
}
-struct dt_device_node *dt_find_node_by_path(const char *path)
+struct dt_device_node *device_tree_find_node_by_path(struct dt_device_node *dt,
+ const char *path)
{
struct dt_device_node *np;
- dt_for_each_device_node(dt_host, np)
+ dt_for_each_device_node(dt, np)
if ( np->full_name && (dt_node_cmp(np->full_name, path) == 0) )
break;
diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h
index eef0335b79..d6366d3dac 100644
--- a/xen/include/xen/device_tree.h
+++ b/xen/include/xen/device_tree.h
@@ -534,13 +534,26 @@ struct dt_device_node *dt_find_node_by_type(struct dt_device_node *from,
struct dt_device_node *dt_find_node_by_alias(const char *alias);
/**
- * dt_find_node_by_path - Find a node matching a full DT path
+ * device_tree_find_node_by_path - Generic function to find a node matching the
+ * full DT path for any given unflatten device tree
+ * @dt_node: The device tree to search
* @path: The full path to match
*
* Returns a node pointer.
*/
-struct dt_device_node *dt_find_node_by_path(const char *path);
+struct dt_device_node *device_tree_find_node_by_path(struct dt_device_node *dt,
+ const char *path);
+/**
+ * dt_find_node_by_path - Find a node matching a full DT path in dt_host
+ * @path: The full path to match
+ *
+ * Returns a node pointer.
+ */
+static inline struct dt_device_node *dt_find_node_by_path(const char *path)
+{
+ return device_tree_find_node_by_path(dt_host, path);
+}
/**
* dt_find_node_by_gpath - Same as dt_find_node_by_path but retrieve the
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* RE: [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree
2023-05-02 23:36 ` [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree Vikram Garhwal
@ 2023-05-04 4:23 ` Henry Wang
2023-05-04 5:56 ` unsubscribe Terry Yang
2023-05-09 11:29 ` [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree Michal Orzel
0 siblings, 2 replies; 46+ messages in thread
From: Henry Wang @ 2023-05-04 4:23 UTC (permalink / raw)
To: Vikram Garhwal, xen-devel; +Cc: sstabellini, michal.orzel, Julien Grall
Hi Vikram,
> -----Original Message-----
> Subject: [XEN][PATCH v6 08/19] xen/device-tree: Add
> device_tree_find_node_by_path() to find nodes in device tree
>
> Add device_tree_find_node_by_path() to find a matching node with path for
> a
> dt_device_node.
>
> Reason behind this function:
> Each time overlay nodes are added using .dtbo, a new fdt(memcpy of
> device_tree_flattened) is created and updated with overlay nodes. This
> updated fdt is further unflattened to a dt_host_new. Next, we need to find
> the overlay nodes in dt_host_new, find the overlay node's parent in dt_host
> and add the nodes as child under their parent in the dt_host. Thus we need
> this function to search for node in different unflattened device trees.
>
> Also, make dt_find_node_by_path() static inline.
>
> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
> ---
> xen/common/device_tree.c | 5 +++--
> xen/include/xen/device_tree.h | 17 +++++++++++++++--
> 2 files changed, 18 insertions(+), 4 deletions(-)
>
[...]
> /**
> - * dt_find_node_by_path - Find a node matching a full DT path
> + * device_tree_find_node_by_path - Generic function to find a node
> matching the
> + * full DT path for any given unflatten device tree
> + * @dt_node: The device tree to search
I noticed that you missed Michal's comment here about renaming the
"dt_node" here to "dt" to match below function prototype...
> * @path: The full path to match
> *
> * Returns a node pointer.
> */
> -struct dt_device_node *dt_find_node_by_path(const char *path);
> +struct dt_device_node *device_tree_find_node_by_path(struct
> dt_device_node *dt,
...here. I personally agree with Michal so I think please fix the comment
to keep consistency.
The rest of the patch looks good to me, so as long as you fixed this, you
can have my:
Reviewed-by: Henry Wang <Henry.Wang@arm.com>
Kind regards,
Henry
^ permalink raw reply [flat|nested] 46+ messages in thread
* unsubscribe
2023-05-04 4:23 ` Henry Wang
@ 2023-05-04 5:56 ` Terry Yang
2023-05-09 11:29 ` [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree Michal Orzel
1 sibling, 0 replies; 46+ messages in thread
From: Terry Yang @ 2023-05-04 5:56 UTC (permalink / raw)
Cc: xen-devel
[-- Attachment #1: Type: text/plain, Size: 2168 bytes --]
Henry Wang <Henry.Wang@arm.com>于2023年5月4日 周四12:23写道：
> Hi Vikram,
>
> > -----Original Message-----
> > Subject: [XEN][PATCH v6 08/19] xen/device-tree: Add
> > device_tree_find_node_by_path() to find nodes in device tree
> >
> > Add device_tree_find_node_by_path() to find a matching node with path for
> > a
> > dt_device_node.
> >
> > Reason behind this function:
> > Each time overlay nodes are added using .dtbo, a new fdt(memcpy of
> > device_tree_flattened) is created and updated with overlay nodes.
> This
> > updated fdt is further unflattened to a dt_host_new. Next, we need
> to find
> > the overlay nodes in dt_host_new, find the overlay node's parent in
> dt_host
> > and add the nodes as child under their parent in the dt_host. Thus
> we need
> > this function to search for node in different unflattened device
> trees.
> >
> > Also, make dt_find_node_by_path() static inline.
> >
> > Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
> > ---
> > xen/common/device_tree.c | 5 +++--
> > xen/include/xen/device_tree.h | 17 +++++++++++++++--
> > 2 files changed, 18 insertions(+), 4 deletions(-)
> >
>
> [...]
>
> > /**
> > - * dt_find_node_by_path - Find a node matching a full DT path
> > + * device_tree_find_node_by_path - Generic function to find a node
> > matching the
> > + * full DT path for any given unflatten device tree
> > + * @dt_node: The device tree to search
>
> I noticed that you missed Michal's comment here about renaming the
> "dt_node" here to "dt" to match below function prototype...
>
> > * @path: The full path to match
> > *
> > * Returns a node pointer.
> > */
> > -struct dt_device_node *dt_find_node_by_path(const char *path);
> > +struct dt_device_node *device_tree_find_node_by_path(struct
> > dt_device_node *dt,
>
> ...here. I personally agree with Michal so I think please fix the comment
> to keep consistency.
>
> The rest of the patch looks good to me, so as long as you fixed this, you
> can have my:
>
> Reviewed-by: Henry Wang <Henry.Wang@arm.com>
>
> Kind regards,
> Henry
>
>
>
[-- Attachment #2: Type: text/html, Size: 2849 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree
2023-05-04 4:23 ` Henry Wang
2023-05-04 5:56 ` unsubscribe Terry Yang
@ 2023-05-09 11:29 ` Michal Orzel
2023-05-31 21:31 ` Vikram Garhwal
1 sibling, 1 reply; 46+ messages in thread
From: Michal Orzel @ 2023-05-09 11:29 UTC (permalink / raw)
To: Henry Wang, Vikram Garhwal, xen-devel; +Cc: sstabellini, Julien Grall
On 04/05/2023 06:23, Henry Wang wrote:
>
>
> Hi Vikram,
>
>> -----Original Message-----
>> Subject: [XEN][PATCH v6 08/19] xen/device-tree: Add
>> device_tree_find_node_by_path() to find nodes in device tree
>>
>> Add device_tree_find_node_by_path() to find a matching node with path for
>> a
>> dt_device_node.
>>
>> Reason behind this function:
>> Each time overlay nodes are added using .dtbo, a new fdt(memcpy of
>> device_tree_flattened) is created and updated with overlay nodes. This
>> updated fdt is further unflattened to a dt_host_new. Next, we need to find
>> the overlay nodes in dt_host_new, find the overlay node's parent in dt_host
>> and add the nodes as child under their parent in the dt_host. Thus we need
>> this function to search for node in different unflattened device trees.
>>
>> Also, make dt_find_node_by_path() static inline.
>>
>> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
>> ---
>> xen/common/device_tree.c | 5 +++--
>> xen/include/xen/device_tree.h | 17 +++++++++++++++--
>> 2 files changed, 18 insertions(+), 4 deletions(-)
>>
>
> [...]
>
>> /**
>> - * dt_find_node_by_path - Find a node matching a full DT path
>> + * device_tree_find_node_by_path - Generic function to find a node
>> matching the
>> + * full DT path for any given unflatten device tree
>> + * @dt_node: The device tree to search
>
> I noticed that you missed Michal's comment here about renaming the
> "dt_node" here to "dt" to match below function prototype...
This is one thing. The other is that in v5 you said this is to be a generic function
where you can search from a middle of a device tree. This means that the parameter should be
named "node" or "from" and the description needs to say "The node to start searching from" +
seeing the lack of ->allnext you can mention that this is inclusive (i.e. the passed node will also be searched).
~Michal
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree
2023-05-09 11:29 ` [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree Michal Orzel
@ 2023-05-31 21:31 ` Vikram Garhwal
2023-06-01 2:02 ` Henry Wang
0 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-31 21:31 UTC (permalink / raw)
To: Michal Orzel, Henry Wang, xen-devel; +Cc: sstabellini, Julien Grall
Hi Henry & Michal,
On 5/9/23 4:29 AM, Michal Orzel wrote:
>
> On 04/05/2023 06:23, Henry Wang wrote:
>>
>> Hi Vikram,
>>
>>> -----Original Message-----
>>> Subject: [XEN][PATCH v6 08/19] xen/device-tree: Add
>>> device_tree_find_node_by_path() to find nodes in device tree
>>>
>>> Add device_tree_find_node_by_path() to find a matching node with path for
>>> a
>>> dt_device_node.
>>>
>>> Reason behind this function:
>>> Each time overlay nodes are added using .dtbo, a new fdt(memcpy of
>>> device_tree_flattened) is created and updated with overlay nodes. This
>>> updated fdt is further unflattened to a dt_host_new. Next, we need to find
>>> the overlay nodes in dt_host_new, find the overlay node's parent in dt_host
>>> and add the nodes as child under their parent in the dt_host. Thus we need
>>> this function to search for node in different unflattened device trees.
>>>
>>> Also, make dt_find_node_by_path() static inline.
>>>
>>> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
>>> ---
>>> xen/common/device_tree.c | 5 +++--
>>> xen/include/xen/device_tree.h | 17 +++++++++++++++--
>>> 2 files changed, 18 insertions(+), 4 deletions(-)
>>>
>> [...]
>>
>>> /**
>>> - * dt_find_node_by_path - Find a node matching a full DT path
>>> + * device_tree_find_node_by_path - Generic function to find a node
>>> matching the
>>> + * full DT path for any given unflatten device tree
>>> + * @dt_node: The device tree to search
>> I noticed that you missed Michal's comment here about renaming the
>> "dt_node" here to "dt" to match below function prototype...
> This is one thing. The other is that in v5 you said this is to be a generic function
> where you can search from a middle of a device tree. This means that the parameter should be
> named "node" or "from" and the description needs to say "The node to start searching from" +
> seeing the lack of ->allnext you can mention that this is inclusive (i.e. the passed node will also be searched).
Changed this for v7. Will send it out soon.
@Henry, i didn't add reviewed-by as the patch is bit changed with
renaming. Can you please review v7 and give your feedback.
>
> ~Michal
^ permalink raw reply [flat|nested] 46+ messages in thread
* RE: [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree
2023-05-31 21:31 ` Vikram Garhwal
@ 2023-06-01 2:02 ` Henry Wang
0 siblings, 0 replies; 46+ messages in thread
From: Henry Wang @ 2023-06-01 2:02 UTC (permalink / raw)
To: Vikram Garhwal, Michal Orzel, xen-devel; +Cc: sstabellini, Julien Grall
Hi Vikram,
> -----Original Message-----
> Hi Henry & Michal,
> Changed this for v7. Will send it out soon.
>
> @Henry, i didn't add reviewed-by as the patch is bit changed with
> renaming. Can you please review v7 and give your feedback.
Thanks for the reminder, yes I would be more than happy to review
the v7 series once you send it.
Kind regards,
Henry
> >
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 09/19] xen/iommu: Move spin_lock from iommu_dt_device_is_assigned to caller
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (7 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 08/19] xen/device-tree: Add device_tree_find_node_by_path() to find nodes in device tree Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-03 7:53 ` Jan Beulich
2023-05-02 23:36 ` [XEN][PATCH v6 10/19] xen/iommu: protect iommu_add_dt_device() with dtdevs_lock Vikram Garhwal
` (9 subsequent siblings)
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall,
Jan Beulich, Paul Durrant, Roger Pau Monné
Rename iommu_dt_device_is_assigned() to iommu_dt_device_is_assigned_locked().
Remove static type so this can also be used by SMMU drivers to check if the
device is being used before removing.
Moving spin_lock to caller was done to prevent the concurrent access to
iommu_dt_device_is_assigned while doing add/remove/assign/deassign.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
---
xen/drivers/passthrough/device_tree.c | 19 +++++++++++++++----
xen/include/xen/iommu.h | 1 +
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c
index 1c32d7b50c..c386fda3e4 100644
--- a/xen/drivers/passthrough/device_tree.c
+++ b/xen/drivers/passthrough/device_tree.c
@@ -83,16 +83,14 @@ fail:
return rc;
}
-static bool_t iommu_dt_device_is_assigned(const struct dt_device_node *dev)
+bool_t iommu_dt_device_is_assigned_locked(const struct dt_device_node *dev)
{
bool_t assigned = 0;
if ( !dt_device_is_protected(dev) )
return 0;
- spin_lock(&dtdevs_lock);
assigned = !list_empty(&dev->domain_list);
- spin_unlock(&dtdevs_lock);
return assigned;
}
@@ -213,27 +211,40 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d,
if ( (d && d->is_dying) || domctl->u.assign_device.flags )
break;
+ spin_lock(&dtdevs_lock);
+
ret = dt_find_node_by_gpath(domctl->u.assign_device.u.dt.path,
domctl->u.assign_device.u.dt.size,
&dev);
if ( ret )
+ {
+ spin_unlock(&dtdevs_lock);
break;
+ }
ret = xsm_assign_dtdevice(XSM_HOOK, d, dt_node_full_name(dev));
if ( ret )
+ {
+ spin_unlock(&dtdevs_lock);
break;
+ }
if ( domctl->cmd == XEN_DOMCTL_test_assign_device )
{
- if ( iommu_dt_device_is_assigned(dev) )
+
+ if ( iommu_dt_device_is_assigned_locked(dev) )
{
printk(XENLOG_G_ERR "%s already assigned.\n",
dt_node_full_name(dev));
ret = -EINVAL;
}
+
+ spin_unlock(&dtdevs_lock);
break;
}
+ spin_unlock(&dtdevs_lock);
+
if ( d == dom_io )
return -EINVAL;
diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index 405db59971..76add226ec 100644
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -214,6 +214,7 @@ struct msi_msg;
#include <xen/device_tree.h>
int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev);
+bool_t iommu_dt_device_is_assigned_locked(const struct dt_device_node *dev);
int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev);
int iommu_dt_domain_init(struct domain *d);
int iommu_release_dt_devices(struct domain *d);
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [XEN][PATCH v6 09/19] xen/iommu: Move spin_lock from iommu_dt_device_is_assigned to caller
2023-05-02 23:36 ` [XEN][PATCH v6 09/19] xen/iommu: Move spin_lock from iommu_dt_device_is_assigned to caller Vikram Garhwal
@ 2023-05-03 7:53 ` Jan Beulich
0 siblings, 0 replies; 46+ messages in thread
From: Jan Beulich @ 2023-05-03 7:53 UTC (permalink / raw)
To: Vikram Garhwal
Cc: sstabellini, michal.orzel, Julien Grall, Paul Durrant,
Roger Pau Monné,
xen-devel
On 03.05.2023 01:36, Vikram Garhwal wrote:
> --- a/xen/include/xen/iommu.h
> +++ b/xen/include/xen/iommu.h
> @@ -214,6 +214,7 @@ struct msi_msg;
> #include <xen/device_tree.h>
>
> int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev);
> +bool_t iommu_dt_device_is_assigned_locked(const struct dt_device_node *dev);
Hmm, exposing a function globally which, first and foremost because of
requiring the caller to hold the correct lock(s), is pretty much
internal, doesn't look very nice to me. Can this perhaps be put in a
private header, such that it gets only limited visibility?
Jan
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 10/19] xen/iommu: protect iommu_add_dt_device() with dtdevs_lock
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (8 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 09/19] xen/iommu: Move spin_lock from iommu_dt_device_is_assigned to caller Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-02 23:36 ` [XEN][PATCH v6 11/19] xen/iommu: Introduce iommu_remove_dt_device() Vikram Garhwal
` (8 subsequent siblings)
18 siblings, 0 replies; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel; +Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall
Protect iommu_add_dt_device() with dtdevs_lock to prevent concurrent access add.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
Reviewed-by: Michal Orzel <michal.orzel@amd.com>
---
xen/drivers/passthrough/device_tree.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c
index c386fda3e4..f3867ef1a6 100644
--- a/xen/drivers/passthrough/device_tree.c
+++ b/xen/drivers/passthrough/device_tree.c
@@ -145,6 +145,8 @@ int iommu_add_dt_device(struct dt_device_node *np)
if ( dev_iommu_fwspec_get(dev) )
return 0;
+ spin_lock(&dtdevs_lock);
+
/*
* According to the Documentation/devicetree/bindings/iommu/iommu.txt
* from Linux.
@@ -157,7 +159,10 @@ int iommu_add_dt_device(struct dt_device_node *np)
* these callback implemented.
*/
if ( !ops->add_device || !ops->dt_xlate )
- return -EINVAL;
+ {
+ rc = -EINVAL;
+ goto fail;
+ }
if ( !dt_device_is_available(iommu_spec.np) )
break;
@@ -188,6 +193,8 @@ int iommu_add_dt_device(struct dt_device_node *np)
if ( rc < 0 )
iommu_fwspec_free(dev);
+fail:
+ spin_unlock(&dtdevs_lock);
return rc;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [XEN][PATCH v6 11/19] xen/iommu: Introduce iommu_remove_dt_device()
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (9 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 10/19] xen/iommu: protect iommu_add_dt_device() with dtdevs_lock Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-03 7:56 ` Jan Beulich
2023-05-02 23:36 ` [XEN][PATCH v6 12/19] xen/smmu: Add remove_device callback for smmu_iommu ops Vikram Garhwal
` (7 subsequent siblings)
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall,
Jan Beulich, Paul Durrant, Roger Pau Monné
Remove master device from the IOMMU. This will be helpful when removing the
overlay nodes using dynamic programming during run time.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Michal Orzel <michal.orzel@amd.com>
---
xen/drivers/passthrough/device_tree.c | 41 +++++++++++++++++++++++++++
xen/include/xen/iommu.h | 2 ++
2 files changed, 43 insertions(+)
diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c
index f3867ef1a6..46f9080c8f 100644
--- a/xen/drivers/passthrough/device_tree.c
+++ b/xen/drivers/passthrough/device_tree.c
@@ -125,6 +125,47 @@ int iommu_release_dt_devices(struct domain *d)
return 0;
}
+int iommu_remove_dt_device(struct dt_device_node *np)
+{
+ const struct iommu_ops *ops = iommu_get_ops();
+ struct device *dev = dt_to_dev(np);
+ int rc;
+
+ if ( !ops )
+ return -EOPNOTSUPP;
+
+ spin_lock(&dtdevs_lock);
+
+ if ( iommu_dt_device_is_assigned_locked(np) )
+ {
+ rc = -EBUSY;
+ goto fail;
+ }
+
+ /*
+ * The driver which supports generic IOMMU DT bindings must have this
+ * callback implemented.
+ */
+ if ( !ops->remove_device )
+ {
+ rc = -EOPNOTSUPP;
+ goto fail;
+ }
+
+ /*
+ * Remove master device from the IOMMU if latter is present and available.
+ * The driver is responsible for removing is_protected flag.
+ */
+ rc = ops->remove_device(0, dev);
+
+ if ( !rc )
+ iommu_fwspec_free(dev);
+
+fail:
+ spin_unlock(&dtdevs_lock);
+ return rc;
+}
+
int iommu_add_dt_device(struct dt_device_node *np)
{
const struct iommu_ops *ops = iommu_get_ops();
diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index 76add226ec..6ba8d73966 100644
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -219,6 +219,8 @@ int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev);
int iommu_dt_domain_init(struct domain *d);
int iommu_release_dt_devices(struct domain *d);
+int iommu_remove_dt_device(struct dt_device_node *np);
+
/*
* Helper to add master device to the IOMMU using generic IOMMU DT bindings.
*
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [XEN][PATCH v6 11/19] xen/iommu: Introduce iommu_remove_dt_device()
2023-05-02 23:36 ` [XEN][PATCH v6 11/19] xen/iommu: Introduce iommu_remove_dt_device() Vikram Garhwal
@ 2023-05-03 7:56 ` Jan Beulich
0 siblings, 0 replies; 46+ messages in thread
From: Jan Beulich @ 2023-05-03 7:56 UTC (permalink / raw)
To: Vikram Garhwal
Cc: sstabellini, michal.orzel, Julien Grall, Paul Durrant,
Roger Pau Monné,
xen-devel
On 03.05.2023 01:36, Vikram Garhwal wrote:
> --- a/xen/include/xen/iommu.h
> +++ b/xen/include/xen/iommu.h
> @@ -219,6 +219,8 @@ int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev);
> int iommu_dt_domain_init(struct domain *d);
> int iommu_release_dt_devices(struct domain *d);
>
> +int iommu_remove_dt_device(struct dt_device_node *np);
> +
> /*
> * Helper to add master device to the IOMMU using generic IOMMU DT bindings.
> *
Nit: I'd consider it more logical if this declaration came after
iommu_add_dt_device()'s. With that adjustment:
Acked-by: Jan Beulich <jbeulich@suse.com>
Jan
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 12/19] xen/smmu: Add remove_device callback for smmu_iommu ops
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (10 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 11/19] xen/iommu: Introduce iommu_remove_dt_device() Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-02 23:36 ` [XEN][PATCH v6 13/19] asm/smp.h: Fix circular dependency for device_tree.h and rwlock.h Vikram Garhwal
` (6 subsequent siblings)
18 siblings, 0 replies; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall,
Rahul Singh, Bertrand Marquis, Volodymyr Babchuk
Add remove_device callback for removing the device entry from smmu-master using
following steps:
1. Find if SMMU master exists for the device node.
2. Check if device is currently in use.
3. Remove the SMMU master.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
Reviewed-by: Michal Orzel <michal.orzel@amd.com>
---
xen/drivers/passthrough/arm/smmu.c | 58 ++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c
index 0a514821b3..39d3a5c345 100644
--- a/xen/drivers/passthrough/arm/smmu.c
+++ b/xen/drivers/passthrough/arm/smmu.c
@@ -816,6 +816,19 @@ static int insert_smmu_master(struct arm_smmu_device *smmu,
return 0;
}
+static int remove_smmu_master(struct arm_smmu_device *smmu,
+ struct arm_smmu_master *master)
+{
+ if (!smmu->masters.rb_node) {
+ ASSERT_UNREACHABLE();
+ return -ENOENT;
+ }
+
+ rb_erase(&master->node, &smmu->masters);
+
+ return 0;
+}
+
static int arm_smmu_dt_add_device_legacy(struct arm_smmu_device *smmu,
struct device *dev,
struct iommu_fwspec *fwspec)
@@ -853,6 +866,34 @@ static int arm_smmu_dt_add_device_legacy(struct arm_smmu_device *smmu,
return insert_smmu_master(smmu, master);
}
+static int arm_smmu_dt_remove_device_legacy(struct arm_smmu_device *smmu,
+ struct device *dev)
+{
+ struct arm_smmu_master *master;
+ struct device_node *dev_node = dev_get_dev_node(dev);
+ int ret;
+
+ master = find_smmu_master(smmu, dev_node);
+ if (master == NULL) {
+ dev_err(dev,
+ "No registrations found for master device %s\n",
+ dev_node->name);
+ return -EINVAL;
+ }
+
+ if (iommu_dt_device_is_assigned_locked(dev_to_dt(dev)))
+ return -EBUSY;
+
+ ret = remove_smmu_master(smmu, master);
+ if (ret)
+ return ret;
+
+ dev_node->is_protected = false;
+
+ kfree(master);
+ return 0;
+}
+
static int register_smmu_master(struct arm_smmu_device *smmu,
struct device *dev,
struct of_phandle_args *masterspec)
@@ -876,6 +917,22 @@ static int register_smmu_master(struct arm_smmu_device *smmu,
fwspec);
}
+static int arm_smmu_dt_remove_device_generic(u8 devfn, struct device *dev)
+{
+ struct arm_smmu_device *smmu;
+ struct iommu_fwspec *fwspec;
+
+ fwspec = dev_iommu_fwspec_get(dev);
+ if (fwspec == NULL)
+ return -ENXIO;
+
+ smmu = find_smmu(fwspec->iommu_dev);
+ if (smmu == NULL)
+ return -ENXIO;
+
+ return arm_smmu_dt_remove_device_legacy(smmu, dev);
+}
+
static int arm_smmu_dt_add_device_generic(u8 devfn, struct device *dev)
{
struct arm_smmu_device *smmu;
@@ -2858,6 +2915,7 @@ static const struct iommu_ops arm_smmu_iommu_ops = {
.init = arm_smmu_iommu_domain_init,
.hwdom_init = arch_iommu_hwdom_init,
.add_device = arm_smmu_dt_add_device_generic,
+ .remove_device = arm_smmu_dt_remove_device_generic,
.teardown = arm_smmu_iommu_domain_teardown,
.iotlb_flush = arm_smmu_iotlb_flush,
.assign_device = arm_smmu_assign_dev,
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [XEN][PATCH v6 13/19] asm/smp.h: Fix circular dependency for device_tree.h and rwlock.h
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (11 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 12/19] xen/smmu: Add remove_device callback for smmu_iommu ops Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-02 23:36 ` [XEN][PATCH v6 14/19] common/device_tree: Add rwlock for dt_host Vikram Garhwal
` (5 subsequent siblings)
18 siblings, 0 replies; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall,
Bertrand Marquis, Volodymyr Babchuk
Dynamic programming ops will modify the dt_host and there might be other
function which are browsing the dt_host at the same time. To avoid the race
conditions, adding rwlock for browsing the dt_host. But adding rwlock in
device_tree.h causes following circular dependency:
device_tree.h->rwlock.h->smp.h->asm/smp.h->device_tree.h
To fix this, removed the "#include <xen/device_tree.h> and forward declared
"struct dt_device_node".
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Henry Wang <Henry.Wang@arm.com>
Reviewed-by: Michal Orzel <michal.orzel@amd.com>
---
xen/arch/arm/include/asm/smp.h | 3 ++-
xen/arch/arm/smpboot.c | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/xen/arch/arm/include/asm/smp.h b/xen/arch/arm/include/asm/smp.h
index a37ca55bff..b12949ba8a 100644
--- a/xen/arch/arm/include/asm/smp.h
+++ b/xen/arch/arm/include/asm/smp.h
@@ -3,13 +3,14 @@
#ifndef __ASSEMBLY__
#include <xen/cpumask.h>
-#include <xen/device_tree.h>
#include <asm/current.h>
#endif
DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_mask);
DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask);
+struct dt_device_node;
+
#define cpu_is_offline(cpu) unlikely(!cpu_online(cpu))
#define smp_processor_id() get_processor_id()
diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
index 4a89b3a834..255bbcc967 100644
--- a/xen/arch/arm/smpboot.c
+++ b/xen/arch/arm/smpboot.c
@@ -10,6 +10,7 @@
#include <xen/cpu.h>
#include <xen/cpumask.h>
#include <xen/delay.h>
+#include <xen/device_tree.h>
#include <xen/domain_page.h>
#include <xen/errno.h>
#include <xen/init.h>
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [XEN][PATCH v6 14/19] common/device_tree: Add rwlock for dt_host
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (12 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 13/19] asm/smp.h: Fix circular dependency for device_tree.h and rwlock.h Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-04 4:38 ` Henry Wang
2023-05-02 23:36 ` [XEN][PATCH v6 15/19] xen/arm: Implement device tree node removal functionalities Vikram Garhwal
` (4 subsequent siblings)
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel; +Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall
Dynamic programming ops will modify the dt_host and there might be other
function which are browsing the dt_host at the same time. To avoid the race
conditions, adding rwlock for browsing the dt_host during runtime.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
xen/common/device_tree.c | 4 ++++
xen/drivers/passthrough/device_tree.c | 18 ++++++++++++++++++
xen/include/xen/device_tree.h | 6 ++++++
3 files changed, 28 insertions(+)
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 426a809f42..48cb68bcd9 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -2109,7 +2109,11 @@ int unflatten_device_tree(const void *fdt, struct dt_device_node **mynodes)
dt_dprintk(" <- unflatten_device_tree()\n");
+ /* Init r/w lock for host device tree. */
+ rwlock_init(&dt_host->lock);
+
return 0;
+
}
static void dt_alias_add(struct dt_alias_prop *ap,
diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c
index 46f9080c8f..e3be8e3f91 100644
--- a/xen/drivers/passthrough/device_tree.c
+++ b/xen/drivers/passthrough/device_tree.c
@@ -111,6 +111,8 @@ int iommu_release_dt_devices(struct domain *d)
if ( !is_iommu_enabled(d) )
return 0;
+ read_lock(&dt_host->lock);
+
list_for_each_entry_safe(dev, _dev, &hd->dt_devices, domain_list)
{
rc = iommu_deassign_dt_device(d, dev);
@@ -118,10 +120,14 @@ int iommu_release_dt_devices(struct domain *d)
{
dprintk(XENLOG_ERR, "Failed to deassign %s in domain %u\n",
dt_node_full_name(dev), d->domain_id);
+
+ read_unlock(&dt_host->lock);
return rc;
}
}
+ read_unlock(&dt_host->lock);
+
return 0;
}
@@ -245,6 +251,8 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d,
int ret;
struct dt_device_node *dev;
+ read_lock(&dt_host->lock);
+
switch ( domctl->cmd )
{
case XEN_DOMCTL_assign_device:
@@ -294,7 +302,10 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d,
spin_unlock(&dtdevs_lock);
if ( d == dom_io )
+ {
+ read_unlock(&dt_host->lock);
return -EINVAL;
+ }
ret = iommu_add_dt_device(dev);
if ( ret < 0 )
@@ -310,6 +321,8 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d,
printk(XENLOG_G_ERR "XEN_DOMCTL_assign_dt_device: assign \"%s\""
" to dom%u failed (%d)\n",
dt_node_full_name(dev), d->domain_id, ret);
+
+ read_unlock(&dt_host->lock);
break;
case XEN_DOMCTL_deassign_device:
@@ -328,11 +341,15 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d,
break;
ret = xsm_deassign_dtdevice(XSM_HOOK, d, dt_node_full_name(dev));
+
if ( ret )
break;
if ( d == dom_io )
+ {
+ read_unlock(&dt_host->lock);
return -EINVAL;
+ }
ret = iommu_deassign_dt_device(d, dev);
@@ -347,5 +364,6 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d,
break;
}
+ read_unlock(&dt_host->lock);
return ret;
}
diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h
index d6366d3dac..e616dd7e9c 100644
--- a/xen/include/xen/device_tree.h
+++ b/xen/include/xen/device_tree.h
@@ -18,6 +18,7 @@
#include <xen/string.h>
#include <xen/types.h>
#include <xen/list.h>
+#include <xen/rwlock.h>
#define DEVICE_TREE_MAX_DEPTH 16
@@ -106,6 +107,11 @@ struct dt_device_node {
struct list_head domain_list;
struct device dev;
+
+ /*
+ * Lock that protects r/w updates to unflattened device tree i.e. dt_host.
+ */
+ rwlock_t lock;
};
#define dt_to_dev(dt_node) (&(dt_node)->dev)
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* RE: [XEN][PATCH v6 14/19] common/device_tree: Add rwlock for dt_host
2023-05-02 23:36 ` [XEN][PATCH v6 14/19] common/device_tree: Add rwlock for dt_host Vikram Garhwal
@ 2023-05-04 4:38 ` Henry Wang
0 siblings, 0 replies; 46+ messages in thread
From: Henry Wang @ 2023-05-04 4:38 UTC (permalink / raw)
To: Vikram Garhwal, xen-devel; +Cc: sstabellini, michal.orzel, Julien Grall
Hi Vikram,
> -----Original Message-----
> Subject: [XEN][PATCH v6 14/19] common/device_tree: Add rwlock for dt_host
>
> Dynamic programming ops will modify the dt_host and there might be other
> function which are browsing the dt_host at the same time. To avoid the race
> conditions, adding rwlock for browsing the dt_host during runtime.
While now I understand why you use rwlock instead of spinlock in this patch
since you explained it in replying my comment in v5 (Thanks!). I would still
suggest that you can add that kind of explanation in the commit message to
make the commit message clear to everyone that reading this patch.
>
> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
> ---
> xen/common/device_tree.c | 4 ++++
> xen/drivers/passthrough/device_tree.c | 18 ++++++++++++++++++
> xen/include/xen/device_tree.h | 6 ++++++
> 3 files changed, 28 insertions(+)
>
[...]
> ret = iommu_add_dt_device(dev);
> if ( ret < 0 )
> @@ -310,6 +321,8 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl,
> struct domain *d,
> printk(XENLOG_G_ERR "XEN_DOMCTL_assign_dt_device: assign
> \"%s\""
> " to dom%u failed (%d)\n",
> dt_node_full_name(dev), d->domain_id, ret);
> +
> + read_unlock(&dt_host->lock);
Since you added "read_unlock(&dt_host->lock);" before the final return,
i.e. "return ret", I don't think you need to add "read_unlock(&dt_host->lock);"
here before the break. Or am I missing something?
> break;
>
> case XEN_DOMCTL_deassign_device:
> @@ -328,11 +341,15 @@ int iommu_do_dt_domctl(struct xen_domctl
> *domctl, struct domain *d,
> break;
>
> ret = xsm_deassign_dtdevice(XSM_HOOK, d, dt_node_full_name(dev));
> +
Nit: Unnecessary blank line addition here.
Kind regards,
Henry
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 15/19] xen/arm: Implement device tree node removal functionalities
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (13 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 14/19] common/device_tree: Add rwlock for dt_host Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-03 7:59 ` Jan Beulich
` (2 more replies)
2023-05-02 23:36 ` [XEN][PATCH v6 16/19] xen/arm: Implement device tree node addition functionalities Vikram Garhwal
` (3 subsequent siblings)
18 siblings, 3 replies; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Julien Grall,
Bertrand Marquis, Volodymyr Babchuk, Andrew Cooper,
George Dunlap, Jan Beulich, Wei Liu
Introduce sysctl XEN_SYSCTL_dt_overlay to remove device-tree nodes added using
device tree overlay.
xl dt-overlay remove file.dtbo:
Removes all the nodes in a given dtbo.
First, removes IRQ permissions and MMIO accesses. Next, it finds the nodes
in dt_host and delete the device node entries from dt_host.
The nodes get removed only if it is not used by any of dom0 or domio.
Also, added overlay_track struct to keep the track of added node through device
tree overlay. overlay_track has dt_host_new which is unflattened form of updated
fdt and name of overlay nodes. When a node is removed, we also free the memory
used by overlay_track for the particular overlay node.
Nested overlay removal is supported in sequential manner only i.e. if
overlay_child nests under overlay_parent, it is assumed that user first removes
overlay_child and then removes overlay_parent.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
xen/arch/arm/sysctl.c | 16 +-
xen/common/Makefile | 1 +
xen/common/dt-overlay.c | 419 +++++++++++++++++++++++++++++++++++
xen/include/public/sysctl.h | 23 ++
xen/include/xen/dt-overlay.h | 58 +++++
5 files changed, 516 insertions(+), 1 deletion(-)
create mode 100644 xen/common/dt-overlay.c
create mode 100644 xen/include/xen/dt-overlay.h
diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c
index b0a78a8b10..456358166c 100644
--- a/xen/arch/arm/sysctl.c
+++ b/xen/arch/arm/sysctl.c
@@ -9,6 +9,7 @@
#include <xen/types.h>
#include <xen/lib.h>
+#include <xen/dt-overlay.h>
#include <xen/errno.h>
#include <xen/hypercall.h>
#include <public/sysctl.h>
@@ -21,7 +22,20 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi)
long arch_do_sysctl(struct xen_sysctl *sysctl,
XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)
{
- return -ENOSYS;
+ long ret = 0;
+
+ switch ( sysctl->cmd )
+ {
+ case XEN_SYSCTL_dt_overlay:
+ ret = dt_sysctl(&sysctl->u.dt_overlay);
+ break;
+
+ default:
+ ret = -ENOSYS;
+ break;
+ }
+
+ return ret;
}
/*
diff --git a/xen/common/Makefile b/xen/common/Makefile
index 46049eac35..e7e96b1087 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o
obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o
obj-$(CONFIG_IOREQ_SERVER) += dm.o
obj-y += domain.o
+obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o
obj-y += event_2l.o
obj-y += event_channel.o
obj-y += event_fifo.o
diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c
new file mode 100644
index 0000000000..b89cceab84
--- /dev/null
+++ b/xen/common/dt-overlay.c
@@ -0,0 +1,419 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * xen/common/dt-overlay.c
+ *
+ * Device tree overlay support in Xen.
+ *
+ * Copyright (C) 2023, Advanced Micro Devices, Inc. All Rights Reserved.
+ * Written by Vikram Garhwal <vikram.garhwal@amd.com>
+ *
+ */
+#include <asm/domain_build.h>
+#include <xen/dt-overlay.h>
+#include <xen/guest_access.h>
+#include <xen/iocap.h>
+#include <xen/xmalloc.h>
+
+static LIST_HEAD(overlay_tracker);
+static DEFINE_SPINLOCK(overlay_lock);
+
+/* Find last descendants of the device_node. */
+static struct dt_device_node *
+ find_last_descendants_node(struct dt_device_node *device_node)
+{
+ struct dt_device_node *child_node;
+
+ for ( child_node = device_node->child; child_node->sibling != NULL;
+ child_node = child_node->sibling );
+
+ /* If last child_node also have children. */
+ if ( child_node->child )
+ child_node = find_last_descendants_node(child_node);
+
+ return child_node;
+}
+
+static int dt_overlay_remove_node(struct dt_device_node *device_node)
+{
+ struct dt_device_node *np;
+ struct dt_device_node *parent_node;
+ struct dt_device_node *device_node_last_descendant = device_node->child;
+
+ parent_node = device_node->parent;
+
+ if ( parent_node == NULL )
+ {
+ dt_dprintk("%s's parent node not found\n", device_node->name);
+ return -EFAULT;
+ }
+
+ np = parent_node->child;
+
+ if ( np == NULL )
+ {
+ dt_dprintk("parent node %s's not found\n", parent_node->name);
+ return -EFAULT;
+ }
+
+ /* If node to be removed is only child node or first child. */
+ if ( !dt_node_cmp(np->full_name, device_node->full_name) )
+ {
+ parent_node->child = np->sibling;
+
+ /*
+ * Iterate over all child nodes of device_node. Given that we are
+ * removing parent node, we need to remove all it's descendants too.
+ */
+ if ( device_node_last_descendant )
+ {
+ device_node_last_descendant =
+ find_last_descendants_node(device_node);
+ parent_node->allnext = device_node_last_descendant->allnext;
+ }
+ else
+ parent_node->allnext = np->allnext;
+
+ return 0;
+ }
+
+ for ( np = parent_node->child; np->sibling != NULL; np = np->sibling )
+ {
+ if ( !dt_node_cmp(np->sibling->full_name, device_node->full_name) )
+ {
+ /* Found the node. Now we remove it. */
+ np->sibling = np->sibling->sibling;
+
+ if ( np->child )
+ np = find_last_descendants_node(np);
+
+ /*
+ * Iterate over all child nodes of device_node. Given that we are
+ * removing parent node, we need to remove all it's descendants too.
+ */
+ if ( device_node_last_descendant )
+ device_node_last_descendant =
+ find_last_descendants_node(device_node);
+
+ if ( device_node_last_descendant )
+ np->allnext = device_node_last_descendant->allnext;
+ else
+ np->allnext = np->allnext->allnext;
+
+ break;
+ }
+ }
+
+ return 0;
+}
+
+/* Basic sanity check for the dtbo tool stack provided to Xen. */
+static int check_overlay_fdt(const void *overlay_fdt, uint32_t overlay_fdt_size)
+{
+ if ( (fdt_totalsize(overlay_fdt) != overlay_fdt_size) ||
+ fdt_check_header(overlay_fdt) )
+ {
+ printk(XENLOG_ERR "The overlay FDT is not a valid Flat Device Tree\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+/* Count number of nodes till one level of __overlay__ tag. */
+static unsigned int overlay_node_count(const void *overlay_fdt)
+{
+ unsigned int num_overlay_nodes = 0;
+ int fragment;
+
+ fdt_for_each_subnode(fragment, overlay_fdt, 0)
+ {
+ int subnode;
+ int overlay;
+
+ overlay = fdt_subnode_offset(overlay_fdt, fragment, "__overlay__");
+
+ /*
+ * overlay value can be < 0. But fdt_for_each_subnode() loop checks for
+ * overlay >= 0. So, no need for a overlay>=0 check here.
+ */
+ fdt_for_each_subnode(subnode, overlay_fdt, overlay)
+ {
+ num_overlay_nodes++;
+ }
+ }
+
+ return num_overlay_nodes;
+}
+
+static int handle_remove_irq_iommu(struct dt_device_node *device_node)
+{
+ int rc = 0;
+ struct domain *d = hardware_domain;
+ domid_t domid;
+ unsigned int naddr, len;
+ unsigned int i, nirq;
+
+ domid = dt_device_used_by(device_node);
+
+ dt_dprintk("Checking if node %s is used by any domain\n",
+ device_node->full_name);
+
+ /* Remove the node if only it's assigned to domain 0 or domain io. */
+ if ( domid != 0 && domid != DOMID_IO )
+ {
+ printk(XENLOG_ERR "Device %s is being used by domain %u. Removing nodes failed\n",
+ device_node->full_name, domid);
+ return -EINVAL;
+ }
+
+ dt_dprintk("Removing node: %s\n", device_node->full_name);
+
+ nirq = dt_number_of_irq(device_node);
+
+ /* Remove IRQ permission */
+ for ( i = 0; i < nirq; i++ )
+ {
+ rc = platform_get_irq(device_node, i);
+ if ( rc < 0 )
+ {
+ printk(XENLOG_ERR "Failed to get IRQ num for device node %s\n",
+ device_node->full_name);
+ return -EINVAL;
+ }
+
+ if ( irq_access_permitted(d, rc) == false )
+ {
+ printk(XENLOG_ERR "IRQ %d is not routed to domain %u\n", rc,
+ domid);
+ return -EINVAL;
+ }
+ /*
+ * TODO: We don't handle shared IRQs for now. So, it is assumed that
+ * the IRQs was not shared with another devices.
+ */
+ rc = irq_deny_access(d, rc);
+ if ( rc )
+ {
+ printk(XENLOG_ERR "unable to revoke access for irq %u for %s\n",
+ i, device_node->full_name);
+ return rc;
+ }
+ }
+
+ /* Check if iommu property exists. */
+ if ( dt_get_property(device_node, "iommus", &len) )
+ {
+ rc = iommu_remove_dt_device(device_node);
+ if ( rc != 0 && rc != -ENXIO )
+ return rc;
+ }
+
+ naddr = dt_number_of_address(device_node);
+
+ /* Remove mmio access. */
+ for ( i = 0; i < naddr; i++ )
+ {
+ uint64_t addr, size;
+
+ rc = dt_device_get_address(device_node, i, &addr, &size);
+ if ( rc )
+ {
+ printk(XENLOG_ERR "Unable to retrieve address %u for %s\n",
+ i, dt_node_full_name(device_node));
+ return rc;
+ }
+
+ rc = iomem_deny_access(d, paddr_to_pfn(addr),
+ paddr_to_pfn(PAGE_ALIGN(addr + size - 1)));
+ if ( rc )
+ {
+ printk(XENLOG_ERR "Unable to remove dom%d access to"
+ " 0x%"PRIx64" - 0x%"PRIx64"\n",
+ d->domain_id,
+ addr & PAGE_MASK, PAGE_ALIGN(addr + size) - 1);
+ return rc;
+ }
+
+ }
+
+ return rc;
+}
+
+/* Removes all descendants of the given node. */
+static int remove_all_descendant_nodes(struct dt_device_node *device_node)
+{
+ int rc = 0;
+ struct dt_device_node *child_node;
+
+ for ( child_node = device_node->child; child_node != NULL;
+ child_node = child_node->sibling )
+ {
+ if ( child_node->child )
+ remove_all_descendant_nodes(child_node);
+
+ rc = handle_remove_irq_iommu(child_node);
+ if ( rc )
+ return rc;
+ }
+
+ return rc;
+}
+
+/* Remove nodes from dt_host. */
+static int remove_nodes(const struct overlay_track *tracker)
+{
+ int rc = 0;
+ struct dt_device_node *overlay_node;
+ unsigned int j;
+
+ for ( j = 0; j < tracker->num_nodes; j++ )
+ {
+ overlay_node = (struct dt_device_node *)tracker->nodes_address[j];
+ if ( overlay_node == NULL )
+ {
+ printk(XENLOG_ERR "Device %s is not present in the tree. Removing nodes failed\n",
+ overlay_node->full_name);
+ return -EINVAL;
+ }
+
+ rc = remove_all_descendant_nodes(overlay_node);
+
+ /* All children nodes are unmapped. Now remove the node itself. */
+ rc = handle_remove_irq_iommu(overlay_node);
+ if ( rc )
+ return rc;
+
+ read_lock(&dt_host->lock);
+
+ rc = dt_overlay_remove_node(overlay_node);
+ if ( rc )
+ {
+ read_unlock(&dt_host->lock);
+
+ return rc;
+ }
+
+ read_unlock(&dt_host->lock);
+ }
+
+ return rc;
+}
+
+/*
+ * First finds the device node to remove. Check if the device is being used by
+ * any dom and finally remove it from dt_host. IOMMU is already being taken care
+ * while destroying the domain.
+ */
+static long handle_remove_overlay_nodes(void *overlay_fdt,
+ uint32_t overlay_fdt_size)
+{
+ int rc = 0;
+ struct overlay_track *entry, *temp, *track;
+ bool found_entry = false;
+
+ rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size);
+ if ( rc )
+ return rc;
+
+ if ( overlay_node_count(overlay_fdt) == 0 )
+ return -EINVAL;
+
+ spin_lock(&overlay_lock);
+
+ /*
+ * First check if dtbo is correct i.e. it should one of the dtbo which was
+ * used when dynamically adding the node.
+ * Limitation: Cases with same node names but different property are not
+ * supported currently. We are relying on user to provide the same dtbo
+ * as it was used when adding the nodes.
+ */
+ list_for_each_entry_safe( entry, temp, &overlay_tracker, entry )
+ {
+ if ( memcmp(entry->overlay_fdt, overlay_fdt, overlay_fdt_size) == 0 )
+ {
+ track = entry;
+ found_entry = true;
+ break;
+ }
+ }
+
+ if ( found_entry == false )
+ {
+ rc = -EINVAL;
+
+ printk(XENLOG_ERR "Cannot find any matching tracker with input dtbo."
+ " Removing nodes is supported for only prior added dtbo. Please"
+ " provide a valid dtbo which was used to add the nodes.\n");
+ goto out;
+
+ }
+
+ rc = remove_nodes(entry);
+
+ if ( rc )
+ {
+ printk(XENLOG_ERR "Removing node failed\n");
+ goto out;
+ }
+
+ list_del(&entry->entry);
+
+ xfree(entry->dt_host_new);
+ xfree(entry->fdt);
+ xfree(entry->overlay_fdt);
+
+ xfree(entry->nodes_address);
+
+ xfree(entry);
+
+out:
+ spin_unlock(&overlay_lock);
+ return rc;
+}
+
+long dt_sysctl(struct xen_sysctl_dt_overlay *op)
+{
+ long ret;
+ void *overlay_fdt;
+
+ if ( op->overlay_fdt_size == 0 || op->overlay_fdt_size > KB(500) )
+ return -EINVAL;
+
+ overlay_fdt = xmalloc_bytes(op->overlay_fdt_size);
+
+ if ( overlay_fdt == NULL )
+ return -ENOMEM;
+
+ ret = copy_from_guest(overlay_fdt, op->overlay_fdt, op->overlay_fdt_size);
+ if ( ret )
+ {
+ gprintk(XENLOG_ERR, "copy from guest failed\n");
+ xfree(overlay_fdt);
+
+ return -EFAULT;
+ }
+
+ switch ( op->overlay_op )
+ {
+ case XEN_SYSCTL_DT_OVERLAY_REMOVE:
+ ret = handle_remove_overlay_nodes(overlay_fdt, op->overlay_fdt_size);
+ xfree(overlay_fdt);
+
+ break;
+
+ default:
+ xfree(overlay_fdt);
+ break;
+ }
+
+ return ret;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h
index 2b24d6bfd0..28f7fba98b 100644
--- a/xen/include/public/sysctl.h
+++ b/xen/include/public/sysctl.h
@@ -1057,6 +1057,24 @@ typedef struct xen_sysctl_cpu_policy xen_sysctl_cpu_policy_t;
DEFINE_XEN_GUEST_HANDLE(xen_sysctl_cpu_policy_t);
#endif
+#if defined(__arm__) || defined (__aarch64__)
+/*
+ * XEN_SYSCTL_dt_overlay
+ * Performs addition/removal of device tree nodes under parent node using dtbo.
+ * This does in three steps:
+ * - Adds/Removes the nodes from dt_host.
+ * - Adds/Removes IRQ permission for the nodes.
+ * - Adds/Removes MMIO accesses.
+ */
+struct xen_sysctl_dt_overlay {
+ XEN_GUEST_HANDLE_64(void) overlay_fdt; /* IN: overlay fdt. */
+ uint32_t overlay_fdt_size; /* IN: Overlay dtb size. */
+#define XEN_SYSCTL_DT_OVERLAY_ADD 1
+#define XEN_SYSCTL_DT_OVERLAY_REMOVE 2
+ uint8_t overlay_op; /* IN: Add or remove. */
+};
+#endif
+
struct xen_sysctl {
uint32_t cmd;
#define XEN_SYSCTL_readconsole 1
@@ -1087,6 +1105,7 @@ struct xen_sysctl {
#define XEN_SYSCTL_livepatch_op 27
/* #define XEN_SYSCTL_set_parameter 28 */
#define XEN_SYSCTL_get_cpu_policy 29
+#define XEN_SYSCTL_dt_overlay 30
uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */
union {
struct xen_sysctl_readconsole readconsole;
@@ -1117,6 +1136,10 @@ struct xen_sysctl {
#if defined(__i386__) || defined(__x86_64__)
struct xen_sysctl_cpu_policy cpu_policy;
#endif
+
+#if defined(__arm__) || defined (__aarch64__)
+ struct xen_sysctl_dt_overlay dt_overlay;
+#endif
uint8_t pad[128];
} u;
};
diff --git a/xen/include/xen/dt-overlay.h b/xen/include/xen/dt-overlay.h
new file mode 100644
index 0000000000..5b369f8eb7
--- /dev/null
+++ b/xen/include/xen/dt-overlay.h
@@ -0,0 +1,58 @@
+ /* SPDX-License-Identifier: GPL-2.0 */
+ /*
+ * xen/dt-overlay.h
+ *
+ * Device tree overlay support in Xen.
+ *
+ * Copyright (C) 2023, Advanced Micro Devices, Inc. All Rights Reserved.
+ * Written by Vikram Garhwal <vikram.garhwal@amd.com>
+ *
+ */
+#ifndef __XEN_DT_OVERLAY_H__
+#define __XEN_DT_OVERLAY_H__
+
+#include <xen/list.h>
+#include <xen/libfdt/libfdt.h>
+#include <xen/device_tree.h>
+#include <xen/rangeset.h>
+
+/*
+ * overlay_node_track describes information about added nodes through dtbo.
+ * @entry: List pointer.
+ * @dt_host_new: Pointer to the updated dt_host_new unflattened 'updated fdt'.
+ * @fdt: Stores the fdt.
+ * @nodes_fullname: Stores the full name of nodes.
+ * @nodes_irq: Stores the IRQ added from overlay dtb.
+ * @node_num_irq: Stores num of IRQ for each node in overlay dtb.
+ * @num_nodes: Stores total number of nodes in overlay dtb.
+ */
+struct overlay_track {
+ struct list_head entry;
+ struct dt_device_node *dt_host_new;
+ void *fdt;
+ void *overlay_fdt;
+ unsigned long *nodes_address;
+ unsigned int num_nodes;
+};
+
+struct xen_sysctl_dt_overlay;
+
+#ifdef CONFIG_OVERLAY_DTB
+long dt_sysctl(struct xen_sysctl_dt_overlay *op);
+#else
+static inline long dt_sysctl(struct xen_sysctl_dt_overlay *op)
+{
+ return -ENOSYS;
+}
+#endif
+#endif
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [XEN][PATCH v6 15/19] xen/arm: Implement device tree node removal functionalities
2023-05-02 23:36 ` [XEN][PATCH v6 15/19] xen/arm: Implement device tree node removal functionalities Vikram Garhwal
@ 2023-05-03 7:59 ` Jan Beulich
2023-05-03 8:02 ` Jan Beulich
2023-05-09 14:30 ` Michal Orzel
2 siblings, 0 replies; 46+ messages in thread
From: Jan Beulich @ 2023-05-03 7:59 UTC (permalink / raw)
To: Vikram Garhwal
Cc: sstabellini, michal.orzel, Julien Grall, Bertrand Marquis,
Volodymyr Babchuk, Andrew Cooper, George Dunlap, Wei Liu,
xen-devel
On 03.05.2023 01:36, Vikram Garhwal wrote:
> --- a/xen/include/public/sysctl.h
> +++ b/xen/include/public/sysctl.h
> @@ -1057,6 +1057,24 @@ typedef struct xen_sysctl_cpu_policy xen_sysctl_cpu_policy_t;
> DEFINE_XEN_GUEST_HANDLE(xen_sysctl_cpu_policy_t);
> #endif
>
> +#if defined(__arm__) || defined (__aarch64__)
> +/*
> + * XEN_SYSCTL_dt_overlay
> + * Performs addition/removal of device tree nodes under parent node using dtbo.
> + * This does in three steps:
> + * - Adds/Removes the nodes from dt_host.
> + * - Adds/Removes IRQ permission for the nodes.
> + * - Adds/Removes MMIO accesses.
> + */
> +struct xen_sysctl_dt_overlay {
> + XEN_GUEST_HANDLE_64(void) overlay_fdt; /* IN: overlay fdt. */
> + uint32_t overlay_fdt_size; /* IN: Overlay dtb size. */
> +#define XEN_SYSCTL_DT_OVERLAY_ADD 1
> +#define XEN_SYSCTL_DT_OVERLAY_REMOVE 2
> + uint8_t overlay_op; /* IN: Add or remove. */
> +};
I think you want to make padding explicit here and also check it to
be zero when incoming.
> --- /dev/null
> +++ b/xen/include/xen/dt-overlay.h
> @@ -0,0 +1,58 @@
> + /* SPDX-License-Identifier: GPL-2.0 */
> + /*
> + * xen/dt-overlay.h
> + *
> + * Device tree overlay support in Xen.
> + *
> + * Copyright (C) 2023, Advanced Micro Devices, Inc. All Rights Reserved.
> + * Written by Vikram Garhwal <vikram.garhwal@amd.com>
> + *
> + */
> +#ifndef __XEN_DT_OVERLAY_H__
> +#define __XEN_DT_OVERLAY_H__
> +
> +#include <xen/list.h>
> +#include <xen/libfdt/libfdt.h>
> +#include <xen/device_tree.h>
> +#include <xen/rangeset.h>
> +
> +/*
> + * overlay_node_track describes information about added nodes through dtbo.
> + * @entry: List pointer.
> + * @dt_host_new: Pointer to the updated dt_host_new unflattened 'updated fdt'.
> + * @fdt: Stores the fdt.
> + * @nodes_fullname: Stores the full name of nodes.
> + * @nodes_irq: Stores the IRQ added from overlay dtb.
> + * @node_num_irq: Stores num of IRQ for each node in overlay dtb.
> + * @num_nodes: Stores total number of nodes in overlay dtb.
> + */
> +struct overlay_track {
> + struct list_head entry;
> + struct dt_device_node *dt_host_new;
> + void *fdt;
> + void *overlay_fdt;
> + unsigned long *nodes_address;
> + unsigned int num_nodes;
> +};
> +
> +struct xen_sysctl_dt_overlay;
> +
> +#ifdef CONFIG_OVERLAY_DTB
> +long dt_sysctl(struct xen_sysctl_dt_overlay *op);
> +#else
> +static inline long dt_sysctl(struct xen_sysctl_dt_overlay *op)
> +{
> + return -ENOSYS;
Pretty certainly -EOPNOTSUPP.
Jan
^ permalink raw reply [flat|nested] 46+ messages in thread* Re: [XEN][PATCH v6 15/19] xen/arm: Implement device tree node removal functionalities
2023-05-02 23:36 ` [XEN][PATCH v6 15/19] xen/arm: Implement device tree node removal functionalities Vikram Garhwal
2023-05-03 7:59 ` Jan Beulich
@ 2023-05-03 8:02 ` Jan Beulich
2023-05-09 14:30 ` Michal Orzel
2 siblings, 0 replies; 46+ messages in thread
From: Jan Beulich @ 2023-05-03 8:02 UTC (permalink / raw)
To: Vikram Garhwal
Cc: sstabellini, michal.orzel, Julien Grall, Bertrand Marquis,
Volodymyr Babchuk, Andrew Cooper, George Dunlap, Wei Liu,
xen-devel
On 03.05.2023 01:36, Vikram Garhwal wrote:
> Introduce sysctl XEN_SYSCTL_dt_overlay to remove device-tree nodes added using
> device tree overlay.
>
> xl dt-overlay remove file.dtbo:
> Removes all the nodes in a given dtbo.
> First, removes IRQ permissions and MMIO accesses. Next, it finds the nodes
> in dt_host and delete the device node entries from dt_host.
>
> The nodes get removed only if it is not used by any of dom0 or domio.
>
> Also, added overlay_track struct to keep the track of added node through device
> tree overlay. overlay_track has dt_host_new which is unflattened form of updated
> fdt and name of overlay nodes. When a node is removed, we also free the memory
> used by overlay_track for the particular overlay node.
>
> Nested overlay removal is supported in sequential manner only i.e. if
> overlay_child nests under overlay_parent, it is assumed that user first removes
> overlay_child and then removes overlay_parent.
>
> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
> ---
> xen/arch/arm/sysctl.c | 16 +-
> xen/common/Makefile | 1 +
> xen/common/dt-overlay.c | 419 +++++++++++++++++++++++++++++++++++
> xen/include/public/sysctl.h | 23 ++
> xen/include/xen/dt-overlay.h | 58 +++++
> 5 files changed, 516 insertions(+), 1 deletion(-)
> create mode 100644 xen/common/dt-overlay.c
> create mode 100644 xen/include/xen/dt-overlay.h
Is it possible that on the next patch I and other REST maintainers are Cc-ed
merely because at this point of introducing the two new files they're not
added to (perhaps) the DEVICE TREE section of ./MAINTAINERS right away?
Jan
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [XEN][PATCH v6 15/19] xen/arm: Implement device tree node removal functionalities
2023-05-02 23:36 ` [XEN][PATCH v6 15/19] xen/arm: Implement device tree node removal functionalities Vikram Garhwal
2023-05-03 7:59 ` Jan Beulich
2023-05-03 8:02 ` Jan Beulich
@ 2023-05-09 14:30 ` Michal Orzel
2023-05-09 14:52 ` Andrew Cooper
2 siblings, 1 reply; 46+ messages in thread
From: Michal Orzel @ 2023-05-09 14:30 UTC (permalink / raw)
To: Vikram Garhwal, xen-devel
Cc: sstabellini, Julien Grall, Bertrand Marquis, Volodymyr Babchuk,
Andrew Cooper, George Dunlap, Jan Beulich, Wei Liu
On 03/05/2023 01:36, Vikram Garhwal wrote:
> Introduce sysctl XEN_SYSCTL_dt_overlay to remove device-tree nodes added using
> device tree overlay.
>
> xl dt-overlay remove file.dtbo:
> Removes all the nodes in a given dtbo.
> First, removes IRQ permissions and MMIO accesses. Next, it finds the nodes
> in dt_host and delete the device node entries from dt_host.
>
> The nodes get removed only if it is not used by any of dom0 or domio.
>
> Also, added overlay_track struct to keep the track of added node through device
> tree overlay. overlay_track has dt_host_new which is unflattened form of updated
> fdt and name of overlay nodes. When a node is removed, we also free the memory
> used by overlay_track for the particular overlay node.
>
> Nested overlay removal is supported in sequential manner only i.e. if
> overlay_child nests under overlay_parent, it is assumed that user first removes
> overlay_child and then removes overlay_parent.
>
> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
> ---
> xen/arch/arm/sysctl.c | 16 +-
> xen/common/Makefile | 1 +
> xen/common/dt-overlay.c | 419 +++++++++++++++++++++++++++++++++++
> xen/include/public/sysctl.h | 23 ++
> xen/include/xen/dt-overlay.h | 58 +++++
> 5 files changed, 516 insertions(+), 1 deletion(-)
> create mode 100644 xen/common/dt-overlay.c
> create mode 100644 xen/include/xen/dt-overlay.h
>
> diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c
> index b0a78a8b10..456358166c 100644
> --- a/xen/arch/arm/sysctl.c
> +++ b/xen/arch/arm/sysctl.c
> @@ -9,6 +9,7 @@
>
> #include <xen/types.h>
> #include <xen/lib.h>
> +#include <xen/dt-overlay.h>
> #include <xen/errno.h>
> #include <xen/hypercall.h>
> #include <public/sysctl.h>
> @@ -21,7 +22,20 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi)
> long arch_do_sysctl(struct xen_sysctl *sysctl,
> XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)
> {
> - return -ENOSYS;
> + long ret = 0;
> +
> + switch ( sysctl->cmd )
> + {
> + case XEN_SYSCTL_dt_overlay:
> + ret = dt_sysctl(&sysctl->u.dt_overlay);
> + break;
> +
> + default:
> + ret = -ENOSYS;
> + break;
> + }
> +
> + return ret;
> }
>
> /*
> diff --git a/xen/common/Makefile b/xen/common/Makefile
> index 46049eac35..e7e96b1087 100644
> --- a/xen/common/Makefile
> +++ b/xen/common/Makefile
> @@ -8,6 +8,7 @@ obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o
> obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o
> obj-$(CONFIG_IOREQ_SERVER) += dm.o
> obj-y += domain.o
> +obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o
> obj-y += event_2l.o
> obj-y += event_channel.o
> obj-y += event_fifo.o
> diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c
> new file mode 100644
> index 0000000000..b89cceab84
> --- /dev/null
> +++ b/xen/common/dt-overlay.c
> @@ -0,0 +1,419 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
GPL-2.0-only according to the latest series from Andrew (GPL-2.0 is a depracated tag)
[...]
> +
> + /* Remove mmio access. */
> + for ( i = 0; i < naddr; i++ )
> + {
> + uint64_t addr, size;
> +
> + rc = dt_device_get_address(device_node, i, &addr, &size);
Given that Ayan's 32-bit series might be merged first, this will have to be changed (to use paddr_t for addr,size, etc.)
> + if ( rc )
> + {
> + printk(XENLOG_ERR "Unable to retrieve address %u for %s\n",
> + i, dt_node_full_name(device_node));
> + return rc;
> + }
> +
> + rc = iomem_deny_access(d, paddr_to_pfn(addr),
> + paddr_to_pfn(PAGE_ALIGN(addr + size - 1)));
> + if ( rc )
> + {
> + printk(XENLOG_ERR "Unable to remove dom%d access to"
> + " 0x%"PRIx64" - 0x%"PRIx64"\n",
> + d->domain_id,
> + addr & PAGE_MASK, PAGE_ALIGN(addr + size) - 1);
> + return rc;
> + }
> +
> + }
> +
> + return rc;
> +}
> +
> +/* Removes all descendants of the given node. */
> +static int remove_all_descendant_nodes(struct dt_device_node *device_node)
> +{
> + int rc = 0;
> + struct dt_device_node *child_node;
> +
> + for ( child_node = device_node->child; child_node != NULL;
> + child_node = child_node->sibling )
> + {
> + if ( child_node->child )
> + remove_all_descendant_nodes(child_node);
> +
> + rc = handle_remove_irq_iommu(child_node);
> + if ( rc )
> + return rc;
> + }
> +
> + return rc;
> +}
> +
> +/* Remove nodes from dt_host. */
> +static int remove_nodes(const struct overlay_track *tracker)
> +{
> + int rc = 0;
> + struct dt_device_node *overlay_node;
> + unsigned int j;
> +
> + for ( j = 0; j < tracker->num_nodes; j++ )
> + {
> + overlay_node = (struct dt_device_node *)tracker->nodes_address[j];
> + if ( overlay_node == NULL )
> + {
> + printk(XENLOG_ERR "Device %s is not present in the tree. Removing nodes failed\n",
> + overlay_node->full_name);
> + return -EINVAL;
> + }
> +
> + rc = remove_all_descendant_nodes(overlay_node);
> +
> + /* All children nodes are unmapped. Now remove the node itself. */
> + rc = handle_remove_irq_iommu(overlay_node);
> + if ( rc )
> + return rc;
> +
> + read_lock(&dt_host->lock);
> +
> + rc = dt_overlay_remove_node(overlay_node);
> + if ( rc )
> + {
> + read_unlock(&dt_host->lock);
> +
> + return rc;
> + }
> +
> + read_unlock(&dt_host->lock);
> + }
> +
> + return rc;
> +}
> +
> +/*
> + * First finds the device node to remove. Check if the device is being used by
> + * any dom and finally remove it from dt_host. IOMMU is already being taken care
> + * while destroying the domain.
> + */
> +static long handle_remove_overlay_nodes(void *overlay_fdt,
> + uint32_t overlay_fdt_size)
> +{
> + int rc = 0;
as always, please do not initialize variables if it is not required (this applies to all the patches)
> + struct overlay_track *entry, *temp, *track;
> + bool found_entry = false;
> +
> + rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size);
> + if ( rc )
> + return rc;
> +
> + if ( overlay_node_count(overlay_fdt) == 0 )
> + return -EINVAL;
> +
> + spin_lock(&overlay_lock);
> +
> + /*
> + * First check if dtbo is correct i.e. it should one of the dtbo which was
> + * used when dynamically adding the node.
> + * Limitation: Cases with same node names but different property are not
> + * supported currently. We are relying on user to provide the same dtbo
> + * as it was used when adding the nodes.
> + */
> + list_for_each_entry_safe( entry, temp, &overlay_tracker, entry )
> + {
> + if ( memcmp(entry->overlay_fdt, overlay_fdt, overlay_fdt_size) == 0 )
> + {
> + track = entry;
> + found_entry = true;
> + break;
> + }
> + }
> +
> + if ( found_entry == false )
> + {
> + rc = -EINVAL;
> +
> + printk(XENLOG_ERR "Cannot find any matching tracker with input dtbo."
> + " Removing nodes is supported for only prior added dtbo. Please"
> + " provide a valid dtbo which was used to add the nodes.\n");
This will be a quite large single line. Maybe some split?
> + goto out;
> +
> + }
> +
> + rc = remove_nodes(entry);
> +
remove this line so that a check follows assignment
> + if ( rc )
> + {
> + printk(XENLOG_ERR "Removing node failed\n");
> + goto out;
> + }
> +
> + list_del(&entry->entry);
> +
> + xfree(entry->dt_host_new);
> + xfree(entry->fdt);
> + xfree(entry->overlay_fdt);
> +
> + xfree(entry->nodes_address);
> +
> + xfree(entry);
> +
> +out:
> + spin_unlock(&overlay_lock);
> + return rc;
> +}
> +
> +long dt_sysctl(struct xen_sysctl_dt_overlay *op)
> +{
> + long ret;
> + void *overlay_fdt;
> +
> + if ( op->overlay_fdt_size == 0 || op->overlay_fdt_size > KB(500) )
> + return -EINVAL;
> +
> + overlay_fdt = xmalloc_bytes(op->overlay_fdt_size);
> +
> + if ( overlay_fdt == NULL )
> + return -ENOMEM;
> +
> + ret = copy_from_guest(overlay_fdt, op->overlay_fdt, op->overlay_fdt_size);
> + if ( ret )
> + {
> + gprintk(XENLOG_ERR, "copy from guest failed\n");
> + xfree(overlay_fdt);
> +
> + return -EFAULT;
> + }
> +
> + switch ( op->overlay_op )
> + {
> + case XEN_SYSCTL_DT_OVERLAY_REMOVE:
> + ret = handle_remove_overlay_nodes(overlay_fdt, op->overlay_fdt_size);
> + xfree(overlay_fdt);
this xfree and ...
> +
> + break;
> +
> + default:
> + xfree(overlay_fdt);
this one can be removed by adding a single xfree before final return
> + break;
> + }
> +
> + return ret;
> +}
> +
> +/*
> + * Local variables:
> + * mode: C
> + * c-file-style: "BSD"
> + * c-basic-offset: 4
> + * indent-tabs-mode: nil
> + * End:
> + */
> diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h
> index 2b24d6bfd0..28f7fba98b 100644
> --- a/xen/include/public/sysctl.h
> +++ b/xen/include/public/sysctl.h
> @@ -1057,6 +1057,24 @@ typedef struct xen_sysctl_cpu_policy xen_sysctl_cpu_policy_t;
> DEFINE_XEN_GUEST_HANDLE(xen_sysctl_cpu_policy_t);
> #endif
>
> +#if defined(__arm__) || defined (__aarch64__)
> +/*
> + * XEN_SYSCTL_dt_overlay
> + * Performs addition/removal of device tree nodes under parent node using dtbo.
> + * This does in three steps:
> + * - Adds/Removes the nodes from dt_host.
> + * - Adds/Removes IRQ permission for the nodes.
> + * - Adds/Removes MMIO accesses.
> + */
> +struct xen_sysctl_dt_overlay {
> + XEN_GUEST_HANDLE_64(void) overlay_fdt; /* IN: overlay fdt. */
> + uint32_t overlay_fdt_size; /* IN: Overlay dtb size. */
> +#define XEN_SYSCTL_DT_OVERLAY_ADD 1
> +#define XEN_SYSCTL_DT_OVERLAY_REMOVE 2
> + uint8_t overlay_op; /* IN: Add or remove. */
> +};
> +#endif
> +
> struct xen_sysctl {
> uint32_t cmd;
> #define XEN_SYSCTL_readconsole 1
> @@ -1087,6 +1105,7 @@ struct xen_sysctl {
> #define XEN_SYSCTL_livepatch_op 27
> /* #define XEN_SYSCTL_set_parameter 28 */
> #define XEN_SYSCTL_get_cpu_policy 29
> +#define XEN_SYSCTL_dt_overlay 30
> uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */
> union {
> struct xen_sysctl_readconsole readconsole;
> @@ -1117,6 +1136,10 @@ struct xen_sysctl {
> #if defined(__i386__) || defined(__x86_64__)
> struct xen_sysctl_cpu_policy cpu_policy;
> #endif
> +
> +#if defined(__arm__) || defined (__aarch64__)
> + struct xen_sysctl_dt_overlay dt_overlay;
> +#endif
> uint8_t pad[128];
> } u;
> };
> diff --git a/xen/include/xen/dt-overlay.h b/xen/include/xen/dt-overlay.h
> new file mode 100644
> index 0000000000..5b369f8eb7
> --- /dev/null
> +++ b/xen/include/xen/dt-overlay.h
> @@ -0,0 +1,58 @@
> + /* SPDX-License-Identifier: GPL-2.0 */
GPL-2.0-only according to the latest series from Andrew (GPL-2.0 is a depracated tag)
> + /*
> + * xen/dt-overlay.h
> + *
> + * Device tree overlay support in Xen.
> + *
> + * Copyright (C) 2023, Advanced Micro Devices, Inc. All Rights Reserved.
> + * Written by Vikram Garhwal <vikram.garhwal@amd.com>
> + *
> + */
> +#ifndef __XEN_DT_OVERLAY_H__
> +#define __XEN_DT_OVERLAY_H__
> +
> +#include <xen/list.h>
> +#include <xen/libfdt/libfdt.h>
> +#include <xen/device_tree.h>
> +#include <xen/rangeset.h>
> +
> +/*
> + * overlay_node_track describes information about added nodes through dtbo.
structure is called overlay_track
> + * @entry: List pointer.
> + * @dt_host_new: Pointer to the updated dt_host_new unflattened 'updated fdt'.
This reads strange, would you mind to fix it?
> + * @fdt: Stores the fdt.
From here ...
> + * @nodes_fullname: Stores the full name of nodes.
> + * @nodes_irq: Stores the IRQ added from overlay dtb.
> + * @node_num_irq: Stores num of IRQ for each node in overlay dtb.
... to here these params do not reflect the struct members. Please fix. Also, you can omit "Stores" word
and just write e.g. "total number of ..."
> + * @num_nodes: Stores total number of nodes in overlay dtb.
> + */
> +struct overlay_track {
> + struct list_head entry;
> + struct dt_device_node *dt_host_new;
> + void *fdt;
> + void *overlay_fdt;
> + unsigned long *nodes_address;
> + unsigned int num_nodes;
> +};
> +
> +struct xen_sysctl_dt_overlay;
> +
> +#ifdef CONFIG_OVERLAY_DTB
> +long dt_sysctl(struct xen_sysctl_dt_overlay *op);
> +#else
> +static inline long dt_sysctl(struct xen_sysctl_dt_overlay *op)
> +{
> + return -ENOSYS;
no xen/errno.h included results in a compilation error on my side.
> +}
> +#endif
add empty line here
> +#endif
add /* __XEN_DT_OVERLAY_H__ */ next to last #endif
> +
> +/*
> + * Local variables:
> + * mode: C
> + * c-file-style: "BSD"
> + * c-basic-offset: 4
> + * tab-width: 4
> + * indent-tabs-mode: nil
> + * End:
> + */
~Michal
^ permalink raw reply [flat|nested] 46+ messages in thread* Re: [XEN][PATCH v6 15/19] xen/arm: Implement device tree node removal functionalities
2023-05-09 14:30 ` Michal Orzel
@ 2023-05-09 14:52 ` Andrew Cooper
0 siblings, 0 replies; 46+ messages in thread
From: Andrew Cooper @ 2023-05-09 14:52 UTC (permalink / raw)
To: Michal Orzel, Vikram Garhwal, xen-devel
Cc: sstabellini, Julien Grall, Bertrand Marquis, Volodymyr Babchuk,
George Dunlap, Jan Beulich, Wei Liu
On 09/05/2023 3:30 pm, Michal Orzel wrote:
> On 03/05/2023 01:36, Vikram Garhwal wrote:
>> diff --git a/xen/include/xen/dt-overlay.h b/xen/include/xen/dt-overlay.h
>> new file mode 100644
>> index 0000000000..5b369f8eb7
>> --- /dev/null
>> +++ b/xen/include/xen/dt-overlay.h
>> @@ -0,0 +1,58 @@
>> + /* SPDX-License-Identifier: GPL-2.0 */
> GPL-2.0-only according to the latest series from Andrew (GPL-2.0 is a depracated tag)
Well, or "-or-later" at your choosing/as applicable, but one of the
explicitly suffixed forms please.
~Andrew
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 16/19] xen/arm: Implement device tree node addition functionalities
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (14 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 15/19] xen/arm: Implement device tree node removal functionalities Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-10 10:18 ` Michal Orzel
2023-05-02 23:36 ` [XEN][PATCH v6 17/19] tools/libs/ctrl: Implement new xc interfaces for dt overlay Vikram Garhwal
` (2 subsequent siblings)
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Andrew Cooper,
George Dunlap, Jan Beulich, Julien Grall, Wei Liu
Update sysctl XEN_SYSCTL_dt_overlay to enable support for dtbo nodes addition
using device tree overlay.
xl dt-overlay add file.dtbo:
Each time overlay nodes are added using .dtbo, a new fdt(memcpy of
device_tree_flattened) is created and updated with overlay nodes. This
updated fdt is further unflattened to a dt_host_new. Next, it checks if any
of the overlay nodes already exists in the dt_host. If overlay nodes doesn't
exist then find the overlay nodes in dt_host_new, find the overlay node's
parent in dt_host and add the nodes as child under their parent in the
dt_host. The node is attached as the last node under target parent.
Finally, add IRQs, add device to IOMMUs, set permissions and map MMIO for the
overlay node.
When a node is added using overlay, a new entry is allocated in the
overlay_track to keep the track of memory allocation due to addition of overlay
node. This is helpful for freeing the memory allocated when a device tree node
is removed.
The main purpose of this to address first part of dynamic programming i.e.
making xen aware of new device tree node which means updating the dt_host with
overlay node information. Here we are adding/removing node from dt_host, and
checking/setting IOMMU and IRQ permission but never mapping them to any domain.
Right now, mapping/Un-mapping will happen only when a new domU is
created/destroyed using "xl create".
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
xen/common/dt-overlay.c | 510 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 510 insertions(+)
diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c
index b89cceab84..09ea46111b 100644
--- a/xen/common/dt-overlay.c
+++ b/xen/common/dt-overlay.c
@@ -33,6 +33,25 @@ static struct dt_device_node *
return child_node;
}
+/*
+ * Returns next node to the input node. If node has children then return
+ * last descendant's next node.
+*/
+static struct dt_device_node *
+dt_find_next_node(struct dt_device_node *dt, const struct dt_device_node *node)
+{
+ struct dt_device_node *np;
+
+ dt_for_each_device_node(dt, np)
+ if ( np == node )
+ break;
+
+ if ( np->child )
+ np = find_last_descendants_node(np);
+
+ return np->allnext;
+}
+
static int dt_overlay_remove_node(struct dt_device_node *device_node)
{
struct dt_device_node *np;
@@ -106,6 +125,76 @@ static int dt_overlay_remove_node(struct dt_device_node *device_node)
return 0;
}
+static int dt_overlay_add_node(struct dt_device_node *device_node,
+ const char *parent_node_path)
+{
+ struct dt_device_node *parent_node;
+ struct dt_device_node *next_node;
+
+ parent_node = dt_find_node_by_path(parent_node_path);
+
+ if ( parent_node == NULL )
+ {
+ dt_dprintk("Parent node %s not found. Overlay node will not be added\n",
+ parent_node_path);
+ return -EINVAL;
+ }
+
+ /* If parent has no child. */
+ if ( parent_node->child == NULL )
+ {
+ next_node = parent_node->allnext;
+ device_node->parent = parent_node;
+ parent_node->allnext = device_node;
+ parent_node->child = device_node;
+ }
+ else
+ {
+ struct dt_device_node *np;
+ /* If parent has at least one child node.
+ * Iterate to the last child node of parent.
+ */
+ for ( np = parent_node->child; np->sibling != NULL; np = np->sibling );
+
+ /* Iterate over all child nodes of np node. */
+ if ( np->child )
+ {
+ struct dt_device_node *np_last_descendant;
+
+ np_last_descendant = find_last_descendants_node(np);
+
+ next_node = np_last_descendant->allnext;
+ np_last_descendant->allnext = device_node;
+ }
+ else
+ {
+ next_node = np->allnext;
+ np->allnext = device_node;
+ }
+
+ device_node->parent = parent_node;
+ np->sibling = device_node;
+ np->sibling->sibling = NULL;
+ }
+
+ /* Iterate over all child nodes of device_node to add children too. */
+ if ( device_node->child )
+ {
+ struct dt_device_node *device_node_last_descendant;
+
+ device_node_last_descendant = find_last_descendants_node(device_node);
+ /* Plug next_node at the end of last children of device_node. */
+ device_node_last_descendant->allnext = next_node;
+ }
+ else
+ {
+ /* Now plug next_node at the end of device_node. */
+ device_node->allnext = next_node;
+ }
+
+ return 0;
+}
+
/* Basic sanity check for the dtbo tool stack provided to Xen. */
static int check_overlay_fdt(const void *overlay_fdt, uint32_t overlay_fdt_size)
{
@@ -145,6 +234,82 @@ static unsigned int overlay_node_count(const void *overlay_fdt)
return num_overlay_nodes;
}
+/*
+ * overlay_get_nodes_info gets full name with path for all the nodes which
+ * are in one level of __overlay__ tag. This is useful when checking node for
+ * duplication i.e. dtbo tries to add nodes which already exists in device tree.
+ */
+static int overlay_get_nodes_info(const void *fdto, char ***nodes_full_path,
+ unsigned int num_overlay_nodes)
+{
+ int fragment;
+
+ *nodes_full_path = xzalloc_bytes(num_overlay_nodes * sizeof(char *));
+
+ if ( *nodes_full_path == NULL )
+ return -ENOMEM;
+
+ fdt_for_each_subnode(fragment, fdto, 0)
+ {
+ int target;
+ int overlay;
+ int subnode;
+ const char *target_path;
+
+ target = fdt_overlay_target_offset(device_tree_flattened, fdto,
+ fragment, &target_path);
+ if ( target < 0 )
+ return target;
+
+ if ( target_path == NULL )
+ return -EINVAL;
+
+ overlay = fdt_subnode_offset(fdto, fragment, "__overlay__");
+
+ /*
+ * overlay value can be < 0. But fdt_for_each_subnode() loop checks for
+ * overlay >= 0. So, no need for a overlay>=0 check here.
+ */
+ fdt_for_each_subnode(subnode, fdto, overlay)
+ {
+ const char *node_name = NULL;
+ int node_name_len;
+ unsigned int target_path_len = strlen(target_path);
+ unsigned int node_full_name_len;
+ unsigned int node_num = 0;
+
+ node_name = fdt_get_name(fdto, subnode, &node_name_len);
+
+ if ( node_name == NULL )
+ return node_name_len;
+
+ /*
+ * Magic number 2 is for adding '/' and '\0'. This is done to keep
+ * the node_full_path in the correct full node name format.
+ */
+ node_full_name_len = target_path_len + node_name_len + 2;
+
+ (*nodes_full_path)[node_num] = xmalloc_bytes(node_full_name_len);
+
+ if ( (*nodes_full_path)[node_num] == NULL )
+ return -ENOMEM;
+
+ memcpy((*nodes_full_path)[node_num], target_path, target_path_len);
+
+ (*nodes_full_path)[node_num][target_path_len] = '/';
+
+ memcpy((*nodes_full_path)[node_num] + target_path_len + 1,
+ node_name, node_name_len);
+
+ (*nodes_full_path)[node_num][node_full_name_len - 1] = '\0';
+
+ node_num++;
+ }
+ }
+
+ return 0;
+}
+
static int handle_remove_irq_iommu(struct dt_device_node *device_node)
{
int rc = 0;
@@ -371,6 +536,344 @@ out:
return rc;
}
+/*
+ * Handles IRQ and IOMMU mapping for the overlay_node and all descendants of the
+ * overlay_node.
+ */
+static int handle_add_irq_iommu(struct domain *d,
+ struct dt_device_node *overlay_node)
+{
+ int rc;
+ unsigned int naddr, i, len;
+ struct dt_device_node *np;
+
+ /* First let's handle the interrupts. */
+ rc = handle_device_interrupts(d, overlay_node, false);
+ if ( rc < 0 )
+ {
+ printk(XENLOG_ERR "Failed to retrieve interrupts configuration\n");
+ return rc;
+ }
+
+ /* Check if iommu property exists. */
+ if ( dt_get_property(overlay_node, "iommus", &len) )
+ {
+ /* Add device to IOMMUs. */
+ rc = iommu_add_dt_device(overlay_node);
+ if ( rc < 0 )
+ {
+ printk(XENLOG_ERR "Failed to add %s to the IOMMU\n",
+ dt_node_full_name(overlay_node));
+ return rc;
+ }
+ }
+
+ /* Set permissions. */
+ naddr = dt_number_of_address(overlay_node);
+
+ dt_dprintk("%s naddr = %u\n", dt_node_full_name(overlay_node), naddr);
+
+ /* Give permission to map MMIOs */
+ for ( i = 0; i < naddr; i++ )
+ {
+ uint64_t addr, size;
+
+ /*
+ * For now, we skip_mapping which means it will only permit iomem access
+ * to hardware_domain using iomem_permit_access() but will never map as
+ * map_range_p2mt() will not be called.
+ */
+ struct map_range_data mr_data = { .d = d,
+ .p2mt = p2m_mmio_direct_c,
+ .skip_mapping = true
+ };
+
+ rc = dt_device_get_address(overlay_node, i, &addr, &size);
+ if ( rc )
+ {
+ printk(XENLOG_ERR "Unable to retrieve address %u for %s\n",
+ i, dt_node_full_name(overlay_node));
+ return rc;
+ }
+
+ rc = map_range_to_domain(overlay_node, addr, size, &mr_data);
+ if ( rc )
+ return rc;
+ }
+
+ /* Map IRQ and IOMMU for overlay_node's children. */
+ for ( np = overlay_node->child; np != NULL; np = np->sibling )
+ {
+ rc = handle_add_irq_iommu(d, np);
+ if ( rc )
+ {
+ printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n");
+ return rc;
+ }
+ }
+
+ return rc;
+}
+
+/*
+ * Adds device tree nodes under target node.
+ * We use tr->dt_host_new to unflatten the updated device_tree_flattened. This
+ * is done to avoid the removal of device_tree generation, iomem regions mapping
+ * to hardware domain done by handle_node().
+ */
+static long handle_add_overlay_nodes(void *overlay_fdt,
+ uint32_t overlay_fdt_size)
+{
+ int rc, j, i;
+ struct dt_device_node *overlay_node;
+ struct overlay_track *tr = NULL;
+ char **nodes_full_path = NULL;
+ unsigned int new_fdt_size;
+
+ tr = xzalloc(struct overlay_track);
+ if ( tr == NULL )
+ return -ENOMEM;
+
+ new_fdt_size = fdt_totalsize(device_tree_flattened) +
+ fdt_totalsize(overlay_fdt);
+
+ tr->fdt = xzalloc_bytes(new_fdt_size);
+ if ( tr->fdt == NULL )
+ {
+ xfree(tr);
+ return -ENOMEM;
+ }
+
+ tr->num_nodes = overlay_node_count(overlay_fdt);
+ if ( tr->num_nodes == 0 )
+ {
+ xfree(tr->fdt);
+ xfree(tr);
+ return -ENOMEM;
+ }
+
+ tr->nodes_address = xzalloc_bytes(tr->num_nodes * sizeof(unsigned long));
+ if ( tr->nodes_address == NULL )
+ {
+ xfree(tr->fdt);
+ xfree(tr);
+ return -ENOMEM;
+ }
+
+ rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size);
+ if ( rc )
+ {
+ xfree(tr->nodes_address);
+ xfree(tr->fdt);
+ xfree(tr);
+ return rc;
+ }
+
+ /*
+ * Keep a copy of overlay_fdt as fdt_overlay_apply will change the input
+ * overlay's content(magic) when applying overlay.
+ */
+ tr->overlay_fdt = xzalloc_bytes(overlay_fdt_size);
+ if ( tr->overlay_fdt == NULL )
+ {
+ xfree(tr->nodes_address);
+ xfree(tr->fdt);
+ xfree(tr);
+ return -ENOMEM;
+ }
+
+ memcpy(tr->overlay_fdt, overlay_fdt, overlay_fdt_size);
+
+ spin_lock(&overlay_lock);
+
+ memcpy(tr->fdt, device_tree_flattened,
+ fdt_totalsize(device_tree_flattened));
+
+ /* Open tr->fdt with more space to accommodate the overlay_fdt. */
+ rc = fdt_open_into(tr->fdt, tr->fdt, new_fdt_size);
+ if ( rc )
+ {
+ printk(XENLOG_ERR "Increasing tr->fdt size failed with error %d\n",
+ rc);
+ goto err;
+ }
+
+ /*
+ * overlay_get_nodes_info is called to get the node information from dtbo.
+ * This is done before fdt_overlay_apply() because the overlay apply will
+ * erase the magic of overlay_fdt.
+ */
+ rc = overlay_get_nodes_info(overlay_fdt, &nodes_full_path,
+ tr->num_nodes);
+ if ( rc )
+ {
+ printk(XENLOG_ERR "Getting nodes information failed with error %d\n",
+ rc);
+ goto err;
+ }
+
+ rc = fdt_overlay_apply(tr->fdt, overlay_fdt);
+ if ( rc )
+ {
+ printk(XENLOG_ERR "Adding overlay node failed with error %d\n", rc);
+ goto err;
+ }
+
+ /*
+ * Check if any of the node already exists in dt_host. If node already exits
+ * we can return here as this overlay_fdt is not suitable for overlay ops.
+ */
+ for ( j = 0; j < tr->num_nodes; j++ )
+ {
+ overlay_node = dt_find_node_by_path(nodes_full_path[j]);
+ if ( overlay_node != NULL )
+ {
+ printk(XENLOG_ERR "node %s exists in device tree\n",
+ nodes_full_path[j]);
+ rc = -EINVAL;
+ goto err;
+ }
+ }
+
+ /* Unflatten the tr->fdt into a new dt_host. */
+ rc = unflatten_device_tree(tr->fdt, &tr->dt_host_new);
+ if ( rc )
+ {
+ printk(XENLOG_ERR "unflatten_device_tree failed with error %d\n", rc);
+ goto err;
+ }
+
+ for ( j = 0; j < tr->num_nodes; j++ )
+ {
+ struct dt_device_node *prev_node, *next_node;
+
+ dt_dprintk("Adding node: %s\n", nodes_full_path[j]);
+
+ /* Find the newly added node in tr->dt_host_new by it's full path. */
+ overlay_node = device_tree_find_node_by_path(tr->dt_host_new,
+ nodes_full_path[j]);
+ if ( overlay_node == NULL )
+ {
+ /* Sanity check. But code will never come here. */
+ ASSERT_UNREACHABLE();
+ goto remove_node;
+ }
+
+ /*
+ * Find previous and next node to overlay_node in dt_host_new. We will
+ * need these nodes to fix the dt_host_new mapping. When overlay_node is
+ * take out of dt_host_new tree and added to dt_host, link between
+ * previous node and next_node is broken. We will need to refresh
+ * dt_host_new with correct linking for any other overlay nodes
+ * extraction in future.
+ */
+ dt_for_each_device_node(tr->dt_host_new, prev_node)
+ if ( prev_node->allnext == overlay_node )
+ break;
+
+ next_node = dt_find_next_node(tr->dt_host_new, overlay_node);
+
+ read_lock(&dt_host->lock);
+
+ /* Add the node to dt_host. */
+ rc = dt_overlay_add_node(overlay_node, overlay_node->parent->full_name);
+ if ( rc )
+ {
+ read_unlock(&dt_host->lock);
+
+ /* Node not added in dt_host. */
+ goto remove_node;
+ }
+
+ read_unlock(&dt_host->lock);
+
+ prev_node->allnext = next_node;
+
+ overlay_node = dt_find_node_by_path(overlay_node->full_name);
+ if ( overlay_node == NULL )
+ {
+ /* Sanity check. But code will never come here. */
+ ASSERT_UNREACHABLE();
+ goto remove_node;
+ }
+
+ rc = handle_add_irq_iommu(hardware_domain, overlay_node);
+ if ( rc )
+ {
+ printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n");
+ return rc;
+ }
+
+ /* Keep overlay_node address in tracker. */
+ tr->nodes_address[j] = (unsigned long)overlay_node;
+ }
+
+ INIT_LIST_HEAD(&tr->entry);
+ list_add_tail(&tr->entry, &overlay_tracker);
+
+ spin_unlock(&overlay_lock);
+
+ if ( nodes_full_path != NULL )
+ {
+ for ( i = 0; i < tr->num_nodes && nodes_full_path[i] != NULL;
+ i++ )
+ {
+ xfree(nodes_full_path[i]);
+ }
+ xfree(nodes_full_path);
+ }
+
+ return rc;
+
+/*
+ * Failure case. We need to remove the nodes, free tracker(if tr exists) and
+ * tr->dt_host_new.
+ */
+remove_node:
+ tr->num_nodes = j;
+ rc = remove_nodes(tr);
+
+ if ( rc )
+ {
+ /*
+ * User needs to provide right overlay. Incorrect node information
+ * example parent node doesn't exist in dt_host etc can cause memory
+ * leaks as removing_nodes() will fail and this means nodes memory is
+ * not freed from tracker. Which may cause memory leaks. Ideally, these
+ * device tree related mistakes will be caught by fdt_overlay_apply()
+ * but given that we don't manage that code keeping this warning message
+ * is better here.
+ */
+ printk(XENLOG_ERR "Removing node failed.\n");
+ spin_unlock(&overlay_lock);
+ return rc;
+ }
+
+err:
+ spin_unlock(&overlay_lock);
+
+ if ( tr->dt_host_new )
+ xfree(tr->dt_host_new);
+
+ xfree(tr->overlay_fdt);
+ xfree(tr->nodes_address);
+ xfree(tr->fdt);
+
+ if ( nodes_full_path != NULL )
+ {
+ for ( i = 0; i < tr->num_nodes && nodes_full_path[i] != NULL;
+ i++ )
+ {
+ xfree(nodes_full_path[i]);
+ }
+ xfree(nodes_full_path);
+ }
+
+ xfree(tr);
+
+ return rc;
+}
+
long dt_sysctl(struct xen_sysctl_dt_overlay *op)
{
long ret;
@@ -395,6 +898,13 @@ long dt_sysctl(struct xen_sysctl_dt_overlay *op)
switch ( op->overlay_op )
{
+ case XEN_SYSCTL_DT_OVERLAY_ADD:
+ ret = handle_add_overlay_nodes(overlay_fdt, op->overlay_fdt_size);
+ if ( ret )
+ xfree(overlay_fdt);
+
+ break;
+
case XEN_SYSCTL_DT_OVERLAY_REMOVE:
ret = handle_remove_overlay_nodes(overlay_fdt, op->overlay_fdt_size);
xfree(overlay_fdt);
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [XEN][PATCH v6 16/19] xen/arm: Implement device tree node addition functionalities
2023-05-02 23:36 ` [XEN][PATCH v6 16/19] xen/arm: Implement device tree node addition functionalities Vikram Garhwal
@ 2023-05-10 10:18 ` Michal Orzel
2023-06-02 0:49 ` Vikram Garhwal
0 siblings, 1 reply; 46+ messages in thread
From: Michal Orzel @ 2023-05-10 10:18 UTC (permalink / raw)
To: Vikram Garhwal, xen-devel
Cc: sstabellini, Andrew Cooper, George Dunlap, Jan Beulich,
Julien Grall, Wei Liu
On 03/05/2023 01:36, Vikram Garhwal wrote:
> Update sysctl XEN_SYSCTL_dt_overlay to enable support for dtbo nodes addition
> using device tree overlay.
>
> xl dt-overlay add file.dtbo:
> Each time overlay nodes are added using .dtbo, a new fdt(memcpy of
> device_tree_flattened) is created and updated with overlay nodes. This
> updated fdt is further unflattened to a dt_host_new. Next, it checks if any
> of the overlay nodes already exists in the dt_host. If overlay nodes doesn't
> exist then find the overlay nodes in dt_host_new, find the overlay node's
> parent in dt_host and add the nodes as child under their parent in the
> dt_host. The node is attached as the last node under target parent.
>
> Finally, add IRQs, add device to IOMMUs, set permissions and map MMIO for the
> overlay node.
>
> When a node is added using overlay, a new entry is allocated in the
> overlay_track to keep the track of memory allocation due to addition of overlay
> node. This is helpful for freeing the memory allocated when a device tree node
> is removed.
>
> The main purpose of this to address first part of dynamic programming i.e.
> making xen aware of new device tree node which means updating the dt_host with
> overlay node information. Here we are adding/removing node from dt_host, and
> checking/setting IOMMU and IRQ permission but never mapping them to any domain.
> Right now, mapping/Un-mapping will happen only when a new domU is
> created/destroyed using "xl create".
>
> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
> ---
> xen/common/dt-overlay.c | 510 ++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 510 insertions(+)
>
> diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c
> index b89cceab84..09ea46111b 100644
> --- a/xen/common/dt-overlay.c
> +++ b/xen/common/dt-overlay.c
> @@ -33,6 +33,25 @@ static struct dt_device_node *
> return child_node;
> }
>
> +/*
> + * Returns next node to the input node. If node has children then return
> + * last descendant's next node.
> +*/
> +static struct dt_device_node *
> +dt_find_next_node(struct dt_device_node *dt, const struct dt_device_node *node)
> +{
> + struct dt_device_node *np;
> +
> + dt_for_each_device_node(dt, np)
> + if ( np == node )
> + break;
> +
> + if ( np->child )
> + np = find_last_descendants_node(np);
> +
> + return np->allnext;
> +}
> +
> static int dt_overlay_remove_node(struct dt_device_node *device_node)
> {
> struct dt_device_node *np;
> @@ -106,6 +125,76 @@ static int dt_overlay_remove_node(struct dt_device_node *device_node)
> return 0;
> }
>
> +static int dt_overlay_add_node(struct dt_device_node *device_node,
> + const char *parent_node_path)
> +{
> + struct dt_device_node *parent_node;
> + struct dt_device_node *next_node;
> +
> + parent_node = dt_find_node_by_path(parent_node_path);
> +
> + if ( parent_node == NULL )
> + {
> + dt_dprintk("Parent node %s not found. Overlay node will not be added\n",
> + parent_node_path);
> + return -EINVAL;
> + }
> +
> + /* If parent has no child. */
> + if ( parent_node->child == NULL )
> + {
> + next_node = parent_node->allnext;
> + device_node->parent = parent_node;
> + parent_node->allnext = device_node;
> + parent_node->child = device_node;
> + }
> + else
> + {
> + struct dt_device_node *np;
> + /* If parent has at least one child node.
incorrect comment style, should be:
/*
*
*/
> + * Iterate to the last child node of parent.
> + */
> + for ( np = parent_node->child; np->sibling != NULL; np = np->sibling );
> +
> + /* Iterate over all child nodes of np node. */
> + if ( np->child )
> + {
> + struct dt_device_node *np_last_descendant;
> +
> + np_last_descendant = find_last_descendants_node(np);
> +
> + next_node = np_last_descendant->allnext;
> + np_last_descendant->allnext = device_node;
> + }
> + else
> + {
> + next_node = np->allnext;
> + np->allnext = device_node;
> + }
> +
> + device_node->parent = parent_node;
> + np->sibling = device_node;
> + np->sibling->sibling = NULL;
> + }
> +
> + /* Iterate over all child nodes of device_node to add children too. */
> + if ( device_node->child )
> + {
> + struct dt_device_node *device_node_last_descendant;
> +
> + device_node_last_descendant = find_last_descendants_node(device_node);
empty line
> + /* Plug next_node at the end of last children of device_node. */
> + device_node_last_descendant->allnext = next_node;
> + }
> + else
> + {
> + /* Now plug next_node at the end of device_node. */
> + device_node->allnext = next_node;
> + }
> +
> + return 0;
> +}
> +
> /* Basic sanity check for the dtbo tool stack provided to Xen. */
> static int check_overlay_fdt(const void *overlay_fdt, uint32_t overlay_fdt_size)
> {
> @@ -145,6 +234,82 @@ static unsigned int overlay_node_count(const void *overlay_fdt)
> return num_overlay_nodes;
> }
>
> +/*
> + * overlay_get_nodes_info gets full name with path for all the nodes which
> + * are in one level of __overlay__ tag. This is useful when checking node for
> + * duplication i.e. dtbo tries to add nodes which already exists in device tree.
> + */
> +static int overlay_get_nodes_info(const void *fdto, char ***nodes_full_path,
> + unsigned int num_overlay_nodes)
> +{
> + int fragment;
> +
> + *nodes_full_path = xzalloc_bytes(num_overlay_nodes * sizeof(char *));
You are not freeing memory in this function in case of an error and rely on a caller
to free the memory allocated by this function. Wouldn't it be better to allocate this
from handle_add_overlay_nodes()?
> +
> + if ( *nodes_full_path == NULL )
> + return -ENOMEM;
> +
> + fdt_for_each_subnode(fragment, fdto, 0)
> + {
> + int target;
> + int overlay;
> + int subnode;
> + const char *target_path;
> +
> + target = fdt_overlay_target_offset(device_tree_flattened, fdto,
> + fragment, &target_path);
> + if ( target < 0 )
> + return target;
> +
> + if ( target_path == NULL )
> + return -EINVAL;
> +
> + overlay = fdt_subnode_offset(fdto, fragment, "__overlay__");
> +
> + /*
> + * overlay value can be < 0. But fdt_for_each_subnode() loop checks for
> + * overlay >= 0. So, no need for a overlay>=0 check here.
> + */
> + fdt_for_each_subnode(subnode, fdto, overlay)
> + {
> + const char *node_name = NULL;
> + int node_name_len;
> + unsigned int target_path_len = strlen(target_path);
> + unsigned int node_full_name_len;
> + unsigned int node_num = 0;
How this is supposed to work given that on each iteration you are setting this to 0
and at the end of the iteration you increment it? It will then always be 0.
> +
> + node_name = fdt_get_name(fdto, subnode, &node_name_len);
> +
> + if ( node_name == NULL )
> + return node_name_len;
> +
> + /*
> + * Magic number 2 is for adding '/' and '\0'. This is done to keep
> + * the node_full_path in the correct full node name format.
> + */
> + node_full_name_len = target_path_len + node_name_len + 2;
> +
> + (*nodes_full_path)[node_num] = xmalloc_bytes(node_full_name_len);
> +
> + if ( (*nodes_full_path)[node_num] == NULL )
> + return -ENOMEM;
> +
> + memcpy((*nodes_full_path)[node_num], target_path, target_path_len);
> +
> + (*nodes_full_path)[node_num][target_path_len] = '/';
> +
> + memcpy((*nodes_full_path)[node_num] + target_path_len + 1,
> + node_name, node_name_len);
> +
> + (*nodes_full_path)[node_num][node_full_name_len - 1] = '\0';
> +
> + node_num++;
> + }
> + }
> +
> + return 0;
> +}
> +
> static int handle_remove_irq_iommu(struct dt_device_node *device_node)
> {
> int rc = 0;
> @@ -371,6 +536,344 @@ out:
> return rc;
> }
>
> +/*
> + * Handles IRQ and IOMMU mapping for the overlay_node and all descendants of the
> + * overlay_node.
> + */
> +static int handle_add_irq_iommu(struct domain *d,
If you only allow adding nodes to hwdom, what's the point of this parameter?
This is not consitent with function that does removing.
> + struct dt_device_node *overlay_node)
> +{
> + int rc;
> + unsigned int naddr, i, len;
> + struct dt_device_node *np;
> +
> + /* First let's handle the interrupts. */
> + rc = handle_device_interrupts(d, overlay_node, false);
Similarily to your comment about skip_mapping, it would be welcome to explain why false here.
> + if ( rc < 0 )
> + {
> + printk(XENLOG_ERR "Failed to retrieve interrupts configuration\n");
> + return rc;
> + }
> +
> + /* Check if iommu property exists. */
> + if ( dt_get_property(overlay_node, "iommus", &len) )
> + {
> + /* Add device to IOMMUs. */
> + rc = iommu_add_dt_device(overlay_node);
> + if ( rc < 0 )
> + {
> + printk(XENLOG_ERR "Failed to add %s to the IOMMU\n",
> + dt_node_full_name(overlay_node));
> + return rc;
> + }
> + }
> +
> + /* Set permissions. */
> + naddr = dt_number_of_address(overlay_node);
> +
> + dt_dprintk("%s naddr = %u\n", dt_node_full_name(overlay_node), naddr);
> +
> + /* Give permission to map MMIOs */
> + for ( i = 0; i < naddr; i++ )
> + {
> + uint64_t addr, size;
Make sure to check Ayan's 32-bit paddr series status as it impacts parts of your code.
> +
> + /*
> + * For now, we skip_mapping which means it will only permit iomem access
> + * to hardware_domain using iomem_permit_access() but will never map as
> + * map_range_p2mt() will not be called.
> + */
> + struct map_range_data mr_data = { .d = d,
> + .p2mt = p2m_mmio_direct_c,
> + .skip_mapping = true
> + };
> +
> + rc = dt_device_get_address(overlay_node, i, &addr, &size);
> + if ( rc )
> + {
> + printk(XENLOG_ERR "Unable to retrieve address %u for %s\n",
> + i, dt_node_full_name(overlay_node));
> + return rc;
> + }
> +
> + rc = map_range_to_domain(overlay_node, addr, size, &mr_data);
> + if ( rc )
> + return rc;
> + }
> +
> + /* Map IRQ and IOMMU for overlay_node's children. */
> + for ( np = overlay_node->child; np != NULL; np = np->sibling )
> + {
> + rc = handle_add_irq_iommu(d, np);
> + if ( rc )
> + {
> + printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n");
> + return rc;
> + }
> + }
> +
> + return rc;
> +}
> +
> +/*
> + * Adds device tree nodes under target node.
> + * We use tr->dt_host_new to unflatten the updated device_tree_flattened. This
> + * is done to avoid the removal of device_tree generation, iomem regions mapping
> + * to hardware domain done by handle_node().
> + */
> +static long handle_add_overlay_nodes(void *overlay_fdt,
> + uint32_t overlay_fdt_size)
> +{
> + int rc, j, i;
> + struct dt_device_node *overlay_node;
> + struct overlay_track *tr = NULL;
> + char **nodes_full_path = NULL;
> + unsigned int new_fdt_size;
> +
> + tr = xzalloc(struct overlay_track);
> + if ( tr == NULL )
> + return -ENOMEM;
> +
> + new_fdt_size = fdt_totalsize(device_tree_flattened) +
> + fdt_totalsize(overlay_fdt);
> +
> + tr->fdt = xzalloc_bytes(new_fdt_size);
> + if ( tr->fdt == NULL )
> + {
> + xfree(tr);
> + return -ENOMEM;
> + }
> +
> + tr->num_nodes = overlay_node_count(overlay_fdt);
> + if ( tr->num_nodes == 0 )
> + {
> + xfree(tr->fdt);
> + xfree(tr);
> + return -ENOMEM;
> + }
> +
> + tr->nodes_address = xzalloc_bytes(tr->num_nodes * sizeof(unsigned long));
> + if ( tr->nodes_address == NULL )
> + {
> + xfree(tr->fdt);
> + xfree(tr);
> + return -ENOMEM;
> + }
> +
> + rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size);
> + if ( rc )
> + {
> + xfree(tr->nodes_address);
> + xfree(tr->fdt);
> + xfree(tr);
> + return rc;
> + }
> +
> + /*
> + * Keep a copy of overlay_fdt as fdt_overlay_apply will change the input
> + * overlay's content(magic) when applying overlay.
> + */
> + tr->overlay_fdt = xzalloc_bytes(overlay_fdt_size);
> + if ( tr->overlay_fdt == NULL )
> + {
> + xfree(tr->nodes_address);
> + xfree(tr->fdt);
> + xfree(tr);
> + return -ENOMEM;
> + }
> +
> + memcpy(tr->overlay_fdt, overlay_fdt, overlay_fdt_size);
> +
> + spin_lock(&overlay_lock);
> +
> + memcpy(tr->fdt, device_tree_flattened,
> + fdt_totalsize(device_tree_flattened));
> +
> + /* Open tr->fdt with more space to accommodate the overlay_fdt. */
> + rc = fdt_open_into(tr->fdt, tr->fdt, new_fdt_size);
> + if ( rc )
> + {
> + printk(XENLOG_ERR "Increasing tr->fdt size failed with error %d\n",
User does not know what tr->fdt is and it's better to be more user friendly.
> + rc);
> + goto err;
> + }
> +
> + /*
> + * overlay_get_nodes_info is called to get the node information from dtbo.
> + * This is done before fdt_overlay_apply() because the overlay apply will
> + * erase the magic of overlay_fdt.
> + */
> + rc = overlay_get_nodes_info(overlay_fdt, &nodes_full_path,
> + tr->num_nodes);
> + if ( rc )
> + {
> + printk(XENLOG_ERR "Getting nodes information failed with error %d\n",
> + rc);
> + goto err;
> + }
> +
> + rc = fdt_overlay_apply(tr->fdt, overlay_fdt);
> + if ( rc )
> + {
> + printk(XENLOG_ERR "Adding overlay node failed with error %d\n", rc);
> + goto err;
> + }
> +
> + /*
> + * Check if any of the node already exists in dt_host. If node already exits
> + * we can return here as this overlay_fdt is not suitable for overlay ops.
> + */
> + for ( j = 0; j < tr->num_nodes; j++ )
> + {
> + overlay_node = dt_find_node_by_path(nodes_full_path[j]);
> + if ( overlay_node != NULL )
> + {
> + printk(XENLOG_ERR "node %s exists in device tree\n",
> + nodes_full_path[j]);
> + rc = -EINVAL;
> + goto err;
> + }
> + }
> +
> + /* Unflatten the tr->fdt into a new dt_host. */
> + rc = unflatten_device_tree(tr->fdt, &tr->dt_host_new);
> + if ( rc )
> + {
> + printk(XENLOG_ERR "unflatten_device_tree failed with error %d\n", rc);
> + goto err;
> + }
> +
> + for ( j = 0; j < tr->num_nodes; j++ )
> + {
> + struct dt_device_node *prev_node, *next_node;
> +
> + dt_dprintk("Adding node: %s\n", nodes_full_path[j]);
> +
> + /* Find the newly added node in tr->dt_host_new by it's full path. */
> + overlay_node = device_tree_find_node_by_path(tr->dt_host_new,
> + nodes_full_path[j]);
> + if ( overlay_node == NULL )
> + {
> + /* Sanity check. But code will never come here. */
> + ASSERT_UNREACHABLE();
> + goto remove_node;
> + }
> +
> + /*
> + * Find previous and next node to overlay_node in dt_host_new. We will
> + * need these nodes to fix the dt_host_new mapping. When overlay_node is
> + * take out of dt_host_new tree and added to dt_host, link between
> + * previous node and next_node is broken. We will need to refresh
> + * dt_host_new with correct linking for any other overlay nodes
> + * extraction in future.
> + */
> + dt_for_each_device_node(tr->dt_host_new, prev_node)
> + if ( prev_node->allnext == overlay_node )
> + break;
> +
> + next_node = dt_find_next_node(tr->dt_host_new, overlay_node);
> +
> + read_lock(&dt_host->lock);
> +
> + /* Add the node to dt_host. */
> + rc = dt_overlay_add_node(overlay_node, overlay_node->parent->full_name);
> + if ( rc )
> + {
> + read_unlock(&dt_host->lock);
> +
> + /* Node not added in dt_host. */
> + goto remove_node;
> + }
> +
> + read_unlock(&dt_host->lock);
> +
> + prev_node->allnext = next_node;
> +
> + overlay_node = dt_find_node_by_path(overlay_node->full_name);
> + if ( overlay_node == NULL )
> + {
> + /* Sanity check. But code will never come here. */
> + ASSERT_UNREACHABLE();
> + goto remove_node;
> + }
> +
> + rc = handle_add_irq_iommu(hardware_domain, overlay_node);
> + if ( rc )
> + {
> + printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n");
> + return rc;
This is definitely wrong as you will return with spinlock held and memory not freed.
> + }
> +
> + /* Keep overlay_node address in tracker. */
> + tr->nodes_address[j] = (unsigned long)overlay_node;
> + }
> +
> + INIT_LIST_HEAD(&tr->entry);
> + list_add_tail(&tr->entry, &overlay_tracker);
> +
> + spin_unlock(&overlay_lock);
> +
> + if ( nodes_full_path != NULL )
> + {
> + for ( i = 0; i < tr->num_nodes && nodes_full_path[i] != NULL;
> + i++ )
> + {
> + xfree(nodes_full_path[i]);
> + }
> + xfree(nodes_full_path);
> + }
This block of code is identical to the one at the end so some cleanup is necessary.
> +
> + return rc;
> +
> +/*
> + * Failure case. We need to remove the nodes, free tracker(if tr exists) and
> + * tr->dt_host_new.
> + */
> +remove_node:
> + tr->num_nodes = j;
> + rc = remove_nodes(tr);
> +
> + if ( rc )
> + {
> + /*
> + * User needs to provide right overlay. Incorrect node information
> + * example parent node doesn't exist in dt_host etc can cause memory
> + * leaks as removing_nodes() will fail and this means nodes memory is
> + * not freed from tracker. Which may cause memory leaks. Ideally, these
> + * device tree related mistakes will be caught by fdt_overlay_apply()
> + * but given that we don't manage that code keeping this warning message
> + * is better here.
> + */
> + printk(XENLOG_ERR "Removing node failed.\n");
> + spin_unlock(&overlay_lock);
> + return rc;
> + }
> +
> +err:
> + spin_unlock(&overlay_lock);
> +
> + if ( tr->dt_host_new )
> + xfree(tr->dt_host_new);
> +
> + xfree(tr->overlay_fdt);
> + xfree(tr->nodes_address);
> + xfree(tr->fdt);
> +
> + if ( nodes_full_path != NULL )
> + {
> + for ( i = 0; i < tr->num_nodes && nodes_full_path[i] != NULL;
> + i++ )
> + {
> + xfree(nodes_full_path[i]);
> + }
> + xfree(nodes_full_path);
> + }
> +
> + xfree(tr);
> +
> + return rc;
> +}
> +
> long dt_sysctl(struct xen_sysctl_dt_overlay *op)
> {
> long ret;
> @@ -395,6 +898,13 @@ long dt_sysctl(struct xen_sysctl_dt_overlay *op)
>
> switch ( op->overlay_op )
> {
> + case XEN_SYSCTL_DT_OVERLAY_ADD:
> + ret = handle_add_overlay_nodes(overlay_fdt, op->overlay_fdt_size);
> + if ( ret )
> + xfree(overlay_fdt);
See my comment about xfree in previous patch
> +
> + break;
> +
> case XEN_SYSCTL_DT_OVERLAY_REMOVE:
> ret = handle_remove_overlay_nodes(overlay_fdt, op->overlay_fdt_size);
> xfree(overlay_fdt);
~Michal
^ permalink raw reply [flat|nested] 46+ messages in thread* Re: [XEN][PATCH v6 16/19] xen/arm: Implement device tree node addition functionalities
2023-05-10 10:18 ` Michal Orzel
@ 2023-06-02 0:49 ` Vikram Garhwal
0 siblings, 0 replies; 46+ messages in thread
From: Vikram Garhwal @ 2023-06-02 0:49 UTC (permalink / raw)
To: Michal Orzel, xen-devel
Cc: sstabellini, Andrew Cooper, George Dunlap, Jan Beulich,
Julien Grall, Wei Liu
Hi Michal,
On 5/10/23 3:18 AM, Michal Orzel wrote:
>
> On 03/05/2023 01:36, Vikram Garhwal wrote:
>> Update sysctl XEN_SYSCTL_dt_overlay to enable support for dtbo nodes addition
>> using device tree overlay.
>>
>> xl dt-overlay add file.dtbo:
>> Each time overlay nodes are added using .dtbo, a new fdt(memcpy of
>> device_tree_flattened) is created and updated with overlay nodes. This
>> updated fdt is further unflattened to a dt_host_new. Next, it checks if any
>> of the overlay nodes already exists in the dt_host. If overlay nodes doesn't
>> exist then find the overlay nodes in dt_host_new, find the overlay node's
>> parent in dt_host and add the nodes as child under their parent in the
>> dt_host. The node is attached as the last node under target parent.
>>
>> Finally, add IRQs, add device to IOMMUs, set permissions and map MMIO for the
>> overlay node.
>>
>> When a node is added using overlay, a new entry is allocated in the
>> overlay_track to keep the track of memory allocation due to addition of overlay
>> node. This is helpful for freeing the memory allocated when a device tree node
>> is removed.
>>
>> The main purpose of this to address first part of dynamic programming i.e.
>> making xen aware of new device tree node which means updating the dt_host with
>> overlay node information. Here we are adding/removing node from dt_host, and
>> checking/setting IOMMU and IRQ permission but never mapping them to any domain.
>> Right now, mapping/Un-mapping will happen only when a new domU is
>> created/destroyed using "xl create".
>>
>> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
>> ---
>> xen/common/dt-overlay.c | 510 ++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 510 insertions(+)
>>
>> diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c
>> index b89cceab84..09ea46111b 100644
>> --- a/xen/common/dt-overlay.c
>> +++ b/xen/common/dt-overlay.c
>> @@ -33,6 +33,25 @@ static struct dt_device_node *
>> return child_node;
>> }
>>
>> +/*
>> + * Returns next node to the input node. If node has children then return
>> + * last descendant's next node.
>> +*/
>> +static struct dt_device_node *
>> +dt_find_next_node(struct dt_device_node *dt, const struct dt_device_node *node)
>> +{
>> + struct dt_device_node *np;
>> +
>> + dt_for_each_device_node(dt, np)
>> + if ( np == node )
>> + break;
>> +
>> + if ( np->child )
>> + np = find_last_descendants_node(np);
>> +
>> + return np->allnext;
>> +}
>> +
>> static int dt_overlay_remove_node(struct dt_device_node *device_node)
>> {
>> struct dt_device_node *np;
>> @@ -106,6 +125,76 @@ static int dt_overlay_remove_node(struct dt_device_node *device_node)
>> return 0;
>> }
>>
>> +static int dt_overlay_add_node(struct dt_device_node *device_node,
>> + const char *parent_node_path)
>> +{
>> + struct dt_device_node *parent_node;
>> + struct dt_device_node *next_node;
>> +
>> + parent_node = dt_find_node_by_path(parent_node_path);
>> +
>> + if ( parent_node == NULL )
>> + {
>> + dt_dprintk("Parent node %s not found. Overlay node will not be added\n",
>> + parent_node_path);
>> + return -EINVAL;
>> + }
>> +
>> + /* If parent has no child. */
>> + if ( parent_node->child == NULL )
>> + {
>> + next_node = parent_node->allnext;
>> + device_node->parent = parent_node;
>> + parent_node->allnext = device_node;
>> + parent_node->child = device_node;
>> + }
>> + else
>> + {
>> + struct dt_device_node *np;
>> + /* If parent has at least one child node.
> incorrect comment style, should be:
> /*
> *
> */
Changed this in v7.
>
>> + * Iterate to the last child node of parent.
>> + */
>> + for ( np = parent_node->child; np->sibling != NULL; np = np->sibling );
>> +
>> + /* Iterate over all child nodes of np node. */
>> + if ( np->child )
>> + {
>> + struct dt_device_node *np_last_descendant;
>> +
>> + np_last_descendant = find_last_descendants_node(np);
>> +
>> + next_node = np_last_descendant->allnext;
>> + np_last_descendant->allnext = device_node;
>> + }
>> + else
>> + {
>> + next_node = np->allnext;
>> + np->allnext = device_node;
>> + }
>> +
>> + device_node->parent = parent_node;
>> + np->sibling = device_node;
>> + np->sibling->sibling = NULL;
>> + }
>> +
>> + /* Iterate over all child nodes of device_node to add children too. */
>> + if ( device_node->child )
>> + {
>> + struct dt_device_node *device_node_last_descendant;
>> +
>> + device_node_last_descendant = find_last_descendants_node(device_node);
> empty line
>
>> + /* Plug next_node at the end of last children of device_node. */
>> + device_node_last_descendant->allnext = next_node;
>> + }
>> + else
>> + {
>> + /* Now plug next_node at the end of device_node. */
>> + device_node->allnext = next_node;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> /* Basic sanity check for the dtbo tool stack provided to Xen. */
>> static int check_overlay_fdt(const void *overlay_fdt, uint32_t overlay_fdt_size)
>> {
>> @@ -145,6 +234,82 @@ static unsigned int overlay_node_count(const void *overlay_fdt)
>> return num_overlay_nodes;
>> }
>>
>> +/*
>> + * overlay_get_nodes_info gets full name with path for all the nodes which
>> + * are in one level of __overlay__ tag. This is useful when checking node for
>> + * duplication i.e. dtbo tries to add nodes which already exists in device tree.
>> + */
>> +static int overlay_get_nodes_info(const void *fdto, char ***nodes_full_path,
>> + unsigned int num_overlay_nodes)
>> +{
>> + int fragment;
>> +
>> + *nodes_full_path = xzalloc_bytes(num_overlay_nodes * sizeof(char *));
> You are not freeing memory in this function in case of an error and rely on a caller
> to free the memory allocated by this function. Wouldn't it be better to allocate this
> from handle_add_overlay_nodes()?
Changed this in v7.
>
>> +
>> + if ( *nodes_full_path == NULL )
>> + return -ENOMEM;
>> +
>> + fdt_for_each_subnode(fragment, fdto, 0)
>> + {
>> + int target;
>> + int overlay;
>> + int subnode;
>> + const char *target_path;
>> +
>> + target = fdt_overlay_target_offset(device_tree_flattened, fdto,
>> + fragment, &target_path);
>> + if ( target < 0 )
>> + return target;
>> +
>> + if ( target_path == NULL )
>> + return -EINVAL;
>> +
>> + overlay = fdt_subnode_offset(fdto, fragment, "__overlay__");
>> +
>> + /*
>> + * overlay value can be < 0. But fdt_for_each_subnode() loop checks for
>> + * overlay >= 0. So, no need for a overlay>=0 check here.
>> + */
>> + fdt_for_each_subnode(subnode, fdto, overlay)
>> + {
>> + const char *node_name = NULL;
>> + int node_name_len;
>> + unsigned int target_path_len = strlen(target_path);
>> + unsigned int node_full_name_len;
>> + unsigned int node_num = 0;
> How this is supposed to work given that on each iteration you are setting this to 0
> and at the end of the iteration you increment it? It will then always be 0.
Yeah, this will work only for one node. I moved it here because of a
comment in v4 but it's wrong. Corrected it now.
Thanks for catching this!
>> +
>> + node_name = fdt_get_name(fdto, subnode, &node_name_len);
>> +
>> + if ( node_name == NULL )
>> + return node_name_len;
>> +
>> + /*
>> + * Magic number 2 is for adding '/' and '\0'. This is done to keep
>> + * the node_full_path in the correct full node name format.
>> + */
>> + node_full_name_len = target_path_len + node_name_len + 2;
>> +
>> + (*nodes_full_path)[node_num] = xmalloc_bytes(node_full_name_len);
>> +
>> + if ( (*nodes_full_path)[node_num] == NULL )
>> + return -ENOMEM;
>> +
>> + memcpy((*nodes_full_path)[node_num], target_path, target_path_len);
>> +
>> + (*nodes_full_path)[node_num][target_path_len] = '/';
>> +
>> + memcpy((*nodes_full_path)[node_num] + target_path_len + 1,
>> + node_name, node_name_len);
>> +
>> + (*nodes_full_path)[node_num][node_full_name_len - 1] = '\0';
>> +
>> + node_num++;
>> + }
>> + }
>> +
>> + return 0;
>> +}
>> +
>> static int handle_remove_irq_iommu(struct dt_device_node *device_node)
>> {
>> int rc = 0;
>> @@ -371,6 +536,344 @@ out:
>> return rc;
>> }
>>
>> +/*
>> + * Handles IRQ and IOMMU mapping for the overlay_node and all descendants of the
>> + * overlay_node.
>> + */
>> +static int handle_add_irq_iommu(struct domain *d,
> If you only allow adding nodes to hwdom, what's the point of this parameter?
> This is not consitent with function that does removing.
Remove domain *d part for this series. This was something added for
assigning the node to a running domain but while splitting the series
into two part(check 00/19 patch) i didn't remove it. Removed it in all
the places.
>
>> + struct dt_device_node *overlay_node)
>> +{
>> + int rc;
>> + unsigned int naddr, i, len;
>> + struct dt_device_node *np;
>> +
>> + /* First let's handle the interrupts. */
>> + rc = handle_device_interrupts(d, overlay_node, false);
> Similarily to your comment about skip_mapping, it would be welcome to explain why false here.
Done!
>
>> + if ( rc < 0 )
>> + {
>> + printk(XENLOG_ERR "Failed to retrieve interrupts configuration\n");
>> + return rc;
>> + }
>> +
>> + /* Check if iommu property exists. */
>> + if ( dt_get_property(overlay_node, "iommus", &len) )
>> + {
>> + /* Add device to IOMMUs. */
>> + rc = iommu_add_dt_device(overlay_node);
>> + if ( rc < 0 )
>> + {
>> + printk(XENLOG_ERR "Failed to add %s to the IOMMU\n",
>> + dt_node_full_name(overlay_node));
>> + return rc;
>> + }
>> + }
>> +
>> + /* Set permissions. */
>> + naddr = dt_number_of_address(overlay_node);
>> +
>> + dt_dprintk("%s naddr = %u\n", dt_node_full_name(overlay_node), naddr);
>> +
>> + /* Give permission to map MMIOs */
>> + for ( i = 0; i < naddr; i++ )
>> + {
>> + uint64_t addr, size;
> Make sure to check Ayan's 32-bit paddr series status as it impacts parts of your code.
So, In staging, I cannot see any change for dt_device_get_address()
which we using in these patches. That function still uses uint64_t addr
instead of paddr_t. Did i misread your comment?
>
>> +
>> + /*
>> + * For now, we skip_mapping which means it will only permit iomem access
>> + * to hardware_domain using iomem_permit_access() but will never map as
>> + * map_range_p2mt() will not be called.
>> + */
>> + struct map_range_data mr_data = { .d = d,
>> + .p2mt = p2m_mmio_direct_c,
>> + .skip_mapping = true
>> + };
>> +
>> + rc = dt_device_get_address(overlay_node, i, &addr, &size);
>> + if ( rc )
>> + {
>> + printk(XENLOG_ERR "Unable to retrieve address %u for %s\n",
>> + i, dt_node_full_name(overlay_node));
>> + return rc;
>> + }
>> +
>> + rc = map_range_to_domain(overlay_node, addr, size, &mr_data);
>> + if ( rc )
>> + return rc;
>> + }
>> +
>> + /* Map IRQ and IOMMU for overlay_node's children. */
>> + for ( np = overlay_node->child; np != NULL; np = np->sibling )
>> + {
>> + rc = handle_add_irq_iommu(d, np);
>> + if ( rc )
>> + {
>> + printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n");
>> + return rc;
>> + }
>> + }
>> +
>> + return rc;
>> +}
>> +
>> +/*
>> + * Adds device tree nodes under target node.
>> + * We use tr->dt_host_new to unflatten the updated device_tree_flattened. This
>> + * is done to avoid the removal of device_tree generation, iomem regions mapping
>> + * to hardware domain done by handle_node().
>> + */
>> +static long handle_add_overlay_nodes(void *overlay_fdt,
>> + uint32_t overlay_fdt_size)
>> +{
>> + int rc, j, i;
>> + struct dt_device_node *overlay_node;
>> + struct overlay_track *tr = NULL;
>> + char **nodes_full_path = NULL;
>> + unsigned int new_fdt_size;
>> +
>> + tr = xzalloc(struct overlay_track);
>> + if ( tr == NULL )
>> + return -ENOMEM;
>> +
>> + new_fdt_size = fdt_totalsize(device_tree_flattened) +
>> + fdt_totalsize(overlay_fdt);
>> +
>> + tr->fdt = xzalloc_bytes(new_fdt_size);
>> + if ( tr->fdt == NULL )
>> + {
>> + xfree(tr);
>> + return -ENOMEM;
>> + }
>> +
>> + tr->num_nodes = overlay_node_count(overlay_fdt);
>> + if ( tr->num_nodes == 0 )
>> + {
>> + xfree(tr->fdt);
>> + xfree(tr);
>> + return -ENOMEM;
>> + }
>> +
>> + tr->nodes_address = xzalloc_bytes(tr->num_nodes * sizeof(unsigned long));
>> + if ( tr->nodes_address == NULL )
>> + {
>> + xfree(tr->fdt);
>> + xfree(tr);
>> + return -ENOMEM;
>> + }
>> +
>> + rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size);
>> + if ( rc )
>> + {
>> + xfree(tr->nodes_address);
>> + xfree(tr->fdt);
>> + xfree(tr);
>> + return rc;
>> + }
>> +
>> + /*
>> + * Keep a copy of overlay_fdt as fdt_overlay_apply will change the input
>> + * overlay's content(magic) when applying overlay.
>> + */
>> + tr->overlay_fdt = xzalloc_bytes(overlay_fdt_size);
>> + if ( tr->overlay_fdt == NULL )
>> + {
>> + xfree(tr->nodes_address);
>> + xfree(tr->fdt);
>> + xfree(tr);
>> + return -ENOMEM;
>> + }
>> +
>> + memcpy(tr->overlay_fdt, overlay_fdt, overlay_fdt_size);
>> +
>> + spin_lock(&overlay_lock);
>> +
>> + memcpy(tr->fdt, device_tree_flattened,
>> + fdt_totalsize(device_tree_flattened));
>> +
>> + /* Open tr->fdt with more space to accommodate the overlay_fdt. */
>> + rc = fdt_open_into(tr->fdt, tr->fdt, new_fdt_size);
>> + if ( rc )
>> + {
>> + printk(XENLOG_ERR "Increasing tr->fdt size failed with error %d\n",
> User does not know what tr->fdt is and it's better to be more user friendly.
Done
>
>> + rc);
>> + goto err;
>> + }
>> +
>> + /*
>> + * overlay_get_nodes_info is called to get the node information from dtbo.
>> + * This is done before fdt_overlay_apply() because the overlay apply will
>> + * erase the magic of overlay_fdt.
>> + */
>> + rc = overlay_get_nodes_info(overlay_fdt, &nodes_full_path,
>> + tr->num_nodes);
>> + if ( rc )
>> + {
>> + printk(XENLOG_ERR "Getting nodes information failed with error %d\n",
>> + rc);
>> + goto err;
>> + }
>> +
>> + rc = fdt_overlay_apply(tr->fdt, overlay_fdt);
>> + if ( rc )
>> + {
>> + printk(XENLOG_ERR "Adding overlay node failed with error %d\n", rc);
>> + goto err;
>> + }
>> +
>> + /*
>> + * Check if any of the node already exists in dt_host. If node already exits
>> + * we can return here as this overlay_fdt is not suitable for overlay ops.
>> + */
>> + for ( j = 0; j < tr->num_nodes; j++ )
>> + {
>> + overlay_node = dt_find_node_by_path(nodes_full_path[j]);
>> + if ( overlay_node != NULL )
>> + {
>> + printk(XENLOG_ERR "node %s exists in device tree\n",
>> + nodes_full_path[j]);
>> + rc = -EINVAL;
>> + goto err;
>> + }
>> + }
>> +
>> + /* Unflatten the tr->fdt into a new dt_host. */
>> + rc = unflatten_device_tree(tr->fdt, &tr->dt_host_new);
>> + if ( rc )
>> + {
>> + printk(XENLOG_ERR "unflatten_device_tree failed with error %d\n", rc);
>> + goto err;
>> + }
>> +
>> + for ( j = 0; j < tr->num_nodes; j++ )
>> + {
>> + struct dt_device_node *prev_node, *next_node;
>> +
>> + dt_dprintk("Adding node: %s\n", nodes_full_path[j]);
>> +
>> + /* Find the newly added node in tr->dt_host_new by it's full path. */
>> + overlay_node = device_tree_find_node_by_path(tr->dt_host_new,
>> + nodes_full_path[j]);
>> + if ( overlay_node == NULL )
>> + {
>> + /* Sanity check. But code will never come here. */
>> + ASSERT_UNREACHABLE();
>> + goto remove_node;
>> + }
>> +
>> + /*
>> + * Find previous and next node to overlay_node in dt_host_new. We will
>> + * need these nodes to fix the dt_host_new mapping. When overlay_node is
>> + * take out of dt_host_new tree and added to dt_host, link between
>> + * previous node and next_node is broken. We will need to refresh
>> + * dt_host_new with correct linking for any other overlay nodes
>> + * extraction in future.
>> + */
>> + dt_for_each_device_node(tr->dt_host_new, prev_node)
>> + if ( prev_node->allnext == overlay_node )
>> + break;
>> +
>> + next_node = dt_find_next_node(tr->dt_host_new, overlay_node);
>> +
>> + read_lock(&dt_host->lock);
>> +
>> + /* Add the node to dt_host. */
>> + rc = dt_overlay_add_node(overlay_node, overlay_node->parent->full_name);
>> + if ( rc )
>> + {
>> + read_unlock(&dt_host->lock);
>> +
>> + /* Node not added in dt_host. */
>> + goto remove_node;
>> + }
>> +
>> + read_unlock(&dt_host->lock);
>> +
>> + prev_node->allnext = next_node;
>> +
>> + overlay_node = dt_find_node_by_path(overlay_node->full_name);
>> + if ( overlay_node == NULL )
>> + {
>> + /* Sanity check. But code will never come here. */
>> + ASSERT_UNREACHABLE();
>> + goto remove_node;
>> + }
>> +
>> + rc = handle_add_irq_iommu(hardware_domain, overlay_node);
>> + if ( rc )
>> + {
>> + printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n");
>> + return rc;
> This is definitely wrong as you will return with spinlock held and memory not freed.
Fixed it. And also split this function into two parts for better read
>
>> + }
>> +
>> + /* Keep overlay_node address in tracker. */
>> + tr->nodes_address[j] = (unsigned long)overlay_node;
>> + }
>> +
>> + INIT_LIST_HEAD(&tr->entry);
>> + list_add_tail(&tr->entry, &overlay_tracker);
>> +
>> + spin_unlock(&overlay_lock);
>> +
>> + if ( nodes_full_path != NULL )
>> + {
>> + for ( i = 0; i < tr->num_nodes && nodes_full_path[i] != NULL;
>> + i++ )
>> + {
>> + xfree(nodes_full_path[i]);
>> + }
>> + xfree(nodes_full_path);
>> + }
> This block of code is identical to the one at the end so some cleanup is necessary.
Created a common function for this as this will happen in three places.
I missed freeing memory in remove_node failure cases.
>
>> +
>> + return rc;
>> +
>> +/*
>> + * Failure case. We need to remove the nodes, free tracker(if tr exists) and
>> + * tr->dt_host_new.
>> + */
>> +remove_node:
>> + tr->num_nodes = j;
>> + rc = remove_nodes(tr);
>> +
>> + if ( rc )
>> + {
>> + /*
>> + * User needs to provide right overlay. Incorrect node information
>> + * example parent node doesn't exist in dt_host etc can cause memory
>> + * leaks as removing_nodes() will fail and this means nodes memory is
>> + * not freed from tracker. Which may cause memory leaks. Ideally, these
>> + * device tree related mistakes will be caught by fdt_overlay_apply()
>> + * but given that we don't manage that code keeping this warning message
>> + * is better here.
>> + */
>> + printk(XENLOG_ERR "Removing node failed.\n");
>> + spin_unlock(&overlay_lock);
>> + return rc;
>> + }
>> +
>> +err:
>> + spin_unlock(&overlay_lock);
>> +
>> + if ( tr->dt_host_new )
>> + xfree(tr->dt_host_new);
>> +
>> + xfree(tr->overlay_fdt);
>> + xfree(tr->nodes_address);
>> + xfree(tr->fdt);
>> +
>> + if ( nodes_full_path != NULL )
>> + {
>> + for ( i = 0; i < tr->num_nodes && nodes_full_path[i] != NULL;
>> + i++ )
>> + {
>> + xfree(nodes_full_path[i]);
>> + }
>> + xfree(nodes_full_path);
>> + }
>> +
>> + xfree(tr);
>> +
>> + return rc;
>> +}
>> +
>> long dt_sysctl(struct xen_sysctl_dt_overlay *op)
>> {
>> long ret;
>> @@ -395,6 +898,13 @@ long dt_sysctl(struct xen_sysctl_dt_overlay *op)
>>
>> switch ( op->overlay_op )
>> {
>> + case XEN_SYSCTL_DT_OVERLAY_ADD:
>> + ret = handle_add_overlay_nodes(overlay_fdt, op->overlay_fdt_size);
>> + if ( ret )
>> + xfree(overlay_fdt);
> See my comment about xfree in previous patch
I am sending v7 with fix for 15/19 patches also. Please review that.
>
>> +
>> + break;
>> +
>> case XEN_SYSCTL_DT_OVERLAY_REMOVE:
>> ret = handle_remove_overlay_nodes(overlay_fdt, op->overlay_fdt_size);
>> xfree(overlay_fdt);
> ~Michal
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 17/19] tools/libs/ctrl: Implement new xc interfaces for dt overlay
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (15 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 16/19] xen/arm: Implement device tree node addition functionalities Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-18 16:01 ` Anthony PERARD
2023-05-02 23:36 ` [XEN][PATCH v6 18/19] tools/libs/light: Implement new libxl functions for device tree overlay ops Vikram Garhwal
2023-05-02 23:36 ` [XEN][PATCH v6 19/19] tools/xl: Add new xl command overlay for device tree overlay support Vikram Garhwal
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Wei Liu,
Anthony PERARD, Juergen Gross
xc_dt_overlay() sends the device tree binary overlay, size of .dtbo and overlay
operation type i.e. add or remove to xen.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
tools/include/xenctrl.h | 5 ++++
tools/libs/ctrl/Makefile.common | 1 +
tools/libs/ctrl/xc_dt_overlay.c | 48 +++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+)
create mode 100644 tools/libs/ctrl/xc_dt_overlay.c
diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h
index 752fc87580..1a99c06561 100644
--- a/tools/include/xenctrl.h
+++ b/tools/include/xenctrl.h
@@ -2666,6 +2666,11 @@ int xc_livepatch_replace(xc_interface *xch, char *name, uint32_t timeout, uint32
int xc_domain_cacheflush(xc_interface *xch, uint32_t domid,
xen_pfn_t start_pfn, xen_pfn_t nr_pfns);
+#if defined(__arm__) || defined(__aarch64__)
+int xc_dt_overlay(xc_interface *xch, void *overlay_fdt,
+ uint32_t overlay_fdt_size, uint8_t overlay_op);
+#endif
+
/* Compat shims */
#include "xenctrl_compat.h"
diff --git a/tools/libs/ctrl/Makefile.common b/tools/libs/ctrl/Makefile.common
index 0a09c28fd3..247afbe5f9 100644
--- a/tools/libs/ctrl/Makefile.common
+++ b/tools/libs/ctrl/Makefile.common
@@ -24,6 +24,7 @@ OBJS-y += xc_hcall_buf.o
OBJS-y += xc_foreign_memory.o
OBJS-y += xc_kexec.o
OBJS-y += xc_resource.o
+OBJS-$(CONFIG_ARM) += xc_dt_overlay.o
OBJS-$(CONFIG_X86) += xc_psr.o
OBJS-$(CONFIG_X86) += xc_pagetab.o
OBJS-$(CONFIG_Linux) += xc_linux.o
diff --git a/tools/libs/ctrl/xc_dt_overlay.c b/tools/libs/ctrl/xc_dt_overlay.c
new file mode 100644
index 0000000000..202fc906f4
--- /dev/null
+++ b/tools/libs/ctrl/xc_dt_overlay.c
@@ -0,0 +1,48 @@
+/*
+ *
+ * Device Tree Overlay functions.
+ * Copyright (C) 2021 Xilinx Inc.
+ * Author Vikram Garhwal <fnu.vikram@xilinx.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "xc_private.h"
+
+int xc_dt_overlay(xc_interface *xch, void *overlay_fdt,
+ uint32_t overlay_fdt_size, uint8_t overlay_op)
+{
+ int err;
+ DECLARE_SYSCTL;
+
+ DECLARE_HYPERCALL_BOUNCE(overlay_fdt, overlay_fdt_size,
+ XC_HYPERCALL_BUFFER_BOUNCE_IN);
+
+ if ( (err = xc_hypercall_bounce_pre(xch, overlay_fdt)) )
+ goto err;
+
+ sysctl.cmd = XEN_SYSCTL_dt_overlay;
+ sysctl.u.dt_overlay.overlay_op = overlay_op;
+ sysctl.u.dt_overlay.overlay_fdt_size = overlay_fdt_size;
+
+ set_xen_guest_handle(sysctl.u.dt_overlay.overlay_fdt, overlay_fdt);
+
+ if ( (err = do_sysctl(xch, &sysctl)) != 0 )
+ PERROR("%s failed", __func__);
+
+err:
+ xc_hypercall_bounce_post(xch, overlay_fdt);
+
+ return err;
+}
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [XEN][PATCH v6 17/19] tools/libs/ctrl: Implement new xc interfaces for dt overlay
2023-05-02 23:36 ` [XEN][PATCH v6 17/19] tools/libs/ctrl: Implement new xc interfaces for dt overlay Vikram Garhwal
@ 2023-05-18 16:01 ` Anthony PERARD
2023-06-02 0:49 ` Vikram Garhwal
0 siblings, 1 reply; 46+ messages in thread
From: Anthony PERARD @ 2023-05-18 16:01 UTC (permalink / raw)
To: Vikram Garhwal
Cc: xen-devel, sstabellini, michal.orzel, Wei Liu, Juergen Gross
On Tue, May 02, 2023 at 04:36:48PM -0700, Vikram Garhwal wrote:
> xc_dt_overlay() sends the device tree binary overlay, size of .dtbo and overlay
> operation type i.e. add or remove to xen.
>
> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Thanks,
--
Anthony PERARD
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [XEN][PATCH v6 17/19] tools/libs/ctrl: Implement new xc interfaces for dt overlay
2023-05-18 16:01 ` Anthony PERARD
@ 2023-06-02 0:49 ` Vikram Garhwal
0 siblings, 0 replies; 46+ messages in thread
From: Vikram Garhwal @ 2023-06-02 0:49 UTC (permalink / raw)
To: Anthony PERARD
Cc: xen-devel, sstabellini, michal.orzel, Wei Liu, Juergen Gross
Hi Anthony,
On 5/18/23 9:01 AM, Anthony PERARD wrote:
> On Tue, May 02, 2023 at 04:36:48PM -0700, Vikram Garhwal wrote:
>> xc_dt_overlay() sends the device tree binary overlay, size of .dtbo and overlay
>> operation type i.e. add or remove to xen.
>>
>> Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
> Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Thanks for reviewing this one. Can you please re-review this patch for
v7 version? I added small padding change as per Jan'
s comment on 15/19 patch and that changed this patch too.
>
> Thanks,
>
^ permalink raw reply [flat|nested] 46+ messages in thread
* [XEN][PATCH v6 18/19] tools/libs/light: Implement new libxl functions for device tree overlay ops
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (16 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 17/19] tools/libs/ctrl: Implement new xc interfaces for dt overlay Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-18 16:01 ` Anthony PERARD
2023-05-02 23:36 ` [XEN][PATCH v6 19/19] tools/xl: Add new xl command overlay for device tree overlay support Vikram Garhwal
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Wei Liu,
Anthony PERARD, Juergen Gross
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
tools/include/libxl.h | 11 +++++
tools/libs/light/Makefile | 3 ++
tools/libs/light/libxl_dt_overlay.c | 71 +++++++++++++++++++++++++++++
3 files changed, 85 insertions(+)
create mode 100644 tools/libs/light/libxl_dt_overlay.c
diff --git a/tools/include/libxl.h b/tools/include/libxl.h
index cfa1a19131..1c5e8abaae 100644
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
@@ -250,6 +250,12 @@
*/
#define LIBXL_HAVE_DEVICETREE_PASSTHROUGH 1
+#if defined(__arm__) || defined(__aarch64__)
+/**
+ * This means Device Tree Overlay is supported.
+ */
+#define LIBXL_HAVE_DT_OVERLAY 1
+#endif
/*
* libxl_domain_build_info has device_model_user to specify the user to
* run the device model with. See docs/misc/qemu-deprivilege.txt.
@@ -2453,6 +2459,11 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid,
int *num);
void libxl_device_pci_list_free(libxl_device_pci* list, int num);
+#if defined(__arm__) || defined(__aarch64__)
+int libxl_dt_overlay(libxl_ctx *ctx, void *overlay,
+ uint32_t overlay_size, uint8_t overlay_op);
+#endif
+
/*
* Turns the current process into a backend device service daemon
* for a driver domain.
diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile
index 96daeabc47..563a1e8d0a 100644
--- a/tools/libs/light/Makefile
+++ b/tools/libs/light/Makefile
@@ -112,6 +112,9 @@ OBJS-y += _libxl_types.o
OBJS-y += libxl_flask.o
OBJS-y += _libxl_types_internal.o
+# Device tree overlay is enabled only for ARM architecture.
+OBJS-$(CONFIG_ARM) += libxl_dt_overlay.o
+
ifeq ($(CONFIG_LIBNL),y)
CFLAGS_LIBXL += $(LIBNL3_CFLAGS)
endif
diff --git a/tools/libs/light/libxl_dt_overlay.c b/tools/libs/light/libxl_dt_overlay.c
new file mode 100644
index 0000000000..a6c709a6dc
--- /dev/null
+++ b/tools/libs/light/libxl_dt_overlay.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2021 Xilinx Inc.
+ * Author Vikram Garhwal <fnu.vikram@xilinx.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include "libxl_osdeps.h" /* must come before any other headers */
+#include "libxl_internal.h"
+#include <libfdt.h>
+#include <xenctrl.h>
+
+static int check_overlay_fdt(libxl__gc *gc, void *fdt, size_t size)
+{
+ int r;
+
+ if (fdt_magic(fdt) != FDT_MAGIC) {
+ LOG(ERROR, "Overlay FDT is not a valid Flat Device Tree");
+ return ERROR_FAIL;
+ }
+
+ r = fdt_check_header(fdt);
+ if (r) {
+ LOG(ERROR, "Failed to check the overlay FDT (%d)", r);
+ return ERROR_FAIL;
+ }
+
+ if (fdt_totalsize(fdt) > size) {
+ LOG(ERROR, "Overlay FDT totalsize is too big");
+ return ERROR_FAIL;
+ }
+
+ return 0;
+}
+
+int libxl_dt_overlay(libxl_ctx *ctx, void *overlay_dt, uint32_t overlay_dt_size,
+ uint8_t overlay_op)
+{
+ int rc;
+ int r;
+ GC_INIT(ctx);
+
+ if (check_overlay_fdt(gc, overlay_dt, overlay_dt_size)) {
+ LOG(ERROR, "Overlay DTB check failed");
+ rc = ERROR_FAIL;
+ goto out;
+ } else {
+ LOG(DEBUG, "Overlay DTB check passed");
+ rc = 0;
+ }
+
+ r = xc_dt_overlay(ctx->xch, overlay_dt, overlay_dt_size, overlay_op);
+
+ if (r) {
+ LOG(ERROR, "%s: Adding/Removing overlay dtb failed.", __func__);
+ rc = ERROR_FAIL;
+ }
+
+out:
+ GC_FREE;
+ return rc;
+}
+
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [XEN][PATCH v6 19/19] tools/xl: Add new xl command overlay for device tree overlay support
2023-05-02 23:36 [XEN][PATCH v6 00/19] dynamic node programming using overlay dtbo Vikram Garhwal
` (17 preceding siblings ...)
2023-05-02 23:36 ` [XEN][PATCH v6 18/19] tools/libs/light: Implement new libxl functions for device tree overlay ops Vikram Garhwal
@ 2023-05-02 23:36 ` Vikram Garhwal
2023-05-18 16:01 ` Anthony PERARD
18 siblings, 1 reply; 46+ messages in thread
From: Vikram Garhwal @ 2023-05-02 23:36 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, vikram.garhwal, michal.orzel, Wei Liu, Anthony PERARD
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
---
tools/xl/xl.h | 1 +
tools/xl/xl_cmdtable.c | 6 +++++
tools/xl/xl_vmcontrol.c | 52 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 59 insertions(+)
diff --git a/tools/xl/xl.h b/tools/xl/xl.h
index 72538d6a81..a923daccd3 100644
--- a/tools/xl/xl.h
+++ b/tools/xl/xl.h
@@ -138,6 +138,7 @@ int main_shutdown(int argc, char **argv);
int main_reboot(int argc, char **argv);
int main_list(int argc, char **argv);
int main_vm_list(int argc, char **argv);
+int main_dt_overlay(int argc, char **argv);
int main_create(int argc, char **argv);
int main_config_update(int argc, char **argv);
int main_button_press(int argc, char **argv);
diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c
index ccf4d83584..db0acff62a 100644
--- a/tools/xl/xl_cmdtable.c
+++ b/tools/xl/xl_cmdtable.c
@@ -630,6 +630,12 @@ const struct cmd_spec cmd_table[] = {
"Issue a qemu monitor command to the device model of a domain",
"<Domain> <Command>",
},
+ { "dt-overlay",
+ &main_dt_overlay, 0, 1,
+ "Add/Remove a device tree overlay",
+ "add/remove <.dtbo>"
+ "-h print this help\n"
+ },
};
const int cmdtable_len = ARRAY_SIZE(cmd_table);
diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c
index 5518c78dc6..de56e00d8b 100644
--- a/tools/xl/xl_vmcontrol.c
+++ b/tools/xl/xl_vmcontrol.c
@@ -1265,6 +1265,58 @@ int main_create(int argc, char **argv)
return 0;
}
+int main_dt_overlay(int argc, char **argv)
+{
+ const char *overlay_ops = NULL;
+ const char *overlay_config_file = NULL;
+ void *overlay_dtb = NULL;
+ int rc;
+ uint8_t op;
+ int overlay_dtb_size = 0;
+ const int overlay_add_op = 1;
+ const int overlay_remove_op = 2;
+
+ if (argc < 2) {
+ help("dt_overlay");
+ return EXIT_FAILURE;
+ }
+
+ overlay_ops = argv[1];
+ overlay_config_file = argv[2];
+
+ if (strcmp(overlay_ops, "add") == 0)
+ op = overlay_add_op;
+ else if (strcmp(overlay_ops, "remove") == 0)
+ op = overlay_remove_op;
+ else {
+ fprintf(stderr, "Invalid dt overlay operation\n");
+ return EXIT_FAILURE;
+ }
+
+ if (overlay_config_file) {
+ rc = libxl_read_file_contents(ctx, overlay_config_file,
+ &overlay_dtb, &overlay_dtb_size);
+
+ if (rc) {
+ fprintf(stderr, "failed to read the overlay device tree file %s\n",
+ overlay_config_file);
+ free(overlay_dtb);
+ return ERROR_FAIL;
+ }
+ } else {
+ fprintf(stderr, "overlay dtbo file not provided\n");
+ return ERROR_FAIL;
+ }
+
+ rc = libxl_dt_overlay(ctx, overlay_dtb, overlay_dtb_size, op);
+
+ free(overlay_dtb);
+
+ if (rc)
+ return EXIT_FAILURE;
+
+ return rc;
+}
/*
* Local variables:
* mode: C
--
2.17.1
^ permalink raw reply related [flat|nested] 46+ messages in thread