* Resend: [PATCH] x86-64: fix unwind annotations in syscall stubs
@ 2010-09-02 12:52 Jan Beulich
2010-09-02 22:49 ` Alexander van Heukelum
2010-09-03 7:11 ` [tip:x86/debug] x86-64: Fix " tip-bot for Jan Beulich
0 siblings, 2 replies; 5+ messages in thread
From: Jan Beulich @ 2010-09-02 12:52 UTC (permalink / raw)
To: mingo, tglx, hpa; +Cc: linux-kernel
With the return address removed from the stack, these should really
refer to their caller's register state.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---
arch/x86/kernel/entry_64.S | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- linux-2.6.36-rc3/arch/x86/kernel/entry_64.S
+++ 2.6.36-rc3-x86_64-stub-unwind-annotations/arch/x86/kernel/entry_64.S
@@ -714,9 +714,8 @@ 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
@@ -735,7 +734,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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Resend: [PATCH] x86-64: fix unwind annotations in syscall stubs
2010-09-02 12:52 Resend: [PATCH] x86-64: fix unwind annotations in syscall stubs Jan Beulich
@ 2010-09-02 22:49 ` Alexander van Heukelum
2010-09-03 7:11 ` [tip:x86/debug] x86-64: Fix " tip-bot for Jan Beulich
1 sibling, 0 replies; 5+ messages in thread
From: Alexander van Heukelum @ 2010-09-02 22:49 UTC (permalink / raw)
To: Jan Beulich, Ingo Molnar, Thomas Gleixner, H. Peter Anvin; +Cc: linux-kernel
On Thu, 02 Sep 2010 13:52 +0100, "Jan Beulich" <JBeulich@novell.com> wrote:
> With the return address removed from the stack, these should really
> refer to their caller's register state.
>
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
>
> ---
> arch/x86/kernel/entry_64.S | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> --- linux-2.6.36-rc3/arch/x86/kernel/entry_64.S
> +++ 2.6.36-rc3-x86_64-stub-unwind-annotations/arch/x86/kernel/entry_64.S
> @@ -714,9 +714,8 @@ 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
> @@ -735,7 +734,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
>
Thanks for creating these...
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip:x86/debug] x86-64: Fix unwind annotations in syscall stubs
2010-09-02 12:52 Resend: [PATCH] x86-64: fix unwind annotations in syscall stubs Jan Beulich
2010-09-02 22:49 ` Alexander van Heukelum
@ 2010-09-03 7:11 ` tip-bot for Jan Beulich
1 sibling, 0 replies; 5+ messages in thread
From: tip-bot for Jan Beulich @ 2010-09-03 7:11 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, jbeulich, heukelum, JBeulich, tglx,
mingo
Commit-ID: e6b04b6b5a3182ae36cf9a69f1aaaee432edc8ad
Gitweb: http://git.kernel.org/tip/e6b04b6b5a3182ae36cf9a69f1aaaee432edc8ad
Author: Jan Beulich <JBeulich@novell.com>
AuthorDate: Thu, 2 Sep 2010 13:52:45 +0100
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 3 Sep 2010 08:14:09 +0200
x86-64: Fix unwind annotations in syscall stubs
With the return address removed from the stack, these should
really refer to their caller's register state.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
LKML-Reference: <4C7FBA3D0200007800013F61@vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/entry_64.S | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 17be5ec..16aeff0 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -714,9 +714,8 @@ 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
@@ -735,7 +734,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
@@ -1445,7 +1444,6 @@ error_swapgs:
error_sti:
TRACE_IRQS_OFF
ret
- CFI_ENDPROC
/*
* There are two places in the kernel that can potentially fault with
@@ -1470,6 +1468,7 @@ bstep_iret:
/* Fix truncated RIP */
movq %rcx,RIP+8(%rsp)
jmp error_swapgs
+ CFI_ENDPROC
END(error_entry)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Resend: [PATCH] x86-64: fix unwind annotations in syscall stubs
@ 2010-09-02 12:53 Jan Beulich
2010-09-02 22:50 ` Alexander van Heukelum
0 siblings, 1 reply; 5+ messages in thread
From: Jan Beulich @ 2010-09-02 12:53 UTC (permalink / raw)
To: mingo, tglx, hpa; +Cc: linux-kernel
The scope should really extend to the end of the function, not the
return location.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---
arch/x86/kernel/entry_64.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-2.6.36-rc3/arch/x86/kernel/entry_64.S
+++ 2.6.36-rc3-x86_64-error_entry-unwind-scope/arch/x86/kernel/entry_64.S
@@ -1445,7 +1445,6 @@ error_swapgs:
error_sti:
TRACE_IRQS_OFF
ret
- CFI_ENDPROC
/*
* There are two places in the kernel that can potentially fault with
@@ -1470,6 +1469,7 @@ bstep_iret:
/* Fix truncated RIP */
movq %rcx,RIP+8(%rsp)
jmp error_swapgs
+ CFI_ENDPROC
END(error_entry)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Resend: [PATCH] x86-64: fix unwind annotations in syscall stubs
2010-09-02 12:53 Resend: [PATCH] x86-64: fix " Jan Beulich
@ 2010-09-02 22:50 ` Alexander van Heukelum
0 siblings, 0 replies; 5+ messages in thread
From: Alexander van Heukelum @ 2010-09-02 22:50 UTC (permalink / raw)
To: Jan Beulich, Ingo Molnar, Thomas Gleixner, H. Peter Anvin; +Cc: linux-kernel
On Thu, 02 Sep 2010 13:53 +0100, "Jan Beulich" <JBeulich@novell.com> wrote:
> The scope should really extend to the end of the function, not the
> return location.
>
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
>
> ---
> arch/x86/kernel/entry_64.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-2.6.36-rc3/arch/x86/kernel/entry_64.S
> +++ 2.6.36-rc3-x86_64-error_entry-unwind-scope/arch/x86/kernel/entry_64.S
> @@ -1445,7 +1445,6 @@ error_swapgs:
> error_sti:
> TRACE_IRQS_OFF
> ret
> - CFI_ENDPROC
>
> /*
> * There are two places in the kernel that can potentially fault with
> @@ -1470,6 +1469,7 @@ bstep_iret:
> /* Fix truncated RIP */
> movq %rcx,RIP+8(%rsp)
> jmp error_swapgs
> + CFI_ENDPROC
> END(error_entry)
>
Indeed.
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-09-03 7:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-02 12:52 Resend: [PATCH] x86-64: fix unwind annotations in syscall stubs Jan Beulich
2010-09-02 22:49 ` Alexander van Heukelum
2010-09-03 7:11 ` [tip:x86/debug] x86-64: Fix " tip-bot for Jan Beulich
-- strict thread matches above, loose matches on Subject: below --
2010-09-02 12:53 Resend: [PATCH] x86-64: fix " Jan Beulich
2010-09-02 22:50 ` Alexander van Heukelum
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox