iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86-32/asm/power: Create stack frames in hibernate_asm_32.S

Browse Source 
swsusp_arch_suspend() is callable non-leaf function which doesn't
honor CONFIG_FRAME_POINTER, which can result in bad stack traces.
Also it's not annotated as ELF callable function which can confuse tooling.

Create a stack frame for it when CONFIG_FRAME_POINTER is enabled and
give it proper ELF function annotation.

Also in this patch introduces the restore_registers() symbol and
gives it ELF function annotation, thus to prepare for later register
restore.

Analogous changes were made for 64bit before in commit ef0f3ed5a4ac
(x86/asm/power: Create stack frames in hibernate_asm_64.S) and
commit 4ce827b4cc58 (x86/power/64: Fix hibernation return address
corruption).

Signed-off-by: Zhimin Gu <kookoo.gu@intel.com>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Zhimin Gu 2018-09-21 14:26:47 +08:00 committed by Rafael J. Wysocki
parent 749fa17093
commit 8e5b2a3c5a
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/include/asm/suspend_32.h
View File

@ -32,4 +32,8 @@ struct saved_context {
unsigned long return_address; unsigned long return_address;
} __attribute__((packed)); } __attribute__((packed));
/* routines for saving/restoring kernel state */
extern char core_restore_code[];
extern char restore_registers[];
#endif /* _ASM_X86_SUSPEND_32_H */ #endif /* _ASM_X86_SUSPEND_32_H */

9
arch/x86/power/hibernate_asm_32.S
View File

@ -12,6 +12,7 @@
#include <asm/page_types.h> #include <asm/page_types.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/processor-flags.h> #include <asm/processor-flags.h>
#include <asm/frame.h>
.text .text
@ -24,8 +25,11 @@ ENTRY(swsusp_arch_suspend)
pushfl pushfl
popl saved_context_eflags popl saved_context_eflags
FRAME_BEGIN
call swsusp_save call swsusp_save
FRAME_END
ret ret
ENDPROC(swsusp_arch_suspend)
ENTRY(restore_image) ENTRY(restore_image)
movl mmu_cr4_features, %ecx movl mmu_cr4_features, %ecx
@ -58,6 +62,10 @@ copy_loop:
.p2align 4,,7 .p2align 4,,7
done: done:
/* code below belongs to the image kernel */
.align PAGE_SIZE
ENTRY(restore_registers)
/* go back to the original page tables */ /* go back to the original page tables */
movl $swapper_pg_dir, %eax movl $swapper_pg_dir, %eax
subl $__PAGE_OFFSET, %eax subl $__PAGE_OFFSET, %eax
@ -83,3 +91,4 @@ done:
xorl %eax, %eax xorl %eax, %eax
ret ret
ENDPROC(restore_registers)