From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932947AbcBWJL1 (ORCPT ); Tue, 23 Feb 2016 04:11:27 -0500 Received: from terminus.zytor.com ([198.137.202.10]:58440 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753319AbcBWJLV (ORCPT ); Tue, 23 Feb 2016 04:11:21 -0500 Date: Tue, 23 Feb 2016 01:01:50 -0800 From: =?UTF-8?B?dGlwLWJvdCBmb3IgSm9zaCBQb2ltYm9ldWYgPHRpcGJvdEB6eXRvci5jb20+?=@zytor.com Message-ID: Cc: bp@alien8.de, tglx@linutronix.de, torvalds@linux-foundation.org, palves@redhat.com, jpoimboe@redhat.com, bp@suse.de, luto@amacapital.net, rafael.j.wysocki@intel.com, hpa@zytor.com, mingo@kernel.org, brgerst@gmail.com, luto@kernel.org, pavel@ucw.cz, namhyung@gmail.com, jslaby@suse.cz, chris.j.arges@canonical.com, peterz@infradead.org, bernd@petrovitsch.priv.at, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, mmarek@suse.cz, acme@kernel.org, akpm@linux-foundation.org Reply-To: jslaby@suse.cz, namhyung@gmail.com, chris.j.arges@canonical.com, bernd@petrovitsch.priv.at, peterz@infradead.org, dvlasenk@redhat.com, akpm@linux-foundation.org, mmarek@suse.cz, acme@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, bp@suse.de, tglx@linutronix.de, torvalds@linux-foundation.org, palves@redhat.com, jpoimboe@redhat.com, luto@amacapital.net, hpa@zytor.com, mingo@kernel.org, rafael.j.wysocki@intel.com, luto@kernel.org, pavel@ucw.cz, brgerst@gmail.com In-Reply-To: References: To: =?UTF-8?B?bGludXgtdGlwLWNvbW1pdHNAdmdlci5rZXJuZWwub3Jn?=@zytor.com Subject: =?UTF-8?B?W3RpcDp4ODYvZGVidWddIHg4Ni9hc20vcG93ZXI6IENyZWF0ZSBzdGFjayBmcmE=?= =?UTF-8?B?bWVzIGluIGhpYmVybmF0ZV9hc21fNjQuUw==?= Git-Commit-ID: =?UTF-8?B?NmY5ZTViOWFiMzE2MWE3N2VkNDAzYWY4ZDdhOWFiMGE3YmFiMWM4OA==?= X-Mailer: =?UTF-8?B?dGlwLWdpdC1sb2ctZGFlbW9u?= Robot-ID: =?UTF-8?B?PHRpcC1ib3QuZ2l0Lmtlcm5lbC5vcmc+?= Robot-Unsubscribe: =?UTF-8?B?Q29udGFjdCA8bWFpbHRvOmhwYUBrZXJuZWwub3JnPiB0byBnZXQgYmxhY2tsaXM=?= =?UTF-8?B?dGVkIGZyb20gdGhlc2UgZW1haWxz?= MIME-Version: =?UTF-8?B?MS4w?= Content-Transfer-Encoding: =?UTF-8?B?OGJpdA==?= Content-Type: =?UTF-8?B?dGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOA==?= Content-Disposition: =?UTF-8?B?aW5saW5l?= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6f9e5b9ab3161a77ed403af8d7a9ab0a7bab1c88 Gitweb: http://git.kernel.org/tip/6f9e5b9ab3161a77ed403af8d7a9ab0a7bab1c88 Author: Josh Poimboeuf AuthorDate: Thu, 21 Jan 2016 16:49:24 -0600 Committer: Ingo Molnar CommitDate: Tue, 23 Feb 2016 09:03:58 +0100 x86/asm/power: Create stack frames in hibernate_asm_64.S swsusp_arch_suspend() and restore_registers() are callable non-leaf functions which don't honor CONFIG_FRAME_POINTER, which can result in bad stack traces. Also they aren't annotated as ELF callable functions which can confuse tooling. Create a stack frame for them when CONFIG_FRAME_POINTER is enabled and give them proper ELF function annotations. Signed-off-by: Josh Poimboeuf Reviewed-by: Borislav Petkov Acked-by: Pavel Machek Acked-by: Rafael J. Wysocki Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Arnaldo Carvalho de Melo Cc: Bernd Petrovitsch Cc: Borislav Petkov Cc: Brian Gerst Cc: Chris J Arges Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Jiri Slaby Cc: Linus Torvalds Cc: Michal Marek Cc: Namhyung Kim Cc: Pedro Alves Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: live-patching@vger.kernel.org Link: http://lkml.kernel.org/r/bdad00205897dc707aebe9e9e39757085e2bf999.1453405861.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/power/hibernate_asm_64.S | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S index e2386cb..4400a43 100644 --- a/arch/x86/power/hibernate_asm_64.S +++ b/arch/x86/power/hibernate_asm_64.S @@ -21,8 +21,10 @@ #include #include #include +#include ENTRY(swsusp_arch_suspend) + FRAME_BEGIN movq $saved_context, %rax movq %rsp, pt_regs_sp(%rax) movq %rbp, pt_regs_bp(%rax) @@ -50,7 +52,9 @@ ENTRY(swsusp_arch_suspend) movq %rax, restore_cr3(%rip) call swsusp_save + FRAME_END ret +ENDPROC(swsusp_arch_suspend) ENTRY(restore_image) /* switch to temporary page tables */ @@ -107,6 +111,7 @@ ENTRY(core_restore_code) */ ENTRY(restore_registers) + FRAME_BEGIN /* go back to the original page tables */ movq %rbx, %cr3 @@ -147,4 +152,6 @@ ENTRY(restore_registers) /* tell the hibernation core that we've just restored the memory */ movq %rax, in_suspend(%rip) + FRAME_END ret +ENDPROC(restore_registers)