From: Zhen Lei <thunder.leizhen@huawei.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>,
Robert Richter <rrichter@cavium.com>,
David Daney <david.daney@cavium.com>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Grant Likely <grant.likely@linaro.org>,
devicetree <devicetree@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Cc: Zefan Li <lizefan@huawei.com>, Xinwei Hu <huxinwei@huawei.com>,
Tianhong Ding <dingtianhong@huawei.com>,
Hanjun Guo <guohanjun@huawei.com>,
Zhen Lei <thunder.leizhen@huawei.com>
Subject: [PATCH v2 3/5] arm64/numa: add nid check for memory block
Date: Sat, 28 May 2016 17:22:55 +0800 [thread overview]
Message-ID: <1464427377-12712-4-git-send-email-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <1464427377-12712-1-git-send-email-thunder.leizhen@huawei.com>
Use the same tactic to cpu and numa-distance nodes.
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
arch/arm64/mm/numa.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c
index c7fe3ec..2601660 100644
--- a/arch/arm64/mm/numa.c
+++ b/arch/arm64/mm/numa.c
@@ -141,6 +141,11 @@ int __init numa_add_memblk(int nid, u64 start, u64 end)
{
int ret;
+ if (nid >= MAX_NUMNODES) {
+ pr_warn("NUMA: Node id %u exceeds maximum value\n", nid);
+ return -EINVAL;
+ }
+
ret = memblock_set_node(start, (end - start), &memblock.memory, nid);
if (ret < 0) {
pr_err("NUMA: memblock [0x%llx - 0x%llx] failed to add on node %d\n",
next prev parent reply other threads:[~2016-05-28 9:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-28 9:22 [PATCH v2 0/5] fix some type infos and bugs for arm64/of numa Zhen Lei
2016-05-28 9:22 ` [PATCH v2 1/5] of/numa: remove a duplicated pr_debug information Zhen Lei
2016-05-28 9:22 ` [PATCH v2 2/5] of/numa: fix a memory@ node can only contains one memory block Zhen Lei
2016-06-01 20:13 ` Rob Herring
2016-06-02 1:36 ` Leizhen (ThunderTown)
[not found] ` <574F8DA8.4040503-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2016-06-03 9:45 ` Will Deacon
[not found] ` <20160603094520.GF9915-5wv7dgnIgG8@public.gmane.org>
2016-06-03 9:50 ` Will Deacon
2016-06-06 1:24 ` Leizhen (ThunderTown)
2016-06-06 8:03 ` Hanjun Guo
2016-05-28 9:22 ` Zhen Lei [this message]
[not found] ` <1464427377-12712-1-git-send-email-thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2016-05-28 9:22 ` [PATCH v2 4/5] of/numa: remove a duplicated warning Zhen Lei
2016-05-28 9:22 ` [PATCH v2 5/5] arm64/numa: avoid inconsistent information to be printed Zhen Lei
[not found] ` <1464427377-12712-6-git-send-email-thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2016-05-31 9:07 ` Matthias Brugger
2016-05-31 11:27 ` Leizhen (ThunderTown)
2016-06-01 1:05 ` Leizhen (ThunderTown)
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=1464427377-12712-4-git-send-email-thunder.leizhen@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=catalin.marinas@arm.com \
--cc=david.daney@cavium.com \
--cc=devicetree@vger.kernel.org \
--cc=dingtianhong@huawei.com \
--cc=frowand.list@gmail.com \
--cc=gkulkarni@caviumnetworks.com \
--cc=grant.likely@linaro.org \
--cc=guohanjun@huawei.com \
--cc=huxinwei@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=robh+dt@kernel.org \
--cc=rrichter@cavium.com \
--cc=will.deacon@arm.com \
/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).