2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* entry.S contains the system-call and fault low-level handling routines.
|
|
|
|
|
* This also contains the timer-interrupt handler, as well as all interrupts
|
|
|
|
|
* and faults that can result in a task-switch.
|
|
|
|
|
*
|
|
|
|
|
* NOTE: This code handles signal-recognition, which happens every time
|
|
|
|
|
* after a timer-interrupt and after each system call.
|
|
|
|
|
*
|
|
|
|
|
* I changed all the .align's to 4 (16 byte alignment), as that's faster
|
|
|
|
|
* on a 486.
|
|
|
|
|
*
|
2007-05-02 17:27:19 +00:00
|
|
|
* Stack layout in 'syscall_exit':
|
2005-04-16 22:20:36 +00:00
|
|
|
* ptrace needs to have all regs on the stack.
|
|
|
|
|
* if the order here is changed, it needs to be
|
|
|
|
|
* updated in fork.c:copy_process, signal.c:do_signal,
|
|
|
|
|
* ptrace.c and ptrace.h
|
|
|
|
|
*
|
|
|
|
|
* 0(%esp) - %ebx
|
|
|
|
|
* 4(%esp) - %ecx
|
|
|
|
|
* 8(%esp) - %edx
|
|
|
|
|
* C(%esp) - %esi
|
|
|
|
|
* 10(%esp) - %edi
|
|
|
|
|
* 14(%esp) - %ebp
|
|
|
|
|
* 18(%esp) - %eax
|
|
|
|
|
* 1C(%esp) - %ds
|
|
|
|
|
* 20(%esp) - %es
|
2007-02-13 12:26:20 +00:00
|
|
|
* 24(%esp) - %fs
|
2009-02-09 13:17:40 +00:00
|
|
|
* 28(%esp) - %gs saved iff !CONFIG_X86_32_LAZY_GS
|
|
|
|
|
* 2C(%esp) - orig_eax
|
|
|
|
|
* 30(%esp) - %eip
|
|
|
|
|
* 34(%esp) - %cs
|
|
|
|
|
* 38(%esp) - %eflags
|
|
|
|
|
* 3C(%esp) - %oldesp
|
|
|
|
|
* 40(%esp) - %oldss
|
2005-04-16 22:20:36 +00:00
|
|
|
*
|
|
|
|
|
* "current" is in register %ebx during any slow entries.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/linkage.h>
|
|
|
|
|
#include <asm/thread_info.h>
|
2006-07-03 07:24:43 +00:00
|
|
|
#include <asm/irqflags.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <asm/errno.h>
|
|
|
|
|
#include <asm/segment.h>
|
|
|
|
|
#include <asm/smp.h>
|
2009-02-13 19:14:01 +00:00
|
|
|
#include <asm/page_types.h>
|
2006-12-07 01:14:01 +00:00
|
|
|
#include <asm/percpu.h>
|
2006-06-26 11:57:44 +00:00
|
|
|
#include <asm/dwarf2.h>
|
2008-03-25 19:16:32 +00:00
|
|
|
#include <asm/processor-flags.h>
|
2008-06-21 18:17:27 +00:00
|
|
|
#include <asm/ftrace.h>
|
2008-05-02 18:10:09 +00:00
|
|
|
#include <asm/irq_vectors.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-06-24 11:16:52 +00:00
|
|
|
/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
|
|
|
|
|
#include <linux/elf-em.h>
|
|
|
|
|
#define AUDIT_ARCH_I386 (EM_386|__AUDIT_ARCH_LE)
|
|
|
|
|
#define __AUDIT_ARCH_LE 0x40000000
|
|
|
|
|
|
|
|
|
|
#ifndef CONFIG_AUDITSYSCALL
|
|
|
|
|
#define sysenter_audit syscall_trace_entry
|
|
|
|
|
#define sysexit_audit syscall_exit_work
|
|
|
|
|
#endif
|
|
|
|
|
|
2006-12-07 01:14:08 +00:00
|
|
|
/*
|
|
|
|
|
* We use macros for low-level operations which need to be overridden
|
|
|
|
|
* for paravirtualization. The following will never clobber any registers:
|
|
|
|
|
* INTERRUPT_RETURN (aka. "iret")
|
|
|
|
|
* GET_CR0_INTO_EAX (aka. "movl %cr0, %eax")
|
2008-06-25 04:19:26 +00:00
|
|
|
* ENABLE_INTERRUPTS_SYSEXIT (aka "sti; sysexit").
|
2006-12-07 01:14:08 +00:00
|
|
|
*
|
|
|
|
|
* For DISABLE_INTERRUPTS/ENABLE_INTERRUPTS (aka "cli"/"sti"), you must
|
|
|
|
|
* specify what registers can be overwritten (CLBR_NONE, CLBR_EAX/EDX/ECX/ANY).
|
|
|
|
|
* Allowing a register to be clobbered can shrink the paravirt replacement
|
|
|
|
|
* enough to patch inline, increasing performance.
|
|
|
|
|
*/
|
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
#define nr_syscalls ((syscall_table_size)/4)
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_PREEMPT
|
2006-12-07 01:14:08 +00:00
|
|
|
#define preempt_stop(clobbers) DISABLE_INTERRUPTS(clobbers); TRACE_IRQS_OFF
|
2005-04-16 22:20:36 +00:00
|
|
|
#else
|
2006-12-07 01:14:08 +00:00
|
|
|
#define preempt_stop(clobbers)
|
i386: fix return to 16-bit stack from NMI handler
Returning to a task with a 16-bit stack requires special care: the iret
instruction does not restore the high word of esp in that case. The
espfix code fixes this, but currently is not invoked on NMIs. This means
that a running task gets the upper word of esp clobbered due intervening
NMIs. To reproduce, compile and run the following program with the nmi
watchdog enabled (nmi_watchdog=2 on the command line). Using gdb you can
see that the high bits of esp contain garbage, while the low bits are
still correct.
This patch puts the espfix code back into the NMI code path.
The patch is slightly complicated due to the irqtrace infrastructure not
being NMI-safe. The NMI return path cannot call TRACE_IRQS_IRET.
Otherwise, the tail of the normal iret-code is correct for the nmi code
path too. To be able to share this code-path, the TRACE_IRQS_IRET was
move up a bit. The espfix code exists after the TRACE_IRQS_IRET, but
this code explicitly disables interrupts. This short interrupts-off
section is now not traced anymore. The return-to-kernel path now always
includes the preliminary test to decide if the espfix code should be
called. This is never the case, but doing it this way keeps the patch as
simple as possible and the few extra instructions should not affect
timing in any significant way.
#define _GNU_SOURCE
#include <stdio.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <unistd.h>
#include <sys/syscall.h>
#include <asm/ldt.h>
int modify_ldt(int func, void *ptr, unsigned long bytecount)
{
return syscall(SYS_modify_ldt, func, ptr, bytecount);
}
/* this is assumed to be usable */
#define SEGBASEADDR 0x10000
#define SEGLIMIT 0x20000
/* 16-bit segment */
struct user_desc desc = {
.entry_number = 0,
.base_addr = SEGBASEADDR,
.limit = SEGLIMIT,
.seg_32bit = 0,
.contents = 0, /* ??? */
.read_exec_only = 0,
.limit_in_pages = 0,
.seg_not_present = 0,
.useable = 1
};
int main(void)
{
setvbuf(stdout, NULL, _IONBF, 0);
/* map a 64 kb segment */
char *pointer = mmap((void *)SEGBASEADDR, SEGLIMIT+1,
PROT_EXEC|PROT_READ|PROT_WRITE,
MAP_SHARED|MAP_ANONYMOUS, -1, 0);
if (pointer == NULL) {
printf("could not map space\n");
return 0;
}
/* write ldt, new mode */
int err = modify_ldt(0x11, &desc, sizeof(desc));
if (err) {
printf("error modifying ldt: %i\n", err);
return 0;
}
for (int i=0; i<1000; i++) {
asm volatile (
"pusha\n\t"
"mov %ss, %eax\n\t" /* preserve ss:esp */
"mov %esp, %ebp\n\t"
"push $7\n\t" /* index 0, ldt, user mode */
"push $65536-4096\n\t" /* esp */
"lss (%esp), %esp\n\t" /* switch to new stack */
"push %eax\n\t" /* save old ss:esp on new stack */
"push %ebp\n\t"
"add $17*65536, %esp\n\t" /* set high bits */
"mov %esp, %edx\n\t"
"mov $10000000, %ecx\n\t" /* wait... */
"1: loop 1b\n\t" /* ... a bit */
"cmp %esp, %edx\n\t"
"je 1f\n\t"
"ud2\n\t" /* esp changed inexplicably! */
"1:\n\t"
"sub $17*65536, %esp\n\t" /* restore high bits */
"lss (%esp), %esp\n\t" /* restore old ss:esp */
"popa\n\t");
printf("\rx%ix", i);
}
return 0;
}
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:57 +00:00
|
|
|
#define resume_kernel restore_all
|
2005-04-16 22:20:36 +00:00
|
|
|
#endif
|
|
|
|
|
|
2006-07-03 07:24:43 +00:00
|
|
|
.macro TRACE_IRQS_IRET
|
|
|
|
|
#ifdef CONFIG_TRACE_IRQFLAGS
|
2008-03-25 19:16:32 +00:00
|
|
|
testl $X86_EFLAGS_IF,PT_EFLAGS(%esp) # interrupts off?
|
2006-07-03 07:24:43 +00:00
|
|
|
jz 1f
|
|
|
|
|
TRACE_IRQS_ON
|
|
|
|
|
1:
|
|
|
|
|
#endif
|
|
|
|
|
.endm
|
|
|
|
|
|
2006-06-27 09:53:48 +00:00
|
|
|
#ifdef CONFIG_VM86
|
|
|
|
|
#define resume_userspace_sig check_userspace
|
|
|
|
|
#else
|
|
|
|
|
#define resume_userspace_sig resume_userspace
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-02-09 13:17:40 +00:00
|
|
|
/*
|
|
|
|
|
* User gs save/restore
|
|
|
|
|
*
|
|
|
|
|
* %gs is used for userland TLS and kernel only uses it for stack
|
|
|
|
|
* canary which is required to be at %gs:20 by gcc. Read the comment
|
|
|
|
|
* at the top of stackprotector.h for more info.
|
|
|
|
|
*
|
|
|
|
|
* Local labels 98 and 99 are used.
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_X86_32_LAZY_GS
|
|
|
|
|
|
|
|
|
|
/* unfortunately push/pop can't be no-op */
|
|
|
|
|
.macro PUSH_GS
|
|
|
|
|
pushl $0
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
.endm
|
|
|
|
|
.macro POP_GS pop=0
|
|
|
|
|
addl $(4 + \pop), %esp
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -(4 + \pop)
|
|
|
|
|
.endm
|
|
|
|
|
.macro POP_GS_EX
|
|
|
|
|
.endm
|
|
|
|
|
|
|
|
|
|
/* all the rest are no-op */
|
|
|
|
|
.macro PTGS_TO_GS
|
|
|
|
|
.endm
|
|
|
|
|
.macro PTGS_TO_GS_EX
|
|
|
|
|
.endm
|
|
|
|
|
.macro GS_TO_REG reg
|
|
|
|
|
.endm
|
|
|
|
|
.macro REG_TO_PTGS reg
|
|
|
|
|
.endm
|
|
|
|
|
.macro SET_KERNEL_GS reg
|
|
|
|
|
.endm
|
|
|
|
|
|
|
|
|
|
#else /* CONFIG_X86_32_LAZY_GS */
|
|
|
|
|
|
|
|
|
|
.macro PUSH_GS
|
|
|
|
|
pushl %gs
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
/*CFI_REL_OFFSET gs, 0*/
|
|
|
|
|
.endm
|
|
|
|
|
|
|
|
|
|
.macro POP_GS pop=0
|
|
|
|
|
98: popl %gs
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
/*CFI_RESTORE gs*/
|
|
|
|
|
.if \pop <> 0
|
|
|
|
|
add $\pop, %esp
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -\pop
|
|
|
|
|
.endif
|
|
|
|
|
.endm
|
|
|
|
|
.macro POP_GS_EX
|
|
|
|
|
.pushsection .fixup, "ax"
|
|
|
|
|
99: movl $0, (%esp)
|
|
|
|
|
jmp 98b
|
|
|
|
|
.section __ex_table, "a"
|
|
|
|
|
.align 4
|
|
|
|
|
.long 98b, 99b
|
|
|
|
|
.popsection
|
|
|
|
|
.endm
|
|
|
|
|
|
|
|
|
|
.macro PTGS_TO_GS
|
|
|
|
|
98: mov PT_GS(%esp), %gs
|
|
|
|
|
.endm
|
|
|
|
|
.macro PTGS_TO_GS_EX
|
|
|
|
|
.pushsection .fixup, "ax"
|
|
|
|
|
99: movl $0, PT_GS(%esp)
|
|
|
|
|
jmp 98b
|
|
|
|
|
.section __ex_table, "a"
|
|
|
|
|
.align 4
|
|
|
|
|
.long 98b, 99b
|
|
|
|
|
.popsection
|
|
|
|
|
.endm
|
|
|
|
|
|
|
|
|
|
.macro GS_TO_REG reg
|
|
|
|
|
movl %gs, \reg
|
|
|
|
|
/*CFI_REGISTER gs, \reg*/
|
|
|
|
|
.endm
|
|
|
|
|
.macro REG_TO_PTGS reg
|
|
|
|
|
movl \reg, PT_GS(%esp)
|
|
|
|
|
/*CFI_REL_OFFSET gs, PT_GS*/
|
|
|
|
|
.endm
|
|
|
|
|
.macro SET_KERNEL_GS reg
|
2009-02-09 13:17:40 +00:00
|
|
|
movl $(__KERNEL_STACK_CANARY), \reg
|
2009-02-09 13:17:40 +00:00
|
|
|
movl \reg, %gs
|
|
|
|
|
.endm
|
|
|
|
|
|
|
|
|
|
#endif /* CONFIG_X86_32_LAZY_GS */
|
|
|
|
|
|
2009-02-09 13:17:40 +00:00
|
|
|
.macro SAVE_ALL
|
|
|
|
|
cld
|
2009-02-09 13:17:40 +00:00
|
|
|
PUSH_GS
|
2009-02-09 13:17:40 +00:00
|
|
|
pushl %fs
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
/*CFI_REL_OFFSET fs, 0;*/
|
|
|
|
|
pushl %es
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
/*CFI_REL_OFFSET es, 0;*/
|
|
|
|
|
pushl %ds
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
/*CFI_REL_OFFSET ds, 0;*/
|
|
|
|
|
pushl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET eax, 0
|
|
|
|
|
pushl %ebp
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET ebp, 0
|
|
|
|
|
pushl %edi
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET edi, 0
|
|
|
|
|
pushl %esi
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET esi, 0
|
|
|
|
|
pushl %edx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET edx, 0
|
|
|
|
|
pushl %ecx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET ecx, 0
|
|
|
|
|
pushl %ebx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET ebx, 0
|
|
|
|
|
movl $(__USER_DS), %edx
|
|
|
|
|
movl %edx, %ds
|
|
|
|
|
movl %edx, %es
|
|
|
|
|
movl $(__KERNEL_PERCPU), %edx
|
2007-02-13 12:26:20 +00:00
|
|
|
movl %edx, %fs
|
2009-02-09 13:17:40 +00:00
|
|
|
SET_KERNEL_GS %edx
|
2009-02-09 13:17:40 +00:00
|
|
|
.endm
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-02-09 13:17:40 +00:00
|
|
|
.macro RESTORE_INT_REGS
|
|
|
|
|
popl %ebx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
CFI_RESTORE ebx
|
|
|
|
|
popl %ecx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
CFI_RESTORE ecx
|
|
|
|
|
popl %edx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
CFI_RESTORE edx
|
|
|
|
|
popl %esi
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
CFI_RESTORE esi
|
|
|
|
|
popl %edi
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
CFI_RESTORE edi
|
|
|
|
|
popl %ebp
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
CFI_RESTORE ebp
|
|
|
|
|
popl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_RESTORE eax
|
2009-02-09 13:17:40 +00:00
|
|
|
.endm
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-02-09 13:17:40 +00:00
|
|
|
.macro RESTORE_REGS pop=0
|
2009-02-09 13:17:40 +00:00
|
|
|
RESTORE_INT_REGS
|
|
|
|
|
1: popl %ds
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
/*CFI_RESTORE ds;*/
|
|
|
|
|
2: popl %es
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
/*CFI_RESTORE es;*/
|
|
|
|
|
3: popl %fs
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
/*CFI_RESTORE fs;*/
|
2009-02-09 13:17:40 +00:00
|
|
|
POP_GS \pop
|
2009-02-09 13:17:40 +00:00
|
|
|
.pushsection .fixup, "ax"
|
|
|
|
|
4: movl $0, (%esp)
|
|
|
|
|
jmp 1b
|
|
|
|
|
5: movl $0, (%esp)
|
|
|
|
|
jmp 2b
|
|
|
|
|
6: movl $0, (%esp)
|
|
|
|
|
jmp 3b
|
|
|
|
|
.section __ex_table, "a"
|
|
|
|
|
.align 4
|
|
|
|
|
.long 1b, 4b
|
|
|
|
|
.long 2b, 5b
|
|
|
|
|
.long 3b, 6b
|
[PATCH] i386: Use %gs as the PDA base-segment in the kernel
This patch is the meat of the PDA change. This patch makes several related
changes:
1: Most significantly, %gs is now used in the kernel. This means that on
entry, the old value of %gs is saved away, and it is reloaded with
__KERNEL_PDA.
2: entry.S constructs the stack in the shape of struct pt_regs, and this
is passed around the kernel so that the process's saved register
state can be accessed.
Unfortunately struct pt_regs doesn't currently have space for %gs
(or %fs). This patch extends pt_regs to add space for gs (no space
is allocated for %fs, since it won't be used, and it would just
complicate the code in entry.S to work around the space).
3: Because %gs is now saved on the stack like %ds, %es and the integer
registers, there are a number of places where it no longer needs to
be handled specially; namely context switch, and saving/restoring the
register state in a signal context.
4: And since kernel threads run in kernel space and call normal kernel
code, they need to be created with their %gs == __KERNEL_PDA.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Chuck Ebbert <76306.1226@compuserve.com>
Cc: Zachary Amsden <zach@vmware.com>
Cc: Jan Beulich <jbeulich@novell.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2006-12-07 01:14:02 +00:00
|
|
|
.popsection
|
2009-02-09 13:17:40 +00:00
|
|
|
POP_GS_EX
|
2009-02-09 13:17:40 +00:00
|
|
|
.endm
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-02-09 13:17:40 +00:00
|
|
|
.macro RING0_INT_FRAME
|
|
|
|
|
CFI_STARTPROC simple
|
|
|
|
|
CFI_SIGNAL_FRAME
|
|
|
|
|
CFI_DEF_CFA esp, 3*4
|
|
|
|
|
/*CFI_OFFSET cs, -2*4;*/
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_OFFSET eip, -3*4
|
2009-02-09 13:17:40 +00:00
|
|
|
.endm
|
2006-06-26 11:57:44 +00:00
|
|
|
|
2009-02-09 13:17:40 +00:00
|
|
|
.macro RING0_EC_FRAME
|
|
|
|
|
CFI_STARTPROC simple
|
|
|
|
|
CFI_SIGNAL_FRAME
|
|
|
|
|
CFI_DEF_CFA esp, 4*4
|
|
|
|
|
/*CFI_OFFSET cs, -2*4;*/
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_OFFSET eip, -3*4
|
2009-02-09 13:17:40 +00:00
|
|
|
.endm
|
2006-06-26 11:57:44 +00:00
|
|
|
|
2009-02-09 13:17:40 +00:00
|
|
|
.macro RING0_PTREGS_FRAME
|
|
|
|
|
CFI_STARTPROC simple
|
|
|
|
|
CFI_SIGNAL_FRAME
|
|
|
|
|
CFI_DEF_CFA esp, PT_OLDESP-PT_EBX
|
|
|
|
|
/*CFI_OFFSET cs, PT_CS-PT_OLDESP;*/
|
|
|
|
|
CFI_OFFSET eip, PT_EIP-PT_OLDESP
|
|
|
|
|
/*CFI_OFFSET es, PT_ES-PT_OLDESP;*/
|
|
|
|
|
/*CFI_OFFSET ds, PT_DS-PT_OLDESP;*/
|
|
|
|
|
CFI_OFFSET eax, PT_EAX-PT_OLDESP
|
|
|
|
|
CFI_OFFSET ebp, PT_EBP-PT_OLDESP
|
|
|
|
|
CFI_OFFSET edi, PT_EDI-PT_OLDESP
|
|
|
|
|
CFI_OFFSET esi, PT_ESI-PT_OLDESP
|
|
|
|
|
CFI_OFFSET edx, PT_EDX-PT_OLDESP
|
|
|
|
|
CFI_OFFSET ecx, PT_ECX-PT_OLDESP
|
2006-12-07 01:14:02 +00:00
|
|
|
CFI_OFFSET ebx, PT_EBX-PT_OLDESP
|
2009-02-09 13:17:40 +00:00
|
|
|
.endm
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(ret_from_fork)
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_STARTPROC
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl %eax
|
2006-07-30 10:04:08 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
call schedule_tail
|
|
|
|
|
GET_THREAD_INFO(%ebp)
|
|
|
|
|
popl %eax
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
2006-09-18 23:20:40 +00:00
|
|
|
pushl $0x0202 # Reset kernel eflags
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
popfl
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp syscall_exit
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(ret_from_fork)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-09-08 16:47:55 +00:00
|
|
|
/*
|
|
|
|
|
* Interrupt exit functions should be protected against kprobes
|
|
|
|
|
*/
|
|
|
|
|
.pushsection .kprobes.text, "ax"
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
|
* Return to user mode is not as complex as all this looks,
|
|
|
|
|
* but we want the default path for a system call return to
|
|
|
|
|
* go as quickly as possible which is why some of this is
|
|
|
|
|
* less clear than it otherwise should be.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
# userspace resumption stub bypassing syscall exit tracing
|
|
|
|
|
ALIGN
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_PTREGS_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
ret_from_exception:
|
2006-12-07 01:14:08 +00:00
|
|
|
preempt_stop(CLBR_ANY)
|
2005-04-16 22:20:36 +00:00
|
|
|
ret_from_intr:
|
|
|
|
|
GET_THREAD_INFO(%ebp)
|
2006-06-27 09:53:48 +00:00
|
|
|
check_userspace:
|
2006-12-07 01:14:02 +00:00
|
|
|
movl PT_EFLAGS(%esp), %eax # mix EFLAGS and CS
|
|
|
|
|
movb PT_CS(%esp), %al
|
2008-03-25 19:16:32 +00:00
|
|
|
andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
|
2006-09-26 08:52:39 +00:00
|
|
|
cmpl $USER_RPL, %eax
|
|
|
|
|
jb resume_kernel # not returning to v8086 or userspace
|
[PATCH] i386: Use %gs as the PDA base-segment in the kernel
This patch is the meat of the PDA change. This patch makes several related
changes:
1: Most significantly, %gs is now used in the kernel. This means that on
entry, the old value of %gs is saved away, and it is reloaded with
__KERNEL_PDA.
2: entry.S constructs the stack in the shape of struct pt_regs, and this
is passed around the kernel so that the process's saved register
state can be accessed.
Unfortunately struct pt_regs doesn't currently have space for %gs
(or %fs). This patch extends pt_regs to add space for gs (no space
is allocated for %fs, since it won't be used, and it would just
complicate the code in entry.S to work around the space).
3: Because %gs is now saved on the stack like %ds, %es and the integer
registers, there are a number of places where it no longer needs to
be handled specially; namely context switch, and saving/restoring the
register state in a signal context.
4: And since kernel threads run in kernel space and call normal kernel
code, they need to be created with their %gs == __KERNEL_PDA.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Chuck Ebbert <76306.1226@compuserve.com>
Cc: Zachary Amsden <zach@vmware.com>
Cc: Jan Beulich <jbeulich@novell.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2006-12-07 01:14:02 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
ENTRY(resume_userspace)
|
2007-10-11 20:11:12 +00:00
|
|
|
LOCKDEP_SYS_EXIT
|
2006-12-07 01:14:08 +00:00
|
|
|
DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt
|
2005-04-16 22:20:36 +00:00
|
|
|
# setting need_resched or sigpending
|
|
|
|
|
# between sampling and the iret
|
2008-06-06 08:14:08 +00:00
|
|
|
TRACE_IRQS_OFF
|
2005-04-16 22:20:36 +00:00
|
|
|
movl TI_flags(%ebp), %ecx
|
|
|
|
|
andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
|
|
|
|
|
# int/exception return?
|
|
|
|
|
jne work_pending
|
|
|
|
|
jmp restore_all
|
2007-02-13 12:26:24 +00:00
|
|
|
END(ret_from_exception)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_PREEMPT
|
|
|
|
|
ENTRY(resume_kernel)
|
2006-12-07 01:14:08 +00:00
|
|
|
DISABLE_INTERRUPTS(CLBR_ANY)
|
2005-04-16 22:20:36 +00:00
|
|
|
cmpl $0,TI_preempt_count(%ebp) # non-zero preempt_count ?
|
i386: fix return to 16-bit stack from NMI handler
Returning to a task with a 16-bit stack requires special care: the iret
instruction does not restore the high word of esp in that case. The
espfix code fixes this, but currently is not invoked on NMIs. This means
that a running task gets the upper word of esp clobbered due intervening
NMIs. To reproduce, compile and run the following program with the nmi
watchdog enabled (nmi_watchdog=2 on the command line). Using gdb you can
see that the high bits of esp contain garbage, while the low bits are
still correct.
This patch puts the espfix code back into the NMI code path.
The patch is slightly complicated due to the irqtrace infrastructure not
being NMI-safe. The NMI return path cannot call TRACE_IRQS_IRET.
Otherwise, the tail of the normal iret-code is correct for the nmi code
path too. To be able to share this code-path, the TRACE_IRQS_IRET was
move up a bit. The espfix code exists after the TRACE_IRQS_IRET, but
this code explicitly disables interrupts. This short interrupts-off
section is now not traced anymore. The return-to-kernel path now always
includes the preliminary test to decide if the espfix code should be
called. This is never the case, but doing it this way keeps the patch as
simple as possible and the few extra instructions should not affect
timing in any significant way.
#define _GNU_SOURCE
#include <stdio.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <unistd.h>
#include <sys/syscall.h>
#include <asm/ldt.h>
int modify_ldt(int func, void *ptr, unsigned long bytecount)
{
return syscall(SYS_modify_ldt, func, ptr, bytecount);
}
/* this is assumed to be usable */
#define SEGBASEADDR 0x10000
#define SEGLIMIT 0x20000
/* 16-bit segment */
struct user_desc desc = {
.entry_number = 0,
.base_addr = SEGBASEADDR,
.limit = SEGLIMIT,
.seg_32bit = 0,
.contents = 0, /* ??? */
.read_exec_only = 0,
.limit_in_pages = 0,
.seg_not_present = 0,
.useable = 1
};
int main(void)
{
setvbuf(stdout, NULL, _IONBF, 0);
/* map a 64 kb segment */
char *pointer = mmap((void *)SEGBASEADDR, SEGLIMIT+1,
PROT_EXEC|PROT_READ|PROT_WRITE,
MAP_SHARED|MAP_ANONYMOUS, -1, 0);
if (pointer == NULL) {
printf("could not map space\n");
return 0;
}
/* write ldt, new mode */
int err = modify_ldt(0x11, &desc, sizeof(desc));
if (err) {
printf("error modifying ldt: %i\n", err);
return 0;
}
for (int i=0; i<1000; i++) {
asm volatile (
"pusha\n\t"
"mov %ss, %eax\n\t" /* preserve ss:esp */
"mov %esp, %ebp\n\t"
"push $7\n\t" /* index 0, ldt, user mode */
"push $65536-4096\n\t" /* esp */
"lss (%esp), %esp\n\t" /* switch to new stack */
"push %eax\n\t" /* save old ss:esp on new stack */
"push %ebp\n\t"
"add $17*65536, %esp\n\t" /* set high bits */
"mov %esp, %edx\n\t"
"mov $10000000, %ecx\n\t" /* wait... */
"1: loop 1b\n\t" /* ... a bit */
"cmp %esp, %edx\n\t"
"je 1f\n\t"
"ud2\n\t" /* esp changed inexplicably! */
"1:\n\t"
"sub $17*65536, %esp\n\t" /* restore high bits */
"lss (%esp), %esp\n\t" /* restore old ss:esp */
"popa\n\t");
printf("\rx%ix", i);
}
return 0;
}
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:57 +00:00
|
|
|
jnz restore_all
|
2005-04-16 22:20:36 +00:00
|
|
|
need_resched:
|
|
|
|
|
movl TI_flags(%ebp), %ecx # need_resched set ?
|
|
|
|
|
testb $_TIF_NEED_RESCHED, %cl
|
|
|
|
|
jz restore_all
|
2008-03-25 19:16:32 +00:00
|
|
|
testl $X86_EFLAGS_IF,PT_EFLAGS(%esp) # interrupts off (exception path) ?
|
2005-04-16 22:20:36 +00:00
|
|
|
jz restore_all
|
|
|
|
|
call preempt_schedule_irq
|
|
|
|
|
jmp need_resched
|
2007-02-13 12:26:24 +00:00
|
|
|
END(resume_kernel)
|
2005-04-16 22:20:36 +00:00
|
|
|
#endif
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2009-09-08 16:47:55 +00:00
|
|
|
/*
|
|
|
|
|
* End of kprobes section
|
|
|
|
|
*/
|
|
|
|
|
.popsection
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
/* SYSENTER_RETURN points to after the "sysenter" instruction in
|
|
|
|
|
the vsyscall page. See vsyscall-sysentry.S, which defines the symbol. */
|
|
|
|
|
|
|
|
|
|
# sysenter call handler stub
|
2008-01-30 12:30:43 +00:00
|
|
|
ENTRY(ia32_sysenter_target)
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_STARTPROC simple
|
2006-09-26 08:52:41 +00:00
|
|
|
CFI_SIGNAL_FRAME
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_DEF_CFA esp, 0
|
|
|
|
|
CFI_REGISTER esp, ebp
|
2008-01-30 12:31:02 +00:00
|
|
|
movl TSS_sysenter_sp0(%esp),%esp
|
2005-04-16 22:20:36 +00:00
|
|
|
sysenter_past_esp:
|
2006-07-03 07:24:43 +00:00
|
|
|
/*
|
2008-03-24 23:43:21 +00:00
|
|
|
* Interrupts are disabled here, but we can't trace it until
|
|
|
|
|
* enough kernel state to call TRACE_IRQS_OFF can be called - but
|
|
|
|
|
* we immediately enable interrupts at that point anyway.
|
2006-07-03 07:24:43 +00:00
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $(__USER_DS)
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
/*CFI_REL_OFFSET ss, 0*/
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl %ebp
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET esp, 0
|
2005-04-16 22:20:36 +00:00
|
|
|
pushfl
|
2008-03-24 23:43:21 +00:00
|
|
|
orl $X86_EFLAGS_IF, (%esp)
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $(__USER_CS)
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
/*CFI_REL_OFFSET cs, 0*/
|
[PATCH] vdso: randomize the i386 vDSO by moving it into a vma
Move the i386 VDSO down into a vma and thus randomize it.
Besides the security implications, this feature also helps debuggers, which
can COW a vma-backed VDSO just like a normal DSO and can thus do
single-stepping and other debugging features.
It's good for hypervisors (Xen, VMWare) too, which typically live in the same
high-mapped address space as the VDSO, hence whenever the VDSO is used, they
get lots of guest pagefaults and have to fix such guest accesses up - which
slows things down instead of speeding things up (the primary purpose of the
VDSO).
There's a new CONFIG_COMPAT_VDSO (default=y) option, which provides support
for older glibcs that still rely on a prelinked high-mapped VDSO. Newer
distributions (using glibc 2.3.3 or later) can turn this option off. Turning
it off is also recommended for security reasons: attackers cannot use the
predictable high-mapped VDSO page as syscall trampoline anymore.
There is a new vdso=[0|1] boot option as well, and a runtime
/proc/sys/vm/vdso_enabled sysctl switch, that allows the VDSO to be turned
on/off.
(This version of the VDSO-randomization patch also has working ELF
coredumping, the previous patch crashed in the coredumping code.)
This code is a combined work of the exec-shield VDSO randomization
code and Gerd Hoffmann's hypervisor-centric VDSO patch. Rusty Russell
started this patch and i completed it.
[akpm@osdl.org: cleanups]
[akpm@osdl.org: compile fix]
[akpm@osdl.org: compile fix 2]
[akpm@osdl.org: compile fix 3]
[akpm@osdl.org: revernt MAXMEM change]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Cc: Gerd Hoffmann <kraxel@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Zachary Amsden <zach@vmware.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-27 09:53:50 +00:00
|
|
|
/*
|
|
|
|
|
* Push current_thread_info()->sysenter_return to the stack.
|
|
|
|
|
* A tiny bit of offset fixup is necessary - 4*4 means the 4 words
|
|
|
|
|
* pushed above; +8 corresponds to copy_thread's esp0 setting.
|
|
|
|
|
*/
|
|
|
|
|
pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET eip, 0
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-03-24 23:43:21 +00:00
|
|
|
pushl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
SAVE_ALL
|
|
|
|
|
ENABLE_INTERRUPTS(CLBR_NONE)
|
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
|
* Load the potential sixth argument from user stack.
|
|
|
|
|
* Careful about security.
|
|
|
|
|
*/
|
|
|
|
|
cmpl $__PAGE_OFFSET-3,%ebp
|
|
|
|
|
jae syscall_fault
|
|
|
|
|
1: movl (%ebp),%ebp
|
2008-03-24 23:43:21 +00:00
|
|
|
movl %ebp,PT_EBP(%esp)
|
2005-04-16 22:20:36 +00:00
|
|
|
.section __ex_table,"a"
|
|
|
|
|
.align 4
|
|
|
|
|
.long 1b,syscall_fault
|
|
|
|
|
.previous
|
|
|
|
|
|
|
|
|
|
GET_THREAD_INFO(%ebp)
|
|
|
|
|
|
2009-03-14 06:38:13 +00:00
|
|
|
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
|
2008-06-24 11:16:52 +00:00
|
|
|
jnz sysenter_audit
|
|
|
|
|
sysenter_do_call:
|
2005-04-16 22:20:36 +00:00
|
|
|
cmpl $(nr_syscalls), %eax
|
|
|
|
|
jae syscall_badsys
|
|
|
|
|
call *sys_call_table(,%eax,4)
|
2006-12-07 01:14:02 +00:00
|
|
|
movl %eax,PT_EAX(%esp)
|
2007-10-11 20:11:12 +00:00
|
|
|
LOCKDEP_SYS_EXIT
|
2007-05-02 17:27:14 +00:00
|
|
|
DISABLE_INTERRUPTS(CLBR_ANY)
|
2006-07-03 07:24:43 +00:00
|
|
|
TRACE_IRQS_OFF
|
2005-04-16 22:20:36 +00:00
|
|
|
movl TI_flags(%ebp), %ecx
|
2009-03-14 06:38:13 +00:00
|
|
|
testl $_TIF_ALLWORK_MASK, %ecx
|
2008-06-24 11:16:52 +00:00
|
|
|
jne sysexit_audit
|
|
|
|
|
sysenter_exit:
|
2005-04-16 22:20:36 +00:00
|
|
|
/* if something modifies registers it must also disable sysexit */
|
2006-12-07 01:14:02 +00:00
|
|
|
movl PT_EIP(%esp), %edx
|
|
|
|
|
movl PT_OLDESP(%esp), %ecx
|
2005-04-16 22:20:36 +00:00
|
|
|
xorl %ebp,%ebp
|
2006-07-03 07:24:43 +00:00
|
|
|
TRACE_IRQS_ON
|
2007-02-13 12:26:20 +00:00
|
|
|
1: mov PT_FS(%esp), %fs
|
2009-02-09 13:17:40 +00:00
|
|
|
PTGS_TO_GS
|
2008-06-25 04:19:26 +00:00
|
|
|
ENABLE_INTERRUPTS_SYSEXIT
|
2008-06-24 11:16:52 +00:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_AUDITSYSCALL
|
|
|
|
|
sysenter_audit:
|
2009-03-14 06:38:13 +00:00
|
|
|
testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
|
2008-06-24 11:16:52 +00:00
|
|
|
jnz syscall_trace_entry
|
|
|
|
|
addl $4,%esp
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
/* %esi already in 8(%esp) 6th arg: 4th syscall arg */
|
|
|
|
|
/* %edx already in 4(%esp) 5th arg: 3rd syscall arg */
|
|
|
|
|
/* %ecx already in 0(%esp) 4th arg: 2nd syscall arg */
|
|
|
|
|
movl %ebx,%ecx /* 3rd arg: 1st syscall arg */
|
|
|
|
|
movl %eax,%edx /* 2nd arg: syscall number */
|
|
|
|
|
movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
|
|
|
|
|
call audit_syscall_entry
|
|
|
|
|
pushl %ebx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
movl PT_EAX(%esp),%eax /* reload syscall number */
|
|
|
|
|
jmp sysenter_do_call
|
|
|
|
|
|
|
|
|
|
sysexit_audit:
|
2009-03-14 06:38:13 +00:00
|
|
|
testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %ecx
|
2008-06-24 11:16:52 +00:00
|
|
|
jne syscall_exit_work
|
|
|
|
|
TRACE_IRQS_ON
|
|
|
|
|
ENABLE_INTERRUPTS(CLBR_ANY)
|
|
|
|
|
movl %eax,%edx /* second arg, syscall return value */
|
|
|
|
|
cmpl $0,%eax /* is it < 0? */
|
|
|
|
|
setl %al /* 1 if so, 0 if not */
|
|
|
|
|
movzbl %al,%eax /* zero-extend that */
|
|
|
|
|
inc %eax /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */
|
|
|
|
|
call audit_syscall_exit
|
|
|
|
|
DISABLE_INTERRUPTS(CLBR_ANY)
|
|
|
|
|
TRACE_IRQS_OFF
|
|
|
|
|
movl TI_flags(%ebp), %ecx
|
2009-03-14 06:38:13 +00:00
|
|
|
testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %ecx
|
2008-06-24 11:16:52 +00:00
|
|
|
jne syscall_exit_work
|
|
|
|
|
movl PT_EAX(%esp),%eax /* reload syscall return value */
|
|
|
|
|
jmp sysenter_exit
|
|
|
|
|
#endif
|
|
|
|
|
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
[PATCH] i386: Use %gs as the PDA base-segment in the kernel
This patch is the meat of the PDA change. This patch makes several related
changes:
1: Most significantly, %gs is now used in the kernel. This means that on
entry, the old value of %gs is saved away, and it is reloaded with
__KERNEL_PDA.
2: entry.S constructs the stack in the shape of struct pt_regs, and this
is passed around the kernel so that the process's saved register
state can be accessed.
Unfortunately struct pt_regs doesn't currently have space for %gs
(or %fs). This patch extends pt_regs to add space for gs (no space
is allocated for %fs, since it won't be used, and it would just
complicate the code in entry.S to work around the space).
3: Because %gs is now saved on the stack like %ds, %es and the integer
registers, there are a number of places where it no longer needs to
be handled specially; namely context switch, and saving/restoring the
register state in a signal context.
4: And since kernel threads run in kernel space and call normal kernel
code, they need to be created with their %gs == __KERNEL_PDA.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Chuck Ebbert <76306.1226@compuserve.com>
Cc: Zachary Amsden <zach@vmware.com>
Cc: Jan Beulich <jbeulich@novell.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2006-12-07 01:14:02 +00:00
|
|
|
.pushsection .fixup,"ax"
|
2007-02-13 12:26:20 +00:00
|
|
|
2: movl $0,PT_FS(%esp)
|
[PATCH] i386: Use %gs as the PDA base-segment in the kernel
This patch is the meat of the PDA change. This patch makes several related
changes:
1: Most significantly, %gs is now used in the kernel. This means that on
entry, the old value of %gs is saved away, and it is reloaded with
__KERNEL_PDA.
2: entry.S constructs the stack in the shape of struct pt_regs, and this
is passed around the kernel so that the process's saved register
state can be accessed.
Unfortunately struct pt_regs doesn't currently have space for %gs
(or %fs). This patch extends pt_regs to add space for gs (no space
is allocated for %fs, since it won't be used, and it would just
complicate the code in entry.S to work around the space).
3: Because %gs is now saved on the stack like %ds, %es and the integer
registers, there are a number of places where it no longer needs to
be handled specially; namely context switch, and saving/restoring the
register state in a signal context.
4: And since kernel threads run in kernel space and call normal kernel
code, they need to be created with their %gs == __KERNEL_PDA.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Chuck Ebbert <76306.1226@compuserve.com>
Cc: Zachary Amsden <zach@vmware.com>
Cc: Jan Beulich <jbeulich@novell.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2006-12-07 01:14:02 +00:00
|
|
|
jmp 1b
|
|
|
|
|
.section __ex_table,"a"
|
|
|
|
|
.align 4
|
|
|
|
|
.long 1b,2b
|
|
|
|
|
.popsection
|
2009-02-09 13:17:40 +00:00
|
|
|
PTGS_TO_GS_EX
|
2008-01-30 12:30:43 +00:00
|
|
|
ENDPROC(ia32_sysenter_target)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-09-08 16:47:55 +00:00
|
|
|
/*
|
|
|
|
|
* syscall stub including irq exit should be protected against kprobes
|
|
|
|
|
*/
|
|
|
|
|
.pushsection .kprobes.text, "ax"
|
2005-04-16 22:20:36 +00:00
|
|
|
# system call handler stub
|
|
|
|
|
ENTRY(system_call)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME # can't unwind into user space anyway
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl %eax # save orig_eax
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
SAVE_ALL
|
|
|
|
|
GET_THREAD_INFO(%ebp)
|
[PATCH] UML Support - Ptrace: adds the host SYSEMU support, for UML and general usage
Jeff Dike <jdike@addtoit.com>,
Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>,
Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Adds a new ptrace(2) mode, called PTRACE_SYSEMU, resembling PTRACE_SYSCALL
except that the kernel does not execute the requested syscall; this is useful
to improve performance for virtual environments, like UML, which want to run
the syscall on their own.
In fact, using PTRACE_SYSCALL means stopping child execution twice, on entry
and on exit, and each time you also have two context switches; with SYSEMU you
avoid the 2nd stop and so save two context switches per syscall.
Also, some architectures don't have support in the host for changing the
syscall number via ptrace(), which is currently needed to skip syscall
execution (UML turns any syscall into getpid() to avoid it being executed on
the host). Fixing that is hard, while SYSEMU is easier to implement.
* This version of the patch includes some suggestions of Jeff Dike to avoid
adding any instructions to the syscall fast path, plus some other little
changes, by myself, to make it work even when the syscall is executed with
SYSENTER (but I'm unsure about them). It has been widely tested for quite a
lot of time.
* Various fixed were included to handle the various switches between
various states, i.e. when for instance a syscall entry is traced with one of
PT_SYSCALL / _SYSEMU / _SINGLESTEP and another one is used on exit.
Basically, this is done by remembering which one of them was used even after
the call to ptrace_notify().
* We're combining TIF_SYSCALL_EMU with TIF_SYSCALL_TRACE or TIF_SINGLESTEP
to make do_syscall_trace() notice that the current syscall was started with
SYSEMU on entry, so that no notification ought to be done in the exit path;
this is a bit of a hack, so this problem is solved in another way in next
patches.
* Also, the effects of the patch:
"Ptrace - i386: fix Syscall Audit interaction with singlestep"
are cancelled; they are restored back in the last patch of this series.
Detailed descriptions of the patches doing this kind of processing follow (but
I've already summed everything up).
* Fix behaviour when changing interception kind #1.
In do_syscall_trace(), we check the status of the TIF_SYSCALL_EMU flag
only after doing the debugger notification; but the debugger might have
changed the status of this flag because he continued execution with
PTRACE_SYSCALL, so this is wrong. This patch fixes it by saving the flag
status before calling ptrace_notify().
* Fix behaviour when changing interception kind #2:
avoid intercepting syscall on return when using SYSCALL again.
A guest process switching from using PTRACE_SYSEMU to PTRACE_SYSCALL
crashes.
The problem is in arch/i386/kernel/entry.S. The current SYSEMU patch
inhibits the syscall-handler to be called, but does not prevent
do_syscall_trace() to be called after this for syscall completion
interception.
The appended patch fixes this. It reuses the flag TIF_SYSCALL_EMU to
remember "we come from PTRACE_SYSEMU and now are in PTRACE_SYSCALL", since
the flag is unused in the depicted situation.
* Fix behaviour when changing interception kind #3:
avoid intercepting syscall on return when using SINGLESTEP.
When testing 2.6.9 and the skas3.v6 patch, with my latest patch and had
problems with singlestepping on UML in SKAS with SYSEMU. It looped
receiving SIGTRAPs without moving forward. EIP of the traced process was
the same for all SIGTRAPs.
What's missing is to handle switching from PTRACE_SYSCALL_EMU to
PTRACE_SINGLESTEP in a way very similar to what is done for the change from
PTRACE_SYSCALL_EMU to PTRACE_SYSCALL_TRACE.
I.e., after calling ptrace(PTRACE_SYSEMU), on the return path, the debugger is
notified and then wake ups the process; the syscall is executed (or skipped,
when do_syscall_trace() returns 0, i.e. when using PTRACE_SYSEMU), and
do_syscall_trace() is called again. Since we are on the return path of a
SYSEMU'd syscall, if the wake up is performed through ptrace(PTRACE_SYSCALL),
we must still avoid notifying the parent of the syscall exit. Now, this
behaviour is extended even to resuming with PTRACE_SINGLESTEP.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-03 22:57:18 +00:00
|
|
|
# system call tracing in operation / emulation
|
2009-03-14 06:38:13 +00:00
|
|
|
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
|
2005-04-16 22:20:36 +00:00
|
|
|
jnz syscall_trace_entry
|
|
|
|
|
cmpl $(nr_syscalls), %eax
|
|
|
|
|
jae syscall_badsys
|
|
|
|
|
syscall_call:
|
|
|
|
|
call *sys_call_table(,%eax,4)
|
2006-12-07 01:14:02 +00:00
|
|
|
movl %eax,PT_EAX(%esp) # store the return value
|
2005-04-16 22:20:36 +00:00
|
|
|
syscall_exit:
|
2007-10-11 20:11:12 +00:00
|
|
|
LOCKDEP_SYS_EXIT
|
2006-12-07 01:14:08 +00:00
|
|
|
DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt
|
2005-04-16 22:20:36 +00:00
|
|
|
# setting need_resched or sigpending
|
|
|
|
|
# between sampling and the iret
|
2006-07-03 07:24:43 +00:00
|
|
|
TRACE_IRQS_OFF
|
2005-04-16 22:20:36 +00:00
|
|
|
movl TI_flags(%ebp), %ecx
|
2009-03-14 06:38:13 +00:00
|
|
|
testl $_TIF_ALLWORK_MASK, %ecx # current->work
|
2005-04-16 22:20:36 +00:00
|
|
|
jne syscall_exit_work
|
|
|
|
|
|
|
|
|
|
restore_all:
|
i386: fix return to 16-bit stack from NMI handler
Returning to a task with a 16-bit stack requires special care: the iret
instruction does not restore the high word of esp in that case. The
espfix code fixes this, but currently is not invoked on NMIs. This means
that a running task gets the upper word of esp clobbered due intervening
NMIs. To reproduce, compile and run the following program with the nmi
watchdog enabled (nmi_watchdog=2 on the command line). Using gdb you can
see that the high bits of esp contain garbage, while the low bits are
still correct.
This patch puts the espfix code back into the NMI code path.
The patch is slightly complicated due to the irqtrace infrastructure not
being NMI-safe. The NMI return path cannot call TRACE_IRQS_IRET.
Otherwise, the tail of the normal iret-code is correct for the nmi code
path too. To be able to share this code-path, the TRACE_IRQS_IRET was
move up a bit. The espfix code exists after the TRACE_IRQS_IRET, but
this code explicitly disables interrupts. This short interrupts-off
section is now not traced anymore. The return-to-kernel path now always
includes the preliminary test to decide if the espfix code should be
called. This is never the case, but doing it this way keeps the patch as
simple as possible and the few extra instructions should not affect
timing in any significant way.
#define _GNU_SOURCE
#include <stdio.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <unistd.h>
#include <sys/syscall.h>
#include <asm/ldt.h>
int modify_ldt(int func, void *ptr, unsigned long bytecount)
{
return syscall(SYS_modify_ldt, func, ptr, bytecount);
}
/* this is assumed to be usable */
#define SEGBASEADDR 0x10000
#define SEGLIMIT 0x20000
/* 16-bit segment */
struct user_desc desc = {
.entry_number = 0,
.base_addr = SEGBASEADDR,
.limit = SEGLIMIT,
.seg_32bit = 0,
.contents = 0, /* ??? */
.read_exec_only = 0,
.limit_in_pages = 0,
.seg_not_present = 0,
.useable = 1
};
int main(void)
{
setvbuf(stdout, NULL, _IONBF, 0);
/* map a 64 kb segment */
char *pointer = mmap((void *)SEGBASEADDR, SEGLIMIT+1,
PROT_EXEC|PROT_READ|PROT_WRITE,
MAP_SHARED|MAP_ANONYMOUS, -1, 0);
if (pointer == NULL) {
printf("could not map space\n");
return 0;
}
/* write ldt, new mode */
int err = modify_ldt(0x11, &desc, sizeof(desc));
if (err) {
printf("error modifying ldt: %i\n", err);
return 0;
}
for (int i=0; i<1000; i++) {
asm volatile (
"pusha\n\t"
"mov %ss, %eax\n\t" /* preserve ss:esp */
"mov %esp, %ebp\n\t"
"push $7\n\t" /* index 0, ldt, user mode */
"push $65536-4096\n\t" /* esp */
"lss (%esp), %esp\n\t" /* switch to new stack */
"push %eax\n\t" /* save old ss:esp on new stack */
"push %ebp\n\t"
"add $17*65536, %esp\n\t" /* set high bits */
"mov %esp, %edx\n\t"
"mov $10000000, %ecx\n\t" /* wait... */
"1: loop 1b\n\t" /* ... a bit */
"cmp %esp, %edx\n\t"
"je 1f\n\t"
"ud2\n\t" /* esp changed inexplicably! */
"1:\n\t"
"sub $17*65536, %esp\n\t" /* restore high bits */
"lss (%esp), %esp\n\t" /* restore old ss:esp */
"popa\n\t");
printf("\rx%ix", i);
}
return 0;
}
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:57 +00:00
|
|
|
TRACE_IRQS_IRET
|
|
|
|
|
restore_all_notrace:
|
2006-12-07 01:14:02 +00:00
|
|
|
movl PT_EFLAGS(%esp), %eax # mix EFLAGS, SS and CS
|
|
|
|
|
# Warning: PT_OLDSS(%esp) contains the wrong/random values if we
|
2005-04-16 22:24:01 +00:00
|
|
|
# are returning to the kernel.
|
|
|
|
|
# See comments in process.c:copy_thread() for details.
|
2006-12-07 01:14:02 +00:00
|
|
|
movb PT_OLDSS(%esp), %ah
|
|
|
|
|
movb PT_CS(%esp), %al
|
2008-03-25 19:16:32 +00:00
|
|
|
andl $(X86_EFLAGS_VM | (SEGMENT_TI_MASK << 8) | SEGMENT_RPL_MASK), %eax
|
2006-09-26 08:52:39 +00:00
|
|
|
cmpl $((SEGMENT_LDT << 8) | USER_RPL), %eax
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_REMEMBER_STATE
|
2005-04-16 22:20:36 +00:00
|
|
|
je ldt_ss # returning to user-space with LDT SS
|
|
|
|
|
restore_nocheck:
|
2009-02-09 13:17:40 +00:00
|
|
|
RESTORE_REGS 4 # skip orig_eax/error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
2008-02-13 21:29:53 +00:00
|
|
|
irq_return:
|
2008-02-09 22:24:08 +00:00
|
|
|
INTERRUPT_RETURN
|
2005-04-16 22:20:36 +00:00
|
|
|
.section .fixup,"ax"
|
2008-03-17 23:37:12 +00:00
|
|
|
ENTRY(iret_exc)
|
2005-04-29 16:38:44 +00:00
|
|
|
pushl $0 # no error code
|
|
|
|
|
pushl $do_iret_error
|
|
|
|
|
jmp error_code
|
2005-04-16 22:20:36 +00:00
|
|
|
.previous
|
|
|
|
|
.section __ex_table,"a"
|
|
|
|
|
.align 4
|
2008-02-09 22:24:08 +00:00
|
|
|
.long irq_return,iret_exc
|
2005-04-16 22:20:36 +00:00
|
|
|
.previous
|
|
|
|
|
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_RESTORE_STATE
|
2005-04-16 22:20:36 +00:00
|
|
|
ldt_ss:
|
2006-12-07 01:14:02 +00:00
|
|
|
larl PT_OLDSS(%esp), %eax
|
2005-04-16 22:20:36 +00:00
|
|
|
jnz restore_nocheck
|
|
|
|
|
testl $0x00400000, %eax # returning to 32bit stack?
|
|
|
|
|
jnz restore_nocheck # allright, normal return
|
2006-12-07 01:14:07 +00:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_PARAVIRT
|
|
|
|
|
/*
|
|
|
|
|
* The kernel can't run on a non-flat stack if paravirt mode
|
|
|
|
|
* is active. Rather than try to fixup the high bits of
|
|
|
|
|
* ESP, bypass this code entirely. This may break DOSemu
|
|
|
|
|
* and/or Wine support in a paravirt VM, although the option
|
|
|
|
|
* is still available to implement the setting of the high
|
|
|
|
|
* 16-bits in the INTERRUPT_RETURN paravirt-op.
|
|
|
|
|
*/
|
2007-10-16 18:51:29 +00:00
|
|
|
cmpl $0, pv_info+PARAVIRT_enabled
|
2006-12-07 01:14:07 +00:00
|
|
|
jne restore_nocheck
|
|
|
|
|
#endif
|
|
|
|
|
|
i386: fix/simplify espfix stack switching, move it into assembly
The espfix code triggers if we have a protected mode userspace
application with a 16-bit stack. On returning to userspace, with iret,
the CPU doesn't restore the high word of the stack pointer. This is an
"official" bug, and the work-around used in the kernel is to temporarily
switch to a 32-bit stack segment/pointer pair where the high word of the
pointer is equal to the high word of the userspace stackpointer.
The current implementation uses THREAD_SIZE to determine the cut-off,
but there is no good reason not to use the more natural 64kb... However,
implementing this by simply substituting THREAD_SIZE with 65536 in
patch_espfix_desc crashed the test application. patch_espfix_desc tries
to do what is described above, but gets it subtly wrong if the userspace
stack pointer is just below a multiple of THREAD_SIZE: an overflow
occurs to bit 13... With a bit of luck, when the kernelspace
stackpointer is just below a 64kb-boundary, the overflow then ripples
trough to bit 16 and userspace will see its stack pointer changed by
65536.
This patch moves all espfix code into entry_32.S. Selecting a 16-bit
cut-off simplifies the code. The game with changing the limit dynamically
is removed too. It complicates matters and I see no value in it. Changing
only the top 16-bit word of ESP is one instruction and it also implies
that only two bytes of the ESPFIX GDT entry need to be changed and this
can be implemented in just a handful simple to understand instructions.
As a side effect, the operation to compute the original ESP from the
ESPFIX ESP and the GDT entry simplifies a bit too, and the remaining
three instructions have been expanded inline in entry_32.S.
impact: can now reliably run userspace with ESP=xxxxfffc on 16-bit
stack segment
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:58 +00:00
|
|
|
/*
|
|
|
|
|
* Setup and switch to ESPFIX stack
|
|
|
|
|
*
|
|
|
|
|
* We're returning to userspace with a 16 bit stack. The CPU will not
|
|
|
|
|
* restore the high word of ESP for us on executing iret... This is an
|
|
|
|
|
* "official" bug of all the x86-compatible CPUs, which we can work
|
|
|
|
|
* around to make dosemu and wine happy. We do this by preloading the
|
|
|
|
|
* high word of ESP with the high word of the userspace ESP while
|
|
|
|
|
* compensating for the offset by changing to the ESPFIX segment with
|
|
|
|
|
* a base address that matches for the difference.
|
|
|
|
|
*/
|
|
|
|
|
mov %esp, %edx /* load kernel esp */
|
|
|
|
|
mov PT_OLDESP(%esp), %eax /* load userspace esp */
|
|
|
|
|
mov %dx, %ax /* eax: new kernel esp */
|
|
|
|
|
sub %eax, %edx /* offset (low word is 0) */
|
|
|
|
|
PER_CPU(gdt_page, %ebx)
|
|
|
|
|
shr $16, %edx
|
|
|
|
|
mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */
|
|
|
|
|
mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */
|
2006-12-07 01:14:01 +00:00
|
|
|
pushl $__ESPFIX_SS
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
i386: fix/simplify espfix stack switching, move it into assembly
The espfix code triggers if we have a protected mode userspace
application with a 16-bit stack. On returning to userspace, with iret,
the CPU doesn't restore the high word of the stack pointer. This is an
"official" bug, and the work-around used in the kernel is to temporarily
switch to a 32-bit stack segment/pointer pair where the high word of the
pointer is equal to the high word of the userspace stackpointer.
The current implementation uses THREAD_SIZE to determine the cut-off,
but there is no good reason not to use the more natural 64kb... However,
implementing this by simply substituting THREAD_SIZE with 65536 in
patch_espfix_desc crashed the test application. patch_espfix_desc tries
to do what is described above, but gets it subtly wrong if the userspace
stack pointer is just below a multiple of THREAD_SIZE: an overflow
occurs to bit 13... With a bit of luck, when the kernelspace
stackpointer is just below a 64kb-boundary, the overflow then ripples
trough to bit 16 and userspace will see its stack pointer changed by
65536.
This patch moves all espfix code into entry_32.S. Selecting a 16-bit
cut-off simplifies the code. The game with changing the limit dynamically
is removed too. It complicates matters and I see no value in it. Changing
only the top 16-bit word of ESP is one instruction and it also implies
that only two bytes of the ESPFIX GDT entry need to be changed and this
can be implemented in just a handful simple to understand instructions.
As a side effect, the operation to compute the original ESP from the
ESPFIX ESP and the GDT entry simplifies a bit too, and the remaining
three instructions have been expanded inline in entry_32.S.
impact: can now reliably run userspace with ESP=xxxxfffc on 16-bit
stack segment
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:58 +00:00
|
|
|
push %eax /* new kernel esp */
|
2006-12-07 01:14:01 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
i386: fix return to 16-bit stack from NMI handler
Returning to a task with a 16-bit stack requires special care: the iret
instruction does not restore the high word of esp in that case. The
espfix code fixes this, but currently is not invoked on NMIs. This means
that a running task gets the upper word of esp clobbered due intervening
NMIs. To reproduce, compile and run the following program with the nmi
watchdog enabled (nmi_watchdog=2 on the command line). Using gdb you can
see that the high bits of esp contain garbage, while the low bits are
still correct.
This patch puts the espfix code back into the NMI code path.
The patch is slightly complicated due to the irqtrace infrastructure not
being NMI-safe. The NMI return path cannot call TRACE_IRQS_IRET.
Otherwise, the tail of the normal iret-code is correct for the nmi code
path too. To be able to share this code-path, the TRACE_IRQS_IRET was
move up a bit. The espfix code exists after the TRACE_IRQS_IRET, but
this code explicitly disables interrupts. This short interrupts-off
section is now not traced anymore. The return-to-kernel path now always
includes the preliminary test to decide if the espfix code should be
called. This is never the case, but doing it this way keeps the patch as
simple as possible and the few extra instructions should not affect
timing in any significant way.
#define _GNU_SOURCE
#include <stdio.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <unistd.h>
#include <sys/syscall.h>
#include <asm/ldt.h>
int modify_ldt(int func, void *ptr, unsigned long bytecount)
{
return syscall(SYS_modify_ldt, func, ptr, bytecount);
}
/* this is assumed to be usable */
#define SEGBASEADDR 0x10000
#define SEGLIMIT 0x20000
/* 16-bit segment */
struct user_desc desc = {
.entry_number = 0,
.base_addr = SEGBASEADDR,
.limit = SEGLIMIT,
.seg_32bit = 0,
.contents = 0, /* ??? */
.read_exec_only = 0,
.limit_in_pages = 0,
.seg_not_present = 0,
.useable = 1
};
int main(void)
{
setvbuf(stdout, NULL, _IONBF, 0);
/* map a 64 kb segment */
char *pointer = mmap((void *)SEGBASEADDR, SEGLIMIT+1,
PROT_EXEC|PROT_READ|PROT_WRITE,
MAP_SHARED|MAP_ANONYMOUS, -1, 0);
if (pointer == NULL) {
printf("could not map space\n");
return 0;
}
/* write ldt, new mode */
int err = modify_ldt(0x11, &desc, sizeof(desc));
if (err) {
printf("error modifying ldt: %i\n", err);
return 0;
}
for (int i=0; i<1000; i++) {
asm volatile (
"pusha\n\t"
"mov %ss, %eax\n\t" /* preserve ss:esp */
"mov %esp, %ebp\n\t"
"push $7\n\t" /* index 0, ldt, user mode */
"push $65536-4096\n\t" /* esp */
"lss (%esp), %esp\n\t" /* switch to new stack */
"push %eax\n\t" /* save old ss:esp on new stack */
"push %ebp\n\t"
"add $17*65536, %esp\n\t" /* set high bits */
"mov %esp, %edx\n\t"
"mov $10000000, %ecx\n\t" /* wait... */
"1: loop 1b\n\t" /* ... a bit */
"cmp %esp, %edx\n\t"
"je 1f\n\t"
"ud2\n\t" /* esp changed inexplicably! */
"1:\n\t"
"sub $17*65536, %esp\n\t" /* restore high bits */
"lss (%esp), %esp\n\t" /* restore old ss:esp */
"popa\n\t");
printf("\rx%ix", i);
}
return 0;
}
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:57 +00:00
|
|
|
/* Disable interrupts, but do not irqtrace this section: we
|
|
|
|
|
* will soon execute iret and the tracer was already set to
|
|
|
|
|
* the irqstate after the iret */
|
2006-12-07 01:14:08 +00:00
|
|
|
DISABLE_INTERRUPTS(CLBR_EAX)
|
i386: fix/simplify espfix stack switching, move it into assembly
The espfix code triggers if we have a protected mode userspace
application with a 16-bit stack. On returning to userspace, with iret,
the CPU doesn't restore the high word of the stack pointer. This is an
"official" bug, and the work-around used in the kernel is to temporarily
switch to a 32-bit stack segment/pointer pair where the high word of the
pointer is equal to the high word of the userspace stackpointer.
The current implementation uses THREAD_SIZE to determine the cut-off,
but there is no good reason not to use the more natural 64kb... However,
implementing this by simply substituting THREAD_SIZE with 65536 in
patch_espfix_desc crashed the test application. patch_espfix_desc tries
to do what is described above, but gets it subtly wrong if the userspace
stack pointer is just below a multiple of THREAD_SIZE: an overflow
occurs to bit 13... With a bit of luck, when the kernelspace
stackpointer is just below a 64kb-boundary, the overflow then ripples
trough to bit 16 and userspace will see its stack pointer changed by
65536.
This patch moves all espfix code into entry_32.S. Selecting a 16-bit
cut-off simplifies the code. The game with changing the limit dynamically
is removed too. It complicates matters and I see no value in it. Changing
only the top 16-bit word of ESP is one instruction and it also implies
that only two bytes of the ESPFIX GDT entry need to be changed and this
can be implemented in just a handful simple to understand instructions.
As a side effect, the operation to compute the original ESP from the
ESPFIX ESP and the GDT entry simplifies a bit too, and the remaining
three instructions have been expanded inline in entry_32.S.
impact: can now reliably run userspace with ESP=xxxxfffc on 16-bit
stack segment
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:58 +00:00
|
|
|
lss (%esp), %esp /* switch to espfix segment */
|
2006-12-07 01:14:01 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET -8
|
|
|
|
|
jmp restore_nocheck
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
ENDPROC(system_call)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
# perform work that needs to be done immediately before resumption
|
|
|
|
|
ALIGN
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_PTREGS_FRAME # can't unwind into user space anyway
|
2005-04-16 22:20:36 +00:00
|
|
|
work_pending:
|
|
|
|
|
testb $_TIF_NEED_RESCHED, %cl
|
|
|
|
|
jz work_notifysig
|
|
|
|
|
work_resched:
|
|
|
|
|
call schedule
|
2007-10-11 20:11:12 +00:00
|
|
|
LOCKDEP_SYS_EXIT
|
2006-12-07 01:14:08 +00:00
|
|
|
DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt
|
2005-04-16 22:20:36 +00:00
|
|
|
# setting need_resched or sigpending
|
|
|
|
|
# between sampling and the iret
|
2006-07-03 07:24:43 +00:00
|
|
|
TRACE_IRQS_OFF
|
2005-04-16 22:20:36 +00:00
|
|
|
movl TI_flags(%ebp), %ecx
|
|
|
|
|
andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
|
|
|
|
|
# than syscall tracing?
|
|
|
|
|
jz restore_all
|
|
|
|
|
testb $_TIF_NEED_RESCHED, %cl
|
|
|
|
|
jnz work_resched
|
|
|
|
|
|
|
|
|
|
work_notifysig: # deal with pending signals and
|
|
|
|
|
# notify-resume requests
|
2006-12-07 01:14:04 +00:00
|
|
|
#ifdef CONFIG_VM86
|
2008-03-25 19:16:32 +00:00
|
|
|
testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
|
2005-04-16 22:20:36 +00:00
|
|
|
movl %esp, %eax
|
|
|
|
|
jne work_notifysig_v86 # returning to kernel-space or
|
|
|
|
|
# vm86-space
|
|
|
|
|
xorl %edx, %edx
|
|
|
|
|
call do_notify_resume
|
2006-06-27 09:53:48 +00:00
|
|
|
jmp resume_userspace_sig
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ALIGN
|
|
|
|
|
work_notifysig_v86:
|
|
|
|
|
pushl %ecx # save ti_flags for do_notify_resume
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
call save_v86_state # %eax contains pt_regs pointer
|
|
|
|
|
popl %ecx
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
2005-04-16 22:20:36 +00:00
|
|
|
movl %eax, %esp
|
2006-12-07 01:14:04 +00:00
|
|
|
#else
|
|
|
|
|
movl %esp, %eax
|
|
|
|
|
#endif
|
2005-04-16 22:20:36 +00:00
|
|
|
xorl %edx, %edx
|
|
|
|
|
call do_notify_resume
|
2006-06-27 09:53:48 +00:00
|
|
|
jmp resume_userspace_sig
|
2007-02-13 12:26:24 +00:00
|
|
|
END(work_pending)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
# perform syscall exit tracing
|
|
|
|
|
ALIGN
|
|
|
|
|
syscall_trace_entry:
|
2006-12-07 01:14:02 +00:00
|
|
|
movl $-ENOSYS,PT_EAX(%esp)
|
2005-04-16 22:20:36 +00:00
|
|
|
movl %esp, %eax
|
2008-07-09 09:38:07 +00:00
|
|
|
call syscall_trace_enter
|
|
|
|
|
/* What it returned is what we'll actually use. */
|
2005-04-16 22:20:36 +00:00
|
|
|
cmpl $(nr_syscalls), %eax
|
|
|
|
|
jnae syscall_call
|
|
|
|
|
jmp syscall_exit
|
2007-02-13 12:26:24 +00:00
|
|
|
END(syscall_trace_entry)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
# perform syscall exit tracing
|
|
|
|
|
ALIGN
|
|
|
|
|
syscall_exit_work:
|
2009-03-14 06:38:13 +00:00
|
|
|
testl $_TIF_WORK_SYSCALL_EXIT, %ecx
|
2005-04-16 22:20:36 +00:00
|
|
|
jz work_pending
|
2006-07-03 07:24:43 +00:00
|
|
|
TRACE_IRQS_ON
|
2008-07-09 09:38:07 +00:00
|
|
|
ENABLE_INTERRUPTS(CLBR_ANY) # could let syscall_trace_leave() call
|
2005-04-16 22:20:36 +00:00
|
|
|
# schedule() instead
|
|
|
|
|
movl %esp, %eax
|
2008-07-09 09:38:07 +00:00
|
|
|
call syscall_trace_leave
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp resume_userspace
|
2007-02-13 12:26:24 +00:00
|
|
|
END(syscall_exit_work)
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME # can't unwind into user space anyway
|
2005-04-16 22:20:36 +00:00
|
|
|
syscall_fault:
|
|
|
|
|
GET_THREAD_INFO(%ebp)
|
2006-12-07 01:14:02 +00:00
|
|
|
movl $-EFAULT,PT_EAX(%esp)
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp resume_userspace
|
2007-02-13 12:26:24 +00:00
|
|
|
END(syscall_fault)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
syscall_badsys:
|
2006-12-07 01:14:02 +00:00
|
|
|
movl $-ENOSYS,PT_EAX(%esp)
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp resume_userspace
|
2007-02-13 12:26:24 +00:00
|
|
|
END(syscall_badsys)
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2009-09-08 16:47:55 +00:00
|
|
|
/*
|
|
|
|
|
* End of kprobes section
|
|
|
|
|
*/
|
|
|
|
|
.popsection
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-02-10 14:51:46 +00:00
|
|
|
/*
|
|
|
|
|
* System calls that need a pt_regs pointer.
|
|
|
|
|
*/
|
|
|
|
|
#define PTREGSCALL(name) \
|
|
|
|
|
ALIGN; \
|
|
|
|
|
ptregs_##name: \
|
|
|
|
|
leal 4(%esp),%eax; \
|
|
|
|
|
jmp sys_##name;
|
|
|
|
|
|
|
|
|
|
PTREGSCALL(iopl)
|
|
|
|
|
PTREGSCALL(fork)
|
|
|
|
|
PTREGSCALL(clone)
|
|
|
|
|
PTREGSCALL(vfork)
|
|
|
|
|
PTREGSCALL(execve)
|
|
|
|
|
PTREGSCALL(sigaltstack)
|
|
|
|
|
PTREGSCALL(sigreturn)
|
|
|
|
|
PTREGSCALL(rt_sigreturn)
|
|
|
|
|
PTREGSCALL(vm86)
|
|
|
|
|
PTREGSCALL(vm86old)
|
|
|
|
|
|
2009-02-09 13:17:40 +00:00
|
|
|
.macro FIXUP_ESPFIX_STACK
|
i386: fix/simplify espfix stack switching, move it into assembly
The espfix code triggers if we have a protected mode userspace
application with a 16-bit stack. On returning to userspace, with iret,
the CPU doesn't restore the high word of the stack pointer. This is an
"official" bug, and the work-around used in the kernel is to temporarily
switch to a 32-bit stack segment/pointer pair where the high word of the
pointer is equal to the high word of the userspace stackpointer.
The current implementation uses THREAD_SIZE to determine the cut-off,
but there is no good reason not to use the more natural 64kb... However,
implementing this by simply substituting THREAD_SIZE with 65536 in
patch_espfix_desc crashed the test application. patch_espfix_desc tries
to do what is described above, but gets it subtly wrong if the userspace
stack pointer is just below a multiple of THREAD_SIZE: an overflow
occurs to bit 13... With a bit of luck, when the kernelspace
stackpointer is just below a 64kb-boundary, the overflow then ripples
trough to bit 16 and userspace will see its stack pointer changed by
65536.
This patch moves all espfix code into entry_32.S. Selecting a 16-bit
cut-off simplifies the code. The game with changing the limit dynamically
is removed too. It complicates matters and I see no value in it. Changing
only the top 16-bit word of ESP is one instruction and it also implies
that only two bytes of the ESPFIX GDT entry need to be changed and this
can be implemented in just a handful simple to understand instructions.
As a side effect, the operation to compute the original ESP from the
ESPFIX ESP and the GDT entry simplifies a bit too, and the remaining
three instructions have been expanded inline in entry_32.S.
impact: can now reliably run userspace with ESP=xxxxfffc on 16-bit
stack segment
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:58 +00:00
|
|
|
/*
|
|
|
|
|
* Switch back for ESPFIX stack to the normal zerobased stack
|
|
|
|
|
*
|
|
|
|
|
* We can't call C functions using the ESPFIX stack. This code reads
|
|
|
|
|
* the high word of the segment base from the GDT and swiches to the
|
|
|
|
|
* normal stack and adjusts ESP with the matching offset.
|
|
|
|
|
*/
|
|
|
|
|
/* fixup the stack */
|
2009-02-09 13:17:40 +00:00
|
|
|
PER_CPU(gdt_page, %ebx)
|
i386: fix/simplify espfix stack switching, move it into assembly
The espfix code triggers if we have a protected mode userspace
application with a 16-bit stack. On returning to userspace, with iret,
the CPU doesn't restore the high word of the stack pointer. This is an
"official" bug, and the work-around used in the kernel is to temporarily
switch to a 32-bit stack segment/pointer pair where the high word of the
pointer is equal to the high word of the userspace stackpointer.
The current implementation uses THREAD_SIZE to determine the cut-off,
but there is no good reason not to use the more natural 64kb... However,
implementing this by simply substituting THREAD_SIZE with 65536 in
patch_espfix_desc crashed the test application. patch_espfix_desc tries
to do what is described above, but gets it subtly wrong if the userspace
stack pointer is just below a multiple of THREAD_SIZE: an overflow
occurs to bit 13... With a bit of luck, when the kernelspace
stackpointer is just below a 64kb-boundary, the overflow then ripples
trough to bit 16 and userspace will see its stack pointer changed by
65536.
This patch moves all espfix code into entry_32.S. Selecting a 16-bit
cut-off simplifies the code. The game with changing the limit dynamically
is removed too. It complicates matters and I see no value in it. Changing
only the top 16-bit word of ESP is one instruction and it also implies
that only two bytes of the ESPFIX GDT entry need to be changed and this
can be implemented in just a handful simple to understand instructions.
As a side effect, the operation to compute the original ESP from the
ESPFIX ESP and the GDT entry simplifies a bit too, and the remaining
three instructions have been expanded inline in entry_32.S.
impact: can now reliably run userspace with ESP=xxxxfffc on 16-bit
stack segment
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:58 +00:00
|
|
|
mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
|
|
|
|
|
mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
|
|
|
|
|
shl $16, %eax
|
|
|
|
|
addl %esp, %eax /* the adjusted stack pointer */
|
2009-02-09 13:17:40 +00:00
|
|
|
pushl $__KERNEL_DS
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
pushl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
i386: fix/simplify espfix stack switching, move it into assembly
The espfix code triggers if we have a protected mode userspace
application with a 16-bit stack. On returning to userspace, with iret,
the CPU doesn't restore the high word of the stack pointer. This is an
"official" bug, and the work-around used in the kernel is to temporarily
switch to a 32-bit stack segment/pointer pair where the high word of the
pointer is equal to the high word of the userspace stackpointer.
The current implementation uses THREAD_SIZE to determine the cut-off,
but there is no good reason not to use the more natural 64kb... However,
implementing this by simply substituting THREAD_SIZE with 65536 in
patch_espfix_desc crashed the test application. patch_espfix_desc tries
to do what is described above, but gets it subtly wrong if the userspace
stack pointer is just below a multiple of THREAD_SIZE: an overflow
occurs to bit 13... With a bit of luck, when the kernelspace
stackpointer is just below a 64kb-boundary, the overflow then ripples
trough to bit 16 and userspace will see its stack pointer changed by
65536.
This patch moves all espfix code into entry_32.S. Selecting a 16-bit
cut-off simplifies the code. The game with changing the limit dynamically
is removed too. It complicates matters and I see no value in it. Changing
only the top 16-bit word of ESP is one instruction and it also implies
that only two bytes of the ESPFIX GDT entry need to be changed and this
can be implemented in just a handful simple to understand instructions.
As a side effect, the operation to compute the original ESP from the
ESPFIX ESP and the GDT entry simplifies a bit too, and the remaining
three instructions have been expanded inline in entry_32.S.
impact: can now reliably run userspace with ESP=xxxxfffc on 16-bit
stack segment
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:58 +00:00
|
|
|
lss (%esp), %esp /* switch to the normal stack segment */
|
2009-02-09 13:17:40 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET -8
|
|
|
|
|
.endm
|
|
|
|
|
.macro UNWIND_ESPFIX_STACK
|
|
|
|
|
movl %ss, %eax
|
|
|
|
|
/* see if on espfix stack */
|
|
|
|
|
cmpw $__ESPFIX_SS, %ax
|
|
|
|
|
jne 27f
|
|
|
|
|
movl $__KERNEL_DS, %eax
|
|
|
|
|
movl %eax, %ds
|
|
|
|
|
movl %eax, %es
|
|
|
|
|
/* switch to normal stack */
|
|
|
|
|
FIXUP_ESPFIX_STACK
|
|
|
|
|
27:
|
|
|
|
|
.endm
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
/*
|
2008-11-11 21:24:58 +00:00
|
|
|
* Build the entry stubs and pointer table with some assembler magic.
|
|
|
|
|
* We pack 7 stubs into a single 32-byte chunk, which will fit in a
|
|
|
|
|
* single cache line on all modern x86 implementations.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2008-11-11 21:03:07 +00:00
|
|
|
.section .init.rodata,"a"
|
2005-04-16 22:20:36 +00:00
|
|
|
ENTRY(interrupt)
|
|
|
|
|
.text
|
2008-11-11 21:24:58 +00:00
|
|
|
.p2align 5
|
|
|
|
|
.p2align CONFIG_X86_L1_CACHE_SHIFT
|
2005-04-16 22:20:36 +00:00
|
|
|
ENTRY(irq_entries_start)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME
|
2008-11-11 21:03:07 +00:00
|
|
|
vector=FIRST_EXTERNAL_VECTOR
|
2008-11-11 21:24:58 +00:00
|
|
|
.rept (NR_VECTORS-FIRST_EXTERNAL_VECTOR+6)/7
|
|
|
|
|
.balign 32
|
|
|
|
|
.rept 7
|
|
|
|
|
.if vector < NR_VECTORS
|
2008-11-12 18:27:35 +00:00
|
|
|
.if vector <> FIRST_EXTERNAL_VECTOR
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
2008-11-11 21:24:58 +00:00
|
|
|
.endif
|
|
|
|
|
1: pushl $(~vector+0x80) /* Note: always in signed byte range */
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2008-11-12 18:27:35 +00:00
|
|
|
.if ((vector-FIRST_EXTERNAL_VECTOR)%7) <> 6
|
2008-11-11 21:24:58 +00:00
|
|
|
jmp 2f
|
|
|
|
|
.endif
|
|
|
|
|
.previous
|
2005-04-16 22:20:36 +00:00
|
|
|
.long 1b
|
2008-11-11 21:24:58 +00:00
|
|
|
.text
|
2005-04-16 22:20:36 +00:00
|
|
|
vector=vector+1
|
2008-11-11 21:24:58 +00:00
|
|
|
.endif
|
|
|
|
|
.endr
|
|
|
|
|
2: jmp common_interrupt
|
2005-04-16 22:20:36 +00:00
|
|
|
.endr
|
2007-02-13 12:26:24 +00:00
|
|
|
END(irq_entries_start)
|
|
|
|
|
|
|
|
|
|
.previous
|
|
|
|
|
END(interrupt)
|
|
|
|
|
.previous
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-07-03 07:24:43 +00:00
|
|
|
/*
|
|
|
|
|
* the CPU automatically disables interrupts when executing an IRQ vector,
|
|
|
|
|
* so IRQ-flags tracing has to follow that:
|
|
|
|
|
*/
|
2008-11-11 21:24:58 +00:00
|
|
|
.p2align CONFIG_X86_L1_CACHE_SHIFT
|
2005-04-16 22:20:36 +00:00
|
|
|
common_interrupt:
|
2008-11-11 21:24:58 +00:00
|
|
|
addl $-0x80,(%esp) /* Adjust vector into the [-256,-1] range */
|
2005-04-16 22:20:36 +00:00
|
|
|
SAVE_ALL
|
2006-07-03 07:24:43 +00:00
|
|
|
TRACE_IRQS_OFF
|
2005-04-16 22:20:36 +00:00
|
|
|
movl %esp,%eax
|
|
|
|
|
call do_IRQ
|
|
|
|
|
jmp ret_from_intr
|
2007-02-13 12:26:24 +00:00
|
|
|
ENDPROC(common_interrupt)
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-09-08 16:47:55 +00:00
|
|
|
/*
|
|
|
|
|
* Irq entries should be protected against kprobes
|
|
|
|
|
*/
|
|
|
|
|
.pushsection .kprobes.text, "ax"
|
2009-01-21 08:26:06 +00:00
|
|
|
#define BUILD_INTERRUPT3(name, nr, fn) \
|
2005-04-16 22:20:36 +00:00
|
|
|
ENTRY(name) \
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME; \
|
2006-06-27 09:53:44 +00:00
|
|
|
pushl $~(nr); \
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4; \
|
|
|
|
|
SAVE_ALL; \
|
2006-07-03 07:24:43 +00:00
|
|
|
TRACE_IRQS_OFF \
|
2005-04-16 22:20:36 +00:00
|
|
|
movl %esp,%eax; \
|
2009-01-21 08:26:06 +00:00
|
|
|
call fn; \
|
2006-07-03 07:24:43 +00:00
|
|
|
jmp ret_from_intr; \
|
2007-02-13 12:26:24 +00:00
|
|
|
CFI_ENDPROC; \
|
|
|
|
|
ENDPROC(name)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-01-21 08:26:06 +00:00
|
|
|
#define BUILD_INTERRUPT(name, nr) BUILD_INTERRUPT3(name, nr, smp_##name)
|
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* The include is where all of the SMP etc. interrupts come from */
|
2009-01-28 18:34:09 +00:00
|
|
|
#include <asm/entry_arch.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(coprocessor_error)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $0
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_coprocessor_error
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(coprocessor_error)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(simd_coprocessor_error)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $0
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_simd_coprocessor_error
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(simd_coprocessor_error)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(device_not_available)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $-1 # mark this as an int
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2008-09-09 19:56:02 +00:00
|
|
|
pushl $do_device_not_available
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2008-09-09 19:56:02 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(device_not_available)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-12-07 01:14:07 +00:00
|
|
|
#ifdef CONFIG_PARAVIRT
|
|
|
|
|
ENTRY(native_iret)
|
2008-02-09 22:24:08 +00:00
|
|
|
iret
|
2006-12-07 01:14:07 +00:00
|
|
|
.section __ex_table,"a"
|
|
|
|
|
.align 4
|
2008-02-09 22:24:08 +00:00
|
|
|
.long native_iret, iret_exc
|
2006-12-07 01:14:07 +00:00
|
|
|
.previous
|
2007-02-13 12:26:24 +00:00
|
|
|
END(native_iret)
|
2006-12-07 01:14:07 +00:00
|
|
|
|
2008-06-25 04:19:26 +00:00
|
|
|
ENTRY(native_irq_enable_sysexit)
|
2006-12-07 01:14:07 +00:00
|
|
|
sti
|
|
|
|
|
sysexit
|
2008-06-25 04:19:26 +00:00
|
|
|
END(native_irq_enable_sysexit)
|
2006-12-07 01:14:07 +00:00
|
|
|
#endif
|
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
ENTRY(overflow)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $0
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_overflow
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(overflow)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(bounds)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $0
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_bounds
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(bounds)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(invalid_op)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $0
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_invalid_op
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(invalid_op)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(coprocessor_segment_overrun)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $0
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_coprocessor_segment_overrun
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(coprocessor_segment_overrun)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(invalid_TSS)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_EC_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_invalid_TSS
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(invalid_TSS)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(segment_not_present)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_EC_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_segment_not_present
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(segment_not_present)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(stack_segment)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_EC_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_stack_segment
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(stack_segment)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
ENTRY(alignment_check)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_EC_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_alignment_check
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(alignment_check)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
[PATCH] x86: error_code is not safe for kprobes
This patch moves the entry.S:error_entry to .kprobes.text section,
since code marked unsafe for kprobes jumps directly to entry.S::error_entry,
that must be marked unsafe as well.
This patch also moves all the ".previous.text" asm directives to ".previous"
for kprobes section.
AK: Following a similar i386 patch from Chuck Ebbert
AK: Also merged Jeremy's fix in.
+From: Jeremy Fitzhardinge <jeremy@goop.org>
KPROBE_ENTRY does a .section .kprobes.text, and expects its users to
do a .previous at the end of the function.
Unfortunately, if any code within the function switches sections, for
example .fixup, then the .previous ends up putting all subsequent code
into .fixup. Worse, any subsequent .fixup code gets intermingled with
the code its supposed to be fixing (which is also in .fixup). It's
surprising this didn't cause more havok.
The fix is to use .pushsection/.popsection, so this stuff nests
properly. A further cleanup would be to get rid of all
.section/.previous pairs, since they're inherently fragile.
+From: Chuck Ebbert <76306.1226@compuserve.com>
Because code marked unsafe for kprobes jumps directly to
entry.S::error_code, that must be marked unsafe as well.
The easiest way to do that is to move the page fault entry
point to just before error_code and let it inherit the same
section.
Also moved all the ".previous" asm directives for kprobes
sections to column 1 and removed ".text" from them.
Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Andi Kleen <ak@suse.de>
2006-09-26 08:52:34 +00:00
|
|
|
ENTRY(divide_error)
|
|
|
|
|
RING0_INT_FRAME
|
|
|
|
|
pushl $0 # no error code
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
pushl $do_divide_error
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(divide_error)
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_X86_MCE
|
|
|
|
|
ENTRY(machine_check)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $0
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2008-10-21 20:45:22 +00:00
|
|
|
pushl machine_check_vector
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(machine_check)
|
2005-04-16 22:20:36 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
ENTRY(spurious_interrupt_bug)
|
2006-06-26 11:57:44 +00:00
|
|
|
RING0_INT_FRAME
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $0
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
pushl $do_spurious_interrupt_bug
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2005-04-16 22:20:36 +00:00
|
|
|
jmp error_code
|
2006-06-26 11:57:44 +00:00
|
|
|
CFI_ENDPROC
|
2007-02-13 12:26:24 +00:00
|
|
|
END(spurious_interrupt_bug)
|
2009-09-08 16:47:55 +00:00
|
|
|
/*
|
|
|
|
|
* End of kprobes section
|
|
|
|
|
*/
|
|
|
|
|
.popsection
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-09-26 08:52:35 +00:00
|
|
|
ENTRY(kernel_thread_helper)
|
|
|
|
|
pushl $0 # fake return address for unwinder
|
|
|
|
|
CFI_STARTPROC
|
|
|
|
|
movl %edx,%eax
|
|
|
|
|
push %edx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
call *%ebx
|
|
|
|
|
push %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
call do_exit
|
2008-11-23 14:47:10 +00:00
|
|
|
ud2 # padding for call trace
|
2006-09-26 08:52:35 +00:00
|
|
|
CFI_ENDPROC
|
|
|
|
|
ENDPROC(kernel_thread_helper)
|
|
|
|
|
|
xen: Core Xen implementation
This patch is a rollup of all the core pieces of the Xen
implementation, including:
- booting and setup
- pagetable setup
- privileged instructions
- segmentation
- interrupt flags
- upcalls
- multicall batching
BOOTING AND SETUP
The vmlinux image is decorated with ELF notes which tell the Xen
domain builder what the kernel's requirements are; the domain builder
then constructs the address space accordingly and starts the kernel.
Xen has its own entrypoint for the kernel (contained in an ELF note).
The ELF notes are set up by xen-head.S, which is included into head.S.
In principle it could be linked separately, but it seems to provoke
lots of binutils bugs.
Because the domain builder starts the kernel in a fairly sane state
(32-bit protected mode, paging enabled, flat segments set up), there's
not a lot of setup needed before starting the kernel proper. The main
steps are:
1. Install the Xen paravirt_ops, which is simply a matter of a
structure assignment.
2. Set init_mm to use the Xen-supplied pagetables (analogous to the
head.S generated pagetables in a native boot).
3. Reserve address space for Xen, since it takes a chunk at the top
of the address space for its own use.
4. Call start_kernel()
PAGETABLE SETUP
Once we hit the main kernel boot sequence, it will end up calling back
via paravirt_ops to set up various pieces of Xen specific state. One
of the critical things which requires a bit of extra care is the
construction of the initial init_mm pagetable. Because Xen places
tight constraints on pagetables (an active pagetable must always be
valid, and must always be mapped read-only to the guest domain), we
need to be careful when constructing the new pagetable to keep these
constraints in mind. It turns out that the easiest way to do this is
use the initial Xen-provided pagetable as a template, and then just
insert new mappings for memory where a mapping doesn't already exist.
This means that during pagetable setup, it uses a special version of
xen_set_pte which ignores any attempt to remap a read-only page as
read-write (since Xen will map its own initial pagetable as RO), but
lets other changes to the ptes happen, so that things like NX are set
properly.
PRIVILEGED INSTRUCTIONS AND SEGMENTATION
When the kernel runs under Xen, it runs in ring 1 rather than ring 0.
This means that it is more privileged than user-mode in ring 3, but it
still can't run privileged instructions directly. Non-performance
critical instructions are dealt with by taking a privilege exception
and trapping into the hypervisor and emulating the instruction, but
more performance-critical instructions have their own specific
paravirt_ops. In many cases we can avoid having to do any hypercalls
for these instructions, or the Xen implementation is quite different
from the normal native version.
The privileged instructions fall into the broad classes of:
Segmentation: setting up the GDT and the GDT entries, LDT,
TLS and so on. Xen doesn't allow the GDT to be directly
modified; all GDT updates are done via hypercalls where the new
entries can be validated. This is important because Xen uses
segment limits to prevent the guest kernel from damaging the
hypervisor itself.
Traps and exceptions: Xen uses a special format for trap entrypoints,
so when the kernel wants to set an IDT entry, it needs to be
converted to the form Xen expects. Xen sets int 0x80 up specially
so that the trap goes straight from userspace into the guest kernel
without going via the hypervisor. sysenter isn't supported.
Kernel stack: The esp0 entry is extracted from the tss and provided to
Xen.
TLB operations: the various TLB calls are mapped into corresponding
Xen hypercalls.
Control registers: all the control registers are privileged. The most
important is cr3, which points to the base of the current pagetable,
and we handle it specially.
Another instruction we treat specially is CPUID, even though its not
privileged. We want to control what CPU features are visible to the
rest of the kernel, and so CPUID ends up going into a paravirt_op.
Xen implements this mainly to disable the ACPI and APIC subsystems.
INTERRUPT FLAGS
Xen maintains its own separate flag for masking events, which is
contained within the per-cpu vcpu_info structure. Because the guest
kernel runs in ring 1 and not 0, the IF flag in EFLAGS is completely
ignored (and must be, because even if a guest domain disables
interrupts for itself, it can't disable them overall).
(A note on terminology: "events" and interrupts are effectively
synonymous. However, rather than using an "enable flag", Xen uses a
"mask flag", which blocks event delivery when it is non-zero.)
There are paravirt_ops for each of cli/sti/save_fl/restore_fl, which
are implemented to manage the Xen event mask state. The only thing
worth noting is that when events are unmasked, we need to explicitly
see if there's a pending event and call into the hypervisor to make
sure it gets delivered.
UPCALLS
Xen needs a couple of upcall (or callback) functions to be implemented
by each guest. One is the event upcalls, which is how events
(interrupts, effectively) are delivered to the guests. The other is
the failsafe callback, which is used to report errors in either
reloading a segment register, or caused by iret. These are
implemented in i386/kernel/entry.S so they can jump into the normal
iret_exc path when necessary.
MULTICALL BATCHING
Xen provides a multicall mechanism, which allows multiple hypercalls
to be issued at once in order to mitigate the cost of trapping into
the hypervisor. This is particularly useful for context switches,
since the 4-5 hypercalls they would normally need (reload cr3, update
TLS, maybe update LDT) can be reduced to one. This patch implements a
generic batching mechanism for hypercalls, which gets used in many
places in the Xen code.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Cc: Ian Pratt <ian.pratt@xensource.com>
Cc: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
Cc: Adrian Bunk <bunk@stusta.de>
2007-07-18 01:37:04 +00:00
|
|
|
#ifdef CONFIG_XEN
|
2008-03-17 23:37:17 +00:00
|
|
|
/* Xen doesn't set %esp to be precisely what the normal sysenter
|
|
|
|
|
entrypoint expects, so fix it up before using the normal path. */
|
|
|
|
|
ENTRY(xen_sysenter_target)
|
|
|
|
|
RING0_INT_FRAME
|
|
|
|
|
addl $5*4, %esp /* remove xen-provided frame */
|
2008-07-18 12:32:23 +00:00
|
|
|
CFI_ADJUST_CFA_OFFSET -5*4
|
2008-03-17 23:37:17 +00:00
|
|
|
jmp sysenter_past_esp
|
2008-07-10 18:09:20 +00:00
|
|
|
CFI_ENDPROC
|
2008-03-17 23:37:17 +00:00
|
|
|
|
xen: Core Xen implementation
This patch is a rollup of all the core pieces of the Xen
implementation, including:
- booting and setup
- pagetable setup
- privileged instructions
- segmentation
- interrupt flags
- upcalls
- multicall batching
BOOTING AND SETUP
The vmlinux image is decorated with ELF notes which tell the Xen
domain builder what the kernel's requirements are; the domain builder
then constructs the address space accordingly and starts the kernel.
Xen has its own entrypoint for the kernel (contained in an ELF note).
The ELF notes are set up by xen-head.S, which is included into head.S.
In principle it could be linked separately, but it seems to provoke
lots of binutils bugs.
Because the domain builder starts the kernel in a fairly sane state
(32-bit protected mode, paging enabled, flat segments set up), there's
not a lot of setup needed before starting the kernel proper. The main
steps are:
1. Install the Xen paravirt_ops, which is simply a matter of a
structure assignment.
2. Set init_mm to use the Xen-supplied pagetables (analogous to the
head.S generated pagetables in a native boot).
3. Reserve address space for Xen, since it takes a chunk at the top
of the address space for its own use.
4. Call start_kernel()
PAGETABLE SETUP
Once we hit the main kernel boot sequence, it will end up calling back
via paravirt_ops to set up various pieces of Xen specific state. One
of the critical things which requires a bit of extra care is the
construction of the initial init_mm pagetable. Because Xen places
tight constraints on pagetables (an active pagetable must always be
valid, and must always be mapped read-only to the guest domain), we
need to be careful when constructing the new pagetable to keep these
constraints in mind. It turns out that the easiest way to do this is
use the initial Xen-provided pagetable as a template, and then just
insert new mappings for memory where a mapping doesn't already exist.
This means that during pagetable setup, it uses a special version of
xen_set_pte which ignores any attempt to remap a read-only page as
read-write (since Xen will map its own initial pagetable as RO), but
lets other changes to the ptes happen, so that things like NX are set
properly.
PRIVILEGED INSTRUCTIONS AND SEGMENTATION
When the kernel runs under Xen, it runs in ring 1 rather than ring 0.
This means that it is more privileged than user-mode in ring 3, but it
still can't run privileged instructions directly. Non-performance
critical instructions are dealt with by taking a privilege exception
and trapping into the hypervisor and emulating the instruction, but
more performance-critical instructions have their own specific
paravirt_ops. In many cases we can avoid having to do any hypercalls
for these instructions, or the Xen implementation is quite different
from the normal native version.
The privileged instructions fall into the broad classes of:
Segmentation: setting up the GDT and the GDT entries, LDT,
TLS and so on. Xen doesn't allow the GDT to be directly
modified; all GDT updates are done via hypercalls where the new
entries can be validated. This is important because Xen uses
segment limits to prevent the guest kernel from damaging the
hypervisor itself.
Traps and exceptions: Xen uses a special format for trap entrypoints,
so when the kernel wants to set an IDT entry, it needs to be
converted to the form Xen expects. Xen sets int 0x80 up specially
so that the trap goes straight from userspace into the guest kernel
without going via the hypervisor. sysenter isn't supported.
Kernel stack: The esp0 entry is extracted from the tss and provided to
Xen.
TLB operations: the various TLB calls are mapped into corresponding
Xen hypercalls.
Control registers: all the control registers are privileged. The most
important is cr3, which points to the base of the current pagetable,
and we handle it specially.
Another instruction we treat specially is CPUID, even though its not
privileged. We want to control what CPU features are visible to the
rest of the kernel, and so CPUID ends up going into a paravirt_op.
Xen implements this mainly to disable the ACPI and APIC subsystems.
INTERRUPT FLAGS
Xen maintains its own separate flag for masking events, which is
contained within the per-cpu vcpu_info structure. Because the guest
kernel runs in ring 1 and not 0, the IF flag in EFLAGS is completely
ignored (and must be, because even if a guest domain disables
interrupts for itself, it can't disable them overall).
(A note on terminology: "events" and interrupts are effectively
synonymous. However, rather than using an "enable flag", Xen uses a
"mask flag", which blocks event delivery when it is non-zero.)
There are paravirt_ops for each of cli/sti/save_fl/restore_fl, which
are implemented to manage the Xen event mask state. The only thing
worth noting is that when events are unmasked, we need to explicitly
see if there's a pending event and call into the hypervisor to make
sure it gets delivered.
UPCALLS
Xen needs a couple of upcall (or callback) functions to be implemented
by each guest. One is the event upcalls, which is how events
(interrupts, effectively) are delivered to the guests. The other is
the failsafe callback, which is used to report errors in either
reloading a segment register, or caused by iret. These are
implemented in i386/kernel/entry.S so they can jump into the normal
iret_exc path when necessary.
MULTICALL BATCHING
Xen provides a multicall mechanism, which allows multiple hypercalls
to be issued at once in order to mitigate the cost of trapping into
the hypervisor. This is particularly useful for context switches,
since the 4-5 hypercalls they would normally need (reload cr3, update
TLS, maybe update LDT) can be reduced to one. This patch implements a
generic batching mechanism for hypercalls, which gets used in many
places in the Xen code.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Cc: Ian Pratt <ian.pratt@xensource.com>
Cc: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
Cc: Adrian Bunk <bunk@stusta.de>
2007-07-18 01:37:04 +00:00
|
|
|
ENTRY(xen_hypervisor_callback)
|
|
|
|
|
CFI_STARTPROC
|
|
|
|
|
pushl $0
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
SAVE_ALL
|
|
|
|
|
TRACE_IRQS_OFF
|
xen: use iret directly when possible
Most of the time we can simply use the iret instruction to exit the
kernel, rather than having to use the iret hypercall - the only
exception is if we're returning into vm86 mode, or from delivering an
NMI (which we don't support yet).
When running native, iret has the behaviour of testing for a pending
interrupt atomically with re-enabling interrupts. Unfortunately
there's no way to do this with Xen, so there's a window in which we
could get a recursive exception after enabling events but before
actually returning to userspace.
This causes a problem: if the nested interrupt causes one of the
task's TIF_WORK_MASK flags to be set, they will not be checked again
before returning to userspace. This means that pending work may be
left pending indefinitely, until the process enters and leaves the
kernel again. The net effect is that a pending signal or reschedule
event could be delayed for an unbounded amount of time.
To deal with this, the xen event upcall handler checks to see if the
EIP is within the critical section of the iret code, after events
are (potentially) enabled up to the iret itself. If its within this
range, it calls the iret critical section fixup, which adjusts the
stack to deal with any unrestored registers, and then shifts the
stack frame up to replace the previous invocation.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
2007-07-18 01:37:07 +00:00
|
|
|
|
|
|
|
|
/* Check to see if we got the event in the critical
|
|
|
|
|
region in xen_iret_direct, after we've reenabled
|
|
|
|
|
events and checked for pending events. This simulates
|
|
|
|
|
iret instruction's behaviour where it delivers a
|
|
|
|
|
pending interrupt when enabling interrupts. */
|
|
|
|
|
movl PT_EIP(%esp),%eax
|
|
|
|
|
cmpl $xen_iret_start_crit,%eax
|
|
|
|
|
jb 1f
|
|
|
|
|
cmpl $xen_iret_end_crit,%eax
|
|
|
|
|
jae 1f
|
|
|
|
|
|
2008-03-17 23:37:22 +00:00
|
|
|
jmp xen_iret_crit_fixup
|
2008-03-17 23:37:17 +00:00
|
|
|
|
|
|
|
|
ENTRY(xen_do_upcall)
|
2008-04-02 17:54:11 +00:00
|
|
|
1: mov %esp, %eax
|
xen: Core Xen implementation
This patch is a rollup of all the core pieces of the Xen
implementation, including:
- booting and setup
- pagetable setup
- privileged instructions
- segmentation
- interrupt flags
- upcalls
- multicall batching
BOOTING AND SETUP
The vmlinux image is decorated with ELF notes which tell the Xen
domain builder what the kernel's requirements are; the domain builder
then constructs the address space accordingly and starts the kernel.
Xen has its own entrypoint for the kernel (contained in an ELF note).
The ELF notes are set up by xen-head.S, which is included into head.S.
In principle it could be linked separately, but it seems to provoke
lots of binutils bugs.
Because the domain builder starts the kernel in a fairly sane state
(32-bit protected mode, paging enabled, flat segments set up), there's
not a lot of setup needed before starting the kernel proper. The main
steps are:
1. Install the Xen paravirt_ops, which is simply a matter of a
structure assignment.
2. Set init_mm to use the Xen-supplied pagetables (analogous to the
head.S generated pagetables in a native boot).
3. Reserve address space for Xen, since it takes a chunk at the top
of the address space for its own use.
4. Call start_kernel()
PAGETABLE SETUP
Once we hit the main kernel boot sequence, it will end up calling back
via paravirt_ops to set up various pieces of Xen specific state. One
of the critical things which requires a bit of extra care is the
construction of the initial init_mm pagetable. Because Xen places
tight constraints on pagetables (an active pagetable must always be
valid, and must always be mapped read-only to the guest domain), we
need to be careful when constructing the new pagetable to keep these
constraints in mind. It turns out that the easiest way to do this is
use the initial Xen-provided pagetable as a template, and then just
insert new mappings for memory where a mapping doesn't already exist.
This means that during pagetable setup, it uses a special version of
xen_set_pte which ignores any attempt to remap a read-only page as
read-write (since Xen will map its own initial pagetable as RO), but
lets other changes to the ptes happen, so that things like NX are set
properly.
PRIVILEGED INSTRUCTIONS AND SEGMENTATION
When the kernel runs under Xen, it runs in ring 1 rather than ring 0.
This means that it is more privileged than user-mode in ring 3, but it
still can't run privileged instructions directly. Non-performance
critical instructions are dealt with by taking a privilege exception
and trapping into the hypervisor and emulating the instruction, but
more performance-critical instructions have their own specific
paravirt_ops. In many cases we can avoid having to do any hypercalls
for these instructions, or the Xen implementation is quite different
from the normal native version.
The privileged instructions fall into the broad classes of:
Segmentation: setting up the GDT and the GDT entries, LDT,
TLS and so on. Xen doesn't allow the GDT to be directly
modified; all GDT updates are done via hypercalls where the new
entries can be validated. This is important because Xen uses
segment limits to prevent the guest kernel from damaging the
hypervisor itself.
Traps and exceptions: Xen uses a special format for trap entrypoints,
so when the kernel wants to set an IDT entry, it needs to be
converted to the form Xen expects. Xen sets int 0x80 up specially
so that the trap goes straight from userspace into the guest kernel
without going via the hypervisor. sysenter isn't supported.
Kernel stack: The esp0 entry is extracted from the tss and provided to
Xen.
TLB operations: the various TLB calls are mapped into corresponding
Xen hypercalls.
Control registers: all the control registers are privileged. The most
important is cr3, which points to the base of the current pagetable,
and we handle it specially.
Another instruction we treat specially is CPUID, even though its not
privileged. We want to control what CPU features are visible to the
rest of the kernel, and so CPUID ends up going into a paravirt_op.
Xen implements this mainly to disable the ACPI and APIC subsystems.
INTERRUPT FLAGS
Xen maintains its own separate flag for masking events, which is
contained within the per-cpu vcpu_info structure. Because the guest
kernel runs in ring 1 and not 0, the IF flag in EFLAGS is completely
ignored (and must be, because even if a guest domain disables
interrupts for itself, it can't disable them overall).
(A note on terminology: "events" and interrupts are effectively
synonymous. However, rather than using an "enable flag", Xen uses a
"mask flag", which blocks event delivery when it is non-zero.)
There are paravirt_ops for each of cli/sti/save_fl/restore_fl, which
are implemented to manage the Xen event mask state. The only thing
worth noting is that when events are unmasked, we need to explicitly
see if there's a pending event and call into the hypervisor to make
sure it gets delivered.
UPCALLS
Xen needs a couple of upcall (or callback) functions to be implemented
by each guest. One is the event upcalls, which is how events
(interrupts, effectively) are delivered to the guests. The other is
the failsafe callback, which is used to report errors in either
reloading a segment register, or caused by iret. These are
implemented in i386/kernel/entry.S so they can jump into the normal
iret_exc path when necessary.
MULTICALL BATCHING
Xen provides a multicall mechanism, which allows multiple hypercalls
to be issued at once in order to mitigate the cost of trapping into
the hypervisor. This is particularly useful for context switches,
since the 4-5 hypercalls they would normally need (reload cr3, update
TLS, maybe update LDT) can be reduced to one. This patch implements a
generic batching mechanism for hypercalls, which gets used in many
places in the Xen code.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Cc: Ian Pratt <ian.pratt@xensource.com>
Cc: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
Cc: Adrian Bunk <bunk@stusta.de>
2007-07-18 01:37:04 +00:00
|
|
|
call xen_evtchn_do_upcall
|
|
|
|
|
jmp ret_from_intr
|
|
|
|
|
CFI_ENDPROC
|
|
|
|
|
ENDPROC(xen_hypervisor_callback)
|
|
|
|
|
|
|
|
|
|
# Hypervisor uses this for application faults while it executes.
|
|
|
|
|
# We get here for two reasons:
|
|
|
|
|
# 1. Fault while reloading DS, ES, FS or GS
|
|
|
|
|
# 2. Fault while executing IRET
|
|
|
|
|
# Category 1 we fix up by reattempting the load, and zeroing the segment
|
|
|
|
|
# register if the load fails.
|
|
|
|
|
# Category 2 we fix up by jumping to do_iret_error. We cannot use the
|
|
|
|
|
# normal Linux return path in this case because if we use the IRET hypercall
|
|
|
|
|
# to pop the stack frame we end up in an infinite loop of failsafe callbacks.
|
|
|
|
|
# We distinguish between categories by maintaining a status value in EAX.
|
|
|
|
|
ENTRY(xen_failsafe_callback)
|
|
|
|
|
CFI_STARTPROC
|
|
|
|
|
pushl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
movl $1,%eax
|
|
|
|
|
1: mov 4(%esp),%ds
|
|
|
|
|
2: mov 8(%esp),%es
|
|
|
|
|
3: mov 12(%esp),%fs
|
|
|
|
|
4: mov 16(%esp),%gs
|
|
|
|
|
testl %eax,%eax
|
|
|
|
|
popl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
lea 16(%esp),%esp
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -16
|
|
|
|
|
jz 5f
|
|
|
|
|
addl $16,%esp
|
|
|
|
|
jmp iret_exc # EAX != 0 => Category 2 (Bad IRET)
|
|
|
|
|
5: pushl $0 # EAX == 0 => Category 1 (Bad segment)
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
SAVE_ALL
|
|
|
|
|
jmp ret_from_exception
|
|
|
|
|
CFI_ENDPROC
|
|
|
|
|
|
|
|
|
|
.section .fixup,"ax"
|
|
|
|
|
6: xorl %eax,%eax
|
|
|
|
|
movl %eax,4(%esp)
|
|
|
|
|
jmp 1b
|
|
|
|
|
7: xorl %eax,%eax
|
|
|
|
|
movl %eax,8(%esp)
|
|
|
|
|
jmp 2b
|
|
|
|
|
8: xorl %eax,%eax
|
|
|
|
|
movl %eax,12(%esp)
|
|
|
|
|
jmp 3b
|
|
|
|
|
9: xorl %eax,%eax
|
|
|
|
|
movl %eax,16(%esp)
|
|
|
|
|
jmp 4b
|
|
|
|
|
.previous
|
|
|
|
|
.section __ex_table,"a"
|
|
|
|
|
.align 4
|
|
|
|
|
.long 1b,6b
|
|
|
|
|
.long 2b,7b
|
|
|
|
|
.long 3b,8b
|
|
|
|
|
.long 4b,9b
|
|
|
|
|
.previous
|
|
|
|
|
ENDPROC(xen_failsafe_callback)
|
|
|
|
|
|
|
|
|
|
#endif /* CONFIG_XEN */
|
|
|
|
|
|
2008-10-06 23:06:12 +00:00
|
|
|
#ifdef CONFIG_FUNCTION_TRACER
|
2008-05-12 19:20:43 +00:00
|
|
|
#ifdef CONFIG_DYNAMIC_FTRACE
|
|
|
|
|
|
|
|
|
|
ENTRY(mcount)
|
|
|
|
|
ret
|
|
|
|
|
END(mcount)
|
|
|
|
|
|
|
|
|
|
ENTRY(ftrace_caller)
|
2008-11-05 21:05:44 +00:00
|
|
|
cmpl $0, function_trace_stop
|
|
|
|
|
jne ftrace_stub
|
|
|
|
|
|
2008-05-12 19:20:43 +00:00
|
|
|
pushl %eax
|
|
|
|
|
pushl %ecx
|
|
|
|
|
pushl %edx
|
|
|
|
|
movl 0xc(%esp), %eax
|
|
|
|
|
movl 0x4(%ebp), %edx
|
2008-06-21 18:17:27 +00:00
|
|
|
subl $MCOUNT_INSN_SIZE, %eax
|
2008-05-12 19:20:43 +00:00
|
|
|
|
|
|
|
|
.globl ftrace_call
|
|
|
|
|
ftrace_call:
|
|
|
|
|
call ftrace_stub
|
|
|
|
|
|
|
|
|
|
popl %edx
|
|
|
|
|
popl %ecx
|
|
|
|
|
popl %eax
|
2008-11-26 05:16:24 +00:00
|
|
|
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
|
|
|
|
.globl ftrace_graph_call
|
|
|
|
|
ftrace_graph_call:
|
|
|
|
|
jmp ftrace_stub
|
|
|
|
|
#endif
|
2008-05-12 19:20:43 +00:00
|
|
|
|
|
|
|
|
.globl ftrace_stub
|
|
|
|
|
ftrace_stub:
|
|
|
|
|
ret
|
|
|
|
|
END(ftrace_caller)
|
|
|
|
|
|
|
|
|
|
#else /* ! CONFIG_DYNAMIC_FTRACE */
|
|
|
|
|
|
2008-05-12 19:20:42 +00:00
|
|
|
ENTRY(mcount)
|
2008-11-05 21:05:44 +00:00
|
|
|
cmpl $0, function_trace_stop
|
|
|
|
|
jne ftrace_stub
|
|
|
|
|
|
2008-05-12 19:20:42 +00:00
|
|
|
cmpl $ftrace_stub, ftrace_trace_function
|
|
|
|
|
jnz trace
|
2008-11-25 20:07:04 +00:00
|
|
|
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
2008-11-26 02:10:01 +00:00
|
|
|
cmpl $ftrace_stub, ftrace_graph_return
|
2008-11-25 20:07:04 +00:00
|
|
|
jnz ftrace_graph_caller
|
2008-12-03 04:50:05 +00:00
|
|
|
|
|
|
|
|
cmpl $ftrace_graph_entry_stub, ftrace_graph_entry
|
|
|
|
|
jnz ftrace_graph_caller
|
2008-11-11 06:03:45 +00:00
|
|
|
#endif
|
2008-05-12 19:20:42 +00:00
|
|
|
.globl ftrace_stub
|
|
|
|
|
ftrace_stub:
|
|
|
|
|
ret
|
|
|
|
|
|
|
|
|
|
/* taken from glibc */
|
|
|
|
|
trace:
|
|
|
|
|
pushl %eax
|
|
|
|
|
pushl %ecx
|
|
|
|
|
pushl %edx
|
|
|
|
|
movl 0xc(%esp), %eax
|
|
|
|
|
movl 0x4(%ebp), %edx
|
2008-06-21 18:17:27 +00:00
|
|
|
subl $MCOUNT_INSN_SIZE, %eax
|
2008-05-12 19:20:42 +00:00
|
|
|
|
2008-05-12 19:20:43 +00:00
|
|
|
call *ftrace_trace_function
|
2008-05-12 19:20:42 +00:00
|
|
|
|
|
|
|
|
popl %edx
|
|
|
|
|
popl %ecx
|
|
|
|
|
popl %eax
|
|
|
|
|
jmp ftrace_stub
|
|
|
|
|
END(mcount)
|
2008-05-12 19:20:43 +00:00
|
|
|
#endif /* CONFIG_DYNAMIC_FTRACE */
|
2008-10-06 23:06:12 +00:00
|
|
|
#endif /* CONFIG_FUNCTION_TRACER */
|
2008-05-12 19:20:42 +00:00
|
|
|
|
2008-11-25 20:07:04 +00:00
|
|
|
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
|
|
|
|
ENTRY(ftrace_graph_caller)
|
2008-11-16 05:02:06 +00:00
|
|
|
cmpl $0, function_trace_stop
|
|
|
|
|
jne ftrace_stub
|
|
|
|
|
|
2008-11-11 06:03:45 +00:00
|
|
|
pushl %eax
|
|
|
|
|
pushl %ecx
|
|
|
|
|
pushl %edx
|
2008-11-12 21:49:23 +00:00
|
|
|
movl 0xc(%esp), %edx
|
2008-11-11 06:03:45 +00:00
|
|
|
lea 0x4(%ebp), %eax
|
function-graph: add stack frame test
In case gcc does something funny with the stack frames, or the return
from function code, we would like to detect that.
An arch may implement passing of a variable that is unique to the
function and can be saved on entering a function and can be tested
when exiting the function. Usually the frame pointer can be used for
this purpose.
This patch also implements this for x86. Where it passes in the stack
frame of the parent function, and will test that frame on exit.
There was a case in x86_32 with optimize for size (-Os) where, for a
few functions, gcc would align the stack frame and place a copy of the
return address into it. The function graph tracer modified the copy and
not the actual return address. On return from the funtion, it did not go
to the tracer hook, but returned to the parent. This broke the function
graph tracer, because the return of the parent (where gcc did not do
this funky manipulation) returned to the location that the child function
was suppose to. This caused strange kernel crashes.
This test detected the problem and pointed out where the issue was.
This modifies the parameters of one of the functions that the arch
specific code calls, so it includes changes to arch code to accommodate
the new prototype.
Note, I notice that the parsic arch implements its own push_return_trace.
This is now a generic function and the ftrace_push_return_trace should be
used instead. This patch does not touch that code.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2009-06-18 16:45:08 +00:00
|
|
|
movl (%ebp), %ecx
|
2008-12-02 20:34:09 +00:00
|
|
|
subl $MCOUNT_INSN_SIZE, %edx
|
2008-11-11 06:03:45 +00:00
|
|
|
call prepare_ftrace_return
|
|
|
|
|
popl %edx
|
|
|
|
|
popl %ecx
|
|
|
|
|
popl %eax
|
2008-11-16 05:02:06 +00:00
|
|
|
ret
|
2008-11-25 20:07:04 +00:00
|
|
|
END(ftrace_graph_caller)
|
2008-11-11 06:03:45 +00:00
|
|
|
|
|
|
|
|
.globl return_to_handler
|
|
|
|
|
return_to_handler:
|
|
|
|
|
pushl %eax
|
|
|
|
|
pushl %edx
|
function-graph: add stack frame test
In case gcc does something funny with the stack frames, or the return
from function code, we would like to detect that.
An arch may implement passing of a variable that is unique to the
function and can be saved on entering a function and can be tested
when exiting the function. Usually the frame pointer can be used for
this purpose.
This patch also implements this for x86. Where it passes in the stack
frame of the parent function, and will test that frame on exit.
There was a case in x86_32 with optimize for size (-Os) where, for a
few functions, gcc would align the stack frame and place a copy of the
return address into it. The function graph tracer modified the copy and
not the actual return address. On return from the funtion, it did not go
to the tracer hook, but returned to the parent. This broke the function
graph tracer, because the return of the parent (where gcc did not do
this funky manipulation) returned to the location that the child function
was suppose to. This caused strange kernel crashes.
This test detected the problem and pointed out where the issue was.
This modifies the parameters of one of the functions that the arch
specific code calls, so it includes changes to arch code to accommodate
the new prototype.
Note, I notice that the parsic arch implements its own push_return_trace.
This is now a generic function and the ftrace_push_return_trace should be
used instead. This patch does not touch that code.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2009-06-18 16:45:08 +00:00
|
|
|
movl %ebp, %eax
|
2008-11-11 06:03:45 +00:00
|
|
|
call ftrace_return_to_handler
|
2009-10-13 20:33:50 +00:00
|
|
|
movl %eax, %ecx
|
2008-11-11 06:03:45 +00:00
|
|
|
popl %edx
|
|
|
|
|
popl %eax
|
2009-10-13 20:33:50 +00:00
|
|
|
jmp *%ecx
|
2008-11-16 05:02:06 +00:00
|
|
|
#endif
|
2008-05-12 19:20:42 +00:00
|
|
|
|
2006-01-06 08:12:05 +00:00
|
|
|
.section .rodata,"a"
|
2007-10-11 09:12:00 +00:00
|
|
|
#include "syscall_table_32.S"
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
syscall_table_size=(.-sys_call_table)
|
2008-11-24 14:38:45 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Some functions should be protected against kprobes
|
|
|
|
|
*/
|
|
|
|
|
.pushsection .kprobes.text, "ax"
|
|
|
|
|
|
|
|
|
|
ENTRY(page_fault)
|
|
|
|
|
RING0_EC_FRAME
|
|
|
|
|
pushl $do_page_fault
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
ALIGN
|
|
|
|
|
error_code:
|
2009-02-09 13:17:40 +00:00
|
|
|
/* the function address is in %gs's slot on the stack */
|
|
|
|
|
pushl %fs
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
/*CFI_REL_OFFSET fs, 0*/
|
2008-11-24 14:38:45 +00:00
|
|
|
pushl %es
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
/*CFI_REL_OFFSET es, 0*/
|
|
|
|
|
pushl %ds
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
/*CFI_REL_OFFSET ds, 0*/
|
|
|
|
|
pushl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET eax, 0
|
|
|
|
|
pushl %ebp
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET ebp, 0
|
|
|
|
|
pushl %edi
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET edi, 0
|
|
|
|
|
pushl %esi
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET esi, 0
|
|
|
|
|
pushl %edx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET edx, 0
|
|
|
|
|
pushl %ecx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET ecx, 0
|
|
|
|
|
pushl %ebx
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
CFI_REL_OFFSET ebx, 0
|
|
|
|
|
cld
|
|
|
|
|
movl $(__KERNEL_PERCPU), %ecx
|
|
|
|
|
movl %ecx, %fs
|
|
|
|
|
UNWIND_ESPFIX_STACK
|
2009-02-09 13:17:40 +00:00
|
|
|
GS_TO_REG %ecx
|
|
|
|
|
movl PT_GS(%esp), %edi # get the function address
|
2008-11-24 14:38:45 +00:00
|
|
|
movl PT_ORIG_EAX(%esp), %edx # get the error code
|
|
|
|
|
movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
|
2009-02-09 13:17:40 +00:00
|
|
|
REG_TO_PTGS %ecx
|
|
|
|
|
SET_KERNEL_GS %ecx
|
2008-11-24 14:38:45 +00:00
|
|
|
movl $(__USER_DS), %ecx
|
|
|
|
|
movl %ecx, %ds
|
|
|
|
|
movl %ecx, %es
|
|
|
|
|
TRACE_IRQS_OFF
|
|
|
|
|
movl %esp,%eax # pt_regs pointer
|
|
|
|
|
call *%edi
|
|
|
|
|
jmp ret_from_exception
|
|
|
|
|
CFI_ENDPROC
|
|
|
|
|
END(page_fault)
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Debug traps and NMI can happen at the one SYSENTER instruction
|
|
|
|
|
* that sets up the real kernel stack. Check here, since we can't
|
|
|
|
|
* allow the wrong stack to be used.
|
|
|
|
|
*
|
|
|
|
|
* "TSS_sysenter_sp0+12" is because the NMI/debug handler will have
|
|
|
|
|
* already pushed 3 words if it hits on the sysenter instruction:
|
|
|
|
|
* eflags, cs and eip.
|
|
|
|
|
*
|
|
|
|
|
* We just load the right stack, and push the three (known) values
|
|
|
|
|
* by hand onto the new stack - while updating the return eip past
|
|
|
|
|
* the instruction that would have done it for sysenter.
|
|
|
|
|
*/
|
2009-02-09 13:17:40 +00:00
|
|
|
.macro FIX_STACK offset ok label
|
|
|
|
|
cmpw $__KERNEL_CS, 4(%esp)
|
|
|
|
|
jne \ok
|
|
|
|
|
\label:
|
|
|
|
|
movl TSS_sysenter_sp0 + \offset(%esp), %esp
|
|
|
|
|
CFI_DEF_CFA esp, 0
|
|
|
|
|
CFI_UNDEFINED eip
|
|
|
|
|
pushfl
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
pushl $__KERNEL_CS
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
pushl $sysenter_past_esp
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2008-11-24 14:38:45 +00:00
|
|
|
CFI_REL_OFFSET eip, 0
|
2009-02-09 13:17:40 +00:00
|
|
|
.endm
|
2008-11-24 14:38:45 +00:00
|
|
|
|
|
|
|
|
ENTRY(debug)
|
|
|
|
|
RING0_INT_FRAME
|
|
|
|
|
cmpl $ia32_sysenter_target,(%esp)
|
|
|
|
|
jne debug_stack_correct
|
2009-02-09 13:17:40 +00:00
|
|
|
FIX_STACK 12, debug_stack_correct, debug_esp_fix_insn
|
2008-11-24 14:38:45 +00:00
|
|
|
debug_stack_correct:
|
|
|
|
|
pushl $-1 # mark this as an int
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
SAVE_ALL
|
|
|
|
|
TRACE_IRQS_OFF
|
|
|
|
|
xorl %edx,%edx # error code 0
|
|
|
|
|
movl %esp,%eax # pt_regs pointer
|
|
|
|
|
call do_debug
|
|
|
|
|
jmp ret_from_exception
|
|
|
|
|
CFI_ENDPROC
|
|
|
|
|
END(debug)
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* NMI is doubly nasty. It can happen _while_ we're handling
|
|
|
|
|
* a debug fault, and the debug fault hasn't yet been able to
|
|
|
|
|
* clear up the stack. So we first check whether we got an
|
|
|
|
|
* NMI on the sysenter entry path, but after that we need to
|
|
|
|
|
* check whether we got an NMI on the debug path where the debug
|
|
|
|
|
* fault happened on the sysenter path.
|
|
|
|
|
*/
|
|
|
|
|
ENTRY(nmi)
|
|
|
|
|
RING0_INT_FRAME
|
|
|
|
|
pushl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
movl %ss, %eax
|
|
|
|
|
cmpw $__ESPFIX_SS, %ax
|
|
|
|
|
popl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
je nmi_espfix_stack
|
|
|
|
|
cmpl $ia32_sysenter_target,(%esp)
|
|
|
|
|
je nmi_stack_fixup
|
|
|
|
|
pushl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
movl %esp,%eax
|
|
|
|
|
/* Do not access memory above the end of our stack page,
|
|
|
|
|
* it might not exist.
|
|
|
|
|
*/
|
|
|
|
|
andl $(THREAD_SIZE-1),%eax
|
|
|
|
|
cmpl $(THREAD_SIZE-20),%eax
|
|
|
|
|
popl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -4
|
|
|
|
|
jae nmi_stack_correct
|
|
|
|
|
cmpl $ia32_sysenter_target,12(%esp)
|
|
|
|
|
je nmi_debug_stack_check
|
|
|
|
|
nmi_stack_correct:
|
|
|
|
|
/* We have a RING0_INT_FRAME here */
|
|
|
|
|
pushl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
SAVE_ALL
|
|
|
|
|
xorl %edx,%edx # zero error code
|
|
|
|
|
movl %esp,%eax # pt_regs pointer
|
|
|
|
|
call do_nmi
|
i386: fix return to 16-bit stack from NMI handler
Returning to a task with a 16-bit stack requires special care: the iret
instruction does not restore the high word of esp in that case. The
espfix code fixes this, but currently is not invoked on NMIs. This means
that a running task gets the upper word of esp clobbered due intervening
NMIs. To reproduce, compile and run the following program with the nmi
watchdog enabled (nmi_watchdog=2 on the command line). Using gdb you can
see that the high bits of esp contain garbage, while the low bits are
still correct.
This patch puts the espfix code back into the NMI code path.
The patch is slightly complicated due to the irqtrace infrastructure not
being NMI-safe. The NMI return path cannot call TRACE_IRQS_IRET.
Otherwise, the tail of the normal iret-code is correct for the nmi code
path too. To be able to share this code-path, the TRACE_IRQS_IRET was
move up a bit. The espfix code exists after the TRACE_IRQS_IRET, but
this code explicitly disables interrupts. This short interrupts-off
section is now not traced anymore. The return-to-kernel path now always
includes the preliminary test to decide if the espfix code should be
called. This is never the case, but doing it this way keeps the patch as
simple as possible and the few extra instructions should not affect
timing in any significant way.
#define _GNU_SOURCE
#include <stdio.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <unistd.h>
#include <sys/syscall.h>
#include <asm/ldt.h>
int modify_ldt(int func, void *ptr, unsigned long bytecount)
{
return syscall(SYS_modify_ldt, func, ptr, bytecount);
}
/* this is assumed to be usable */
#define SEGBASEADDR 0x10000
#define SEGLIMIT 0x20000
/* 16-bit segment */
struct user_desc desc = {
.entry_number = 0,
.base_addr = SEGBASEADDR,
.limit = SEGLIMIT,
.seg_32bit = 0,
.contents = 0, /* ??? */
.read_exec_only = 0,
.limit_in_pages = 0,
.seg_not_present = 0,
.useable = 1
};
int main(void)
{
setvbuf(stdout, NULL, _IONBF, 0);
/* map a 64 kb segment */
char *pointer = mmap((void *)SEGBASEADDR, SEGLIMIT+1,
PROT_EXEC|PROT_READ|PROT_WRITE,
MAP_SHARED|MAP_ANONYMOUS, -1, 0);
if (pointer == NULL) {
printf("could not map space\n");
return 0;
}
/* write ldt, new mode */
int err = modify_ldt(0x11, &desc, sizeof(desc));
if (err) {
printf("error modifying ldt: %i\n", err);
return 0;
}
for (int i=0; i<1000; i++) {
asm volatile (
"pusha\n\t"
"mov %ss, %eax\n\t" /* preserve ss:esp */
"mov %esp, %ebp\n\t"
"push $7\n\t" /* index 0, ldt, user mode */
"push $65536-4096\n\t" /* esp */
"lss (%esp), %esp\n\t" /* switch to new stack */
"push %eax\n\t" /* save old ss:esp on new stack */
"push %ebp\n\t"
"add $17*65536, %esp\n\t" /* set high bits */
"mov %esp, %edx\n\t"
"mov $10000000, %ecx\n\t" /* wait... */
"1: loop 1b\n\t" /* ... a bit */
"cmp %esp, %edx\n\t"
"je 1f\n\t"
"ud2\n\t" /* esp changed inexplicably! */
"1:\n\t"
"sub $17*65536, %esp\n\t" /* restore high bits */
"lss (%esp), %esp\n\t" /* restore old ss:esp */
"popa\n\t");
printf("\rx%ix", i);
}
return 0;
}
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-06-17 22:35:57 +00:00
|
|
|
jmp restore_all_notrace
|
2008-11-24 14:38:45 +00:00
|
|
|
CFI_ENDPROC
|
|
|
|
|
|
|
|
|
|
nmi_stack_fixup:
|
|
|
|
|
RING0_INT_FRAME
|
2009-02-09 13:17:40 +00:00
|
|
|
FIX_STACK 12, nmi_stack_correct, 1
|
2008-11-24 14:38:45 +00:00
|
|
|
jmp nmi_stack_correct
|
|
|
|
|
|
|
|
|
|
nmi_debug_stack_check:
|
|
|
|
|
/* We have a RING0_INT_FRAME here */
|
|
|
|
|
cmpw $__KERNEL_CS,16(%esp)
|
|
|
|
|
jne nmi_stack_correct
|
|
|
|
|
cmpl $debug,(%esp)
|
|
|
|
|
jb nmi_stack_correct
|
|
|
|
|
cmpl $debug_esp_fix_insn,(%esp)
|
|
|
|
|
ja nmi_stack_correct
|
2009-02-09 13:17:40 +00:00
|
|
|
FIX_STACK 24, nmi_stack_correct, 1
|
2008-11-24 14:38:45 +00:00
|
|
|
jmp nmi_stack_correct
|
|
|
|
|
|
|
|
|
|
nmi_espfix_stack:
|
|
|
|
|
/* We have a RING0_INT_FRAME here.
|
|
|
|
|
*
|
|
|
|
|
* create the pointer to lss back
|
|
|
|
|
*/
|
|
|
|
|
pushl %ss
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
pushl %esp
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
2009-02-23 16:13:07 +00:00
|
|
|
addl $4, (%esp)
|
2008-11-24 14:38:45 +00:00
|
|
|
/* copy the iret frame of 12 bytes */
|
|
|
|
|
.rept 3
|
|
|
|
|
pushl 16(%esp)
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
.endr
|
|
|
|
|
pushl %eax
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
SAVE_ALL
|
|
|
|
|
FIXUP_ESPFIX_STACK # %eax == %esp
|
|
|
|
|
xorl %edx,%edx # zero error code
|
|
|
|
|
call do_nmi
|
|
|
|
|
RESTORE_REGS
|
|
|
|
|
lss 12+4(%esp), %esp # back to espfix stack
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET -24
|
|
|
|
|
jmp irq_return
|
|
|
|
|
CFI_ENDPROC
|
|
|
|
|
END(nmi)
|
|
|
|
|
|
|
|
|
|
ENTRY(int3)
|
|
|
|
|
RING0_INT_FRAME
|
|
|
|
|
pushl $-1 # mark this as an int
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
SAVE_ALL
|
|
|
|
|
TRACE_IRQS_OFF
|
|
|
|
|
xorl %edx,%edx # zero error code
|
|
|
|
|
movl %esp,%eax # pt_regs pointer
|
|
|
|
|
call do_int3
|
|
|
|
|
jmp ret_from_exception
|
|
|
|
|
CFI_ENDPROC
|
|
|
|
|
END(int3)
|
|
|
|
|
|
|
|
|
|
ENTRY(general_protection)
|
|
|
|
|
RING0_EC_FRAME
|
|
|
|
|
pushl $do_general_protection
|
|
|
|
|
CFI_ADJUST_CFA_OFFSET 4
|
|
|
|
|
jmp error_code
|
|
|
|
|
CFI_ENDPROC
|
|
|
|
|
END(general_protection)
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* End of kprobes section
|
|
|
|
|
*/
|
|
|
|
|
.popsection
|