* [PATCH] ix86: unwind-annotate thunk_32.S
@ 2014-09-24 7:41 Jan Beulich
2014-10-08 8:10 ` [tip:x86/asm] x86: Unwind-annotate thunk_32.S tip-bot for Jan Beulich
2014-10-08 10:33 ` tip-bot for Jan Beulich
0 siblings, 2 replies; 3+ messages in thread
From: Jan Beulich @ 2014-09-24 7:41 UTC (permalink / raw)
To: mingo, tglx, hpa; +Cc: linux-kernel
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
arch/x86/lib/thunk_32.S | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
--- 3.17-rc6/arch/x86/lib/thunk_32.S
+++ 3.17-rc6-ix86-annotate-thunks/arch/x86/lib/thunk_32.S
@@ -6,22 +6,31 @@
*/
#include <linux/linkage.h>
#include <asm/asm.h>
+ #include <asm/dwarf2.h>
#ifdef CONFIG_TRACE_IRQFLAGS
/* put return address in eax (arg1) */
.macro thunk_ra name,func
.globl \name
\name:
- pushl %eax
- pushl %ecx
- pushl %edx
+ CFI_STARTPROC
+ pushl_cfi %eax
+ CFI_REL_OFFSET eax, 0
+ pushl_cfi %ecx
+ CFI_REL_OFFSET ecx, 0
+ pushl_cfi %edx
+ CFI_REL_OFFSET edx, 0
/* Place EIP in the arg1 */
movl 3*4(%esp), %eax
call \func
- popl %edx
- popl %ecx
- popl %eax
+ popl_cfi %edx
+ CFI_RESTORE edx
+ popl_cfi %ecx
+ CFI_RESTORE ecx
+ popl_cfi %eax
+ CFI_RESTORE eax
ret
+ CFI_ENDPROC
_ASM_NOKPROBE(\name)
.endm
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:x86/asm] x86: Unwind-annotate thunk_32.S
2014-09-24 7:41 [PATCH] ix86: unwind-annotate thunk_32.S Jan Beulich
@ 2014-10-08 8:10 ` tip-bot for Jan Beulich
2014-10-08 10:33 ` tip-bot for Jan Beulich
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Jan Beulich @ 2014-10-08 8:10 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, jbeulich, JBeulich, tglx
Commit-ID: 82ef36449d311a29b20f82fdce0de856057fa691
Gitweb: http://git.kernel.org/tip/82ef36449d311a29b20f82fdce0de856057fa691
Author: Jan Beulich <JBeulich@suse.com>
AuthorDate: Wed, 24 Sep 2014 08:41:30 +0100
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 8 Oct 2014 10:05:50 +0200
x86: Unwind-annotate thunk_32.S
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/542291CA0200007800038085@mail.emea.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/lib/thunk_32.S | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/arch/x86/lib/thunk_32.S b/arch/x86/lib/thunk_32.S
index e9acf5f..5f72e53 100644
--- a/arch/x86/lib/thunk_32.S
+++ b/arch/x86/lib/thunk_32.S
@@ -11,9 +11,13 @@
.macro THUNK name, func, put_ret_addr_in_eax=0
.globl \name
\name:
- pushl %eax
- pushl %ecx
- pushl %edx
+ CFI_STARTPROC
+ pushl_cfi %eax
+ CFI_REL_OFFSET eax, 0
+ pushl_cfi %ecx
+ CFI_REL_OFFSET ecx, 0
+ pushl_cfi %edx
+ CFI_REL_OFFSET edx, 0
.if \put_ret_addr_in_eax
/* Place EIP in the arg1 */
@@ -21,10 +25,14 @@
.endif
call \func
- popl %edx
- popl %ecx
- popl %eax
+ popl_cfi %edx
+ CFI_RESTORE edx
+ popl_cfi %ecx
+ CFI_RESTORE ecx
+ popl_cfi %eax
+ CFI_RESTORE eax
ret
+ CFI_ENDPROC
_ASM_NOKPROBE(\name)
.endm
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:x86/asm] x86: Unwind-annotate thunk_32.S
2014-09-24 7:41 [PATCH] ix86: unwind-annotate thunk_32.S Jan Beulich
2014-10-08 8:10 ` [tip:x86/asm] x86: Unwind-annotate thunk_32.S tip-bot for Jan Beulich
@ 2014-10-08 10:33 ` tip-bot for Jan Beulich
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Jan Beulich @ 2014-10-08 10:33 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, jbeulich, JBeulich, tglx
Commit-ID: f74954f01ec9bb2004bcc24f247d1f26f1063ad2
Gitweb: http://git.kernel.org/tip/f74954f01ec9bb2004bcc24f247d1f26f1063ad2
Author: Jan Beulich <JBeulich@suse.com>
AuthorDate: Wed, 24 Sep 2014 08:41:30 +0100
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 8 Oct 2014 12:31:45 +0200
x86: Unwind-annotate thunk_32.S
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/542291CA0200007800038085@mail.emea.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/lib/thunk_32.S | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/arch/x86/lib/thunk_32.S b/arch/x86/lib/thunk_32.S
index e9acf5f..e28cdaf 100644
--- a/arch/x86/lib/thunk_32.S
+++ b/arch/x86/lib/thunk_32.S
@@ -6,14 +6,19 @@
*/
#include <linux/linkage.h>
#include <asm/asm.h>
+ #include <asm/dwarf2.h>
/* put return address in eax (arg1) */
.macro THUNK name, func, put_ret_addr_in_eax=0
.globl \name
\name:
- pushl %eax
- pushl %ecx
- pushl %edx
+ CFI_STARTPROC
+ pushl_cfi %eax
+ CFI_REL_OFFSET eax, 0
+ pushl_cfi %ecx
+ CFI_REL_OFFSET ecx, 0
+ pushl_cfi %edx
+ CFI_REL_OFFSET edx, 0
.if \put_ret_addr_in_eax
/* Place EIP in the arg1 */
@@ -21,10 +26,14 @@
.endif
call \func
- popl %edx
- popl %ecx
- popl %eax
+ popl_cfi %edx
+ CFI_RESTORE edx
+ popl_cfi %ecx
+ CFI_RESTORE ecx
+ popl_cfi %eax
+ CFI_RESTORE eax
ret
+ CFI_ENDPROC
_ASM_NOKPROBE(\name)
.endm
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-08 10:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-24 7:41 [PATCH] ix86: unwind-annotate thunk_32.S Jan Beulich
2014-10-08 8:10 ` [tip:x86/asm] x86: Unwind-annotate thunk_32.S tip-bot for Jan Beulich
2014-10-08 10:33 ` tip-bot for Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome