All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de,
	mingo@redhat.com, rusty@rustcorp.com.au
Cc: kozerkov@parallels.com, matt@codeblueprint.co.uk,
	lv.zheng@intel.com, xen-devel@lists.xensource.com,
	joro@8bytes.org, x86@kernel.org, robert.moore@intel.com,
	linux-acpi@vger.kernel.org, glin@suse.com, lenb@kernel.org,
	josh@joshtriplett.org, jlee@suse.com, lguest@lists.ozlabs.org,
	boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com,
	toshi.kani@hp.com, andrew.cooper3@citrix.com, rjw@rjwysocki.net,
	linux-kernel@vger.kernel.org, luto@amacapital.net,
	"Luis R. Rodriguez" <mcgrof@kernel.org>,
	david.vrabel@citrix.com, tiwai@suse.de
Subject: [PATCH v5 10/14] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around
Date: Fri,  8 Apr 2016 16:40:21 -0700	[thread overview]
Message-ID: <1460158825-13117-11-git-send-email-mcgrof@kernel.org> (raw)
In-Reply-To: <1460158825-13117-1-git-send-email-mcgrof@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 <luto@amacapital.net>
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
 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


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

WARNING: multiple messages have this Message-ID (diff)
From: "Luis R. Rodriguez" <mcgrof@kernel.org>
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,
	rjw@rjwysocki.net, lenb@kernel.org, robert.moore@intel.com,
	lv.zheng@intel.com, toshi.kani@hp.com,
	linux-acpi@vger.kernel.org, kozerkov@parallels.com,
	josh@joshtriplett.org, joro@8bytes.org, tiwai@suse.de,
	"Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: [PATCH v5 10/14] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around
Date: Fri,  8 Apr 2016 16:40:21 -0700	[thread overview]
Message-ID: <1460158825-13117-11-git-send-email-mcgrof@kernel.org> (raw)
In-Reply-To: <1460158825-13117-1-git-send-email-mcgrof@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 <luto@amacapital.net>
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
 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

  parent reply	other threads:[~2016-04-08 23:40 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-08 23:40 [PATCH v5 00/14] x86: remove paravirt_enabled() Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 01/14] x86/boot: enumerate documentation for the x86 hardware_subarch Luis R. Rodriguez
2016-04-13  8:01   ` Ingo Molnar
2016-04-13 15:17     ` Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 02/14] x86/xen: use X86_SUBARCH_XEN for PV guest boots Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 03/14] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly Luis R. Rodriguez
2016-04-08 23:40   ` Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Luis R. Rodriguez
2016-04-11  6:50   ` [Xen-devel] " Juergen Gross
2016-04-12 20:50     ` Luis R. Rodriguez
2016-04-13 22:49       ` Luis R. Rodriguez
2016-04-11 13:49   ` Boris Ostrovsky
2016-04-11 13:49     ` Boris Ostrovsky
2016-04-12 20:56     ` Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 05/14] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez
2016-04-08 23:40   ` Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 06/14] x86/init: use a platform legacy quirk for ebda Luis R. Rodriguez
2016-04-08 23:40   ` Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 07/14] tools/lguest: force disable tboot and apm Luis R. Rodriguez
2016-04-08 23:40   ` Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 08/14] apm32: remove paravirt_enabled() use Luis R. Rodriguez
2016-04-08 23:40   ` Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 09/14] x86/tboot: remove paravirt_enabled() Luis R. Rodriguez
2016-04-08 23:40   ` Luis R. Rodriguez
2016-04-08 23:40 ` Luis R. Rodriguez [this message]
2016-04-08 23:40   ` [PATCH v5 10/14] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 11/14] pnpbios: replace paravirt_enabled() check with legacy device check Luis R. Rodriguez
2016-04-08 23:40   ` Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 12/14] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 13/14] x86/init: rename ebda code file Luis R. Rodriguez
2016-04-08 23:40 ` [PATCH v5 14/14] x86/paravirt: remove paravirt_enabled() Luis R. Rodriguez
2016-04-11  6:51   ` [Xen-devel] " Juergen Gross
2016-04-08 23:57 ` [PATCH v5 02/14] x86/xen: use X86_SUBARCH_XEN for PV guest boots Luis R. Rodriguez
2016-04-08 23:57 ` [PATCH v5 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Luis R. Rodriguez
2016-04-08 23:57 ` [PATCH v5 05/14] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez
2016-04-08 23:58 ` [PATCH v5 07/14] tools/lguest: force disable tboot and apm Luis R. Rodriguez
2016-04-13  8:44   ` Ingo Molnar
2016-04-13 15:45     ` Luis R. Rodriguez
2016-04-08 23:58 ` [PATCH v5 09/14] x86/tboot: remove paravirt_enabled() Luis R. Rodriguez
2016-04-08 23:58 ` [PATCH v5 10/14] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around Luis R. Rodriguez
2016-04-08 23:59 ` [PATCH v5 14/14] x86/paravirt: remove paravirt_enabled() Luis R. Rodriguez
2016-04-09  0:00 ` [PATCH v5 00/14] x86: " Luis R. Rodriguez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460158825-13117-11-git-send-email-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=andrew.cooper3@citrix.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=boris.ostrovsky@oracle.com \
    --cc=bp@alien8.de \
    --cc=david.vrabel@citrix.com \
    --cc=glin@suse.com \
    --cc=hpa@zytor.com \
    --cc=jlee@suse.com \
    --cc=joro@8bytes.org \
    --cc=josh@joshtriplett.org \
    --cc=kozerkov@parallels.com \
    --cc=lenb@kernel.org \
    --cc=lguest@lists.ozlabs.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=lv.zheng@intel.com \
    --cc=matt@codeblueprint.co.uk \
    --cc=mingo@redhat.com \
    --cc=rjw@rjwysocki.net \
    --cc=robert.moore@intel.com \
    --cc=rusty@rustcorp.com.au \
    --cc=tglx@linutronix.de \
    --cc=tiwai@suse.de \
    --cc=toshi.kani@hp.com \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.