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 <[email protected]> --- kernel/events/callchain.c | 2 +- kernel/events/core.c | 2 +- kernel/events/ring_buffer.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index 97b67df8fbfe..09f470a9262e 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -77,7 +77,7 @@ static int alloc_callchain_buffers(void) for_each_possible_cpu(cpu) { entries->cpu_entries[cpu] = kmalloc_node(size, GFP_KERNEL, - cpu_to_node(cpu)); + cpu_to_mem(cpu)); if (!entries->cpu_entries[cpu]) goto fail; } diff --git a/kernel/events/core.c b/kernel/events/core.c index a33d9a2bcbd7..bb1a5f326309 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7911,7 +7911,7 @@ static void perf_event_init_cpu(int cpu) if (swhash->hlist_refcount > 0) { struct swevent_hlist *hlist; - hlist = kzalloc_node(sizeof(*hlist), GFP_KERNEL, cpu_to_node(cpu)); + hlist = kzalloc_node(sizeof(*hlist), GFP_KERNEL, cpu_to_mem(cpu)); WARN_ON(!hlist); rcu_assign_pointer(swhash->swevent_hlist, hlist); } diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index 146a5792b1d2..22128f58aa0b 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -265,7 +265,7 @@ static void *perf_mmap_alloc_page(int cpu) struct page *page; int node; - node = (cpu == -1) ? cpu : cpu_to_node(cpu); + node = (cpu == -1) ? NUMA_NO_NODE : cpu_to_mem(cpu); page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0); if (!page) return NULL; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
