From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760026AbcBYFyd (ORCPT ); Thu, 25 Feb 2016 00:54:33 -0500 Received: from torg.zytor.com ([198.137.202.12]:54402 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759423AbcBYFy2 (ORCPT ); Thu, 25 Feb 2016 00:54:28 -0500 Date: Wed, 24 Feb 2016 21:52:09 -0800 From: tip-bot for Josh Poimboeuf Message-ID: Cc: akpm@linux-foundation.org, peterz@infradead.org, namhyung@gmail.com, pbonzini@redhat.com, mmarek@suse.cz, linux-kernel@vger.kernel.org, mingo@kernel.org, jslaby@suse.cz, dvlasenk@redhat.com, chris.j.arges@canonical.com, gleb@kernel.org, luto@kernel.org, luto@amacapital.net, bernd@petrovitsch.priv.at, acme@kernel.org, jpoimboe@redhat.com, bp@alien8.de, hpa@zytor.com, palves@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de, brgerst@gmail.com Reply-To: pbonzini@redhat.com, namhyung@gmail.com, akpm@linux-foundation.org, peterz@infradead.org, mmarek@suse.cz, mingo@kernel.org, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, jslaby@suse.cz, chris.j.arges@canonical.com, gleb@kernel.org, luto@amacapital.net, luto@kernel.org, acme@kernel.org, jpoimboe@redhat.com, bernd@petrovitsch.priv.at, palves@redhat.com, hpa@zytor.com, bp@alien8.de, brgerst@gmail.com, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <20160122161612.GE20502@treble.redhat.com> References: <20160122161612.GE20502@treble.redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] x86/kvm: Make test_cc() always inline Git-Commit-ID: cb7390fed4c04e609a420ac0b1c07a7a781b43bf 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: cb7390fed4c04e609a420ac0b1c07a7a781b43bf Gitweb: http://git.kernel.org/tip/cb7390fed4c04e609a420ac0b1c07a7a781b43bf Author: Josh Poimboeuf AuthorDate: Fri, 22 Jan 2016 10:16:12 -0600 Committer: Ingo Molnar CommitDate: Wed, 24 Feb 2016 08:35:44 +0100 x86/kvm: Make test_cc() always inline With some configs (including allyesconfig), gcc doesn't inline test_cc(). When that happens, test_cc() doesn't create a stack frame before inserting the inline asm call instruction. This breaks frame pointer convention if CONFIG_FRAME_POINTER is enabled and can result in a bad stack trace. Force it to always be inlined so that its containing function's stack frame can be used. Suggested-by: Paolo Bonzini Signed-off-by: Josh Poimboeuf Acked-by: Paolo Bonzini 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: Gleb Natapov 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: kvm@vger.kernel.org Cc: live-patching@vger.kernel.org Link: http://lkml.kernel.org/r/20160122161612.GE20502@treble.redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kvm/emulate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index aa4d726..80363eb 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -969,7 +969,7 @@ static int em_bsr_c(struct x86_emulate_ctxt *ctxt) return fastop(ctxt, em_bsr); } -static u8 test_cc(unsigned int condition, unsigned long flags) +static __always_inline u8 test_cc(unsigned int condition, unsigned long flags) { u8 rc; void (*fop)(void) = (void *)em_setcc + 4 * (condition & 0xf);