340 lines
9.0 KiB
Plaintext
340 lines
9.0 KiB
Plaintext
|
From: jbeulich@novell.com
|
||
|
|
Subject: fix unwind annotations
|
||
|
|
Patch-mainline: tbd
|
||
|
|
References: bnc#472783
|
||
|
|
|
||
|
|
Automatically created from "patches.arch/x86_64-unwind-annotations" by xen-port-patches.py
|
||
|
|
|
||
|
|
--- head-2010-03-15.orig/arch/x86/kernel/entry_64-xen.S 2010-03-17 14:27:13.000000000 +0100
|
||
|
|
+++ head-2010-03-15/arch/x86/kernel/entry_64-xen.S 2010-03-17 16:10:12.000000000 +0100
|
||
|
|
@@ -41,6 +41,7 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
#include <linux/linkage.h>
|
||
|
|
+#include <linux/stringify.h>
|
||
|
|
#include <asm/segment.h>
|
||
|
|
#include <asm/cache.h>
|
||
|
|
#include <asm/errno.h>
|
||
|
|
@@ -231,21 +232,21 @@ NMI_MASK = 0x80000000
|
||
|
|
/*
|
||
|
|
* initial frame state for interrupts (and exceptions without error code)
|
||
|
|
*/
|
||
|
|
- .macro EMPTY_FRAME start=1 offset=0
|
||
|
|
- .if \start
|
||
|
|
+ .macro EMPTY_FRAME offset=0
|
||
|
|
CFI_STARTPROC simple
|
||
|
|
CFI_SIGNAL_FRAME
|
||
|
|
- CFI_DEF_CFA rsp,8+\offset
|
||
|
|
- .else
|
||
|
|
- CFI_DEF_CFA_OFFSET 8+\offset
|
||
|
|
- .endif
|
||
|
|
+ CFI_DEF_CFA rsp,\offset
|
||
|
|
.endm
|
||
|
|
|
||
|
|
/*
|
||
|
|
* initial frame state for syscall
|
||
|
|
*/
|
||
|
|
.macro BASIC_FRAME start=1 offset=0
|
||
|
|
- EMPTY_FRAME \start, SS+8+\offset-RIP
|
||
|
|
+ .if \start
|
||
|
|
+ EMPTY_FRAME __stringify(SS+8+\offset-RIP)
|
||
|
|
+ .else
|
||
|
|
+ CFI_DEF_CFA_OFFSET SS+8+\offset-RIP
|
||
|
|
+ .endif
|
||
|
|
/*CFI_REL_OFFSET ss, SS+\offset-RIP*/
|
||
|
|
CFI_REL_OFFSET rsp, RSP+\offset-RIP
|
||
|
|
/*CFI_REL_OFFSET rflags, EFLAGS+\offset-RIP*/
|
||
|
|
@@ -271,15 +272,16 @@ NMI_MASK = 0x80000000
|
||
|
|
* with vector already pushed)
|
||
|
|
*/
|
||
|
|
.macro XCPT_FRAME start=1 offset=0
|
||
|
|
- INTR_FRAME \start, RIP+\offset-ORIG_RAX
|
||
|
|
- /*CFI_REL_OFFSET orig_rax, ORIG_RAX-ORIG_RAX*/
|
||
|
|
+ INTR_FRAME \start, __stringify(RIP+\offset-ORIG_RAX)
|
||
|
|
.endm
|
||
|
|
|
||
|
|
/*
|
||
|
|
* frame that enables calling into C.
|
||
|
|
*/
|
||
|
|
.macro PARTIAL_FRAME start=1 offset=0
|
||
|
|
- XCPT_FRAME 2*\start, ORIG_RAX+\offset-ARGOFFSET
|
||
|
|
+ .if \start >= 0
|
||
|
|
+ XCPT_FRAME 2*\start, __stringify(ORIG_RAX+\offset-ARGOFFSET)
|
||
|
|
+ .endif
|
||
|
|
CFI_REL_OFFSET rdi, RDI+\offset-ARGOFFSET
|
||
|
|
CFI_REL_OFFSET rsi, RSI+\offset-ARGOFFSET
|
||
|
|
CFI_REL_OFFSET rdx, RDX+\offset-ARGOFFSET
|
||
|
|
@@ -295,7 +297,9 @@ NMI_MASK = 0x80000000
|
||
|
|
* frame that enables passing a complete pt_regs to a C function.
|
||
|
|
*/
|
||
|
|
.macro DEFAULT_FRAME start=1 offset=0
|
||
|
|
- PARTIAL_FRAME \start, R11+\offset-R15
|
||
|
|
+ .if \start >= -1
|
||
|
|
+ PARTIAL_FRAME \start, __stringify(R11+\offset-R15)
|
||
|
|
+ .endif
|
||
|
|
CFI_REL_OFFSET rbx, RBX+\offset
|
||
|
|
CFI_REL_OFFSET rbp, RBP+\offset
|
||
|
|
CFI_REL_OFFSET r12, R12+\offset
|
||
|
|
@@ -334,21 +338,23 @@ NMI_MASK = 0x80000000
|
||
|
|
#ifndef CONFIG_XEN
|
||
|
|
/* save partial stack frame */
|
||
|
|
ENTRY(save_args)
|
||
|
|
- XCPT_FRAME
|
||
|
|
+ XCPT_FRAME offset=__stringify(ORIG_RAX-ARGOFFSET+16)
|
||
|
|
cld
|
||
|
|
- movq_cfi rdi, RDI+16-ARGOFFSET
|
||
|
|
- movq_cfi rsi, RSI+16-ARGOFFSET
|
||
|
|
- movq_cfi rdx, RDX+16-ARGOFFSET
|
||
|
|
- movq_cfi rcx, RCX+16-ARGOFFSET
|
||
|
|
- movq_cfi rax, RAX+16-ARGOFFSET
|
||
|
|
- movq_cfi r8, R8+16-ARGOFFSET
|
||
|
|
- movq_cfi r9, R9+16-ARGOFFSET
|
||
|
|
- movq_cfi r10, R10+16-ARGOFFSET
|
||
|
|
- movq_cfi r11, R11+16-ARGOFFSET
|
||
|
|
+ movq %rdi, RDI+16-ARGOFFSET(%rsp)
|
||
|
|
+ movq %rsi, RSI+16-ARGOFFSET(%rsp)
|
||
|
|
+ movq %rdx, RDX+16-ARGOFFSET(%rsp)
|
||
|
|
+ movq %rcx, RCX+16-ARGOFFSET(%rsp)
|
||
|
|
+ movq_cfi rax, __stringify(RAX+16-ARGOFFSET)
|
||
|
|
+ movq %r8, R8+16-ARGOFFSET(%rsp)
|
||
|
|
+ movq %r9, R9+16-ARGOFFSET(%rsp)
|
||
|
|
+ movq %r10, R10+16-ARGOFFSET(%rsp)
|
||
|
|
+ movq_cfi r11, __stringify(R11+16-ARGOFFSET)
|
||
|
|
|
||
|
|
leaq -ARGOFFSET+16(%rsp),%rdi /* arg1 for handler */
|
||
|
|
movq_cfi rbp, 8 /* push %rbp */
|
||
|
|
leaq 8(%rsp), %rbp /* mov %rsp, %ebp */
|
||
|
|
+ CFI_DEF_CFA_REGISTER rbp
|
||
|
|
+ CFI_ADJUST_CFA_OFFSET -8
|
||
|
|
testl $3, CS(%rdi)
|
||
|
|
je 1f
|
||
|
|
SWAPGS
|
||
|
|
@@ -360,11 +366,10 @@ ENTRY(save_args)
|
||
|
|
*/
|
||
|
|
1: incl PER_CPU_VAR(irq_count)
|
||
|
|
jne 2f
|
||
|
|
- popq_cfi %rax /* move return address... */
|
||
|
|
+ popq %rax /* move return address... */
|
||
|
|
mov PER_CPU_VAR(irq_stack_ptr),%rsp
|
||
|
|
- EMPTY_FRAME 0
|
||
|
|
- pushq_cfi %rbp /* backlink for unwinder */
|
||
|
|
- pushq_cfi %rax /* ... to the new stack */
|
||
|
|
+ pushq %rbp /* backlink for unwinder */
|
||
|
|
+ pushq %rax /* ... to the new stack */
|
||
|
|
/*
|
||
|
|
* We entered an interrupt context - irqs are off:
|
||
|
|
*/
|
||
|
|
@@ -375,14 +380,14 @@ END(save_args)
|
||
|
|
#endif
|
||
|
|
|
||
|
|
ENTRY(save_rest)
|
||
|
|
- PARTIAL_FRAME 1 REST_SKIP+8
|
||
|
|
+ CFI_STARTPROC
|
||
|
|
movq 5*8+16(%rsp), %r11 /* save return address */
|
||
|
|
- movq_cfi rbx, RBX+16
|
||
|
|
- movq_cfi rbp, RBP+16
|
||
|
|
- movq_cfi r12, R12+16
|
||
|
|
- movq_cfi r13, R13+16
|
||
|
|
- movq_cfi r14, R14+16
|
||
|
|
- movq_cfi r15, R15+16
|
||
|
|
+ movq %rbx, RBX+16(%rsp)
|
||
|
|
+ movq %rbp, RBP+16(%rsp)
|
||
|
|
+ movq %r12, R12+16(%rsp)
|
||
|
|
+ movq %r13, R13+16(%rsp)
|
||
|
|
+ movq %r14, R14+16(%rsp)
|
||
|
|
+ movq %r15, R15+16(%rsp)
|
||
|
|
movq %r11, 8(%rsp) /* return address */
|
||
|
|
FIXUP_TOP_OF_STACK %r11, 16
|
||
|
|
ret
|
||
|
|
@@ -393,23 +398,23 @@ END(save_rest)
|
||
|
|
/* save complete stack frame */
|
||
|
|
.pushsection .kprobes.text, "ax"
|
||
|
|
ENTRY(save_paranoid)
|
||
|
|
- XCPT_FRAME 1 RDI+8
|
||
|
|
+ XCPT_FRAME offset=__stringify(ORIG_RAX-R15+8)
|
||
|
|
cld
|
||
|
|
- movq_cfi rdi, RDI+8
|
||
|
|
- movq_cfi rsi, RSI+8
|
||
|
|
- movq_cfi rdx, RDX+8
|
||
|
|
- movq_cfi rcx, RCX+8
|
||
|
|
- movq_cfi rax, RAX+8
|
||
|
|
- movq_cfi r8, R8+8
|
||
|
|
- movq_cfi r9, R9+8
|
||
|
|
- movq_cfi r10, R10+8
|
||
|
|
- movq_cfi r11, R11+8
|
||
|
|
- movq_cfi rbx, RBX+8
|
||
|
|
- movq_cfi rbp, RBP+8
|
||
|
|
- movq_cfi r12, R12+8
|
||
|
|
- movq_cfi r13, R13+8
|
||
|
|
- movq_cfi r14, R14+8
|
||
|
|
- movq_cfi r15, R15+8
|
||
|
|
+ movq %rdi, RDI+8(%rsp)
|
||
|
|
+ movq %rsi, RSI+8(%rsp)
|
||
|
|
+ movq_cfi rdx, __stringify(RDX+8)
|
||
|
|
+ movq_cfi rcx, __stringify(RCX+8)
|
||
|
|
+ movq_cfi rax, __stringify(RAX+8)
|
||
|
|
+ movq %r8, R8+8(%rsp)
|
||
|
|
+ movq %r9, R9+8(%rsp)
|
||
|
|
+ movq %r10, R10+8(%rsp)
|
||
|
|
+ movq %r11, R11+8(%rsp)
|
||
|
|
+ movq_cfi rbx, __stringify(RBX+8)
|
||
|
|
+ movq %rbp, RBP+8(%rsp)
|
||
|
|
+ movq %r12, R12+8(%rsp)
|
||
|
|
+ movq %r13, R13+8(%rsp)
|
||
|
|
+ movq %r14, R14+8(%rsp)
|
||
|
|
+ movq %r15, R15+8(%rsp)
|
||
|
|
movl $1,%ebx
|
||
|
|
movl $MSR_GS_BASE,%ecx
|
||
|
|
rdmsr
|
||
|
|
@@ -700,7 +705,7 @@ ENTRY(\label)
|
||
|
|
subq $REST_SKIP, %rsp
|
||
|
|
CFI_ADJUST_CFA_OFFSET REST_SKIP
|
||
|
|
call save_rest
|
||
|
|
- DEFAULT_FRAME 0 8 /* offset 8: return address */
|
||
|
|
+ DEFAULT_FRAME -2 8 /* offset 8: return address */
|
||
|
|
leaq 8(%rsp), \arg /* pt_regs pointer */
|
||
|
|
call \func
|
||
|
|
jmp ptregscall_common
|
||
|
|
@@ -717,21 +722,20 @@ END(\label)
|
||
|
|
ENTRY(ptregscall_common)
|
||
|
|
DEFAULT_FRAME 1 8 /* offset 8: return address */
|
||
|
|
RESTORE_TOP_OF_STACK %r11, 8
|
||
|
|
- movq_cfi_restore R15+8, r15
|
||
|
|
- movq_cfi_restore R14+8, r14
|
||
|
|
- movq_cfi_restore R13+8, r13
|
||
|
|
- movq_cfi_restore R12+8, r12
|
||
|
|
- movq_cfi_restore RBP+8, rbp
|
||
|
|
- movq_cfi_restore RBX+8, rbx
|
||
|
|
+ movq_cfi_restore __stringify(R15+8), r15
|
||
|
|
+ movq_cfi_restore __stringify(R14+8), r14
|
||
|
|
+ movq_cfi_restore __stringify(R13+8), r13
|
||
|
|
+ movq_cfi_restore __stringify(R12+8), r12
|
||
|
|
+ movq_cfi_restore __stringify(RBP+8), rbp
|
||
|
|
+ movq_cfi_restore __stringify(RBX+8), rbx
|
||
|
|
ret $REST_SKIP /* pop extended registers */
|
||
|
|
CFI_ENDPROC
|
||
|
|
END(ptregscall_common)
|
||
|
|
|
||
|
|
ENTRY(stub_execve)
|
||
|
|
CFI_STARTPROC
|
||
|
|
- popq %r11
|
||
|
|
- CFI_ADJUST_CFA_OFFSET -8
|
||
|
|
- CFI_REGISTER rip, r11
|
||
|
|
+ addq $8, %rsp
|
||
|
|
+ PARTIAL_FRAME 0
|
||
|
|
SAVE_REST
|
||
|
|
FIXUP_TOP_OF_STACK %r11
|
||
|
|
movq %rsp, %rcx
|
||
|
|
@@ -750,7 +754,7 @@ END(stub_execve)
|
||
|
|
ENTRY(stub_rt_sigreturn)
|
||
|
|
CFI_STARTPROC
|
||
|
|
addq $8, %rsp
|
||
|
|
- CFI_ADJUST_CFA_OFFSET -8
|
||
|
|
+ PARTIAL_FRAME 0
|
||
|
|
SAVE_REST
|
||
|
|
movq %rsp,%rdi
|
||
|
|
FIXUP_TOP_OF_STACK %r11
|
||
|
|
@@ -926,10 +930,10 @@ ENTRY(\sym)
|
||
|
|
movq 8(%rsp),%r11
|
||
|
|
CFI_RESTORE r11
|
||
|
|
movq $-1,8(%rsp) /* ORIG_RAX: no syscall to restart */
|
||
|
|
- subq $(15-1)*8,%rsp
|
||
|
|
- CFI_ADJUST_CFA_OFFSET (15-1)*8
|
||
|
|
+ subq $ORIG_RAX-R15-8, %rsp
|
||
|
|
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15-8
|
||
|
|
call error_entry
|
||
|
|
- DEFAULT_FRAME 0
|
||
|
|
+ DEFAULT_FRAME -1
|
||
|
|
movq %rsp,%rdi /* pt_regs pointer */
|
||
|
|
xorl %esi,%esi /* no error code */
|
||
|
|
call \do_sym
|
||
|
|
@@ -953,10 +957,10 @@ ENTRY(\sym)
|
||
|
|
CFI_RESTORE rcx
|
||
|
|
movq 8(%rsp),%r11
|
||
|
|
CFI_RESTORE r11
|
||
|
|
- subq $(15-2)*8,%rsp
|
||
|
|
- CFI_ADJUST_CFA_OFFSET (15-2)*8
|
||
|
|
+ subq $ORIG_RAX-R15-2*8, %rsp
|
||
|
|
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15-2*8
|
||
|
|
call error_entry
|
||
|
|
- DEFAULT_FRAME 0
|
||
|
|
+ DEFAULT_FRAME -1
|
||
|
|
movq %rsp,%rdi /* pt_regs pointer */
|
||
|
|
movq ORIG_RAX(%rsp),%rsi /* get error code */
|
||
|
|
movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
|
||
|
|
@@ -1225,7 +1229,7 @@ paranoidzeroentry machine_check *machine
|
||
|
|
|
||
|
|
/* ebx: no swapgs flag */
|
||
|
|
ENTRY(paranoid_exit)
|
||
|
|
- INTR_FRAME
|
||
|
|
+ DEFAULT_FRAME
|
||
|
|
DISABLE_INTERRUPTS(CLBR_NONE)
|
||
|
|
TRACE_IRQS_OFF
|
||
|
|
testl %ebx,%ebx /* swapgs needed? */
|
||
|
|
@@ -1276,25 +1280,24 @@ END(paranoid_exit)
|
||
|
|
* returns in "no swapgs flag" in %ebx.
|
||
|
|
*/
|
||
|
|
ENTRY(error_entry)
|
||
|
|
- XCPT_FRAME 2
|
||
|
|
- CFI_ADJUST_CFA_OFFSET 15*8
|
||
|
|
+ XCPT_FRAME start=2 offset=__stringify(ORIG_RAX-R15+8)
|
||
|
|
/* oldrax contains error code */
|
||
|
|
cld
|
||
|
|
- movq_cfi rdi, RDI+8
|
||
|
|
- movq_cfi rsi, RSI+8
|
||
|
|
- movq_cfi rdx, RDX+8
|
||
|
|
- movq_cfi rcx, RCX+8
|
||
|
|
- movq_cfi rax, RAX+8
|
||
|
|
- movq_cfi r8, R8+8
|
||
|
|
- movq_cfi r9, R9+8
|
||
|
|
- movq_cfi r10, R10+8
|
||
|
|
- movq_cfi r11, R11+8
|
||
|
|
- movq_cfi rbx, RBX+8
|
||
|
|
- movq_cfi rbp, RBP+8
|
||
|
|
- movq_cfi r12, R12+8
|
||
|
|
- movq_cfi r13, R13+8
|
||
|
|
- movq_cfi r14, R14+8
|
||
|
|
- movq_cfi r15, R15+8
|
||
|
|
+ movq %rdi, RDI+8(%rsp)
|
||
|
|
+ movq %rsi, RSI+8(%rsp)
|
||
|
|
+ movq %rdx, RDX+8(%rsp)
|
||
|
|
+ movq %rcx, RCX+8(%rsp)
|
||
|
|
+ movq %rax, RAX+8(%rsp)
|
||
|
|
+ movq %r8, R8+8(%rsp)
|
||
|
|
+ movq %r9, R9+8(%rsp)
|
||
|
|
+ movq %r10, R10+8(%rsp)
|
||
|
|
+ movq %r11, R11+8(%rsp)
|
||
|
|
+ movq_cfi rbx, __stringify(RBX+8)
|
||
|
|
+ movq %rbp, RBP+8(%rsp)
|
||
|
|
+ movq %r12, R12+8(%rsp)
|
||
|
|
+ movq %r13, R13+8(%rsp)
|
||
|
|
+ movq %r14, R14+8(%rsp)
|
||
|
|
+ movq %r15, R15+8(%rsp)
|
||
|
|
#ifndef CONFIG_XEN
|
||
|
|
xorl %ebx,%ebx
|
||
|
|
testl $3,CS+8(%rsp)
|
||
|
|
@@ -1305,7 +1308,6 @@ error_sti:
|
||
|
|
#endif
|
||
|
|
TRACE_IRQS_OFF
|
||
|
|
ret
|
||
|
|
- CFI_ENDPROC
|
||
|
|
|
||
|
|
#ifndef CONFIG_XEN
|
||
|
|
/*
|
||
|
|
@@ -1316,6 +1318,7 @@ error_sti:
|
||
|
|
* compat mode. Check for these here too.
|
||
|
|
*/
|
||
|
|
error_kernelspace:
|
||
|
|
+ CFI_REL_OFFSET rcx, RCX+8
|
||
|
|
incl %ebx
|
||
|
|
leaq irq_return(%rip),%rcx
|
||
|
|
cmpq %rcx,RIP+8(%rsp)
|
||
|
|
@@ -1332,6 +1335,7 @@ bstep_iret:
|
||
|
|
movq %rcx,RIP+8(%rsp)
|
||
|
|
jmp error_swapgs
|
||
|
|
#endif
|
||
|
|
+ CFI_ENDPROC
|
||
|
|
END(error_entry)
|
||
|
|
|
||
|
|
|