From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755081AbcASNlR (ORCPT ); Tue, 19 Jan 2016 08:41:17 -0500 Received: from terminus.zytor.com ([198.137.202.10]:43993 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932252AbcASNlD (ORCPT ); Tue, 19 Jan 2016 08:41:03 -0500 Date: Tue, 19 Jan 2016 05:39:40 -0800 From: tip-bot for Josh Poimboeuf Message-ID: Cc: bernd@petrovitsch.priv.at, mingo@kernel.org, jslaby@suse.cz, bp@alien8.de, luto@kernel.org, chris.j.arges@canonical.com, dvlasenk@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, brgerst@gmail.com, palves@redhat.com, peterz@infradead.org, acme@kernel.org, mmarek@suse.cz, torvalds@linux-foundation.org, jpoimboe@redhat.com, luto@amacapital.net, namhyung@gmail.com Reply-To: tglx@linutronix.de, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, brgerst@gmail.com, hpa@zytor.com, palves@redhat.com, peterz@infradead.org, acme@kernel.org, mmarek@suse.cz, jpoimboe@redhat.com, namhyung@gmail.com, luto@amacapital.net, torvalds@linux-foundation.org, jslaby@suse.cz, bernd@petrovitsch.priv.at, mingo@kernel.org, bp@alien8.de, luto@kernel.org, chris.j.arges@canonical.com In-Reply-To: <3f488a8e3bfc8ac7d4d3d350953e664e7182b044.1450442274.git.jpoimboe@redhat.com> References: <3f488a8e3bfc8ac7d4d3d350953e664e7182b044.1450442274.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm: Clean up frame pointer macros Git-Commit-ID: 997963edd912a6d77d68b2bbc19f40ce8facabd7 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: 997963edd912a6d77d68b2bbc19f40ce8facabd7 Gitweb: http://git.kernel.org/tip/997963edd912a6d77d68b2bbc19f40ce8facabd7 Author: Josh Poimboeuf AuthorDate: Fri, 18 Dec 2015 06:39:18 -0600 Committer: Ingo Molnar CommitDate: Tue, 19 Jan 2016 12:59:07 +0100 x86/asm: Clean up frame pointer macros The asm macros for setting up and restoring the frame pointer aren't currently being used. However, they will be needed soon to help asm functions to comply with stacktool. Rename FRAME/ENDFRAME to FRAME_BEGIN/FRAME_END for more symmetry. Also make the code more readable and improve the comments. Signed-off-by: Josh Poimboeuf 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 Link: http://lkml.kernel.org/r/3f488a8e3bfc8ac7d4d3d350953e664e7182b044.1450442274.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/frame.h | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/arch/x86/include/asm/frame.h b/arch/x86/include/asm/frame.h index 793179c..cec213b 100644 --- a/arch/x86/include/asm/frame.h +++ b/arch/x86/include/asm/frame.h @@ -1,23 +1,34 @@ +#ifndef _ASM_X86_FRAME_H +#define _ASM_X86_FRAME_H + #ifdef __ASSEMBLY__ #include -/* The annotation hides the frame from the unwinder and makes it look - like a ordinary ebp save/restore. This avoids some special cases for - frame pointer later */ +/* + * These are stack frame creation macros. They should be used by every + * callable non-leaf asm function to make kernel stack traces more reliable. + */ #ifdef CONFIG_FRAME_POINTER - .macro FRAME - __ASM_SIZE(push,) %__ASM_REG(bp) - __ASM_SIZE(mov) %__ASM_REG(sp), %__ASM_REG(bp) - .endm - .macro ENDFRAME - __ASM_SIZE(pop,) %__ASM_REG(bp) - .endm -#else - .macro FRAME - .endm - .macro ENDFRAME - .endm -#endif + +.macro FRAME_BEGIN + push %_ASM_BP + _ASM_MOV %_ASM_SP, %_ASM_BP +.endm + +.macro FRAME_END + pop %_ASM_BP +.endm + +#define FRAME_OFFSET __ASM_SEL(4, 8) + +#else /* !CONFIG_FRAME_POINTER */ + +#define FRAME_BEGIN +#define FRAME_END +#define FRAME_OFFSET 0 + +#endif /* CONFIG_FRAME_POINTER */ #endif /* __ASSEMBLY__ */ +#endif /* _ASM_X86_FRAME_H */