linux-acpi.vger.kernel.org archive mirror
 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: x86@kernel.org, linux-kernel@vger.kernel.org,
	luto@amacapital.net, boris.ostrovsky@oracle.com, jgross@suse.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, bigeasy@linutronix.de,
	ffainelli@freebox.fr, george.dunlap@citrix.com,
	julien.grall@linaro.org, mbizon@freebox.fr, tiwai@suse.de,
	"Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: [PATCH v6 10/16] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around
Date: Wed, 13 Apr 2016 17:04:40 -0700	[thread overview]
Message-ID: <1460592286-300-11-git-send-email-mcgrof@kernel.org> (raw)
In-Reply-To: <1460592286-300-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-14  0:04 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-14  0:04 [PATCH v6 00/16] x86: remove paravirt_enabled() Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 01/16] x86/boot: enumerate documentation for the x86 hardware_subarch Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 02/16] x86/xen: use X86_SUBARCH_XEN for PV guest boots Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 03/16] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 04/16] x86/rtc: replace paravirt rtc check with platform legacy quirk Luis R. Rodriguez
2016-04-14  4:28   ` Juergen Gross
2016-04-14  0:04 ` [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 06/16] x86/init: use a platform legacy quirk for ebda Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 07/16] tools/lguest: force disable tboot and apm Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 08/16] apm32: remove paravirt_enabled() use Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 09/16] x86/tboot: remove paravirt_enabled() Luis R. Rodriguez
2016-04-14  0:04 ` Luis R. Rodriguez [this message]
2016-04-14  0:04 ` [PATCH v6 11/16] pnpbios: replace paravirt_enabled() check with legacy device check Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 13/16] x86/init: rename ebda code file Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 14/16] x86/paravirt: remove paravirt_enabled() Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 15/16] x86/init: disable pnpbios for X86_SUBARCH_INTEL_MID Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 16/16] x86/init: disable pnpbios and rtc for X86_SUBARCH_CE4100 Luis R. Rodriguez
2016-04-14  0:13 ` [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez
2016-04-14  0:13 ` [PATCH v6 07/16] tools/lguest: force disable tboot and apm Luis R. Rodriguez
2016-04-14  0:13 ` [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES Luis R. Rodriguez
2016-04-14  0:17 ` [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code 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=1460592286-300-11-git-send-email-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=andrew.cooper3@citrix.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=bigeasy@linutronix.de \
    --cc=boris.ostrovsky@oracle.com \
    --cc=bp@alien8.de \
    --cc=david.vrabel@citrix.com \
    --cc=ffainelli@freebox.fr \
    --cc=george.dunlap@citrix.com \
    --cc=glin@suse.com \
    --cc=hpa@zytor.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=linux-kernel@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=lv.zheng@intel.com \
    --cc=matt@codeblueprint.co.uk \
    --cc=mbizon@freebox.fr \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).