From: Jiang Liu <jiang.liu@linux.intel.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Mel Gorman <mgorman@suse.de>,
David Rientjes <rientjes@google.com>,
Mike Galbraith <umgwanakikbuti@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Dipankar Sarma <dipankar@in.ibm.com>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Balbir Singh <bsingharora@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Jens Axboe <axboe@kernel.dk>,
Frederic Weisbecker <fweisbec@gmail.com>, Jan Kara <jack@suse.cz>,
Ingo Molnar <mingo@kernel.org>,
Christoph Hellwig <hch@infradead.org>,
"Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>,
Roman Gushchin <klamm@yandex-team.ru>,
Xie XiuQi <xiexiuqi@huawei.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
Tony Luck <tony.luck@intel.com>,
linux-mm@kvack.org, linux-hotplug@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [RFC Patch V1 01/30] mm, kernel: Use cpu_to_mem()/numa_mem_id() to support memoryless node
Date: Fri, 11 Jul 2014 07:37:18 +0000 [thread overview]
Message-ID: <1405064267-11678-2-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1405064267-11678-1-git-send-email-jiang.liu@linux.intel.com>
When CONFIG_HAVE_MEMORYLESS_NODES is enabled, cpu_to_node()/numa_node_id()
may return a node without memory, and later cause system failure/panic
when calling kmalloc_node() and friends with returned node id.
So use cpu_to_mem()/numa_mem_id() instead to get the nearest node with
memory for the/current cpu.
If CONFIG_HAVE_MEMORYLESS_NODES is disabled, cpu_to_mem()/numa_mem_id()
is the same as cpu_to_node()/numa_node_id().
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
kernel/rcu/rcutorture.c | 2 +-
kernel/smp.c | 2 +-
kernel/smpboot.c | 2 +-
kernel/taskstats.c | 2 +-
kernel/timer.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 7fa34f86e5ba..f593762d3214 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -1209,7 +1209,7 @@ static int rcutorture_booster_init(int cpu)
mutex_lock(&boost_mutex);
VERBOSE_TOROUT_STRING("Creating rcu_torture_boost task");
boost_tasks[cpu] = kthread_create_on_node(rcu_torture_boost, NULL,
- cpu_to_node(cpu),
+ cpu_to_mem(cpu),
"rcu_torture_boost");
if (IS_ERR(boost_tasks[cpu])) {
retval = PTR_ERR(boost_tasks[cpu]);
diff --git a/kernel/smp.c b/kernel/smp.c
index 80c33f8de14f..2f3b84aef159 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -41,7 +41,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
case CPU_UP_PREPARE:
case CPU_UP_PREPARE_FROZEN:
if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL,
- cpu_to_node(cpu)))
+ cpu_to_mem(cpu)))
return notifier_from_errno(-ENOMEM);
cfd->csd = alloc_percpu(struct call_single_data);
if (!cfd->csd) {
diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index eb89e1807408..9c08e68e48a9 100644
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -171,7 +171,7 @@ __smpboot_create_thread(struct smp_hotplug_thread *ht, unsigned int cpu)
if (tsk)
return 0;
- td = kzalloc_node(sizeof(*td), GFP_KERNEL, cpu_to_node(cpu));
+ td = kzalloc_node(sizeof(*td), GFP_KERNEL, cpu_to_mem(cpu));
if (!td)
return -ENOMEM;
td->cpu = cpu;
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index 13d2f7cd65db..cf5cba1e7fbe 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -304,7 +304,7 @@ static int add_del_listener(pid_t pid, const struct cpumask *mask, int isadd)
if (isadd = REGISTER) {
for_each_cpu(cpu, mask) {
s = kmalloc_node(sizeof(struct listener),
- GFP_KERNEL, cpu_to_node(cpu));
+ GFP_KERNEL, cpu_to_mem(cpu));
if (!s) {
ret = -ENOMEM;
goto cleanup;
diff --git a/kernel/timer.c b/kernel/timer.c
index 3bb01a323b2a..5831a38b5681 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1546,7 +1546,7 @@ static int init_timers_cpu(int cpu)
* The APs use this path later in boot
*/
base = kzalloc_node(sizeof(*base), GFP_KERNEL,
- cpu_to_node(cpu));
+ cpu_to_mem(cpu));
if (!base)
return -ENOMEM;
--
1.7.10.4
next prev parent reply other threads:[~2014-07-11 7:37 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-11 7:37 [RFC Patch V1 00/30] Enable memoryless node on x86 platforms Jiang Liu
2014-07-11 7:37 ` Jiang Liu [this message]
2014-07-11 15:14 ` [RFC Patch V1 01/30] mm, kernel: Use cpu_to_mem()/numa_mem_id() to support memoryless node Paul E. McKenney
2014-07-21 17:15 ` Nishanth Aravamudan
2014-07-21 17:33 ` Paul E. McKenney
2014-07-12 12:32 ` Jens Axboe
2014-07-11 7:37 ` [RFC Patch V1 02/30] mm, sched: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 03/30] mm, net: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 04/30] mm, netfilter: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 05/30] mm, perf: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 06/30] mm, tracing: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 07/30] mm: " Jiang Liu
2014-07-11 13:51 ` Christoph Lameter
2014-07-11 14:42 ` Tejun Heo
2014-07-11 15:13 ` Christoph Lameter
2014-07-11 15:21 ` Tejun Heo
2014-07-11 15:33 ` Tejun Heo
2014-07-11 15:55 ` Christoph Lameter
2014-07-11 15:58 ` Tejun Heo
2014-07-11 16:04 ` Christoph Lameter
2014-07-11 15:58 ` Christoph Lameter
2014-07-11 16:01 ` Tejun Heo
2014-07-11 16:19 ` Christoph Lameter
2014-07-11 16:24 ` Tejun Heo
2014-07-11 17:29 ` Christoph Lameter
2014-07-11 18:28 ` Tejun Heo
2014-07-11 19:11 ` Christoph Lameter
2014-07-23 3:16 ` Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 08/30] mm, thp: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 09/30] mm, memcg: " Jiang Liu
2014-07-18 7:36 ` Michal Hocko
2014-07-23 3:18 ` Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 10/30] mm, xfrm: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 11/30] mm, char/mspec.c: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 12/30] mm, IB/qib: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 13/30] mm, i40e: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 14/30] mm, i40evf: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 15/30] mm, igb: " Jiang Liu
2014-07-21 17:42 ` Nishanth Aravamudan
[not found] ` <CAKgT0UdZdbduP-=R7uRCxJVxt1yCDoHpnercnDoyrCbWNtx=6Q@mail.gmail.com>
2014-07-21 21:09 ` Nishanth Aravamudan
2014-07-23 3:20 ` Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 16/30] mm, ixgbe: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 17/30] mm, intel_powerclamp: " Jiang Liu
2014-07-21 17:38 ` [RFC Patch V1 17/30] mm, intel_powerclamp: Use cpu_to_mem()/numa_mem_id() to support memoryless Nishanth Aravamudan
2014-07-11 7:37 ` [RFC Patch V1 18/30] mm, bnx2fc: Use cpu_to_mem()/numa_mem_id() to support memoryless node Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 19/30] mm, bnx2i: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 20/30] mm, fcoe: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 21/30] mm, irqchip: " Jiang Liu
2014-07-18 12:40 ` Jason Cooper
2014-07-23 3:47 ` Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 22/30] mm, of: " Jiang Liu
2014-07-21 17:52 ` Nishanth Aravamudan
2014-07-28 13:30 ` Grant Likely
2014-07-28 19:26 ` Nishanth Aravamudan
2014-07-11 7:37 ` [RFC Patch V1 23/30] mm, x86: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 24/30] mm, x86/platform/uv: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 25/30] mm, x86, kvm: " Jiang Liu
2014-07-11 7:44 ` Paolo Bonzini
2014-07-11 7:37 ` [RFC Patch V1 26/30] mm, x86, perf: " Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 27/30] x86, numa: Kill useless code to improve code readability Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 28/30] mm: Update _mem_id_[] for every possible CPU when memory configuration changes Jiang Liu
2014-07-21 17:47 ` [RFC Patch V1 28/30] mm: Update _mem_id_[] for every possible CPU when memory configuration chan Nishanth Aravamudan
2014-07-23 8:16 ` Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 29/30] mm, x86: Enable memoryless node support to better support CPU/memory hotplug Jiang Liu
2014-07-24 23:26 ` [RFC Patch V1 29/30] mm, x86: Enable memoryless node support to better support CPU/memory hotplu Nishanth Aravamudan
2014-07-25 1:41 ` Jiang Liu
2014-07-11 7:37 ` [RFC Patch V1 30/30] x86, NUMA: Online node earlier when doing CPU hot-addition Jiang Liu
2014-07-24 23:30 ` Nishanth Aravamudan
2014-07-25 1:43 ` Jiang Liu
2014-07-25 1:44 ` Jiang Liu
2014-07-11 8:29 ` [RFC Patch V1 00/30] Enable memoryless node on x86 platforms Peter Zijlstra
2014-07-11 15:33 ` Greg KH
2014-07-11 20:02 ` Dave Hansen
2014-07-11 20:20 ` Andi Kleen
2014-07-11 20:51 ` Peter Zijlstra
2014-07-11 21:58 ` Andi Kleen
2014-07-15 1:18 ` David Rientjes
2014-07-11 23:51 ` H. Peter Anvin
2014-07-11 22:40 ` Jiri Kosina
2014-07-15 1:19 ` David Rientjes
2014-07-21 17:23 ` Nishanth Aravamudan
2014-07-21 17:41 ` Tony Luck
2014-07-21 17:57 ` Nishanth Aravamudan
2014-07-23 8:20 ` Jiang Liu
2014-07-24 23:32 ` Nishanth Aravamudan
2014-07-25 1:50 ` Jiang Liu
2014-08-18 23:30 ` Nishanth Aravamudan
2014-07-21 20:06 ` Peter Zijlstra
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=1405064267-11678-2-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=bsingharora@gmail.com \
--cc=dipankar@in.ibm.com \
--cc=fweisbec@gmail.com \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=klamm@yandex-team.ru \
--cc=linux-hotplug@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rientjes@google.com \
--cc=srivatsa.bhat@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=umgwanakikbuti@gmail.com \
--cc=xiexiuqi@huawei.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 read-only IMAP folder(s) and NNTP newsgroup(s).