* [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory
@ 2021-11-10 20:18 Stefano Stabellini
2021-11-11 8:26 ` Penny Zheng
2021-11-11 11:14 ` Julien Grall
0 siblings, 2 replies; 6+ messages in thread
From: Stefano Stabellini @ 2021-11-10 20:18 UTC (permalink / raw)
To: julien
Cc: sstabellini, Penny.Zheng, Bertrand.Marquis, Wei.Chen, iwj,
Volodymyr_Babchuk, xen-devel, Stefano Stabellini
From: Stefano Stabellini <stefano.stabellini@xilinx.com>
DomUs static-mem ranges are added to the reserved_mem array for
accounting, but they shouldn't be assigned to dom0 as the other regular
reserved-memory ranges in device tree.
In make_memory_nodes, fix the error by skipping banks with xen_domain
set to true in the reserved-memory array. Also make sure to use the
first valid (!xen_domain) start address for the memory node name.
Fixes: 41c031ff437b ("xen/arm: introduce domain on Static Allocation")
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>
---
Changes in v3:
- move BUG_ON inside the loop
Changes in v2:
- improve commit message
- improve in-code comment
- update nr_cells appropriately
---
xen/arch/arm/domain_build.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 9e92b640cd..dafbc13962 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -862,21 +862,25 @@ static int __init make_memory_node(const struct domain *d,
{
int res, i;
int reg_size = addrcells + sizecells;
- int nr_cells = reg_size * mem->nr_banks;
+ int nr_cells = 0;
/* Placeholder for memory@ + a 64-bit number + \0 */
char buf[24];
__be32 reg[NR_MEM_BANKS * 4 /* Worst case addrcells + sizecells */];
__be32 *cells;
- BUG_ON(nr_cells >= ARRAY_SIZE(reg));
if ( mem->nr_banks == 0 )
return -ENOENT;
- dt_dprintk("Create memory node (reg size %d, nr cells %d)\n",
- reg_size, nr_cells);
+ /* find first memory range not bound to a Xen domain */
+ for ( i = 0; i < mem->nr_banks && mem->bank[i].xen_domain; i++ )
+ ;
+ if ( i == mem->nr_banks )
+ return 0;
+
+ dt_dprintk("Create memory node\n");
/* ePAPR 3.4 */
- snprintf(buf, sizeof(buf), "memory@%"PRIx64, mem->bank[0].start);
+ snprintf(buf, sizeof(buf), "memory@%"PRIx64, mem->bank[i].start);
res = fdt_begin_node(fdt, buf);
if ( res )
return res;
@@ -886,17 +890,24 @@ static int __init make_memory_node(const struct domain *d,
return res;
cells = ®[0];
- for ( i = 0 ; i < mem->nr_banks; i++ )
+ for ( ; i < mem->nr_banks; i++ )
{
u64 start = mem->bank[i].start;
u64 size = mem->bank[i].size;
+ if ( mem->bank[i].xen_domain )
+ continue;
+
dt_dprintk(" Bank %d: %#"PRIx64"->%#"PRIx64"\n",
i, start, start + size);
+ nr_cells += reg_size;
+ BUG_ON(nr_cells >= ARRAY_SIZE(reg));
dt_child_set_range(&cells, addrcells, sizecells, start, size);
}
+ dt_dprintk("(reg size %d, nr cells %d)\n", reg_size, nr_cells);
+
res = fdt_property(fdt, "reg", reg, nr_cells * sizeof(*reg));
if ( res )
return res;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory
2021-11-10 20:18 [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory Stefano Stabellini
@ 2021-11-11 8:26 ` Penny Zheng
2021-11-11 11:14 ` Julien Grall
1 sibling, 0 replies; 6+ messages in thread
From: Penny Zheng @ 2021-11-11 8:26 UTC (permalink / raw)
To: Stefano Stabellini, julien
Cc: Bertrand Marquis, Wei Chen, iwj, Volodymyr_Babchuk, xen-devel,
Stefano Stabellini
Hi Stefano
> -----Original Message-----
> From: Stefano Stabellini <sstabellini@kernel.org>
> Sent: Thursday, November 11, 2021 4:18 AM
> To: julien@xen.org
> Cc: sstabellini@kernel.org; Penny Zheng <Penny.Zheng@arm.com>; Bertrand
> Marquis <Bertrand.Marquis@arm.com>; Wei Chen <Wei.Chen@arm.com>;
> iwj@xenproject.org; Volodymyr_Babchuk@epam.com; xen-
> devel@lists.xenproject.org; Stefano Stabellini <stefano.stabellini@xilinx.com>
> Subject: [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as
> reserved-memory
>
> From: Stefano Stabellini <stefano.stabellini@xilinx.com>
>
> DomUs static-mem ranges are added to the reserved_mem array for
> accounting, but they shouldn't be assigned to dom0 as the other regular
> reserved-memory ranges in device tree.
>
> In make_memory_nodes, fix the error by skipping banks with xen_domain set
> to true in the reserved-memory array. Also make sure to use the first valid
> (!xen_domain) start address for the memory node name.
>
> Fixes: 41c031ff437b ("xen/arm: introduce domain on Static Allocation")
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
> Release-Acked-by: Ian Jackson <iwj@xenproject.org>
Thx again for the fixing up.
Reviewed-by: Penny Zheng <penny.zheng@arm.com>
> ---
> Changes in v3:
> - move BUG_ON inside the loop
>
> Changes in v2:
> - improve commit message
> - improve in-code comment
> - update nr_cells appropriately
> ---
> xen/arch/arm/domain_build.c | 23 +++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 9e92b640cd..dafbc13962 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -862,21 +862,25 @@ static int __init make_memory_node(const struct
> domain *d, {
> int res, i;
> int reg_size = addrcells + sizecells;
> - int nr_cells = reg_size * mem->nr_banks;
> + int nr_cells = 0;
> /* Placeholder for memory@ + a 64-bit number + \0 */
> char buf[24];
> __be32 reg[NR_MEM_BANKS * 4 /* Worst case addrcells + sizecells */];
> __be32 *cells;
>
> - BUG_ON(nr_cells >= ARRAY_SIZE(reg));
> if ( mem->nr_banks == 0 )
> return -ENOENT;
>
> - dt_dprintk("Create memory node (reg size %d, nr cells %d)\n",
> - reg_size, nr_cells);
> + /* find first memory range not bound to a Xen domain */
> + for ( i = 0; i < mem->nr_banks && mem->bank[i].xen_domain; i++ )
> + ;
> + if ( i == mem->nr_banks )
> + return 0;
> +
> + dt_dprintk("Create memory node\n");
>
> /* ePAPR 3.4 */
> - snprintf(buf, sizeof(buf), "memory@%"PRIx64, mem->bank[0].start);
> + snprintf(buf, sizeof(buf), "memory@%"PRIx64, mem->bank[i].start);
> res = fdt_begin_node(fdt, buf);
> if ( res )
> return res;
> @@ -886,17 +890,24 @@ static int __init make_memory_node(const struct
> domain *d,
> return res;
>
> cells = ®[0];
> - for ( i = 0 ; i < mem->nr_banks; i++ )
> + for ( ; i < mem->nr_banks; i++ )
> {
> u64 start = mem->bank[i].start;
> u64 size = mem->bank[i].size;
>
> + if ( mem->bank[i].xen_domain )
> + continue;
> +
> dt_dprintk(" Bank %d: %#"PRIx64"->%#"PRIx64"\n",
> i, start, start + size);
>
> + nr_cells += reg_size;
> + BUG_ON(nr_cells >= ARRAY_SIZE(reg));
> dt_child_set_range(&cells, addrcells, sizecells, start, size);
> }
>
> + dt_dprintk("(reg size %d, nr cells %d)\n", reg_size, nr_cells);
> +
> res = fdt_property(fdt, "reg", reg, nr_cells * sizeof(*reg));
> if ( res )
> return res;
> --
> 2.25.1
--
Cheers,
Penny Zheng
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory
2021-11-10 20:18 [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory Stefano Stabellini
2021-11-11 8:26 ` Penny Zheng
@ 2021-11-11 11:14 ` Julien Grall
2021-11-11 13:33 ` Ian Jackson
1 sibling, 1 reply; 6+ messages in thread
From: Julien Grall @ 2021-11-11 11:14 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Penny.Zheng, Bertrand.Marquis, Wei.Chen, iwj, Volodymyr_Babchuk,
xen-devel, Stefano Stabellini
Hi Stefano,
On 10/11/2021 20:18, Stefano Stabellini wrote:
> From: Stefano Stabellini <stefano.stabellini@xilinx.com>
>
> DomUs static-mem ranges are added to the reserved_mem array for
> accounting, but they shouldn't be assigned to dom0 as the other regular
> reserved-memory ranges in device tree.
>
> In make_memory_nodes, fix the error by skipping banks with xen_domain
> set to true in the reserved-memory array. Also make sure to use the
> first valid (!xen_domain) start address for the memory node name.
>
> Fixes: 41c031ff437b ("xen/arm: introduce domain on Static Allocation")
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
> Release-Acked-by: Ian Jackson <iwj@xenproject.org>
Reviewed-by: Julien Grall <jgrall@amazon.com>
Cheers,
> ---
> Changes in v3:
> - move BUG_ON inside the loop
>
> Changes in v2:
> - improve commit message
> - improve in-code comment
> - update nr_cells appropriately
> ---
> xen/arch/arm/domain_build.c | 23 +++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 9e92b640cd..dafbc13962 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -862,21 +862,25 @@ static int __init make_memory_node(const struct domain *d,
> {
> int res, i;
> int reg_size = addrcells + sizecells;
> - int nr_cells = reg_size * mem->nr_banks;
> + int nr_cells = 0;
> /* Placeholder for memory@ + a 64-bit number + \0 */
> char buf[24];
> __be32 reg[NR_MEM_BANKS * 4 /* Worst case addrcells + sizecells */];
> __be32 *cells;
>
> - BUG_ON(nr_cells >= ARRAY_SIZE(reg));
> if ( mem->nr_banks == 0 )
> return -ENOENT;
>
> - dt_dprintk("Create memory node (reg size %d, nr cells %d)\n",
> - reg_size, nr_cells);
> + /* find first memory range not bound to a Xen domain */
> + for ( i = 0; i < mem->nr_banks && mem->bank[i].xen_domain; i++ )
> + ;
> + if ( i == mem->nr_banks )
> + return 0;
> +
> + dt_dprintk("Create memory node\n");
>
> /* ePAPR 3.4 */
> - snprintf(buf, sizeof(buf), "memory@%"PRIx64, mem->bank[0].start);
> + snprintf(buf, sizeof(buf), "memory@%"PRIx64, mem->bank[i].start);
> res = fdt_begin_node(fdt, buf);
> if ( res )
> return res;
> @@ -886,17 +890,24 @@ static int __init make_memory_node(const struct domain *d,
> return res;
>
> cells = ®[0];
> - for ( i = 0 ; i < mem->nr_banks; i++ )
> + for ( ; i < mem->nr_banks; i++ )
> {
> u64 start = mem->bank[i].start;
> u64 size = mem->bank[i].size;
>
> + if ( mem->bank[i].xen_domain )
> + continue;
> +
> dt_dprintk(" Bank %d: %#"PRIx64"->%#"PRIx64"\n",
> i, start, start + size);
>
> + nr_cells += reg_size;
> + BUG_ON(nr_cells >= ARRAY_SIZE(reg));
> dt_child_set_range(&cells, addrcells, sizecells, start, size);
> }
>
> + dt_dprintk("(reg size %d, nr cells %d)\n", reg_size, nr_cells);
> +
> res = fdt_property(fdt, "reg", reg, nr_cells * sizeof(*reg));
> if ( res )
> return res;
>
--
Julien Grall
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory
2021-11-11 11:14 ` Julien Grall
@ 2021-11-11 13:33 ` Ian Jackson
2021-11-11 13:41 ` Julien Grall
0 siblings, 1 reply; 6+ messages in thread
From: Ian Jackson @ 2021-11-11 13:33 UTC (permalink / raw)
To: Julien Grall
Cc: Stefano Stabellini, Penny.Zheng, Bertrand.Marquis, Wei.Chen,
Volodymyr_Babchuk, xen-devel, Stefano Stabellini
Julien Grall writes ("Re: [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory"):
> Hi Stefano,
>
> On 10/11/2021 20:18, Stefano Stabellini wrote:
> > From: Stefano Stabellini <stefano.stabellini@xilinx.com>
> >
> > DomUs static-mem ranges are added to the reserved_mem array for
> > accounting, but they shouldn't be assigned to dom0 as the other regular
> > reserved-memory ranges in device tree.
> >
> > In make_memory_nodes, fix the error by skipping banks with xen_domain
> > set to true in the reserved-memory array. Also make sure to use the
> > first valid (!xen_domain) start address for the memory node name.
> >
> > Fixes: 41c031ff437b ("xen/arm: introduce domain on Static Allocation")
> > Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
> > Release-Acked-by: Ian Jackson <iwj@xenproject.org>
>
> Reviewed-by: Julien Grall <jgrall@amazon.com>
FTAOD: I don't see a for-4.16 tag here. So I think this is targeted
for post-4.16 ? But I wonder if it ought to be considered. I don't
understand the impact of the bug that is being fixed here.
Thanks,
Ian.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory
2021-11-11 13:33 ` Ian Jackson
@ 2021-11-11 13:41 ` Julien Grall
2021-11-11 14:48 ` Ian Jackson
0 siblings, 1 reply; 6+ messages in thread
From: Julien Grall @ 2021-11-11 13:41 UTC (permalink / raw)
To: Ian Jackson
Cc: Stefano Stabellini, Penny.Zheng, Bertrand.Marquis, Wei.Chen,
Volodymyr_Babchuk, xen-devel, Stefano Stabellini
Hi Ian,
On 11/11/2021 13:33, Ian Jackson wrote:
> Julien Grall writes ("Re: [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory"):
>> Hi Stefano,
>>
>> On 10/11/2021 20:18, Stefano Stabellini wrote:
>>> From: Stefano Stabellini <stefano.stabellini@xilinx.com>
>>>
>>> DomUs static-mem ranges are added to the reserved_mem array for
>>> accounting, but they shouldn't be assigned to dom0 as the other regular
>>> reserved-memory ranges in device tree.
>>>
>>> In make_memory_nodes, fix the error by skipping banks with xen_domain
>>> set to true in the reserved-memory array. Also make sure to use the
>>> first valid (!xen_domain) start address for the memory node name.
>>>
>>> Fixes: 41c031ff437b ("xen/arm: introduce domain on Static Allocation")
>>> Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
>>> Release-Acked-by: Ian Jackson <iwj@xenproject.org>
>>
>> Reviewed-by: Julien Grall <jgrall@amazon.com>
>
> FTAOD: I don't see a for-4.16 tag here. So I think this is targeted
> for post-4.16 ? But I wonder if it ought to be considered. I don't
> understand the impact of the bug that is being fixed here.
The first version of the patch [1] was tagged with for-4.16 and contains
the rationale.
I was thinking to commit it because it already contains your
release-acked-by. Can you let me know if it still stands?
Cheers,
[1]
https://lore.kernel.org/xen-devel/24970.20802.96908.223297@mariner.uk.xensource.com/T/#m058f2d243f6670ef48e77f40c25ac0115f0dae74
>
> Thanks,
> Ian.
>
--
Julien Grall
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory
2021-11-11 13:41 ` Julien Grall
@ 2021-11-11 14:48 ` Ian Jackson
0 siblings, 0 replies; 6+ messages in thread
From: Ian Jackson @ 2021-11-11 14:48 UTC (permalink / raw)
To: Julien Grall
Cc: Stefano Stabellini, Penny.Zheng, Bertrand.Marquis, Wei.Chen,
Volodymyr_Babchuk, xen-devel, Stefano Stabellini
Julien Grall writes ("Re: [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory"):
> The first version of the patch [1] was tagged with for-4.16 and contains
> the rationale.
>
> I was thinking to commit it because it already contains your
> release-acked-by. Can you let me know if it still stands?
Oh. Please go ahead. I'm sorry to be confused; I rely on the
computer as my external storage :-).
Ian.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-11 14:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-10 20:18 [PATCH v3] xen/arm: don't assign domU static-mem to dom0 as reserved-memory Stefano Stabellini
2021-11-11 8:26 ` Penny Zheng
2021-11-11 11:14 ` Julien Grall
2021-11-11 13:33 ` Ian Jackson
2021-11-11 13:41 ` Julien Grall
2021-11-11 14:48 ` Ian Jackson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).