[PATCH] x86_64: Move int 3 handler to debug stack and allow to increase it.

This
- switches the INT3 handler to run on an IST stack (to cope with
  breakpoints set by a kernel debugger on places where the kernel's
  %gs base hasn't been set up, yet); the IST stack used is shared with
  the INT1 handler's
[AK: this also allows setting a kprobe on the interrupt/exception entry
points]
- allows nesting of INT1/INT3 handlers so that one can, with a kernel
  debugger, debug (at least) the user-mode portions of the INT1/INT3
  handling; the nesting isn't actively enabled here since a kernel-
  debugger-free kernel doesn't need it

Signed-Off-By: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 18 insertions, 4 deletions

diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c
index 7b7131d8bc90..39e728cfe6a0 100644
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
@@ -145,7 +145,7 @@ void pda_init(int cpu)
         pda->irqstackptr += IRQSTACKSIZE-64;
 } 
 
-char boot_exception_stacks[N_EXCEPTION_STACKS * EXCEPTION_STKSZ] 
+char boot_exception_stacks[(N_EXCEPTION_STACKS - 2) * EXCEPTION_STKSZ + DEBUG_STKSZ]
 __attribute__((section(".bss.page_aligned")));
 
 /* May not be marked __init: used by software suspend */
@@ -236,13 +236,27 @@ void __cpuinit cpu_init (void)
          */
         for (v = 0; v < N_EXCEPTION_STACKS; v++) {
                 if (cpu) {
-                        estacks = (char *)__get_free_pages(GFP_ATOMIC, 
-                                                   EXCEPTION_STACK_ORDER);
+                        static const unsigned int order[N_EXCEPTION_STACKS] = {
+                                [0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,
+                                [DEBUG_STACK - 1] = DEBUG_STACK_ORDER
+                        };
+
+                        estacks = (char *)__get_free_pages(GFP_ATOMIC, order[v]);
                         if (!estacks)
                                 panic("Cannot allocate exception stack %ld %d\n",
                                       v, cpu); 
                 }
-                estacks += EXCEPTION_STKSZ;
+                switch (v + 1) {
+#if DEBUG_STKSZ > EXCEPTION_STKSZ
+                case DEBUG_STACK:
+                        cpu_pda[cpu].debugstack = (unsigned long)estacks;
+                        estacks += DEBUG_STKSZ;
+                        break;
+#endif
+                default:
+                        estacks += EXCEPTION_STKSZ;
+                        break;
+                }
                 t->ist[v] = (unsigned long)estacks;
         }