From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932810AbcBWJKY (ORCPT ); Tue, 23 Feb 2016 04:10:24 -0500 Received: from terminus.zytor.com ([198.137.202.10]:58248 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757597AbcBWJKT (ORCPT ); Tue, 23 Feb 2016 04:10:19 -0500 Date: Tue, 23 Feb 2016 01:04:15 -0800 From: =?UTF-8?B?dGlwLWJvdCBmb3IgSm9zaCBQb2ltYm9ldWYgPHRpcGJvdEB6eXRvci5jb20+?=@zytor.com Message-ID: Cc: tglx@linutronix.de, namhyung@gmail.com, pbonzini@redhat.com, linux-kernel@vger.kernel.org, gleb@kernel.org, jpoimboe@redhat.com, brgerst@gmail.com, hpa@zytor.com, mmarek@suse.cz, peterz@infradead.org, bernd@petrovitsch.priv.at, jslaby@suse.cz, mingo@kernel.org, luto@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, acme@kernel.org, palves@redhat.com, chris.j.arges@canonical.com, luto@amacapital.net, bp@alien8.de, dvlasenk@redhat.com Reply-To: mmarek@suse.cz, bernd@petrovitsch.priv.at, peterz@infradead.org, jslaby@suse.cz, tglx@linutronix.de, namhyung@gmail.com, pbonzini@redhat.com, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, gleb@kernel.org, brgerst@gmail.com, hpa@zytor.com, chris.j.arges@canonical.com, bp@alien8.de, luto@amacapital.net, dvlasenk@redhat.com, mingo@kernel.org, luto@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, acme@kernel.org, palves@redhat.com In-Reply-To: <20160122161612.GE20502@treble.redhat.com> References: <20160122161612.GE20502@treble.redhat.com> To: =?UTF-8?B?bGludXgtdGlwLWNvbW1pdHNAdmdlci5rZXJuZWwub3Jn?=@zytor.com Subject: =?UTF-8?B?W3RpcDp4ODYvZGVidWddIHg4Ni9rdm06IE1ha2UgdGVzdF9jYygpIGFsd2F5cyA=?= =?UTF-8?B?aW5saW5l?= Git-Commit-ID: =?UTF-8?B?ZGNmNmZkYmFhOTlmYzNhM2UzODc5N2U2ZDU5NmM1MjQxZGUxOGI5Yg==?= 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: dcf6fdbaa99fc3a3e38797e6d596c5241de18b9b Gitweb: http://git.kernel.org/tip/dcf6fdbaa99fc3a3e38797e6d596c5241de18b9b Author: Josh Poimboeuf AuthorDate: Fri, 22 Jan 2016 10:16:12 -0600 Committer: Ingo Molnar CommitDate: Tue, 23 Feb 2016 09:04:00 +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);