x86/cpu changes for v3.15
Subsystems (5)
Linus,
Please pull the latest x86-cpu-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus
# HEAD: 69f2366c9456d0ce784cf5aba87ee77eeadc1d5e x86, cpu: Add forcepae parameter for booting PAE kernels on PAE-disabled Pentium M
Bigger changes:
- Intel CPU hardware-enablement: new vector instructions support
(AVX-512), by Fenghua Yu.
- Support the clflushopt instruction and use it in appropriate places. clflushopt is similar to clflush but with more relaxed ordering, by Ross Zwisler.
- MSR accessor cleanups, by Borislav Petkov.
- 'forcepae' boot flag for those who have way too much time to spend on way too old Pentium-M systems and want to live way too dangerously, by Chris Bainbridge.
out-of-topic modifications in x86-cpu-for-linus:
--------------------------------------------------
drivers/gpu/drm/drm_cache.c # 2a0788d: x86: Use clflushopt in drm_clflus
# 2a0c772: x86: Use clflushopt in drm_clflus
include/linux/kernel.h # 8c90487: Rename TAINT_UNSAFE_SMP to TAINT_
kernel/module.c # 8c90487: Rename TAINT_UNSAFE_SMP to TAINT_
Thanks,
Ingo
------------------>
Borislav Petkov (3):
x86: Add another set of MSR accessor functions x86, AMD: Convert to the new bit access MSR accessors x86, Intel: Convert to the new bit access MSR accessors
Chris Bainbridge (1):
x86, cpu: Add forcepae parameter for booting PAE kernels on PAE-disabled Pentium M
Dave Jones (1):
Rename TAINT_UNSAFE_SMP to TAINT_CPU_OUT_OF_SPEC
Fenghua Yu (2):
x86, AVX-512: AVX-512 Feature Detection x86, AVX-512: Enable AVX-512 States Context Switch
H. Peter Anvin (1):
x86, intel: Make MSR_IA32_MISC_ENABLE bit constants systematic
Ross Zwisler (4):
x86: Add support for the clflushopt instruction
x86: Use clflushopt in clflush_cache_range
x86: Use clflushopt in drm_clflush_page
x86: Use clflushopt in drm_clflush_virt_range
Documentation/kernel-parameters.txt | 7 +++ arch/x86/boot/cpucheck.c | 20 ++++++++ arch/x86/include/asm/cpufeature.h | 5 ++ arch/x86/include/asm/msr.h | 2 + arch/x86/include/asm/special_insns.h | 8 ++++ arch/x86/include/asm/xsave.h | 16 ++++--- arch/x86/include/uapi/asm/msr-index.h | 75 +++++++++++++++++++---------- arch/x86/kernel/cpu/amd.c | 50 +++++--------------- arch/x86/kernel/cpu/intel.c | 53 ++++++++++++--------- arch/x86/lib/msr.c | 89 ++++++++++++++++++++++++++++++++++- arch/x86/mm/pageattr.c | 8 ++-- drivers/gpu/drm/drm_cache.c | 10 +++- include/linux/kernel.h | 2 +- kernel/module.c | 2 +- kernel/panic.c | 2 +- 15 files changed, 248 insertions(+), 101 deletions(-)
Documentation/kernel-parameters.txt +7 -0
@@ -1011,6 +1011,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. parameter will force ia64_sal_cache_flush to call ia64_pal_cache_flush instead of SAL_CACHE_FLUSH. + forcepae [X86-32] + Forcefully enable Physical Address Extension (PAE). + Many Pentium M systems disable PAE but may have a + functionally usable PAE implementation. + Warning: use of this parameter will taint the kernel + and may cause unknown problems. + ftrace=[tracer] [FTRACE] will set and start the specified tracer as early as possible in order to facilitate early
arch/x86/boot/cpucheck.c +20 -0
@@ -67,6 +67,13 @@ static int is_transmeta(void) cpu_vendor[2 ] ==A32 ('M' ,'x' ,'8' ,'6' ); } +static int is_intel (void ) +{ +return cpu_vendor[0 ] ==A32 ('G' ,'e' ,'n' ,'u' ) && + cpu_vendor[1 ] ==A32 ('i' ,'n' ,'e' ,'I' ) && + cpu_vendor[2 ] ==A32 ('n' ,'t' ,'e' ,'l' ); +} +/* Returns a bitmask of which words we have error bits in */ static int check_cpuflags (void ) {
@@ -153,6 +160,19 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr) asm("wrmsr" : :"a" (eax),"d" (edx),"c" (ecx)); err =check_cpuflags (); + }else if (err ==0x01 && + !(err_flags[0 ] & ~(1 <<X86_FEATURE_PAE )) && +is_intel () && cpu.level ==6 && + (cpu.model ==9 || cpu.model ==13 )) { +/* PAE is disabled on this Pentium M but can be forced */ +if (cmdline_find_option_bool ("forcepae" )) { +puts ("WARNING: Forcing PAE in CPU flags\n" ); +set_bit (X86_FEATURE_PAE , cpu.flags); + err =check_cpuflags (); + } +else { +puts ("WARNING: PAE disabled. Use parameter 'forcepae' to enable at your own risk!\n" ); + } }if (err_flags_ptr)
arch/x86/include/asm/cpufeature.h +5 -0
@@ -217,9 +217,14 @@#define X86_FEATURE_INVPCID (9*32+10)/* Invalidate Processor Context ID */ #define X86_FEATURE_RTM (9*32+11)/* Restricted Transactional Memory */ #define X86_FEATURE_MPX (9*32+14)/* Memory Protection Extension */ +#define X86_FEATURE_AVX512F (9*32+16)/* AVX-512 Foundation */ #define X86_FEATURE_RDSEED (9*32+18)/* The RDSEED instruction */ #define X86_FEATURE_ADX (9*32+19)/* The ADCX and ADOX instructions */ #define X86_FEATURE_SMAP (9*32+20)/* Supervisor Mode Access Prevention */ +#define X86_FEATURE_CLFLUSHOPT (9*32+23)/* CLFLUSHOPT instruction */ +#define X86_FEATURE_AVX512PF (9*32+26)/* AVX-512 Prefetch */ +#define X86_FEATURE_AVX512ER (9*32+27)/* AVX-512 Exponential and Reciprocal */ +#define X86_FEATURE_AVX512CD (9*32+28)/* AVX-512 Conflict Detection */ /* * BUG word(s)
arch/x86/include/asm/msr.h +2 -0
@@ -214,6 +214,8 @@ do { \struct msr *msrs_alloc (void );void msrs_free (struct msr *msrs); +int msr_set_bit (u32 msr,u8 bit); +int msr_clear_bit (u32 msr,u8 bit);#ifdef CONFIG_SMP int rdmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h);
arch/x86/include/asm/special_insns.h +8 -0
@@ -191,6 +191,14 @@ static inline void clflush(volatile void *__p) asmvolatile ("clflush %0" :"+m" (*(volatile char __force *)__p)); } +static inline void clflushopt (volatile void *__p) +{ + alternative_io(".byte " __stringify(NOP_DS_PREFIX) "; clflush %P0", +".byte 0x66; clflush %P0" , +X86_FEATURE_CLFLUSHOPT , +"+m" (*(volatile char __force *)__p)); +} +#define nop () asm volatile ("nop")
arch/x86/include/asm/xsave.h +10 -6
@@ -6,11 +6,14 @@#define XSTATE_CPUID 0x0000000d -#define XSTATE_FP 0x1 -#define XSTATE_SSE 0x2 -#define XSTATE_YMM 0x4 -#define XSTATE_BNDREGS 0x8 -#define XSTATE_BNDCSR 0x10 +#define XSTATE_FP 0x1 +#define XSTATE_SSE 0x2 +#define XSTATE_YMM 0x4 +#define XSTATE_BNDREGS 0x8 +#define XSTATE_BNDCSR 0x10 +#define XSTATE_OPMASK 0x20 +#define XSTATE_ZMM_Hi256 0x40 +#define XSTATE_Hi16_ZMM 0x80#define XSTATE_FPSSE (XSTATE_FP | XSTATE_SSE)
@@ -23,7 +26,8 @@#define XSAVE_YMM_OFFSET (XSAVE_HDR_SIZE + XSAVE_HDR_OFFSET)/* Supported features which support lazy state saving */ -#define XSTATE_LAZY (XSTATE_FP | XSTATE_SSE | XSTATE_YMM) +#define XSTATE_LAZY (XSTATE_FP | XSTATE_SSE | XSTATE_YMM \ + | XSTATE_OPMASK | XSTATE_ZMM_Hi256 | XSTATE_Hi16_ZMM)/* Supported features which require eager state saving */ #define XSTATE_EAGER (XSTATE_BNDREGS | XSTATE_BNDCSR)
arch/x86/include/uapi/asm/msr-index.h +50 -25
83 lines not on this page · raw message
arch/x86/kernel/cpu/amd.c +13 -37
97 lines not on this page · raw message
arch/x86/kernel/cpu/intel.c +30 -23
83 lines not on this page · raw message
arch/x86/lib/msr.c +88 -1
98 lines not on this page · raw message
arch/x86/mm/pageattr.c +4 -4
@@ -126,8 +126,8 @@ within(unsigned long addr, unsigned long start, unsigned long end)* @vaddr: virtual start address * @size: number of bytes to flush * -* clflush is an unordered instruction which needs fencing with mfence -* to avoid ordering issues. +* clflushopt is an unordered instruction which needs fencing with mfence or +* sfence to avoid ordering issues. */ void clflush_cache_range (void *vaddr,unsigned int size) {
@@ -136,11 +136,11 @@ void clflush_cache_range(void *vaddr, unsigned int size)mb ();for (; vaddr < vend; vaddr += boot_cpu_data.x86_clflush_size) -clflush (vaddr); +clflushopt (vaddr);/* * Flush any possible final partial cacheline: */ -clflush (vend); +clflushopt (vend);mb (); }
drivers/gpu/drm/drm_cache.c +8 -2
@@ -32,6 +32,12 @@#include <drm/drmP.h> #if defined(CONFIG_X86 ) + +/* +* clflushopt is an unordered instruction which needs fencing with mfence or +* sfence to avoid ordering issues. For drm_clflush_page this fencing happens +* in the caller. +*/ static void drm_clflush_page (struct page *page) {
@@ -44,7 +50,7 @@ drm_clflush_page(struct page *page) page_virtual =kmap_atomic (page);for (i =0 ; i <PAGE_SIZE ; i += size) -clflush (page_virtual + i); +clflushopt (page_virtual + i);kunmap_atomic (page_virtual); }
@@ -133,7 +139,7 @@ drm_clflush_virt_range(char *addr, unsigned long length)mb ();for (; addr < end; addr += boot_cpu_data.x86_clflush_size)clflush (addr); -clflush (end -1 ); +clflushopt (end -1 );mb ();return ; }
include/linux/kernel.h +1 -1
@@ -458,7 +458,7 @@ extern enum system_states {#define TAINT_PROPRIETARY_MODULE 0#define TAINT_FORCED_MODULE 1 -#define TAINT_UNSAFE_SMP 2 +#define TAINT_CPU_OUT_OF_SPEC 2#define TAINT_FORCED_RMMOD 3#define TAINT_MACHINE_CHECK 4#define TAINT_BAD_PAGE 5
kernel/module.c +1 -1
@@ -1015,7 +1015,7 @@ static size_t module_flags_taint(struct module *mod, char *buf) buf[l++] ='C' ;/* * TAINT_FORCED_RMMOD: could be added. -* TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't +* TAINT_CPU_OUT_OF_SPEC, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't * apply to modules. */ return l;
kernel/panic.c +1 -1
@@ -199,7 +199,7 @@ struct tnt {static const struct tnt tnts[] = { {TAINT_PROPRIETARY_MODULE ,'P' ,'G' }, {TAINT_FORCED_MODULE ,'F' ,' ' }, - {TAINT_UNSAFE_SMP ,'S' ,' ' }, + {TAINT_CPU_OUT_OF_SPEC ,'S' ,' ' }, {TAINT_FORCED_RMMOD ,'R' ,' ' }, {TAINT_MACHINE_CHECK ,'M' ,' ' }, {TAINT_BAD_PAGE ,'B' ,' ' },