mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot for Luis R. Rodriguez" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:x86/boot] x86/cpu/intel: Remove not needed paravirt_enabled() use for F00F work around
Date: Fri, 22 Apr 2016 02:52:37 -0700	[thread overview]
Message-ID: <tip-fa392794ed8329379f3f637da7c3c2f078309a77@git.kernel.org> (raw)
In-Reply-To: <1460592286-300-11-git-send-email-mcgrof@kernel.org>

Commit-ID:  fa392794ed8329379f3f637da7c3c2f078309a77
Gitweb:     http://git.kernel.org/tip/fa392794ed8329379f3f637da7c3c2f078309a77
Author:     Luis R. Rodriguez <mcgrof@kernel.org>
AuthorDate: Wed, 13 Apr 2016 17:04:40 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
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 <luto@amacapital.net>
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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 <mingo@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 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);

  reply	other threads:[~2016-04-22  9:54 UTC|newest]

Thread overview: 39+ 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-22  9:49   ` [tip:x86/boot] x86/boot: Enumerate " tip-bot for 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-22  9:49   ` [tip:x86/boot] x86/xen: Use " tip-bot for 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-22  9:49   ` [tip:x86/boot] tools/lguest: Make " tip-bot for 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-22  9:50   ` [tip:x86/boot] x86/rtc: Replace " tip-bot for Luis R. Rodriguez
2024-04-03 15:34   ` [tip: x86/cleanups] x86/rtc: Remove unused intel-mid.h tip-bot2 for Andy Shevchenko
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-22  9:50   ` [tip:x86/boot] x86/ACPI: Move " tip-bot for 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-22  9:51   ` [tip:x86/boot] x86/init: Use a platform legacy quirk for EBDA tip-bot for Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 07/16] tools/lguest: force disable tboot and apm Luis R. Rodriguez
2016-04-22  9:51   ` [tip:x86/boot] tools/lguest: Force disable tboot and APM tip-bot for Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 08/16] apm32: remove paravirt_enabled() use Luis R. Rodriguez
2016-04-22  9:51   ` [tip:x86/boot] x86/apm32: Remove " tip-bot for Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 09/16] x86/tboot: remove paravirt_enabled() Luis R. Rodriguez
2016-04-22  9:52   ` [tip:x86/boot] x86/tboot: Remove paravirt_enabled() use tip-bot for Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 10/16] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around Luis R. Rodriguez
2016-04-22  9:52   ` tip-bot for 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-22  9:53   ` [tip:x86/boot] x86, drivers/pnpbios: Replace " tip-bot for Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES Luis R. Rodriguez
2016-04-22  9:53   ` [tip:x86/boot] x86/ACPI: Parse ACPI_FADT_LEGACY_DEVICES tip-bot for Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 13/16] x86/init: rename ebda code file Luis R. Rodriguez
2016-04-22  9:53   ` [tip:x86/boot] x86/init: Rename EBDA " tip-bot for Luis R. Rodriguez
2016-04-14  0:04 ` [PATCH v6 14/16] x86/paravirt: remove paravirt_enabled() Luis R. Rodriguez
2016-04-22  9:54   ` [tip:x86/boot] x86/paravirt: Remove paravirt_enabled() tip-bot for 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-22  9:54   ` [tip:x86/boot] x86/init: Disable " tip-bot for 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-22  9:54   ` [tip:x86/boot] x86/init: Disable " tip-bot for 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=tip-fa392794ed8329379f3f637da7c3c2f078309a77@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=bp@alien8.de \
    --cc=brgerst@gmail.com \
    --cc=dvlasenk@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=mcgrof@kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /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

Powered by JetHome