From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759939AbcBYFwi (ORCPT ); Thu, 25 Feb 2016 00:52:38 -0500 Received: from torg.zytor.com ([198.137.202.12]:54204 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759532AbcBYFwf (ORCPT ); Thu, 25 Feb 2016 00:52:35 -0500 Date: Wed, 24 Feb 2016 21:50:12 -0800 From: tip-bot for Josh Poimboeuf Message-ID: Cc: luto@kernel.org, brgerst@gmail.com, dvlasenk@redhat.com, bp@alien8.de, jpoimboe@redhat.com, akpm@linux-foundation.org, palves@redhat.com, luto@amacapital.net, namhyung@gmail.com, torvalds@linux-foundation.org, jslaby@suse.cz, pavel@ucw.cz, acme@kernel.org, hpa@zytor.com, tglx@linutronix.de, bp@suse.de, bernd@petrovitsch.priv.at, linux-kernel@vger.kernel.org, rafael.j.wysocki@intel.com, peterz@infradead.org, mmarek@suse.cz, chris.j.arges@canonical.com, mingo@kernel.org Reply-To: jpoimboe@redhat.com, akpm@linux-foundation.org, palves@redhat.com, luto@amacapital.net, luto@kernel.org, bp@alien8.de, brgerst@gmail.com, dvlasenk@redhat.com, hpa@zytor.com, namhyung@gmail.com, torvalds@linux-foundation.org, jslaby@suse.cz, pavel@ucw.cz, acme@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, rafael.j.wysocki@intel.com, tglx@linutronix.de, bp@suse.de, bernd@petrovitsch.priv.at, mingo@kernel.org, mmarek@suse.cz, chris.j.arges@canonical.com In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] x86/asm/power: Create stack frames in hibernate_asm_64.S Git-Commit-ID: ef0f3ed5a4acfb24740480bf2e50b178724f094d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ef0f3ed5a4acfb24740480bf2e50b178724f094d Gitweb: http://git.kernel.org/tip/ef0f3ed5a4acfb24740480bf2e50b178724f094d Author: Josh Poimboeuf AuthorDate: Thu, 21 Jan 2016 16:49:24 -0600 Committer: Ingo Molnar CommitDate: Wed, 24 Feb 2016 08:35:43 +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)