* Resend: [PATCH] x86-64: use symbolics instead of raw numbers in entry_64.S
@ 2010-09-02 12:55 Jan Beulich
2010-09-02 22:53 ` Alexander van Heukelum
2010-09-03 7:12 ` [tip:x86/debug] x86-64: Use " tip-bot for Jan Beulich
0 siblings, 2 replies; 3+ messages in thread
From: Jan Beulich @ 2010-09-02 12:55 UTC (permalink / raw)
To: mingo, tglx, hpa; +Cc: linux-kernel
... making the code a little less fragile.
Also use pushq_cfi instead of raw CFI annotations in two more places,
and add two missing annotations after stack pointer adjustments which
got modified here anyway.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---
arch/x86/kernel/entry_64.S | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
--- linux-2.6.36-rc3/arch/x86/kernel/entry_64.S
+++ 2.6.36-rc3-x86_64-unwind-annotations/arch/x86/kernel/entry_64.S
@@ -796,8 +796,8 @@ END(interrupt)
/* 0(%rsp): ~(interrupt number) */
.macro interrupt func
- subq $10*8, %rsp
- CFI_ADJUST_CFA_OFFSET 10*8
+ subq $ORIG_RAX-ARGOFFSET+8, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+8
call save_args
PARTIAL_FRAME 0
call \func
@@ -1036,8 +1036,8 @@ ENTRY(\sym)
INTR_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
- subq $15*8,%rsp
- CFI_ADJUST_CFA_OFFSET 15*8
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call error_entry
DEFAULT_FRAME 0
movq %rsp,%rdi /* pt_regs pointer */
@@ -1052,9 +1052,9 @@ END(\sym)
ENTRY(\sym)
INTR_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
- pushq $-1 /* ORIG_RAX: no syscall to restart */
- CFI_ADJUST_CFA_OFFSET 8
- subq $15*8, %rsp
+ pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
TRACE_IRQS_OFF
movq %rsp,%rdi /* pt_regs pointer */
@@ -1070,9 +1070,9 @@ END(\sym)
ENTRY(\sym)
INTR_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
- pushq $-1 /* ORIG_RAX: no syscall to restart */
- CFI_ADJUST_CFA_OFFSET 8
- subq $15*8, %rsp
+ pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
TRACE_IRQS_OFF
movq %rsp,%rdi /* pt_regs pointer */
@@ -1089,8 +1089,8 @@ END(\sym)
ENTRY(\sym)
XCPT_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
- subq $15*8,%rsp
- CFI_ADJUST_CFA_OFFSET 15*8
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call error_entry
DEFAULT_FRAME 0
movq %rsp,%rdi /* pt_regs pointer */
@@ -1107,8 +1107,8 @@ END(\sym)
ENTRY(\sym)
XCPT_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
- subq $15*8,%rsp
- CFI_ADJUST_CFA_OFFSET 15*8
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
DEFAULT_FRAME 0
TRACE_IRQS_OFF
@@ -1498,8 +1498,8 @@ ENTRY(nmi)
INTR_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
pushq_cfi $-1
- subq $15*8, %rsp
- CFI_ADJUST_CFA_OFFSET 15*8
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
DEFAULT_FRAME 0
/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Resend: [PATCH] x86-64: use symbolics instead of raw numbers in entry_64.S
2010-09-02 12:55 Resend: [PATCH] x86-64: use symbolics instead of raw numbers in entry_64.S Jan Beulich
@ 2010-09-02 22:53 ` Alexander van Heukelum
2010-09-03 7:12 ` [tip:x86/debug] x86-64: Use " tip-bot for Jan Beulich
1 sibling, 0 replies; 3+ messages in thread
From: Alexander van Heukelum @ 2010-09-02 22:53 UTC (permalink / raw)
To: Jan Beulich, Ingo Molnar, Thomas Gleixner, H. Peter Anvin; +Cc: linux-kernel
On Thu, 02 Sep 2010 13:55 +0100, "Jan Beulich" <JBeulich@novell.com> wrote:
> ... making the code a little less fragile.
>
> Also use pushq_cfi instead of raw CFI annotations in two more places,
> and add two missing annotations after stack pointer adjustments which
> got modified here anyway.
>
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
Good cleanup.
Generated binary is identical...
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
> ---
> arch/x86/kernel/entry_64.S | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> --- linux-2.6.36-rc3/arch/x86/kernel/entry_64.S
> +++ 2.6.36-rc3-x86_64-unwind-annotations/arch/x86/kernel/entry_64.S
> @@ -796,8 +796,8 @@ END(interrupt)
>
> /* 0(%rsp): ~(interrupt number) */
> .macro interrupt func
> - subq $10*8, %rsp
> - CFI_ADJUST_CFA_OFFSET 10*8
> + subq $ORIG_RAX-ARGOFFSET+8, %rsp
> + CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+8
> call save_args
> PARTIAL_FRAME 0
> call \func
> @@ -1036,8 +1036,8 @@ ENTRY(\sym)
> INTR_FRAME
> PARAVIRT_ADJUST_EXCEPTION_FRAME
> pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
> - subq $15*8,%rsp
> - CFI_ADJUST_CFA_OFFSET 15*8
> + subq $ORIG_RAX-R15, %rsp
> + CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
> call error_entry
> DEFAULT_FRAME 0
> movq %rsp,%rdi /* pt_regs pointer */
> @@ -1052,9 +1052,9 @@ END(\sym)
> ENTRY(\sym)
> INTR_FRAME
> PARAVIRT_ADJUST_EXCEPTION_FRAME
> - pushq $-1 /* ORIG_RAX: no syscall to restart */
> - CFI_ADJUST_CFA_OFFSET 8
> - subq $15*8, %rsp
> + pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
> + subq $ORIG_RAX-R15, %rsp
> + CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
> call save_paranoid
> TRACE_IRQS_OFF
> movq %rsp,%rdi /* pt_regs pointer */
> @@ -1070,9 +1070,9 @@ END(\sym)
> ENTRY(\sym)
> INTR_FRAME
> PARAVIRT_ADJUST_EXCEPTION_FRAME
> - pushq $-1 /* ORIG_RAX: no syscall to restart */
> - CFI_ADJUST_CFA_OFFSET 8
> - subq $15*8, %rsp
> + pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
> + subq $ORIG_RAX-R15, %rsp
> + CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
> call save_paranoid
> TRACE_IRQS_OFF
> movq %rsp,%rdi /* pt_regs pointer */
> @@ -1089,8 +1089,8 @@ END(\sym)
> ENTRY(\sym)
> XCPT_FRAME
> PARAVIRT_ADJUST_EXCEPTION_FRAME
> - subq $15*8,%rsp
> - CFI_ADJUST_CFA_OFFSET 15*8
> + subq $ORIG_RAX-R15, %rsp
> + CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
> call error_entry
> DEFAULT_FRAME 0
> movq %rsp,%rdi /* pt_regs pointer */
> @@ -1107,8 +1107,8 @@ END(\sym)
> ENTRY(\sym)
> XCPT_FRAME
> PARAVIRT_ADJUST_EXCEPTION_FRAME
> - subq $15*8,%rsp
> - CFI_ADJUST_CFA_OFFSET 15*8
> + subq $ORIG_RAX-R15, %rsp
> + CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
> call save_paranoid
> DEFAULT_FRAME 0
> TRACE_IRQS_OFF
> @@ -1498,8 +1498,8 @@ ENTRY(nmi)
> INTR_FRAME
> PARAVIRT_ADJUST_EXCEPTION_FRAME
> pushq_cfi $-1
> - subq $15*8, %rsp
> - CFI_ADJUST_CFA_OFFSET 15*8
> + subq $ORIG_RAX-R15, %rsp
> + CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
> call save_paranoid
> DEFAULT_FRAME 0
> /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel"
> in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:x86/debug] x86-64: Use symbolics instead of raw numbers in entry_64.S
2010-09-02 12:55 Resend: [PATCH] x86-64: use symbolics instead of raw numbers in entry_64.S Jan Beulich
2010-09-02 22:53 ` Alexander van Heukelum
@ 2010-09-03 7:12 ` tip-bot for Jan Beulich
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Jan Beulich @ 2010-09-03 7:12 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, jbeulich, heukelum, JBeulich, tglx,
mingo
Commit-ID: b1cccb1bb01dc1cb89f58723a58c3d4988d44d94
Gitweb: http://git.kernel.org/tip/b1cccb1bb01dc1cb89f58723a58c3d4988d44d94
Author: Jan Beulich <JBeulich@novell.com>
AuthorDate: Thu, 2 Sep 2010 13:55:11 +0100
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 3 Sep 2010 08:14:10 +0200
x86-64: Use symbolics instead of raw numbers in entry_64.S
... making the code a little less fragile.
Also use pushq_cfi instead of raw CFI annotations in two more
places, and add two missing annotations after stack pointer
adjustments which got modified here anyway.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
LKML-Reference: <4C7FBACF0200007800013F6A@vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/entry_64.S | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 64dfe30..6f30583 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -795,8 +795,8 @@ END(interrupt)
/* 0(%rsp): ~(interrupt number) */
.macro interrupt func
- subq $10*8, %rsp
- CFI_ADJUST_CFA_OFFSET 10*8
+ subq $ORIG_RAX-ARGOFFSET+8, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+8
call save_args
PARTIAL_FRAME 0
call \func
@@ -1035,8 +1035,8 @@ ENTRY(\sym)
INTR_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
- subq $15*8,%rsp
- CFI_ADJUST_CFA_OFFSET 15*8
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call error_entry
DEFAULT_FRAME 0
movq %rsp,%rdi /* pt_regs pointer */
@@ -1051,9 +1051,9 @@ END(\sym)
ENTRY(\sym)
INTR_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
- pushq $-1 /* ORIG_RAX: no syscall to restart */
- CFI_ADJUST_CFA_OFFSET 8
- subq $15*8, %rsp
+ pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
TRACE_IRQS_OFF
movq %rsp,%rdi /* pt_regs pointer */
@@ -1069,9 +1069,9 @@ END(\sym)
ENTRY(\sym)
INTR_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
- pushq $-1 /* ORIG_RAX: no syscall to restart */
- CFI_ADJUST_CFA_OFFSET 8
- subq $15*8, %rsp
+ pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
TRACE_IRQS_OFF
movq %rsp,%rdi /* pt_regs pointer */
@@ -1088,8 +1088,8 @@ END(\sym)
ENTRY(\sym)
XCPT_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
- subq $15*8,%rsp
- CFI_ADJUST_CFA_OFFSET 15*8
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call error_entry
DEFAULT_FRAME 0
movq %rsp,%rdi /* pt_regs pointer */
@@ -1106,8 +1106,8 @@ END(\sym)
ENTRY(\sym)
XCPT_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
- subq $15*8,%rsp
- CFI_ADJUST_CFA_OFFSET 15*8
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
DEFAULT_FRAME 0
TRACE_IRQS_OFF
@@ -1497,8 +1497,8 @@ ENTRY(nmi)
INTR_FRAME
PARAVIRT_ADJUST_EXCEPTION_FRAME
pushq_cfi $-1
- subq $15*8, %rsp
- CFI_ADJUST_CFA_OFFSET 15*8
+ subq $ORIG_RAX-R15, %rsp
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
DEFAULT_FRAME 0
/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-03 7:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-02 12:55 Resend: [PATCH] x86-64: use symbolics instead of raw numbers in entry_64.S Jan Beulich
2010-09-02 22:53 ` Alexander van Heukelum
2010-09-03 7:12 ` [tip:x86/debug] x86-64: Use " 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