Skip to contentSkip to conversation

move do_suspend_lowlevel to correct segment

PATCH In review Shaohua Li 2 participants 3 messages Jun 15, 2006 – Jun 16, 2006

lore
Share & tools
lore

Shaohua Li

author
#0 lore raw

PATCH 1/1 move do_suspend_lowlevel to correct segment

Move do_suspend_lowlevel to correct segment. If it is in the same hugepage with ro data, mark_rodata_ro will make it unexecutable.

---

 linux-2.6.17-rc5-root/arch/i386/kernel/acpi/wakeup.S |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
arch/i386/kernel/acpi/wakeup.S renamed from arch/i386/kernel/acpi/wakeup.S~wakeup +4 -5
diff -puN arch/i386/kernel/acpi/wakeup.S~wakeup arch/i386/kernel/acpi/wakeup.S
@@ -265,11 +265,6 @@ ENTRY(acpi_copy_wakeup_routine)
 	movl	$0x12345678, saved_magic
 	ret
 
-.data
-ALIGN
-ENTRY(saved_magic)	.long	0
-ENTRY(saved_eip)	.long	0
-
 save_registers:
 	leal	4(%esp), %eax
 	movl	%eax, saved_context_esp
@@ -304,7 +299,11 @@ ret_point:
 	call	restore_processor_state
 	ret
 
+.data
 ALIGN
+ENTRY(saved_magic)	.long	0
+ENTRY(saved_eip)	.long	0
+
 # saved registers
 saved_gdt:	.long	0,0
 saved_idt:	.long	0,0

_

#1 lore raw

Hi!

Quoted 2 lines

Move do_suspend_lowlevel to correct segment. If it is in the same hugepage with ro data, mark_rodata_ro will make it unexecutable.

I guess I do not know enough about segments... Original code puts saved_magic into .data (and probably puts save_registers there by mistake, too -- so you are fixing things), but you put saved_magic code into .data, too, so how does its read-only status change?

Does x86-64 need similar fix?
Pavel

Quoted 34 lines

---

 linux-2.6.17-rc5-root/arch/i386/kernel/acpi/wakeup.S |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff -puN arch/i386/kernel/acpi/wakeup.S~wakeup arch/i386/kernel/acpi/wakeup.S

arch/i386/kernel/acpi/wakeup.S renamed from arch/i386/kernel/acpi/wakeup.S~wakeup +4 -5
@@ -265,11 +265,6 @@ ENTRY(acpi_copy_wakeup_routine)
 	movl	$0x12345678, saved_magic
 	ret
 
-.data
-ALIGN
-ENTRY(saved_magic)	.long	0
-ENTRY(saved_eip)	.long	0
-
 save_registers:
 	leal	4(%esp), %eax
 	movl	%eax, saved_context_esp
@@ -304,7 +299,11 @@ ret_point:
 	call	restore_processor_state
 	ret
 
+.data
 ALIGN
+ENTRY(saved_magic)	.long	0
+ENTRY(saved_eip)	.long	0
+
 # saved registers
 saved_gdt:	.long	0,0
 saved_idt:	.long	0,0

_

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
author
#2 lore raw

Hi Pavel,

Quoted 7 lines · Pavel Machek
Quoted 2 lines

Move do_suspend_lowlevel to correct segment. If it is in the same hugepage with ro data, mark_rodata_ro will make it unexecutable.

I guess I do not know enough about segments... Original code puts saved_magic into .data (and probably puts save_registers there by mistake, too -- so you are fixing things), but you put saved_magic code into .data, too, so how does its read-only status change?

No, mark_rodata_ro will call change_page_attr, which will split huge page into small pages, and changes the attr of the pages to PAGE_KERNEL. mark_rodata_ro just changes rodata to read-only page attr.

Quoted 1 line

Does x86-64 need similar fix?

It appears not needed

Thanks,
Shaohua

Quoted 37 lines
Quoted 36 lines

---

 linux-2.6.17-rc5-root/arch/i386/kernel/acpi/wakeup.S |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff -puN arch/i386/kernel/acpi/wakeup.S~wakeup arch/i386/kernel/acpi/wakeup.S

arch/i386/kernel/acpi/wakeup.S renamed from arch/i386/kernel/acpi/wakeup.S~wakeup +4 -5
@@ -265,11 +265,6 @@ ENTRY(acpi_copy_wakeup_routine)
 	movl	$0x12345678, saved_magic
 	ret
 
-.data
-ALIGN
-ENTRY(saved_magic)	.long	0
-ENTRY(saved_eip)	.long	0
-
 save_registers:
 	leal	4(%esp), %eax
 	movl	%eax, saved_context_esp
@@ -304,7 +299,11 @@ ret_point:
 	call	restore_processor_state
 	ret
 
+.data
 ALIGN
+ENTRY(saved_magic)	.long	0
+ENTRY(saved_eip)	.long	0
+
 # saved registers
 saved_gdt:	.long	0,0
 saved_idt:	.long	0,0

_

Signature · 1 line
Shaohua Li <[email protected]>