Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753231AbcDVJyB (ORCPT ); Fri, 22 Apr 2016 05:54:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37358 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752424AbcDVJx7 (ORCPT ); Fri, 22 Apr 2016 05:53:59 -0400 Date: Fri, 22 Apr 2016 02:52:37 -0700 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: linux-kernel@vger.kernel.org, brgerst@gmail.com, bp@alien8.de, hpa@zytor.com, mcgrof@kernel.org, mingo@kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de, luto@amacapital.net, dvlasenk@redhat.com, peterz@infradead.org Reply-To: peterz@infradead.org, dvlasenk@redhat.com, luto@amacapital.net, tglx@linutronix.de, torvalds@linux-foundation.org, bp@alien8.de, brgerst@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, mcgrof@kernel.org, hpa@zytor.com In-Reply-To: <1460592286-300-11-git-send-email-mcgrof@kernel.org> References: <1460592286-300-11-git-send-email-mcgrof@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/cpu/intel: Remove not needed paravirt_enabled() use for F00F work around Git-Commit-ID: fa392794ed8329379f3f637da7c3c2f078309a77 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 Content-Length: 2589 Lines: 71 Commit-ID: fa392794ed8329379f3f637da7c3c2f078309a77 Gitweb: http://git.kernel.org/tip/fa392794ed8329379f3f637da7c3c2f078309a77 Author: Luis R. Rodriguez AuthorDate: Wed, 13 Apr 2016 17:04:40 -0700 Committer: Ingo Molnar CommitDate: Fri, 22 Apr 2016 10:29:05 +0200 x86/cpu/intel: Remove not needed paravirt_enabled() use for F00F work around The X86_BUG_F00F work around is responsible for fixing up the error generated on attempted F00F exploitation from an OOPS to a SIGILL. There is no reason why this code should not be allowed to run on PV guest on a F00F-affected CPU -- it would simply never trigger. The pv_enabled() check was there only to avoid printing the f00f workaround, so removing the check is purely a cosmetic change. Suggested-by: Andy Lutomirski Signed-off-by: Luis R. Rodriguez Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: andrew.cooper3@citrix.com Cc: andriy.shevchenko@linux.intel.com Cc: bigeasy@linutronix.de Cc: boris.ostrovsky@oracle.com Cc: david.vrabel@citrix.com Cc: ffainelli@freebox.fr Cc: george.dunlap@citrix.com Cc: glin@suse.com Cc: jgross@suse.com Cc: jlee@suse.com Cc: josh@joshtriplett.org Cc: julien.grall@linaro.org Cc: konrad.wilk@oracle.com Cc: kozerkov@parallels.com Cc: lenb@kernel.org Cc: lguest@lists.ozlabs.org Cc: linux-acpi@vger.kernel.org Cc: lv.zheng@intel.com Cc: matt@codeblueprint.co.uk Cc: mbizon@freebox.fr Cc: rjw@rjwysocki.net Cc: robert.moore@intel.com Cc: rusty@rustcorp.com.au Cc: tiwai@suse.de Cc: toshi.kani@hp.com Cc: xen-devel@lists.xensource.com Link: http://lkml.kernel.org/r/1460592286-300-11-git-send-email-mcgrof@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 1f7fdb9..016b3d9 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -233,7 +233,7 @@ static void intel_workarounds(struct cpuinfo_x86 *c) * The Quark is also family 5, but does not have the same bug. */ clear_cpu_bug(c, X86_BUG_F00F); - if (!paravirt_enabled() && c->x86 == 5 && c->x86_model < 9) { + if (c->x86 == 5 && c->x86_model < 9) { static int f00f_workaround_enabled; set_cpu_bug(c, X86_BUG_F00F);