From: Roland McGrath <roland@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>
Cc: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Laurent Riffard <laurent.riffard@free.fr>,
Miles Lane <miles.lane@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH x86/mm] x86 vDSO: canonicalize sysenter .eh_frame
Date: Thu, 6 Dec 2007 17:14:29 -0800 (PST) [thread overview]
Message-ID: <20071207011429.EE2BC26F8D9@magilla.localdomain> (raw)
In-Reply-To: Andrew Morton's message of Thursday, 6 December 2007 14:37:54 -0800 <20071206143754.07a67819.akpm@linux-foundation.org>
Some assembler versions automagically optimize .eh_frame contents,
changing their size. The CFI in sysenter.S was not using optimal
formatting, so it would be changed by newer/smarter assemblers.
This ran afoul of the wired constant for padding out the other vDSO
images to match its size. This changes the original hand-coded
source to use the optimal format encoding for its operations. That
leaves nothing more for a fancy assembler to do, so the sizes will
match the wired-in expected size regardless of the assembler version.
Signed-off-by: Roland McGrath <roland@redhat.com>
---
arch/x86/vdso/vdso32/int80.S | 2 +-
arch/x86/vdso/vdso32/syscall.S | 2 +-
arch/x86/vdso/vdso32/sysenter.S | 18 ++++++------------
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/arch/x86/vdso/vdso32/int80.S b/arch/x86/vdso/vdso32/int80.S
index be4b7a9..b15b7c0 100644
--- a/arch/x86/vdso/vdso32/int80.S
+++ b/arch/x86/vdso/vdso32/int80.S
@@ -50,7 +50,7 @@ __kernel_vsyscall:
/*
* Pad out the segment to match the size of the sysenter.S version.
*/
-VDSO32_vsyscall_eh_frame_size = 0x44
+VDSO32_vsyscall_eh_frame_size = 0x40
.section .data,"aw",@progbits
.space VDSO32_vsyscall_eh_frame_size-(.LENDFDEDLSI-.LSTARTFRAMEDLSI), 0
.previous
diff --git a/arch/x86/vdso/vdso32/syscall.S b/arch/x86/vdso/vdso32/syscall.S
index fe88d34..5415b56 100644
--- a/arch/x86/vdso/vdso32/syscall.S
+++ b/arch/x86/vdso/vdso32/syscall.S
@@ -71,7 +71,7 @@ __kernel_vsyscall:
/*
* Pad out the segment to match the size of the sysenter.S version.
*/
-VDSO32_vsyscall_eh_frame_size = 0x44
+VDSO32_vsyscall_eh_frame_size = 0x40
.section .data,"aw",@progbits
.space VDSO32_vsyscall_eh_frame_size-(.LENDFDE1-.LSTARTFRAME), 0
.previous
diff --git a/arch/x86/vdso/vdso32/sysenter.S b/arch/x86/vdso/vdso32/sysenter.S
index 902d5fc..e2800af 100644
--- a/arch/x86/vdso/vdso32/sysenter.S
+++ b/arch/x86/vdso/vdso32/sysenter.S
@@ -84,31 +84,25 @@ VDSO32_SYSENTER_RETURN: /* Symbol used by sysenter.c via vdso32-syms.h */
.uleb128 0
/* What follows are the instructions for the table generation.
We have to record all changes of the stack pointer. */
- .byte 0x04 /* DW_CFA_advance_loc4 */
- .long .Lpush_ecx-.LSTART_vsyscall
+ .byte 0x40 + (.Lpush_ecx-.LSTART_vsyscall) /* DW_CFA_advance_loc */
.byte 0x0e /* DW_CFA_def_cfa_offset */
.byte 0x08 /* RA at offset 8 now */
- .byte 0x04 /* DW_CFA_advance_loc4 */
- .long .Lpush_edx-.Lpush_ecx
+ .byte 0x40 + (.Lpush_edx-.Lpush_ecx) /* DW_CFA_advance_loc */
.byte 0x0e /* DW_CFA_def_cfa_offset */
.byte 0x0c /* RA at offset 12 now */
- .byte 0x04 /* DW_CFA_advance_loc4 */
- .long .Lenter_kernel-.Lpush_edx
+ .byte 0x40 + (.Lenter_kernel-.Lpush_edx) /* DW_CFA_advance_loc */
.byte 0x0e /* DW_CFA_def_cfa_offset */
.byte 0x10 /* RA at offset 16 now */
.byte 0x85, 0x04 /* DW_CFA_offset %ebp -16 */
/* Finally the epilogue. */
- .byte 0x04 /* DW_CFA_advance_loc4 */
- .long .Lpop_ebp-.Lenter_kernel
+ .byte 0x40 + (.Lpop_ebp-.Lenter_kernel) /* DW_CFA_advance_loc */
.byte 0x0e /* DW_CFA_def_cfa_offset */
.byte 0x0c /* RA at offset 12 now */
.byte 0xc5 /* DW_CFA_restore %ebp */
- .byte 0x04 /* DW_CFA_advance_loc4 */
- .long .Lpop_edx-.Lpop_ebp
+ .byte 0x40 + (.Lpop_edx-.Lpop_ebp) /* DW_CFA_advance_loc */
.byte 0x0e /* DW_CFA_def_cfa_offset */
.byte 0x08 /* RA at offset 8 now */
- .byte 0x04 /* DW_CFA_advance_loc4 */
- .long .Lpop_ecx-.Lpop_edx
+ .byte 0x40 + (.Lpop_ecx-.Lpop_edx) /* DW_CFA_advance_loc */
.byte 0x0e /* DW_CFA_def_cfa_offset */
.byte 0x04 /* RA at offset 4 now */
.align 4
next prev parent reply other threads:[~2007-12-07 1:15 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-05 5:17 2.6.24-rc4-mm1 Andrew Morton
2007-12-05 9:15 ` 2.6.24-rc4-mm1: kobj changes fallout on powerpc Olof Johansson
2007-12-05 13:11 ` Kamalesh Babulal
2007-12-05 15:46 ` Greg KH
2007-12-05 14:12 ` 2.6.24-rc4-mm1 kobject changes broken with hvcs driver " Kamalesh Babulal
2007-12-05 15:47 ` Greg KH
2007-12-06 18:19 ` Balbir Singh
2007-12-06 18:50 ` Greg KH
2007-12-06 18:49 ` Kamalesh Babulal
2007-12-06 18:58 ` Balbir Singh
2007-12-06 19:21 ` Badari Pulavarty
2007-12-07 1:29 ` Balbir Singh
2007-12-06 20:31 ` Greg KH
2007-12-06 23:54 ` Badari Pulavarty
2007-12-07 0:32 ` Greg KH
2007-12-07 3:02 ` Kamalesh Babulal
2007-12-07 5:14 ` Greg KH
2007-12-07 22:01 ` Balbir Singh
2007-12-05 23:41 ` 2.6.24-rc4-mm1: hostbyte=0x01 driverbyte=0x00 (now bisected) Alexey Dobriyan
2007-12-06 7:52 ` Hannes Reinecke
2007-12-06 12:08 ` Jens Axboe
2007-12-06 19:19 ` Alexey Dobriyan
2007-12-06 3:15 ` 2.6.24-rc4-mm1 Kernel build fails on S390x Kamalesh Babulal
2007-12-06 7:19 ` Andrew Morton
2007-12-06 6:59 ` 2.6.24-rc4-mm1 Reuben Farrelly
2007-12-06 7:09 ` 2.6.24-rc4-mm1 David Miller
2007-12-07 13:16 ` 2.6.24-rc4-mm1 Ilpo Järvinen
2007-12-12 17:57 ` 2.6.24-rc4-mm1 Cedric Le Goater
2007-12-06 7:35 ` 2.6.24-rc4-mm1 Andrew Morton
2007-12-10 12:24 ` 2.6.24-rc4-mm1 Ilpo Järvinen
2007-12-10 20:05 ` 2.6.24-rc4-mm1 Ilpo Järvinen
2007-12-12 19:21 ` 2.6.24-rc4-mm1 Cedric Le Goater
2007-12-13 17:38 ` tcp_sacktag_one() WARNING (was Re: 2.6.24-rc4-mm1) Cedric Le Goater
2007-12-06 11:49 ` 2.6.24-rc4-mm1 Valdis.Kletnieks
2007-12-06 12:04 ` 2.6.24-rc4-mm1 Andrew Morton
2007-12-06 19:18 ` 2.6.24-rc4-mm1 Valdis.Kletnieks
2007-12-06 19:38 ` 2.6.24-rc4-mm1 Greg KH
2007-12-06 20:04 ` 2.6.24-rc4-mm1 Valdis.Kletnieks
2007-12-06 22:04 ` [dm-devel] 2.6.24-rc4-mm1 Kay Sievers
2007-12-06 22:12 ` Alasdair G Kergon
2007-12-06 23:12 ` Valdis.Kletnieks
2007-12-06 23:24 ` Kay Sievers
2007-12-07 18:20 ` Valdis.Kletnieks
2007-12-07 18:44 ` Kay Sievers
2007-12-07 20:28 ` Valdis.Kletnieks
2007-12-07 20:49 ` Kay Sievers
2007-12-06 22:28 ` 2.6.24-rc4-mm1: VDSOSYM build error Laurent Riffard
2007-12-06 22:37 ` Andrew Morton
2007-12-06 23:28 ` Miles Lane
2007-12-06 23:34 ` Andrew Morton
2007-12-06 23:47 ` Miles Lane
2007-12-07 10:36 ` Ingo Molnar
2007-12-07 1:14 ` Roland McGrath [this message]
2007-12-07 1:27 ` [PATCH x86/mm] x86 vDSO: canonicalize sysenter .eh_frame Harvey Harrison
2007-12-07 3:27 ` Miles Lane
2007-12-07 9:44 ` Ingo Molnar
2007-12-07 2:12 ` 2.6.24-rc4-mm1 Dave Young
2007-12-07 22:22 ` 2.6.24-rc4-mm1 Luis R. Rodriguez
2007-12-10 1:07 ` 2.6.24-rc4-mm1 Dave Young
2007-12-09 17:55 ` 2.6.24-rc4-mm1 Nick Kossifidis
[not found] ` <E1J0Yfy-0001V7-Rr@localhost>
2007-12-07 8:35 ` [PATCH BUGFIX] hid: the `bit' in hidinput_mapping_quirks() is an out parameter Fengguang Wu
2007-12-10 10:03 ` Jiri Kosina
2007-12-07 14:34 ` broken suspend (sched related) [Was: 2.6.24-rc4-mm1] Jiri Slaby
2007-12-07 15:11 ` Ingo Molnar
2007-12-07 17:51 ` Ingo Molnar
2007-12-08 8:10 ` Jiri Slaby
2007-12-08 8:39 ` Ingo Molnar
2007-12-08 9:23 ` Jiri Slaby
2007-12-08 15:24 ` Ingo Molnar
2007-12-08 17:34 ` Jiri Slaby
2007-12-08 17:43 ` Jiri Slaby
2007-12-09 8:06 ` Ingo Molnar
2007-12-08 23:12 ` Jiri Slaby
2007-12-09 7:46 ` Ingo Molnar
2007-12-09 9:09 ` Jiri Slaby
2007-12-10 8:19 ` Gautham R Shenoy
2007-12-10 8:55 ` Jiri Slaby
2007-12-10 9:10 ` Ingo Molnar
2007-12-10 10:15 ` Gautham R Shenoy
2007-12-10 10:21 ` Ingo Molnar
2007-12-10 11:08 ` Gautham R Shenoy
2007-12-10 11:28 ` Ingo Molnar
2007-12-10 11:49 ` Gautham R Shenoy
2007-12-10 9:29 ` Ingo Molnar
2007-12-07 18:20 ` [PATCH] md: balance braces in raid5 debug code Mariusz Kozlowski
2007-12-08 0:04 ` 2.6.24-rc4-mm1: undefined reference to `compat_sys_timerfd' on sparc64 Mariusz Kozlowski
2007-12-08 0:08 ` Andrew Morton
2007-12-08 9:17 ` Mariusz Kozlowski
2007-12-11 10:15 ` David Miller
2007-12-08 18:20 ` 2.6.24-rc4-mm1: some issues " Mariusz Kozlowski
2007-12-08 18:22 ` Andrew Morton
2007-12-09 8:45 ` David Miller
2007-12-09 9:03 ` Andrew Morton
2007-12-10 14:48 ` 2.6.24-rc4-mm1 Reuben Farrelly
2007-12-10 21:11 ` 2.6.24-rc4-mm1 Andrew Morton
2007-12-11 14:12 ` 2.6.24-rc4-mm1 Reuben Farrelly
2007-12-11 16:20 ` 2.6.24-rc4-mm1 Martin Bligh
2007-12-11 16:59 ` 2.6.24-rc4-mm1 Randy Dunlap
2007-12-11 17:50 ` 2.6.24-rc4-mm1 Martin Bligh
[not found] ` <33307c790712110813h23def95dvd068b7226e9fcd36@mail.gmail.com>
2007-12-11 20:37 ` 2.6.24-rc4-mm1 Andrew Morton
2007-12-11 21:20 ` 2.6.24-rc4-mm1 Ingo Molnar
2007-12-11 21:26 ` 2.6.24-rc4-mm1 Kok, Auke
2007-12-11 21:59 ` 2.6.24-rc4-mm1 Kok, Auke
2007-12-11 22:10 ` 2.6.24-rc4-mm1 Andrew Morton
2007-12-11 22:17 ` 2.6.24-rc4-mm1 Kok, Auke
2007-12-11 23:15 ` 2.6.24-rc4-mm1 Randy Dunlap
2007-12-12 4:16 ` 2.6.24-rc4-mm1 Rik van Riel
2007-12-13 17:45 ` 2.6.24-rc4-mm1 - BUG in tcp_fragment Cedric Le Goater
2007-12-13 23:00 ` Ilpo Järvinen
2007-12-14 6:52 ` Cedric Le Goater
2007-12-14 20:14 ` [PATCH net-2.6.25] Revert recent TCP work Ilpo Järvinen
2007-12-16 22:21 ` David Miller
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=20071207011429.EE2BC26F8D9@magilla.localdomain \
--to=roland@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=harvey.harrison@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).