From: "Alexander van Heukelum" <heukelum@fastmail.fm>
To: "Jan Beulich" <JBeulich@novell.com>,
"Ingo Molnar" <mingo@elte.hu>,
"Thomas Gleixner" <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: Resend: [PATCH] x86-64: use symbolics instead of raw numbers in entry_64.S
Date: Fri, 03 Sep 2010 00:53:09 +0200 [thread overview]
Message-ID: <1283467989.11524.1393104501@webmail.messagingengine.com> (raw)
In-Reply-To: <4C7FBACF0200007800013F6A@vpn.id2.novell.com>
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/
>
>
>
next prev parent reply other threads:[~2010-09-02 22:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2010-09-03 7:12 ` [tip:x86/debug] x86-64: Use " tip-bot for Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283467989.11524.1393104501@webmail.messagingengine.com \
--to=heukelum@fastmail.fm \
--cc=JBeulich@novell.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox