From: Brian Gerst <brgerst@gmail.com>
To: tj@kernel.org
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
torvalds@linux-foundation.org, mingo@elte.hu
Subject: [PATCH] x86-32: Allocate irq stacks seperate from percpu area
Date: Wed, 27 Oct 2010 01:43:02 -0400 [thread overview]
Message-ID: <1288158182-1753-1-git-send-email-brgerst@gmail.com> (raw)
In-Reply-To: <AANLkTinnc3vBSmewf7ixuOSDYxG+5VNiGaB-vSrDNRiO@mail.gmail.com>
The percpu allocator cannot handle alignments larger than one page.
Allocate the irq stacks seperately, and only keep the pointers as
percpu data.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/include/asm/irq.h | 2 --
arch/x86/kernel/irq_32.c | 12 ++----------
arch/x86/kernel/smpboot.c | 1 -
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index 0bf5b00..13b0eba 100644
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -21,10 +21,8 @@ static inline int irq_canonicalize(int irq)
#ifdef CONFIG_X86_32
extern void irq_ctx_init(int cpu);
-extern void irq_ctx_exit(int cpu);
#else
# define irq_ctx_init(cpu) do { } while (0)
-# define irq_ctx_exit(cpu) do { } while (0)
#endif
#define __ARCH_HAS_DO_SOFTIRQ
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index 50fbbe6..64668db 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -60,9 +60,6 @@ union irq_ctx {
static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
static DEFINE_PER_CPU(union irq_ctx *, softirq_ctx);
-static DEFINE_PER_CPU_MULTIPAGE_ALIGNED(union irq_ctx, hardirq_stack, THREAD_SIZE);
-static DEFINE_PER_CPU_MULTIPAGE_ALIGNED(union irq_ctx, softirq_stack, THREAD_SIZE);
-
static void call_on_stack(void *func, void *stack)
{
asm volatile("xchgl %%ebx,%%esp \n"
@@ -128,7 +125,7 @@ void __cpuinit irq_ctx_init(int cpu)
if (per_cpu(hardirq_ctx, cpu))
return;
- irqctx = &per_cpu(hardirq_stack, cpu);
+ irqctx = (union irq_ctx *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER);
irqctx->tinfo.task = NULL;
irqctx->tinfo.exec_domain = NULL;
irqctx->tinfo.cpu = cpu;
@@ -137,7 +134,7 @@ void __cpuinit irq_ctx_init(int cpu)
per_cpu(hardirq_ctx, cpu) = irqctx;
- irqctx = &per_cpu(softirq_stack, cpu);
+ irqctx = (union irq_ctx *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER);
irqctx->tinfo.task = NULL;
irqctx->tinfo.exec_domain = NULL;
irqctx->tinfo.cpu = cpu;
@@ -150,11 +147,6 @@ void __cpuinit irq_ctx_init(int cpu)
cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
}
-void irq_ctx_exit(int cpu)
-{
- per_cpu(hardirq_ctx, cpu) = NULL;
-}
-
asmlinkage void do_softirq(void)
{
unsigned long flags;
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 6af1185..90baf56 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1373,7 +1373,6 @@ void play_dead_common(void)
{
idle_task_exit();
reset_lazy_tlbstate();
- irq_ctx_exit(raw_smp_processor_id());
c1e_remove_cpu(raw_smp_processor_id());
mb();
--
1.7.2.3
next prev parent reply other threads:[~2010-10-27 5:43 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-25 22:41 [PATCH] MN10300: Fix the PERCPU() alignment to allow for workqueues David Howells
2010-10-26 9:10 ` Tejun Heo
2010-10-26 10:22 ` David Howells
2010-10-26 12:14 ` Tejun Heo
2010-10-26 12:27 ` Tejun Heo
2010-10-26 12:45 ` [PATCH] x86, percpu: revert commit fe8e0c25 Tejun Heo
2010-10-26 13:25 ` Ingo Molnar
2010-10-26 13:34 ` Tejun Heo
2010-10-26 13:49 ` Brian Gerst
2010-10-26 15:08 ` Linus Torvalds
2010-10-27 5:43 ` Brian Gerst [this message]
2010-10-27 6:07 ` [PATCH] x86-32: Allocate irq stacks seperate from percpu area Eric Dumazet
2010-10-27 9:57 ` Peter Zijlstra
2010-10-27 13:33 ` Eric Dumazet
2010-10-27 13:42 ` Tejun Heo
2010-10-27 13:57 ` Eric Dumazet
2010-10-27 14:00 ` Tejun Heo
2010-10-27 14:24 ` Eric Dumazet
2010-10-27 14:39 ` Tejun Heo
2010-10-27 14:39 ` Eric Dumazet
2010-10-27 14:43 ` Tejun Heo
2010-10-27 15:21 ` Eric Dumazet
2010-10-27 15:35 ` Tejun Heo
2010-10-27 16:07 ` Eric Dumazet
2010-10-27 17:33 ` [PATCH] numa: fix slab_node(MPOL_BIND) Eric Dumazet
2010-10-28 15:59 ` Linus Torvalds
2010-10-28 16:27 ` Eric Dumazet
2010-10-28 16:45 ` Mel Gorman
2010-10-28 16:55 ` Christoph Lameter
2010-10-28 21:07 ` Andrew Morton
2010-10-29 14:55 ` Christoph Lameter
2010-10-27 20:55 ` [PATCH] x86-32: Allocate irq stacks seperate from percpu area Eric Dumazet
2010-10-28 12:01 ` Tejun Heo
2010-10-28 12:30 ` Eric Dumazet
2010-10-28 14:40 ` [PATCH] x86-32: NUMA irq stacks allocations Eric Dumazet
2010-10-29 6:43 ` [tip:x86/urgent] x86-32: Restore irq stacks NUMA-aware allocations tip-bot for Eric Dumazet
2010-10-29 18:32 ` Peter Zijlstra
2010-10-29 20:09 ` Cyrill Gorcunov
2010-10-29 20:28 ` Cyrill Gorcunov
2010-10-29 20:53 ` Eric Dumazet
2010-10-29 20:59 ` Cyrill Gorcunov
2010-10-29 20:58 ` Eric Dumazet
2010-10-29 21:21 ` Cyrill Gorcunov
2010-10-27 15:19 ` [PATCH] x86-32: Allocate irq stacks seperate from percpu area Linus Torvalds
2010-10-27 15:30 ` Ingo Molnar
2010-10-27 15:33 ` Ingo Molnar
2010-10-27 15:40 ` Tejun Heo
2010-10-27 15:43 ` Ingo Molnar
2010-10-27 16:03 ` [tip:x86/urgent] " tip-bot for Brian Gerst
2010-10-27 16:04 ` [tip:x86/urgent] percpu: Remove the multi-page alignment facility tip-bot for Ingo Molnar
2010-10-26 14:06 ` [RFC PATCH] percpu: always align percpu output section to PAGE_SIZE Tejun Heo
2011-03-24 6:46 ` [Uclinux-dist-devel] " Mike Frysinger
2011-03-24 8:25 ` Tejun Heo
2011-03-24 8:51 ` Tejun Heo
2011-03-24 13:46 ` Mike Frysinger
2011-03-24 17:51 ` Tejun Heo
2011-03-24 8:54 ` [PATCH UPDATED] " Tejun Heo
2010-10-26 14:50 ` [PATCH] MN10300: Fix the PERCPU() alignment to allow for workqueues David Howells
2010-10-26 14:56 ` Tejun Heo
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=1288158182-1753-1-git-send-email-brgerst@gmail.com \
--to=brgerst@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/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
Powered by JetHome