i386 double fault enhancements
PATCH 1/1 i386 double fault enhancements
Make the double fault handler use CPU-specific stacks. Add some abstraction to simplify future change of other exception handlers to go through task gates. Change the pointer validity checks in the double fault handler to account for the fact that both GDT and TSS aren't in static kernel space anymore. Add a new notification of the event through the die notifier chain, also providing some environmental adjustments so that various infrastructural things work independent of the fact that the fault and the callbacks are running on other then the normal kernel stack.
arch/i386/kernel/cpu/common.c renamed from home/jbeulich/tmp/linux-2.6.16-rc4/arch/i386/kernel/cpu/common.c +50 -3
@@ -4,6 +4,7 @@#include <linux/smp.h> #include <linux/module.h> #include <linux/percpu.h> +#include <linux/bootmem.h> #include <asm/semaphore.h> #include <asm/processor.h> #include <asm/i387.h>
@@ -569,6 +570,7 @@ void __init early_cpu_init(void)void __devinit cpu_init (void ) {int cpu =smp_processor_id (); +unsigned i;struct tss_struct * t = &per_cpu (init_tss, cpu);struct thread_struct *thread = ¤t->thread;struct desc_struct *gdt =get_cpu_gdt_table (cpu);
@@ -621,9 +623,54 @@ void __devinit cpu_init(void)load_TR_desc ();load_LDT (&init_mm.context); -#ifdef CONFIG_DOUBLEFAULT -/* Set up doublefault TSS pointer in the GDT */ -__set_tss_desc (cpu,GDT_ENTRY_DOUBLEFAULT_TSS , &doublefault_tss); +#ifdef N_EXCEPTION_TSS +# if EXCEPTION_STACK_ORDER >THREAD_ORDER +# error Assertion failed: EXCEPTION_STACK_ORDER <= THREAD_ORDER +# endif +for (i =0 ; i <N_EXCEPTION_TSS ; ++i) { +unsigned long stack; + +/* Set up exception handling TSS */ + exception_tss[cpu][i].ebx = (unsigned long )&exception_tss[cpu][i]; + +/* Set up exception handling stacks */ +# ifdef CONFIG_SMP +if (cpu) { + stack =__get_free_pages (GFP_ATOMIC ,THREAD_ORDER ); +if (!stack) +panic ("Cannot allocate exception stack %u %d\n" , + i, + cpu); + } + else +# endif + stack = (unsigned long )__alloc_bootmem (EXCEPTION_STKSZ , +THREAD_SIZE , +__pa (MAX_DMA_ADDRESS )); + stack +=EXCEPTION_STKSZ ; + exception_tss[cpu][i].esp = exception_tss[cpu][i].esp0 = stack; +# ifdef CONFIG_SMP +if (cpu) { +unsigned j; + +for (j =EXCEPTION_STACK_ORDER ; j <THREAD_ORDER ; ++j) { +/* set_page_refs sets the page count only for the first +page, but since we split the larger-order page here, +we need to adjust the page count before freeing the +pieces. */ +struct page * page =virt_to_page ((void *)stack); + +BUG_ON (page_count (page)); +set_page_count (page,1 ); +free_pages (stack, j); + stack += (PAGE_SIZE << j); + } + } +# endif + +/* Set up exception handling TSS pointer in the GDT */ +__set_tss_desc (cpu,GDT_ENTRY_EXCEPTION_TSS + i, &exception_tss[cpu][i]); + }#endif /* Clear %fs and %gs. */
arch/i386/kernel/doublefault.c renamed from home/jbeulich/tmp/linux-2.6.16-rc4/arch/i386/kernel/doublefault.c +52 -29
110 lines not on this page · raw message
arch/i386/kernel/traps.c renamed from home/jbeulich/tmp/linux-2.6.16-rc4/arch/i386/kernel/traps.c +25 -1
@@ -61,6 +61,26 @@ asmlinkage int system_call(void);struct desc_struct default_ldt[] = { {0 ,0 }, {0 ,0 }, {0 ,0 }, {0 ,0 }, {0 ,0 } }; +void doublefault_fn (void ); + +#ifdef N_EXCEPTION_TSS +struct tss_struct exception_tss[NR_CPUS][N_EXCEPTION_TSS] __cacheline_aligned = { + [0 ...NR_CPUS -1 ] = { + [0 ...N_EXCEPTION_TSS -1 ] = { + .cs = __KERNEL_CS, + .ss = __KERNEL_DS, + .ss0 = __KERNEL_DS, + .__cr3 =__pa (swapper_pg_dir), + .io_bitmap_base =INVALID_IO_BITMAP_OFFSET , + .ds = __USER_DS, + .es = __USER_DS, + .eflags =X86_EFLAGS_SF |0x2 ,/* 0x2 bit is always set */ + }, + [DOUBLEFAULT_TSS ].eip = (unsigned long )doublefault_fn + } +}; +#endif +/* Do we ignore FPU interrupts ? */ char ignore_fpu_irq =0 ;
@@ -1086,10 +1106,12 @@ static void __init set_system_gate(unsig_set_gate (idt_table+n,15 ,3 ,addr,__KERNEL_CS); } +#ifdef N_EXCEPTION_TSS static void __init set_task_gate (unsigned int n,unsigned int gdt_entry) {_set_gate (idt_table+n,5 ,0 ,0 ,(gdt_entry<<3 )); } +#endif void __init trap_init (void )
@@ -1114,7 +1136,9 @@ void __init trap_init(void)set_trap_gate (5 ,&bounds);set_trap_gate (6 ,&invalid_op);set_trap_gate (7 ,&device_not_available); -set_task_gate (8 ,GDT_ENTRY_DOUBLEFAULT_TSS ); +#ifdef DOUBLEFAULT_TSS +set_task_gate (8 ,GDT_ENTRY_EXCEPTION_TSS +DOUBLEFAULT_TSS ); +#endif set_trap_gate (9 ,&coprocessor_segment_overrun);set_trap_gate (10 ,&invalid_TSS);set_trap_gate (11 ,&segment_not_present);
include/asm-i386/kdebug.h renamed from home/jbeulich/tmp/linux-2.6.16-rc4/include/asm-i386/kdebug.h +1 -0
@@ -39,6 +39,7 @@ enum die_val {DIE_CALL ,DIE_NMI_IPI ,DIE_PAGE_FAULT , +DIE_DOUBLE_FAULT }; static inline int notify_die(enum die_val val, const char *str,
include/asm-i386/processor.h renamed from home/jbeulich/tmp/linux-2.6.16-rc4/include/asm-i386/processor.h +6 -1
@@ -90,7 +90,9 @@ struct cpuinfo_x86 {extern struct cpuinfo_x86 boot_cpu_data;extern struct cpuinfo_x86 new_cpu_data; -extern struct tss_struct doublefault_tss; +#ifdef N_EXCEPTION_TSS +extern struct tss_struct exception_tss[NR_CPUS ][N_EXCEPTION_TSS ]; +#endif DECLARE_PER_CPU(struct tss_struct, init_tss);#ifdef CONFIG_SMP
@@ -486,6 +488,9 @@ struct thread_struct { .io_bitmap = { [ 0 ... IO_BITMAP_LONGS] = ~0 }, \ } +#define EXCEPTION_STACK_ORDER 0 +#define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER) +static inline void load_esp0 (struct tss_struct *tss,struct thread_struct *thread) { tss->esp0 = thread->esp0;
include/asm-i386/segment.h renamed from home/jbeulich/tmp/linux-2.6.16-rc4/include/asm-i386/segment.h +15 -4
@@ -43,7 +43,8 @@* 28 - unused * 29 - unused * 30 - unused -* 31 - TSS for double fault handler +* 31 - TSS for first exception handler (double fault) +* 32+ TSSes for further exception handlers */ #define GDT_ENTRY_TLS_ENTRIES 3#define GDT_ENTRY_TLS_MIN 6
@@ -74,12 +75,22 @@#define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14)#define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) -#define GDT_ENTRY_DOUBLEFAULT_TSS 31 +#define GDT_ENTRY_EXCEPTION_TSS 31 +#ifdef CONFIG_DOUBLEFAULT +# define DOUBLEFAULT_TSS 0 +# define N_EXCEPTION_TSS 1 +#else +# undef GDT_ENTRY_EXCEPTION_TSS +#endif /* -* The GDT has 32 entries +* The GDT has 31+ entries */ -#define GDT_ENTRIES 32 +#ifdef N_EXCEPTION_TSS +# define GDT_ENTRIES (31 + N_EXCEPTION_TSS) +#else +# define GDT_ENTRIES 31 +#endif #define GDT_SIZE (GDT_ENTRIES * 8)
include/asm-i386/thread_info.h renamed from home/jbeulich/tmp/linux-2.6.16-rc4/include/asm-i386/thread_info.h +3 -2
@@ -54,10 +54,11 @@ struct thread_info {#define PREEMPT_ACTIVE 0x10000000#ifdef CONFIG_4KSTACKS -#define THREAD_SIZE (4096) +#define THREAD_ORDER 0#else -#define THREAD_SIZE (8192) +#define THREAD_ORDER 1#endif +#define THREAD_SIZE (4096 << THREAD_ORDER)#define STACK_WARN (THREAD_SIZE/8)/*
Quoted 10 lines · Jan Beulich
Make the double fault handler use CPU-specific stacks. Add some abstraction to simplify future change of other exception handlers to go through task gates. Change the pointer validity checks in the double fault handler to account for the fact that both GDT and TSS aren't in static kernel space anymore. Add a new notification of the event through the die notifier chain, also providing some environmental adjustments so that various infrastructural things work independent of the fact that the fault and the callbacks are running on other then the normal kernel stack.
Why?
Quoted 1 line
+# ifdef
CONFIG_SMP
Please don't bother with the space after the #. Yes, it's for nesting level, but if someone later comes along and sticks more ifdefs around this code, they won't go through and add the extra spaces anyway.
Such problems can be avoided by not adding the ifdefs at all..
Quoted 1 line
+#ifdef
N_EXCEPTION_TSS
Can't we use CONFIG_DOUBLEFAULT throughout? It's very much clearer.
Quoted 6 lines
arch/i386/kernel/traps.c renamed from home/jbeulich/tmp/linux-2.6.16-rc4/arch/i386/kernel/traps.c +6
-0+struct tss_struct exception_tss[NR_CPUS][N_EXCEPTION_TSS] __cacheline_aligned = { + [0 ...NR_CPUS -1 ] = { + [0 ...N_EXCEPTION_TSS -1 ] = { + .cs = __KERNEL_CS, + .ss = __KERNEL_DS, + .ss0 = __KERNEL_DS,
arch/i386/kernel/traps.c asmlinkage int system_call(void); · line 82
Quoted 10 lines
arch/i386/kernel/traps.c renamed from home/jbeulich/tmp/linux-2.6.16-rc4/arch/i386/kernel/traps.c +10
-0+ .__cr3 = __pa(swapper_pg_dir), + .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, + .ds = __USER_DS, + .es = __USER_DS, + .eflags = X86_EFLAGS_SF | 0x2, /* 0x2 bit is always set */ + }, + [DOUBLEFAULT_TSS ].eip = (unsigned long )doublefault_fn + } +}; +#endif
How much more RAM does this patch consume?
Quoted 1 line
+#define
EXCEPTION_STKSZ(PAGE_SIZE<<EXCEPTION_STACK_ORDER)
"EXCEPTION_STACK_SIZE", please.
Quoted 12 lines · Andrew Morton
Quoted 10 lines · Jan Beulich
Make the double fault handler use CPU-specific stacks. Add some abstraction to simplify future change of other exception handlers to go through task gates. Change the pointer validity checks in the double fault handler to account for the fact that both GDT and TSS aren't in static kernel space anymore. Add a new notification of the event through the die notifier chain, also providing some environmental adjustments so that various infrastructural things work independent of the fact that the fault and the callbacks are running on other then the normal kernel stack.
Quoted 1 line
Why?
Means that if you have two double faults in parallel they still work. Good for robustness under kernel bugs.
-Andi
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Andrew Morton <[email protected]> 22.02.06 23:32:12 >>>
Quoted 10 lines · Jan Beulich
Make the double fault handler use CPU-specific stacks. Add some abstraction to simplify future change of other exception handlers to go through task gates. Change the pointer validity checks in the double fault handler to account for the fact that both GDT and TSS aren't in static kernel space anymore. Add a new notification of the event through the die notifier chain, also providing some environmental adjustments so that various infrastructural things work independent of the fact that the fault and the callbacks are running on other then the normal kernel stack.
Quoted 1 line
Why?
In addition to what Andi said, the infrastructural changes are so that you can do more than just printk()ing information, namely enter a debugger. Even for printk() I doubt someone has verified and can guarantee for the future that the possible code paths never use any of the things that make assumptions about the current stack (specifically, uses of thread_info).
Quoted 5 lines
Quoted 1 line
+# ifdef
CONFIG_SMPPlease don't bother with the space after the #. Yes, it's for nesting level, but if someone later comes along and sticks more ifdefs around this code, they won't go through and add the extra spaces anyway.
Will change that.
Quoted 1 line
Such problems can be avoided by not adding the ifdefs at all..
Here, the code could probably be enabled always, but I dislike having dead code like this needlessly compiled.
Quoted 3 lines
Quoted 1 line
+#ifdef
N_EXCEPTION_TSSCan't we use
CONFIG_DOUBLEFAULTthroughout? It's very much clearer.
We could, when not considering broader use. I specifically introduced N_EXCEPTION_TSS so that it wouldn't be as hard as it currently is to have other exceptions got through task gates (nlkd's fault/trap/abort infrastructure does, for example).
Quoted 10 lines
Quoted 10 lines
arch/i386/kernel/traps.c renamed from home/jbeulich/tmp/linux-2.6.16-rc4/arch/i386/kernel/traps.c +10
-0+struct tss_struct exception_tss[NR_CPUS][N_EXCEPTION_TSS] __cacheline_aligned = { + [0 ...NR_CPUS -1 ] = { + [0 ...N_EXCEPTION_TSS -1 ] = { + .cs = __KERNEL_CS, + .ss = __KERNEL_DS, + .ss0 = __KERNEL_DS, + .__cr3 =__pa (swapper_pg_dir), + .io_bitmap_base =INVALID_IO_BITMAP_OFFSET , + .ds = __USER_DS, + .es = __USER_DS,
Quoted 8 lines
arch/i386/kernel/traps.c asmlinkage int system_call(void); · line 82
Quoted 6 lines
arch/i386/kernel/traps.c renamed from home/jbeulich/tmp/linux-2.6.16-rc4/arch/i386/kernel/traps.c +6
-0+ .eflags = X86_EFLAGS_SF | 0x2, /* 0x2 bit is always set */ + }, + [DOUBLEFAULT_TSS ].eip = (unsigned long )doublefault_fn + } +}; +#endif How much more RAM does this patch consume?
8k TSS plus 4k stack per CPU compared to a single global TSS plus 1k stack in current code. One could argue that the I/O bitmap isn't really needed here, but mis-using it as stack wouldn't work well (because of the thread_info restrictions the TSS would then need to be allocated so that the I/O bitmap gets page aligned), nor can it be easily left off (struct tss_struct unfortunately includes this non-architectural part).
Quoted 3 lines
Quoted 1 line
+#define
EXCEPTION_STKSZ(PAGE_SIZE<<EXCEPTION_STACK_ORDER)"
EXCEPTION_STACK_SIZE", please.
Fine with me; just followed the x86-64 naming.
Jan
Quoted 5 lines · Jan Beulich
Quoted 1 line
Can't we use
CONFIG_DOUBLEFAULTthroughout? It's very much clearer.We could, when not considering broader use. I specifically introduced
N_EXCEPTION_TSSso that it wouldn't be as hard as it currently is to have other exceptions got through task gates (nlkd's fault/trap/abort infrastructure does, for example).
So please keep this in your out of tree patch. In mainline it's just needlessly obsfucating the code.
Jan Beulich
Acked-by Andi KleenQuoted 11 lines
Quoted 1 line
+# ifdef
CONFIG_SMPPlease don't bother with the space after the #. Yes, it's for nesting level, but if someone later comes along and sticks more ifdefs around this code, they won't go through and add the extra spaces anyway.
Such problems can be avoided by not adding the ifdefs at all..
...Quoted 1 line
+#define
EXCEPTION_STKSZ(PAGE_SIZE<<EXCEPTION_STACK_ORDER)"
EXCEPTION_STACK_SIZE", please.
Below an updated patch.
Make the double fault handler use CPU-specific stacks. Add some abstraction to simplify future change of other exception handlers to go through task gates. Change the pointer validity checks in the double fault handler to account for the fact that both GDT and TSS aren't in static kernel space anymore. Add a new notification of the event through the die notifier chain, also providing some environmental adjustments so that various infrastructural things work independent of the fact that the fault and the callbacks are running on other then the normal kernel stack.
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc5/arch/i386/kernel/cpu/common.c 2.6.16-rc5-i386-doublefault/arch/i386/kernel/cpu/common.c
arch/i386/kernel/cpu/common.c renamed from home/jbeulich/tmp/linux-2.6.16-rc5/arch/i386/kernel/cpu/common.c +49 -3
@@ -573,6 +573,7 @@ void __init early_cpu_init(void)void __devinit cpu_init (void ) {int cpu =smp_processor_id (); +unsigned i;struct tss_struct * t = &per_cpu (init_tss, cpu);struct thread_struct *thread = ¤t->thread;struct desc_struct *gdt;
@@ -645,9 +646,54 @@ void __devinit cpu_init(void)load_TR_desc ();load_LDT (&init_mm.context); -#ifdef CONFIG_DOUBLEFAULT -/* Set up doublefault TSS pointer in the GDT */ -__set_tss_desc (cpu,GDT_ENTRY_DOUBLEFAULT_TSS , &doublefault_tss); +#ifdef N_EXCEPTION_TSS +#if EXCEPTION_STACK_ORDER >THREAD_ORDER +#error Assertion failed: EXCEPTION_STACK_ORDER <= THREAD_ORDER +#endif +for (i =0 ; i <N_EXCEPTION_TSS ; ++i) { +unsigned long stack; + +/* Set up exception handling TSS */ + exception_tss[cpu][i].ebx = (unsigned long )&exception_tss[cpu][i]; + +/* Set up exception handling stacks */ +#ifdef CONFIG_SMP +if (cpu) { + stack =__get_free_pages (GFP_ATOMIC ,THREAD_ORDER ); +if (!stack) +panic ("Cannot allocate exception stack %u %d\n" , + i, + cpu); + } + else +#endif + stack = (unsigned long )__alloc_bootmem (EXCEPTION_STACK_SIZE , +THREAD_SIZE , +__pa (MAX_DMA_ADDRESS )); + stack +=EXCEPTION_STACK_SIZE ; + exception_tss[cpu][i].esp = exception_tss[cpu][i].esp0 = stack; +#ifdef CONFIG_SMP +if (cpu) { +unsigned j; + +for (j =EXCEPTION_STACK_ORDER ; j <THREAD_ORDER ; ++j) { +/* set_page_refs sets the page count only for the first +page, but since we split the larger-order page here, +we need to adjust the page count before freeing the +pieces. */ +struct page * page =virt_to_page ((void *)stack); + +BUG_ON (page_count (page)); +set_page_count (page,1 ); +free_pages (stack, j); + stack += (PAGE_SIZE << j); + } + } +#endif + +/* Set up exception handling TSS pointer in the GDT */ +__set_tss_desc (cpu,GDT_ENTRY_EXCEPTION_TSS + i, &exception_tss[cpu][i]); + }#endif /* Clear %fs and %gs. */
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc5/arch/i386/kernel/doublefault.c 2.6.16-rc5-i386-doublefault/arch/i386/kernel/doublefault.c
arch/i386/kernel/doublefault.c renamed from home/jbeulich/tmp/linux-2.6.16-rc5/arch/i386/kernel/doublefault.c +52 -29
110 lines not on this page · raw message
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc5/arch/i386/kernel/head.S 2.6.16-rc5-i386-doublefault/arch/i386/kernel/head.S
arch/i386/kernel/head.S renamed from home/jbeulich/tmp/linux-2.6.16-rc5/arch/i386/kernel/head.S +3 -1
@@ -532,5 +532,7 @@ ENTRY(cpu_gdt_table) .quad 0x0000000000000000 /* 0xe0 - unused */ .quad 0x0000000000000000 /* 0xe8 - unused */ .quad 0x0000000000000000 /* 0xf0 - unused */ - .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */ + /* Remaining entries represent TSSes for handling exceptions and + are run-time initialized. */ + .fill GDT_ENTRIES - (. - cpu_gdt_table) / 8, 8, 0
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc5/arch/i386/kernel/traps.c 2.6.16-rc5-i386-doublefault/arch/i386/kernel/traps.c
arch/i386/kernel/traps.c renamed from home/jbeulich/tmp/linux-2.6.16-rc5/arch/i386/kernel/traps.c +25 -1
@@ -61,6 +61,26 @@ asmlinkage int system_call(void);struct desc_struct default_ldt[] = { {0 ,0 }, {0 ,0 }, {0 ,0 }, {0 ,0 }, {0 ,0 } }; +void doublefault_fn (void ); + +#ifdef N_EXCEPTION_TSS +struct tss_struct exception_tss[NR_CPUS][N_EXCEPTION_TSS] __cacheline_aligned = { + [0 ...NR_CPUS -1 ] = { + [0 ...N_EXCEPTION_TSS -1 ] = { + .cs = __KERNEL_CS, + .ss = __KERNEL_DS, + .ss0 = __KERNEL_DS, + .__cr3 =__pa (swapper_pg_dir), + .io_bitmap_base =INVALID_IO_BITMAP_OFFSET , + .ds = __USER_DS, + .es = __USER_DS, + .eflags =X86_EFLAGS_SF |0x2 ,/* 0x2 bit is always set */ + }, + [DOUBLEFAULT_TSS ].eip = (unsigned long )doublefault_fn + } +}; +#endif +/* Do we ignore FPU interrupts ? */ char ignore_fpu_irq =0 ;
@@ -1086,10 +1106,12 @@ static void __init set_system_gate(unsig_set_gate (idt_table+n,15 ,3 ,addr,__KERNEL_CS); } +#ifdef N_EXCEPTION_TSS static void __init set_task_gate (unsigned int n,unsigned int gdt_entry) {_set_gate (idt_table+n,5 ,0 ,0 ,(gdt_entry<<3 )); } +#endif void __init trap_init (void )
@@ -1114,7 +1136,9 @@ void __init trap_init(void)set_trap_gate (5 ,&bounds);set_trap_gate (6 ,&invalid_op);set_trap_gate (7 ,&device_not_available); -set_task_gate (8 ,GDT_ENTRY_DOUBLEFAULT_TSS ); +#ifdef DOUBLEFAULT_TSS +set_task_gate (8 ,GDT_ENTRY_EXCEPTION_TSS +DOUBLEFAULT_TSS ); +#endif set_trap_gate (9 ,&coprocessor_segment_overrun);set_trap_gate (10 ,&invalid_TSS);set_trap_gate (11 ,&segment_not_present);
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc5/include/asm-i386/kdebug.h 2.6.16-rc5-i386-doublefault/include/asm-i386/kdebug.h
include/asm-i386/kdebug.h renamed from home/jbeulich/tmp/linux-2.6.16-rc5/include/asm-i386/kdebug.h +1 -0
@@ -39,6 +39,7 @@ enum die_val {DIE_CALL ,DIE_NMI_IPI ,DIE_PAGE_FAULT , +DIE_DOUBLE_FAULT }; static inline int notify_die(enum die_val val, const char *str,
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc5/include/asm-i386/processor.h 2.6.16-rc5-i386-doublefault/include/asm-i386/processor.h
include/asm-i386/processor.h renamed from home/jbeulich/tmp/linux-2.6.16-rc5/include/asm-i386/processor.h +6 -1
@@ -90,7 +90,9 @@ struct cpuinfo_x86 {extern struct cpuinfo_x86 boot_cpu_data;extern struct cpuinfo_x86 new_cpu_data; -extern struct tss_struct doublefault_tss; +#ifdef N_EXCEPTION_TSS +extern struct tss_struct exception_tss[NR_CPUS ][N_EXCEPTION_TSS ]; +#endif DECLARE_PER_CPU(struct tss_struct, init_tss);#ifdef CONFIG_SMP
@@ -486,6 +488,9 @@ struct thread_struct { .io_bitmap = { [ 0 ... IO_BITMAP_LONGS] = ~0 }, \ } +#define EXCEPTION_STACK_ORDER 0 +#define EXCEPTION_STACK_SIZE (PAGE_SIZE << EXCEPTION_STACK_ORDER) +static inline void load_esp0 (struct tss_struct *tss,struct thread_struct *thread) { tss->esp0 = thread->esp0;
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc5/include/asm-i386/segment.h 2.6.16-rc5-i386-doublefault/include/asm-i386/segment.h
include/asm-i386/segment.h renamed from home/jbeulich/tmp/linux-2.6.16-rc5/include/asm-i386/segment.h +15 -4
@@ -43,7 +43,8 @@* 28 - unused * 29 - unused * 30 - unused -* 31 - TSS for double fault handler +* 31 - TSS for first exception handler (double fault) +* 32+ TSSes for further exception handlers */ #define GDT_ENTRY_TLS_ENTRIES 3#define GDT_ENTRY_TLS_MIN 6
@@ -74,12 +75,22 @@#define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14)#define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) -#define GDT_ENTRY_DOUBLEFAULT_TSS 31 +#define GDT_ENTRY_EXCEPTION_TSS 31 +#ifdef CONFIG_DOUBLEFAULT +#define DOUBLEFAULT_TSS 0 +#define N_EXCEPTION_TSS 1 +#else +#undef GDT_ENTRY_EXCEPTION_TSS +#endif /* -* The GDT has 32 entries +* The GDT has 31+ entries */ -#define GDT_ENTRIES 32 +#ifdef N_EXCEPTION_TSS +#define GDT_ENTRIES (31 + N_EXCEPTION_TSS) +#else +#define GDT_ENTRIES 31 +#endif #define GDT_SIZE (GDT_ENTRIES * 8)
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc5/include/asm-i386/thread_info.h 2.6.16-rc5-i386-doublefault/include/asm-i386/thread_info.h
include/asm-i386/thread_info.h renamed from home/jbeulich/tmp/linux-2.6.16-rc5/include/asm-i386/thread_info.h +3 -2
@@ -54,10 +54,11 @@ struct thread_info {#define PREEMPT_ACTIVE 0x10000000#ifdef CONFIG_4KSTACKS -#define THREAD_SIZE (4096) +#define THREAD_ORDER 0#else -#define THREAD_SIZE (8192) +#define THREAD_ORDER 1#endif +#define THREAD_SIZE (4096 << THREAD_ORDER)#define STACK_WARN (THREAD_SIZE/8)/*