From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755303AbcDGAIj (ORCPT ); Wed, 6 Apr 2016 20:08:39 -0400 Received: from mail.kernel.org ([198.145.29.136]:55666 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754894AbcDGAHI (ORCPT ); Wed, 6 Apr 2016 20:07:08 -0400 From: "Luis R. Rodriguez" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Cc: x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, boris.ostrovsky@oracle.com, david.vrabel@citrix.com, konrad.wilk@oracle.com, xen-devel@lists.xensource.com, lguest@lists.ozlabs.org, andriy.shevchenko@linux.intel.com, jlee@suse.com, glin@suse.com, matt@codeblueprint.co.uk, andrew.cooper3@citrix.com, "Luis R. Rodriguez" Subject: [PATCH v4 10/14] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around Date: Wed, 6 Apr 2016 17:06:30 -0700 Message-Id: <1459987594-5434-11-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> References: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 f71a34944b56..66509285ffdd 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); -- 2.7.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luis R. Rodriguez" Subject: [PATCH v4 10/14] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around Date: Wed, 6 Apr 2016 17:06:30 -0700 Message-ID: <1459987594-5434-11-git-send-email-mcgrof@kernel.org> References: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Cc: xen-devel@lists.xensource.com, matt@codeblueprint.co.uk, andrew.cooper3@citrix.com, x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, jlee@suse.com, "Luis R. Rodriguez" , lguest@lists.ozlabs.org, glin@suse.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com List-Id: xen-devel@lists.xenproject.org VGhlIFg4Nl9CVUdfRjAwRiB3b3JrIGFyb3VuZCBpcyByZXNwb25zaWJsZSBmb3IgZml4aW5nIHVw IHRoZSBlcnJvcgpnZW5lcmF0ZWQgb24gYXR0ZW1wdGVkIEYwMEYgZXhwbG9pdGF0aW9uIGZyb20g YW4gT09QUyB0byBhIFNJR0lMTC4KVGhlcmUgaXMgbm8gcmVhc29uIHdoeSB0aGlzIGNvZGUgc2hv dWxkIG5vdCBiZSBhbGxvd2VkIHRvIHJ1biBvbgpQViBndWVzdCBvbiBhIEYwMEYtYWZmZWN0ZWQg Q1BVIC0tIGl0IHdvdWxkIHNpbXBseSBuZXZlciB0cmlnZ2VyLgpUaGUgcHZfZW5hYmxlZCgpIGNo ZWNrIHdhcyB0aGVyZSBvbmx5IHRvIGF2b2lkIHByaW50aW5nIHRoZSBmMDBmCndvcmthcm91bmQs IHNvIHJlbW92aW5nIHRoZSBjaGVjayBpcyBwdXJlbHkgYSBjb3NtZXRpYyBjaGFuZ2UuCgpTdWdn ZXN0ZWQtYnk6IEFuZHkgTHV0b21pcnNraSA8bHV0b0BhbWFjYXBpdGFsLm5ldD4KU2lnbmVkLW9m Zi1ieTogTHVpcyBSLiBSb2RyaWd1ZXogPG1jZ3JvZkBrZXJuZWwub3JnPgotLS0KIGFyY2gveDg2 L2tlcm5lbC9jcHUvaW50ZWwuYyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigr KSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9jcHUvaW50ZWwu YyBiL2FyY2gveDg2L2tlcm5lbC9jcHUvaW50ZWwuYwppbmRleCBmNzFhMzQ5NDRiNTYuLjY2NTA5 Mjg1ZmZkZCAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL2NwdS9pbnRlbC5jCisrKyBiL2Fy Y2gveDg2L2tlcm5lbC9jcHUvaW50ZWwuYwpAQCAtMjMzLDcgKzIzMyw3IEBAIHN0YXRpYyB2b2lk IGludGVsX3dvcmthcm91bmRzKHN0cnVjdCBjcHVpbmZvX3g4NiAqYykKIAkgKiBUaGUgUXVhcmsg aXMgYWxzbyBmYW1pbHkgNSwgYnV0IGRvZXMgbm90IGhhdmUgdGhlIHNhbWUgYnVnLgogCSAqLwog CWNsZWFyX2NwdV9idWcoYywgWDg2X0JVR19GMDBGKTsKLQlpZiAoIXBhcmF2aXJ0X2VuYWJsZWQo KSAmJiBjLT54ODYgPT0gNSAmJiBjLT54ODZfbW9kZWwgPCA5KSB7CisJaWYgKGMtPng4NiA9PSA1 ICYmIGMtPng4Nl9tb2RlbCA8IDkpIHsKIAkJc3RhdGljIGludCBmMDBmX3dvcmthcm91bmRfZW5h YmxlZDsKIAogCQlzZXRfY3B1X2J1ZyhjLCBYODZfQlVHX0YwMEYpOwotLSAKMi43LjIKCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hl bi1kZXZlbAo=