On Fri, Jul 11, 2014 at 03:37:18PM +0800, Jiang Liu wrote:
> 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@xxxxxxxxxxxxxxx>
For the rcutorture piece:
Acked-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Or if you separate the kernel/rcu/rcutorture.c portion into a separate
patch, I will queue it separately.
Thanx, Paul
> ---
> 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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-hotplug" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
