x86-32: Restore irq stacks NUMA-aware allocations (5c1eb089) · Commits · 戴 / test

Commit ("Allocate irq stacks seperate from percpu area") removed NUMA affinity of IRQ stacks as side-effect of the fix. Using alloc_pages_node() instead of __get_free_pages() is safe, even if the target node has no available LOWMEM pages : alloc_pages_node() fallbacks to another node. Signed-off-by:

Eric Dumazet <eric.dumazet@gmail.com> Acked-by:

Brian Gerst <brgerst@gmail.com> Cc: tj@kernel.org Cc: torvalds@linux-foundation.org Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <1288276854.2649.607.camel@edumazet-laptop> Signed-off-by:

Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/irq_32.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include <linux/delay.h>
		#include <linux/uaccess.h>
		#include <linux/percpu.h>
		#include <linux/mm.h>

		#include <asm/apic.h>

		@@ -125,7 +126,9 @@ void __cpuinit irq_ctx_init(int cpu)
		if (per_cpu(hardirq_ctx, cpu))
		return;

		irqctx = (union irq_ctx *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER);
		irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
		THREAD_FLAGS,
		THREAD_ORDER));
		irqctx->tinfo.task = NULL;
		irqctx->tinfo.exec_domain = NULL;
		irqctx->tinfo.cpu = cpu;
		@@ -134,7 +137,9 @@ void __cpuinit irq_ctx_init(int cpu)

		per_cpu(hardirq_ctx, cpu) = irqctx;

		irqctx = (union irq_ctx *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER);
		irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
		THREAD_FLAGS,
		THREAD_ORDER));
		irqctx->tinfo.task = NULL;
		irqctx->tinfo.exec_domain = NULL;
		irqctx->tinfo.cpu = cpu;

Admin message