Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0230bb03 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/cpu: Move X86_BUG_ESPFIX initialization to generic_identify() 



It was in detect_nopl(), which was either a mistake by me or some kind
of mis-merge.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
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: Rudolf Marek <r.marek@assembler.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: ff236456f072 ("x86/cpu: Move X86_BUG_ESPFIX initialization to generic_identify")
Link: http://lkml.kernel.org/r/0949337f13660461edca08ab67d1a841441289c9.1460075211.git.luto@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3e2b68d7

arch/x86/kernel/cpu/common.c

+25 −25
Original line number Original line Diff line number Diff line
@@ -861,31 +861,6 @@ static void detect_nopl(struct cpuinfo_x86 *c) 
	clear_cpu_cap(c, X86_FEATURE_NOPL);

	clear_cpu_cap(c, X86_FEATURE_NOPL);

#else

#else

	set_cpu_cap(c, X86_FEATURE_NOPL);

	set_cpu_cap(c, X86_FEATURE_NOPL);

#endif



	/*

	 * ESPFIX is a strange bug.  All real CPUs have it.  Paravirt

	 * systems that run Linux at CPL > 0 may or may not have the

	 * issue, but, even if they have the issue, there's absolutely

	 * nothing we can do about it because we can't use the real IRET

	 * instruction.

	 *

	 * NB: For the time being, only 32-bit kernels support

	 * X86_BUG_ESPFIX as such.  64-bit kernels directly choose

	 * whether to apply espfix using paravirt hooks.  If any

	 * non-paravirt system ever shows up that does *not* have the

	 * ESPFIX issue, we can change this.

	 */

#ifdef CONFIG_X86_32

#ifdef CONFIG_PARAVIRT

	do {

		extern void native_iret(void);

		if (pv_cpu_ops.iret == native_iret)

			set_cpu_bug(c, X86_BUG_ESPFIX);

	} while (0);

#else

	set_cpu_bug(c, X86_BUG_ESPFIX);

#endif

#endif

#endif

}

}
@@ -952,6 +927,31 @@ static void generic_identify(struct cpuinfo_x86 *c) 
	detect_nopl(c);

	detect_nopl(c);





	detect_null_seg_behavior(c);

	detect_null_seg_behavior(c);



	/*

	 * ESPFIX is a strange bug.  All real CPUs have it.  Paravirt

	 * systems that run Linux at CPL > 0 may or may not have the

	 * issue, but, even if they have the issue, there's absolutely

	 * nothing we can do about it because we can't use the real IRET

	 * instruction.

	 *

	 * NB: For the time being, only 32-bit kernels support

	 * X86_BUG_ESPFIX as such.  64-bit kernels directly choose

	 * whether to apply espfix using paravirt hooks.  If any

	 * non-paravirt system ever shows up that does *not* have the

	 * ESPFIX issue, we can change this.

	 */

#ifdef CONFIG_X86_32

# ifdef CONFIG_PARAVIRT

	do {

		extern void native_iret(void);

		if (pv_cpu_ops.iret == native_iret)

			set_cpu_bug(c, X86_BUG_ESPFIX);

	} while (0);

# else

	set_cpu_bug(c, X86_BUG_ESPFIX);

# endif

#endif

}

}





static void x86_init_cache_qos(struct cpuinfo_x86 *c)

static void x86_init_cache_qos(struct cpuinfo_x86 *c)