xen/arm: bootfdt: Always sort memory banks
PATCH 1/1 xen/arm: bootfdt: Always sort memory banks
From: Oleksandr Tyshchenko <[email protected]>
At the moment, Xen expects the memory banks to be ordered. Unfortunately, there may be a case when updated by firmware device tree contains unordered banks. This means Xen will panic when setting xenheap mappings for the subsequent bank with start address being less than xenheap_mfn_start (start address of the first bank).
As there is no clear requirment regarding ordering in the device tree, update code to be able to deal with by sorting memory banks if we have more than one.
---
The proposed commit fixes the booting Xen on R-Car M3-W+ SoC:
Starting kernel ...
- UART enabled -
- Boot CPU booting -
- Current EL 00000008 -
- Initialize CPU -
- Turning on paging -
- Zero BSS -
- Ready -
(XEN) Checking for initrd in /chosen
(XEN) Initrd 0000000084000040-0000000085dbc32a
(XEN) RAM: 0000000480000000 - 00000004ffffffff
(XEN) RAM: 0000000048000000 - 00000000bfffffff
(XEN) RAM: 0000000600000000 - 00000006ffffffff
...
(XEN) ****************************************
(XEN) Panic on CPU 0:
(XEN) cannot add xenheap mapping at 48000 below heap start 480000 (XEN) ****************************************
(XEN)
(XEN) Reboot in five seconds...
--- xen/arch/arm/bootfdt.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
xen/arch/arm/bootfdt.c +22 -0
@@ -13,6 +13,7 @@#include <xen/init.h> #include <xen/device_tree.h> #include <xen/libfdt/libfdt.h> +#include <xen/sort.h> #include <xsm/xsm.h> #include <asm/setup.h>
@@ -395,6 +396,21 @@ static void __init early_print_info(void)printk ("\n" ); } +/* This function assumes that memory regions are not overlapped */ +static int __init cmp_memory_node (const void *key,const void *elem) +{ +const struct membank *handler0 = key; +const struct membank *handler1 = elem; + +if ( handler0->start < handler1->start ) +return -1 ; + +if ( handler0->start >= (handler1->start + handler1->size) ) +return 1 ; + +return 0 ; +} +/** * boot_fdt_info - initialize bootinfo from a DTB * @fdt: flattened device tree binary
@@ -412,6 +428,12 @@ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr)add_boot_module (BOOTMOD_FDT , paddr,fdt_totalsize (fdt), false);device_tree_for_each_node ((void *)fdt,0 , early_scan_node,NULL ); +if ( bootinfo.mem.nr_banks >1 ) + { +/* Some DT may describe unordered banks, sort them in ascending order */ +sort (bootinfo.mem.bank, bootinfo.mem.nr_banks,sizeof (struct membank ), + cmp_memory_node,NULL ); + }early_print_info ();return fdt_totalsize (fdt);
Signature · 1 line
2.7.4
Quoted 9 lines · Oleksandr Tyshchenko
From: Oleksandr Tyshchenko <[email protected]>
At the moment, Xen expects the memory banks to be ordered. Unfortunately, there may be a case when updated by firmware device tree contains unordered banks. This means Xen will panic when setting xenheap mappings for the subsequent bank with start address being less than
xenheap_mfn_start(start address of the first bank).
Quoted 6 lines
As there is no clear requirment regarding ordering in the device tree, update code to be able to deal with by sorting memory banks if we have more than one.
Suggested-by Julien Grall <[email protected]>Signed-off-by Oleksandr Tyshchenko <[email protected]>
Quoted 80 lines
---
The proposed commit fixes the booting Xen on R-Car M3-W+ SoC:
Starting kernel ...
- UART enabled -
- Boot CPU booting -
- Current EL 00000008 -
- Initialize CPU -
- Turning on paging -
- Zero BSS -
- Ready -
(XEN) Checking for initrd in /chosen
(XEN) Initrd 0000000084000040-0000000085dbc32a
(XEN) RAM: 0000000480000000 -00000004ffffffff
(XEN) RAM: 0000000048000000 -00000000bfffffff
(XEN) RAM: 0000000600000000 -00000006ffffffff...
(XEN) ****************************************
(XEN) Panic on CPU 0:
(XEN) cannot add xenheap mapping at 48000 below heap start 480000 (XEN) ****************************************
(XEN)
(XEN) Reboot in five seconds...--- xen/arch/arm/bootfdt.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)xen/arch/arm/bootfdt.c +22
-0@@ -13,6 +13,7 @@#include <xen/init.h> #include <xen/device_tree.h> #include <xen/libfdt/libfdt.h> +#include <xen/sort.h> #include <xsm/xsm.h> #include <asm/setup.h> @@ -395,6 +396,21 @@ static void __init early_print_info(void)printk ("\n" ); } +/* This function assumes that memory regions are not overlapped */ +static int __init cmp_memory_node (const void *key,const void *elem) +{ +const struct membank *handler0 = key; +const struct membank *handler1 = elem; + +if ( handler0->start < handler1->start ) +return -1 ; + +if ( handler0->start >= (handler1->start + handler1->size) ) +return 1 ; + +return 0 ; +} +/** * boot_fdt_info - initialize bootinfo from a DTB * @fdt: flattened device tree binary @@ -412,6 +428,12 @@ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr)add_boot_module (BOOTMOD_FDT , paddr,fdt_totalsize (fdt), false);device_tree_for_each_node ((void *)fdt,0 , early_scan_node,NULL ); +if ( bootinfo.mem.nr_banks >1 ) + { +/* Some DT may describe unordered banks, sort them in ascending order */ +sort (bootinfo.mem.bank, bootinfo.mem.nr_banks,sizeof (struct membank ), + cmp_memory_node,NULL ); + }early_print_info ();return fdt_totalsize (fdt);Signature · 1 line
2.7.4
Hi Oleksandr,
Quoted 8 lines · Oleksandr Tyshchenko
From: Oleksandr Tyshchenko <[email protected]>
At the moment, Xen expects the memory banks to be ordered. Unfortunately, there may be a case when updated by firmware device tree contains unordered banks. This means Xen will panic when setting xenheap mappings for the subsequent bank with start address being less than
xenheap_mfn_start(start address of the first bank).
Please clarify in the commit message that the behavior you are describing is for arm64. For arm32, there is only one heap region.
That said, I think the sorting is fine to be done in common code.
Quoted 2 lines
As there is no clear requirment regarding ordering in the device
s/requirment/requirement/
Quoted 70 lines
tree, update code to be able to deal with by sorting memory banks if we have more than one.
Suggested-by Julien Grall <[email protected]>Signed-off-by Oleksandr Tyshchenko <[email protected]>---
The proposed commit fixes the booting Xen on R-Car M3-W+ SoC:
Starting kernel ...
- UART enabled -
- Boot CPU booting -
- Current EL 00000008 -
- Initialize CPU -
- Turning on paging -
- Zero BSS -
- Ready -
(XEN) Checking for initrd in /chosen
(XEN) Initrd 0000000084000040-0000000085dbc32a
(XEN) RAM: 0000000480000000 -00000004ffffffff
(XEN) RAM: 0000000048000000 -00000000bfffffff
(XEN) RAM: 0000000600000000 -00000006ffffffff...
(XEN) ****************************************
(XEN) Panic on CPU 0:
(XEN) cannot add xenheap mapping at 48000 below heap start 480000 (XEN) ****************************************
(XEN)
(XEN) Reboot in five seconds...--- xen/arch/arm/bootfdt.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)xen/arch/arm/bootfdt.c +16
-0@@ -13,6 +13,7 @@#include <xen/init.h> #include <xen/device_tree.h> #include <xen/libfdt/libfdt.h> +#include <xen/sort.h> #include <xsm/xsm.h> #include <asm/setup.h> @@ -395,6 +396,21 @@ static void __init early_print_info(void)printk ("\n" ); } +/* This function assumes that memory regions are not overlapped */ +static int __init cmp_memory_node (const void *key,const void *elem) +{ +const struct membank *handler0 = key; +const struct membank *handler1 = elem; + +if ( handler0->start < handler1->start ) +return -1 ; + +if ( handler0->start >= (handler1->start + handler1->size) ) +return 1 ; + +return 0 ; +} +/** * boot_fdt_info - initialize bootinfo from a DTB * @fdt: flattened device tree binary
xen/arch/arm/bootfdt.c size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) · line 431
Quoted 4 lines
xen/arch/arm/bootfdt.c +1
-0@@ -412,6 +428,12 @@ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr)add_boot_module (BOOTMOD_FDT , paddr,fdt_totalsize (fdt), false);device_tree_for_each_node ((void *)fdt,0 , early_scan_node,NULL ); +if ( bootinfo.mem.nr_banks >1 )
NIT: sort() is already be able to deal with one element array. So this checks looks a bit pointless.
xen/arch/arm/bootfdt.c size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) · line 433
Quoted 2 lines
xen/arch/arm/bootfdt.c +2
-0+ { +/* Some DT may describe unordered banks, sort them in ascending order */
It would be good to explain in the comment *why* this is necessary. Some along the line:
On Arm64, setup_xenheap_pages() expects to be called with the lowest bank in memory first. There is no requirement that the DT will provide the banks sorted in ascending order. So sort them through.
xen/arch/arm/bootfdt.c size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) · line 439
Quoted 7 lines
xen/arch/arm/bootfdt.c +3
-0+sort (bootinfo.mem.bank, bootinfo.mem.nr_banks,sizeof (struct membank ), + cmp_memory_node,NULL ); + }early_print_info ();return fdt_totalsize (fdt);
Cheers,
Signature · 1 line
Julien Grall
Quoted 1 line · Julien Grall
Hi Oleksandr,
Hi Julien
Sorry for the late response.
Quoted 11 lines · Oleksandr Tyshchenko
Quoted 8 lines
From: Oleksandr Tyshchenko <[email protected]>
At the moment, Xen expects the memory banks to be ordered. Unfortunately, there may be a case when updated by firmware device tree contains unordered banks. This means Xen will panic when setting xenheap mappings for the subsequent bank with start address being less than
xenheap_mfn_start(start address of the first bank).
Quoted 3 lines
Please clarify in the commit message that the behavior you are describing is for arm64. For arm32, there is only one heap region.
That said, I think the sorting is fine to be done in common code.
ok
Quoted 6 lines
Quoted 4 lines
As there is no clear requirment regarding ordering in the device
s/requirment/requirement/
ok
Quoted 67 lines
Quoted 67 lines
tree, update code to be able to deal with by sorting memory banks if we have more than one.
Suggested-by Julien Grall <[email protected]>Signed-off-by Oleksandr Tyshchenko <[email protected]>---
The proposed commit fixes the booting Xen on R-Car M3-W+ SoC:
Starting kernel ...
- UART enabled -
- Boot CPU booting -
- Current EL 00000008 -
- Initialize CPU -
- Turning on paging -
- Zero BSS -
- Ready -
(XEN) Checking for initrd in /chosen
(XEN) Initrd 0000000084000040-0000000085dbc32a
(XEN) RAM: 0000000480000000 -00000004ffffffff
(XEN) RAM: 0000000048000000 -00000000bfffffff
(XEN) RAM: 0000000600000000 -00000006ffffffff...
(XEN) ****************************************
(XEN) Panic on CPU 0:
(XEN) cannot add xenheap mapping at 48000 below heap start 480000 (XEN) ****************************************
(XEN)
(XEN) Reboot in five seconds...
---
xen/arch/arm/bootfdt.c| 22 ++++++++++++++++++++++1 file changed, 22 insertions(+)xen/arch/arm/bootfdt.c +1
-0@@ -13,6 +13,7 @@ #include <xen/init.h> #include <xen/device_tree.h> #include <xen/libfdt/libfdt.h> +#include <xen/sort.h> #include <xsm/xsm.h> #include <asm/setup.h> @@ -395,6 +396,21 @@ static void __init early_print_info(void)
printk("\n");
}
+/* This function assumes that memory regions are not overlapped */xen/arch/arm/bootfdt.c +14
-0+static int __init cmp_memory_node (const void *key,const void *elem) +{ + const struct membank *handler0 = key; + const struct membank *handler1 = elem; + + if ( handler0->start < handler1->start ) + return -1; + + if ( handler0->start >= (handler1->start + handler1->size) ) + return 1; + + return 0; +} +/**
*boot_fdt_info- initialize bootinfo from a DTB
Quoted 8 lines
xen/arch/arm/bootfdt.c size_t __init boot_fdt_info(const void *fdt, · line 431
Quoted 6 lines
* @fdt: flattened device tree binary
xen/arch/arm/bootfdt.c +1
-0@@ -412,6 +428,12 @@ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) add_boot_module(BOOTMOD_FDT, paddr, fdt_totalsize(fdt), false); device_tree_for_each_node((void *)fdt, 0, early_scan_node, NULL); + if ( bootinfo.mem.nr_banks > 1 )NIT:
sort()is already be able to deal with one element array. So this checks looks a bit pointless.
Agree, will drop.
Quoted 9 lines
Quoted 5 lines
xen/arch/arm/bootfdt.c +2
-0+ { + /* Some DT may describe unordered banks, sort them inascending order */
It would be good to explain in the comment *why* this is necessary. Some along the line:
On Arm64,
setup_xenheap_pages()expects to be called with the lowest bank in memory first. There is no requirement that the DT will provide the banks sorted in ascending order. So sort them through.
ok
Quoted 12 lines
Quoted 9 lines
+ sort(bootinfo.mem.bank, bootinfo.mem.nr_banks, sizeof(struct membank),
+cmp_memory_node, NULL);
+ }
early_print_info();
returnfdt_totalsize(fdt);Cheers,
Signature · 3 lines
Regards, Oleksandr Tyshchenko