# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1183459285 -3600
# Node ID 83cbda5c1e1b55acf5f8b9981cfe022a2da05e3c
# Parent 0900fb1a3693dc175088f2278ca119aa4c6f3135
x86-64: bump STACK_SIZE to 32 so that trampoline and IST stacks fit
without undue squeezing.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
xen/arch/x86/hvm/svm/svm.c | 12 ++++++------
xen/arch/x86/mm.c | 5 +++--
xen/arch/x86/setup.c | 2 +-
xen/arch/x86/traps.c | 2 +-
xen/arch/x86/x86_32/xen.lds.S | 4 +++-
xen/arch/x86/x86_64/traps.c | 29 ++++++++++++++++-------------
xen/arch/x86/x86_64/xen.lds.S | 4 +++-
xen/include/asm-x86/config.h | 8 ++++++--
xen/include/asm-x86/processor.h | 7 +++++++
9 files changed, 46 insertions(+), 27 deletions(-)
diff -r 0900fb1a3693 -r 83cbda5c1e1b xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c Tue Jul 03 11:24:40 2007 +0100
+++ b/xen/arch/x86/hvm/svm/svm.c Tue Jul 03 11:41:25 2007 +0100
@@ -807,9 +807,9 @@ static void svm_ctxt_switch_from(struct
#ifdef __x86_64__
/* Resume use of ISTs now that the host TR is reinstated. */
- idt_tables[cpu][TRAP_double_fault].a |= 1UL << 32; /* IST1 */
- idt_tables[cpu][TRAP_nmi].a |= 2UL << 32; /* IST2 */
- idt_tables[cpu][TRAP_machine_check].a |= 3UL << 32; /* IST3 */
+ idt_tables[cpu][TRAP_double_fault].a |= IST_DF << 32;
+ idt_tables[cpu][TRAP_nmi].a |= IST_NMI << 32;
+ idt_tables[cpu][TRAP_machine_check].a |= IST_MCE << 32;
#endif
}
@@ -832,9 +832,9 @@ static void svm_ctxt_switch_to(struct vc
* Cannot use ISTs for NMI/#MC/#DF while we are running with the guest TR.
* But this doesn't matter: the IST is only req'd to handle SYSCALL/SYSRET.
*/
- idt_tables[cpu][TRAP_double_fault].a &= ~(3UL << 32);
- idt_tables[cpu][TRAP_nmi].a &= ~(3UL << 32);
- idt_tables[cpu][TRAP_machine_check].a &= ~(3UL << 32);
+ idt_tables[cpu][TRAP_double_fault].a &= ~(7UL << 32);
+ idt_tables[cpu][TRAP_nmi].a &= ~(7UL << 32);
+ idt_tables[cpu][TRAP_machine_check].a &= ~(7UL << 32);
#endif
svm_restore_dr(v);
diff -r 0900fb1a3693 -r 83cbda5c1e1b xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Tue Jul 03 11:24:40 2007 +0100
+++ b/xen/arch/x86/mm.c Tue Jul 03 11:41:25 2007 +0100
@@ -3655,8 +3655,9 @@ void memguard_unguard_range(void *p, uns
void memguard_guard_stack(void *p)
{
- BUILD_BUG_ON((DEBUG_STACK_SIZE + PAGE_SIZE) > STACK_SIZE);
- p = (void *)((unsigned long)p + STACK_SIZE - DEBUG_STACK_SIZE - PAGE_SIZE);
+ BUILD_BUG_ON((PRIMARY_STACK_SIZE + PAGE_SIZE) > STACK_SIZE);
+ p = (void *)((unsigned long)p + STACK_SIZE -
+ PRIMARY_STACK_SIZE - PAGE_SIZE);
memguard_guard_range(p, PAGE_SIZE);
}
diff -r 0900fb1a3693 -r 83cbda5c1e1b xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c Tue Jul 03 11:24:40 2007 +0100
+++ b/xen/arch/x86/setup.c Tue Jul 03 11:41:25 2007 +0100
@@ -109,7 +109,7 @@ extern void early_cpu_init(void);
struct tss_struct init_tss[NR_CPUS];
-char __attribute__ ((__section__(".bss.page_aligned"))) cpu0_stack[STACK_SIZE];
+char __attribute__ ((__section__(".bss.stack_aligned")))
cpu0_stack[STACK_SIZE];
struct cpuinfo_x86 boot_cpu_data = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
diff -r 0900fb1a3693 -r 83cbda5c1e1b xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c Tue Jul 03 11:24:40 2007 +0100
+++ b/xen/arch/x86/traps.c Tue Jul 03 11:41:25 2007 +0100
@@ -280,7 +280,7 @@ void show_stack_overflow(unsigned int cp
unsigned long *stack, addr;
esp_bottom = (esp | (STACK_SIZE - 1)) + 1;
- esp_top = esp_bottom - DEBUG_STACK_SIZE;
+ esp_top = esp_bottom - PRIMARY_STACK_SIZE;
printk("Valid stack range: %p-%p, sp=%p, tss.esp0=%p\n",
(void *)esp_top, (void *)esp_bottom, (void *)esp,
diff -r 0900fb1a3693 -r 83cbda5c1e1b xen/arch/x86/x86_32/xen.lds.S
--- a/xen/arch/x86/x86_32/xen.lds.S Tue Jul 03 11:24:40 2007 +0100
+++ b/xen/arch/x86/x86_32/xen.lds.S Tue Jul 03 11:41:25 2007 +0100
@@ -70,12 +70,14 @@ SECTIONS
.data.percpu : { *(.data.percpu) } :text
__per_cpu_data_end = .;
. = __per_cpu_start + (NR_CPUS << PERCPU_SHIFT);
- . = ALIGN(STACK_SIZE);
+ . = ALIGN(PAGE_SIZE);
__per_cpu_end = .;
__bss_start = .; /* BSS */
.bss : {
+ . = ALIGN(STACK_SIZE);
*(.bss.stack_aligned)
+ . = ALIGN(PAGE_SIZE);
*(.bss.page_aligned)
*(.bss)
} :text
diff -r 0900fb1a3693 -r 83cbda5c1e1b xen/arch/x86/x86_64/traps.c
--- a/xen/arch/x86/x86_64/traps.c Tue Jul 03 11:24:40 2007 +0100
+++ b/xen/arch/x86/x86_64/traps.c Tue Jul 03 11:41:25 2007 +0100
@@ -292,11 +292,11 @@ void __init percpu_traps_init(void)
if ( cpu == 0 )
{
- /* Specify dedicated interrupt stacks for NMIs and double faults. */
+ /* Specify dedicated interrupt stacks for NMI, #DF, and #MC. */
set_intr_gate(TRAP_double_fault, &double_fault);
- idt_table[TRAP_double_fault].a |= 1UL << 32; /* IST1 */
- idt_table[TRAP_nmi].a |= 2UL << 32; /* IST2 */
- idt_table[TRAP_machine_check].a |= 3UL << 32; /* IST3 */
+ idt_table[TRAP_double_fault].a |= IST_DF << 32;
+ idt_table[TRAP_nmi].a |= IST_NMI << 32;
+ idt_table[TRAP_machine_check].a |= IST_MCE << 32;
/*
* The 32-on-64 hypercall entry vector is only accessible from ring 1.
@@ -311,17 +311,20 @@ void __init percpu_traps_init(void)
stack_bottom = (char *)get_stack_bottom();
stack = (char *)((unsigned long)stack_bottom & ~(STACK_SIZE - 1));
- /* Machine Check handler has its own per-CPU 1kB stack. */
- init_tss[cpu].ist[2] = (unsigned long)&stack[1024];
-
- /* Double-fault handler has its own per-CPU 1kB stack. */
- init_tss[cpu].ist[0] = (unsigned long)&stack[2048];
-
- /* NMI handler has its own per-CPU 1kB stack. */
- init_tss[cpu].ist[1] = (unsigned long)&stack[3072];
+ /* IST_MAX IST pages + 1 syscall page + 1 guard page + primary stack. */
+ BUILD_BUG_ON((IST_MAX + 2) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE);
+
+ /* Machine Check handler has its own per-CPU 4kB stack. */
+ init_tss[cpu].ist[IST_MCE] = (unsigned long)&stack[IST_MCE * PAGE_SIZE];
+
+ /* Double-fault handler has its own per-CPU 4kB stack. */
+ init_tss[cpu].ist[IST_DF] = (unsigned long)&stack[IST_DF * PAGE_SIZE];
+
+ /* NMI handler has its own per-CPU 4kB stack. */
+ init_tss[cpu].ist[IST_NMI] = (unsigned long)&stack[IST_NMI * PAGE_SIZE];
/* Trampoline for SYSCALL entry from long mode. */
- stack = &stack[3072]; /* Skip the NMI and DF stacks. */
+ stack = &stack[IST_MAX * PAGE_SIZE]; /* Skip the IST stacks. */
wrmsr(MSR_LSTAR, (unsigned long)stack, ((unsigned long)stack>>32));
stack += write_stack_trampoline(stack, stack_bottom, FLAT_KERNEL_CS64);
diff -r 0900fb1a3693 -r 83cbda5c1e1b xen/arch/x86/x86_64/xen.lds.S
--- a/xen/arch/x86/x86_64/xen.lds.S Tue Jul 03 11:24:40 2007 +0100
+++ b/xen/arch/x86/x86_64/xen.lds.S Tue Jul 03 11:41:25 2007 +0100
@@ -68,12 +68,14 @@ SECTIONS
.data.percpu : { *(.data.percpu) } :text
__per_cpu_data_end = .;
. = __per_cpu_start + (NR_CPUS << PERCPU_SHIFT);
- . = ALIGN(STACK_SIZE);
+ . = ALIGN(PAGE_SIZE);
__per_cpu_end = .;
__bss_start = .; /* BSS */
.bss : {
+ . = ALIGN(STACK_SIZE);
*(.bss.stack_aligned)
+ . = ALIGN(PAGE_SIZE);
*(.bss.page_aligned)
*(.bss)
} :text
diff -r 0900fb1a3693 -r 83cbda5c1e1b xen/include/asm-x86/config.h
--- a/xen/include/asm-x86/config.h Tue Jul 03 11:24:40 2007 +0100
+++ b/xen/include/asm-x86/config.h Tue Jul 03 11:41:25 2007 +0100
@@ -77,11 +77,15 @@
#define MEMORY_GUARD
#endif
+#ifdef __i386__
#define STACK_ORDER 2
+#else
+#define STACK_ORDER 3
+#endif
#define STACK_SIZE (PAGE_SIZE << STACK_ORDER)
-/* Debug stack is restricted to 8kB by guard pages. */
-#define DEBUG_STACK_SIZE 8192
+/* Primary stack is restricted to 8kB by guard pages. */
+#define PRIMARY_STACK_SIZE 8192
#define CONFIG_DMA_BITSIZE 32
diff -r 0900fb1a3693 -r 83cbda5c1e1b xen/include/asm-x86/processor.h
--- a/xen/include/asm-x86/processor.h Tue Jul 03 11:24:40 2007 +0100
+++ b/xen/include/asm-x86/processor.h Tue Jul 03 11:41:25 2007 +0100
@@ -448,6 +448,13 @@ struct tss_struct {
u8 __cacheline_filler[24];
} __cacheline_aligned __attribute__((packed));
+#ifdef __x86_64__
+# define IST_DF 1UL
+# define IST_NMI 2UL
+# define IST_MCE 3UL
+# define IST_MAX 3UL
+#endif
+
#define IDT_ENTRIES 256
extern idt_entry_t idt_table[];
extern idt_entry_t *idt_tables[];
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home