From: Stefano Stabellini <sstabellini@kernel.org>
To: Julien.Grall@arm.com
Cc: jgross@suse.com, xen-devel@lists.xenproject.org,
sstabellini@kernel.org, Volodymyr_Babchuk@epam.com,
Stefano Stabellini <stefano.stabellini@xilinx.com>
Subject: [Xen-devel] [PATCH v2 2/3] xen/arm: make_memory_node return error on nr_banks == 0
Date: Mon, 7 Oct 2019 18:15:00 -0700 [thread overview]
Message-ID: <20191008011501.21038-2-sstabellini@kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.21.1910071811320.13684@sstabellini-ThinkPad-T480s>
Call make_memory_node for reserved_memory only if we actually have any
reserved_memory regions to handle.
Add a check in make_memory_node to return an error if it has been called
with no memory banks as argument.
Fixes: 248faa637d2 (xen/arm: add reserved-memory regions to the dom0 memory node)
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
---
Changes in v2:
- patch added
---
xen/arch/arm/domain_build.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 60923a7051..ea01aada0b 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -650,6 +650,8 @@ static int __init make_memory_node(const struct domain *d,
__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);
@@ -1540,10 +1542,13 @@ static int __init handle_node(struct domain *d, struct kernel_info *kinfo,
* Create a second memory node to store the ranges covering
* reserved-memory regions.
*/
- res = make_memory_node(d, kinfo->fdt, addrcells, sizecells,
- &bootinfo.reserved_mem);
- if ( res )
- return res;
+ if ( bootinfo.reserved_mem.nr_banks > 0 )
+ {
+ res = make_memory_node(d, kinfo->fdt, addrcells, sizecells,
+ &bootinfo.reserved_mem);
+ if ( res )
+ return res;
+ }
}
res = fdt_end_node(kinfo->fdt);
--
2.17.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-10-08 1:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-08 1:14 [Xen-devel] [PATCH for-4.13 v2 0/3] fixes for make_[memory/cpu]_node Stefano Stabellini
2019-10-08 1:14 ` [Xen-devel] [PATCH v2 1/3] xen/arm: fix buf size in make_cpus_node Stefano Stabellini
2019-10-08 11:15 ` Julien Grall
2019-10-08 21:18 ` Stefano Stabellini
2019-10-08 21:47 ` Julien Grall
2019-10-08 1:15 ` Stefano Stabellini [this message]
2019-10-08 12:53 ` [Xen-devel] [PATCH v2 2/3] xen/arm: make_memory_node return error on nr_banks == 0 Julien Grall
2019-10-08 1:15 ` [Xen-devel] [PATCH v2 3/3] xen/arm: fix duplicate memory node in DT Stefano Stabellini
2019-10-08 12:54 ` Julien Grall
2019-10-08 4:21 ` [Xen-devel] [PATCH for-4.13 v2 0/3] fixes for make_[memory/cpu]_node Jürgen Groß
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191008011501.21038-2-sstabellini@kernel.org \
--to=sstabellini@kernel.org \
--cc=Julien.Grall@arm.com \
--cc=Volodymyr_Babchuk@epam.com \
--cc=jgross@suse.com \
--cc=stefano.stabellini@xilinx.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).