Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1378355

[PATCH v6 10/16] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v6 00/16] x86: remove paravirt_enabled() "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 06/16] x86/init: use a platform legacy quirk for ebda "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 11/16] pnpbios: replace paravirt_enabled() check with legacy device check "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 08/16] apm32: remove paravirt_enabled() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 07/16] tools/lguest: force disable tboot and apm "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 03/16] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 01/16] x86/boot: enumerate documentation for the x86 hardware_subarch "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 16/16] x86/init: disable pnpbios and rtc for X86_SUBARCH_CE4100 "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 10/16] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 14/16] x86/paravirt: remove paravirt_enabled() "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 15/16] x86/init: disable pnpbios for X86_SUBARCH_INTEL_MID "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 13/16] x86/init: rename ebda code file "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 04/16] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
    Re: [PATCH v6 04/16] x86/rtc: replace paravirt rtc check with  platform legacy quirk Juergen Gross <jgross@suse.com> - 2016-04-14 06:30 +0200
  [PATCH v6 07/16] tools/lguest: force disable tboot and apm "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:20 +0200
  [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:20 +0200
  [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:20 +0200

csiph-web