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-2011-01-30.orig/arch/x86/kernel/entry_64-xen.S 2011-02-02 15:07:22.000000000 +0100 +++ head-2011-01-30/arch/x86/kernel/entry_64-xen.S 2011-02-02 15:09:22.000000000 +0100 @@ -223,23 +223,16 @@ NMI_MASK = 0x80000000 .endm /* - * initial frame state for interrupts (and exceptions without error code) + * initial frame state for syscall */ - .macro EMPTY_FRAME start=1 offset=0 + .macro BASIC_FRAME start=1 offset=0 .if \start CFI_STARTPROC simple CFI_SIGNAL_FRAME - CFI_DEF_CFA rsp,8+\offset + CFI_DEF_CFA rsp, SS+8+\offset-RIP .else - CFI_DEF_CFA_OFFSET 8+\offset + CFI_DEF_CFA_OFFSET SS+8+\offset-RIP .endif - .endm - -/* - * initial frame state for syscall - */ - .macro BASIC_FRAME start=1 offset=0 - EMPTY_FRAME \start, SS+8+\offset-RIP /*CFI_REL_OFFSET ss, SS+\offset-RIP*/ CFI_REL_OFFSET rsp, RSP+\offset-RIP /*CFI_REL_OFFSET rflags, EFLAGS+\offset-RIP*/ @@ -266,14 +259,15 @@ NMI_MASK = 0x80000000 */ .macro XCPT_FRAME start=1 offset=0 INTR_FRAME \start, RIP+\offset-ORIG_RAX - /*CFI_REL_OFFSET orig_rax, ORIG_RAX-ORIG_RAX*/ .endm /* * frame that enables calling into C. */ .macro PARTIAL_FRAME start=1 offset=0 + .if \start >= 0 XCPT_FRAME 2*\start, 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 @@ -289,7 +283,9 @@ NMI_MASK = 0x80000000 * frame that enables passing a complete pt_regs to a C function. */ .macro DEFAULT_FRAME start=1 offset=0 + .if \start >= -1 PARTIAL_FRAME \start, R11+\offset-R15 + .endif CFI_REL_OFFSET rbx, RBX+\offset CFI_REL_OFFSET rbp, RBP+\offset CFI_REL_OFFSET r12, R12+\offset @@ -329,25 +325,27 @@ NMI_MASK = 0x80000000 /* save partial stack frame */ .pushsection .kprobes.text, "ax" ENTRY(save_args) - XCPT_FRAME + XCPT_FRAME offset=ORIG_RAX-RBP+8 cld /* * start from rbp in pt_regs and jump over * return address. */ movq_cfi rdi, RDI+8-RBP - movq_cfi rsi, RSI+8-RBP - movq_cfi rdx, RDX+8-RBP - movq_cfi rcx, RCX+8-RBP + movq %rsi, RSI+8-RBP(%rsp) + movq %rdx, RDX+8-RBP(%rsp) + movq %rcx, RCX+8-RBP(%rsp) movq_cfi rax, RAX+8-RBP - movq_cfi r8, R8+8-RBP - movq_cfi r9, R9+8-RBP - movq_cfi r10, R10+8-RBP - movq_cfi r11, R11+8-RBP + movq %r8, R8+8-RBP(%rsp) + movq %r9, R9+8-RBP(%rsp) + movq %r10, R10+8-RBP(%rsp) + movq %r11, R11+8-RBP(%rsp) leaq -RBP+8(%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 @@ -359,11 +357,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 +372,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 +390,23 @@ END(save_rest) /* save complete stack frame */ .pushsection .kprobes.text, "ax" ENTRY(save_paranoid) - XCPT_FRAME 1 RDI+8 + XCPT_FRAME offset=ORIG_RAX-R15+8 cld - movq_cfi rdi, RDI+8 - movq_cfi rsi, RSI+8 + movq %rdi, RDI+8(%rsp) + movq %rsi, RSI+8(%rsp) 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 %r8, R8+8(%rsp) + movq %r9, R9+8(%rsp) + movq %r10, R10+8(%rsp) + movq %r11, R11+8(%rsp) 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 %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 @@ -692,7 +689,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 @@ -905,7 +902,7 @@ ENTRY(\sym) subq $ORIG_RAX-R15-1*8,%rsp CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15-1*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 @@ -932,7 +929,7 @@ ENTRY(\sym) 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 */ @@ -1254,25 +1251,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=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 %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, 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 %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) @@ -1293,6 +1289,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)