x86/asm changes for v3.11
Linus,
Please pull the latest x86-asm-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-asm-for-linus
HEAD: a3d7b7dddcc38c19aa46509c7282e8def80384a8 x86, asm, cleanup: Replace open-coded control register values with symbolic
Misc changes, with a bigger processor-flags cleanup/reorganization by H. Peter Anvin.
out-of-topic modifications in x86-asm-for-linus:
------------------------------------------------drivers/lguest/x86/core.c # 1adfa76: x86, flags: Rename X86_EFLAGS_BITinclude/uapi/linux/const.h # 2fc016c: linux/const.h: Add _BITUL() and _
Thanks,
Ingo
------------------>
H. Peter Anvin (5):
linux/const.h: Add _BITUL() and _BITULL()
x86, flags: Rename X86_EFLAGS_BIT1 to X86_EFLAGS_FIXED
x86: Rename X86_CR4_RDWRGSFS to X86_CR4_FSGSBASE
x86, processor-flags: Fix the datatypes and add bit number defines x86, asm, cleanup: Replace open-coded control register values with symbolic
Jan Beulich (1):
x86: __force_order doesn't need to be an actual variable
Joe Perches (1):
x86/vdso: Convert use of typedef ctl_table to struct ctl_table
arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/include/asm/special_insns.h | 2 +- arch/x86/include/uapi/asm/processor-flags.h | 154 +++++++++++++++++++--------- arch/x86/kernel/cpu/mtrr/cyrix.c | 2 +- arch/x86/kernel/cpu/mtrr/generic.c | 2 +- arch/x86/kernel/entry_64.S | 2 +- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 2 +- arch/x86/kernel/relocate_kernel_32.S | 2 +- arch/x86/kvm/vmx.c | 2 +- arch/x86/kvm/x86.c | 2 +- arch/x86/vdso/vdso32-setup.c | 4 +- drivers/lguest/x86/core.c | 2 +- include/uapi/linux/const.h | 3 + 14 files changed, 120 insertions(+), 63 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -59,7 +59,7 @@ (~(unsigned long )(X86_CR4_VME |X86_CR4_PVI |X86_CR4_TSD |X86_CR4_DE \ |X86_CR4_PSE |X86_CR4_PAE |X86_CR4_MCE \ |X86_CR4_PGE |X86_CR4_PCE |X86_CR4_OSFXSR |X86_CR4_PCIDE \ - |X86_CR4_OSXSAVE |X86_CR4_SMEP |X86_CR4_RDWRGSFS \ + |X86_CR4_OSXSAVE |X86_CR4_SMEP |X86_CR4_FSGSBASE \ | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE))#define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)
arch/x86/include/asm/special_insns.h +1 -1
@@ -16,7 +16,7 @@ static inline void native_clts(void)* all loads stores around it, which can hurt performance. Solution is to * use a variable and mimic reads and writes to it to enforce serialization */ -static unsigned long __force_order; +extern unsigned long __force_order;static inline unsigned long native_read_cr0 (void ) {
arch/x86/include/uapi/asm/processor-flags.h +104 -50
179 lines not on this page · raw message
arch/x86/kernel/cpu/mtrr/cyrix.c +1 -1
@@ -167,7 +167,7 @@ static void post_set(void)setCx86 (CX86_CCR3 , ccr3);/* Enable caches */ -write_cr0 (read_cr0 () &0xbfffffff ); +write_cr0 (read_cr0 () & ~X86_CR0_CD );/* Restore value of CR4 */ if (cpu_has_pge)
arch/x86/kernel/cpu/mtrr/generic.c +1 -1
@@ -701,7 +701,7 @@ static void post_set(void) __releases(set_atomicity_lock)mtrr_wrmsr (MSR_MTRRdefType, deftype_lo, deftype_hi);/* Enable caches */ -write_cr0 (read_cr0 () &0xbfffffff ); +write_cr0 (read_cr0 () & ~X86_CR0_CD );/* Restore value of CR4 */ if (cpu_has_pge)
arch/x86/kernel/entry_64.S +1 -1
@@ -365,7 +365,7 @@ ENDPROC(native_usergs_sysret64) /*CFI_REL_OFFSET ss,0*/ pushq_cfi %rax /* rsp */ CFI_REL_OFFSET rsp,0 - pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_BIT1) /* eflags - interrupts on */ + pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */ /*CFI_REL_OFFSET rflags,0*/ pushq_cfi $__KERNEL_CS /* cs */ /*CFI_REL_OFFSET cs,0*/
arch/x86/kernel/process_32.c +1 -1
@@ -147,7 +147,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, childregs->bp = arg; childregs->orig_ax =-1 ; childregs->cs = __KERNEL_CS |get_kernel_rpl (); - childregs->flags =X86_EFLAGS_IF |X86_EFLAGS_BIT1 ; + childregs->flags =X86_EFLAGS_IF |X86_EFLAGS_FIXED ; p->fpu_counter =0 ; p->thread.io_bitmap_ptr =NULL ;memset (p->thread.ptrace_bps,0 ,sizeof (p->thread.ptrace_bps));
arch/x86/kernel/process_64.c +1 -1
@@ -176,7 +176,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, childregs->bp = arg; childregs->orig_ax =-1 ; childregs->cs = __KERNEL_CS |get_kernel_rpl (); - childregs->flags =X86_EFLAGS_IF |X86_EFLAGS_BIT1 ; + childregs->flags =X86_EFLAGS_IF |X86_EFLAGS_FIXED ;return 0 ; } *childregs = *current_pt_regs ();
arch/x86/kernel/relocate_kernel_32.S +1 -1
@@ -186,7 +186,7 @@ identity_mapped: movl CP_PA_PGD(%ebx), %eax movl %eax, %cr3 movl %cr0, %eax - orl $(1<<31), %eax + orl $X86_CR0_PG, %eax movl %eax, %cr0 lea PAGE_SIZE(%edi), %esp movl %edi, %eax
arch/x86/kvm/vmx.c +1 -1
@@ -7942,7 +7942,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,kvm_register_write (vcpu,VCPU_REGS_RSP , vmcs12->host_rsp);kvm_register_write (vcpu,VCPU_REGS_RIP , vmcs12->host_rip); -vmx_set_rflags (vcpu,X86_EFLAGS_BIT1 ); +vmx_set_rflags (vcpu,X86_EFLAGS_FIXED );/* * Note that calling vmx_set_cr0 is important, even if cr0 hasn't * actually changed, because it depends on the current state of
arch/x86/kvm/x86.c +1 -1
@@ -619,7 +619,7 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)if (!guest_cpuid_has_smep (vcpu) && (cr4 &X86_CR4_SMEP ))return 1 ; -if (!guest_cpuid_has_fsgsbase (vcpu) && (cr4 &X86_CR4_RDWRGSFS )) +if (!guest_cpuid_has_fsgsbase (vcpu) && (cr4 &X86_CR4_FSGSBASE ))return 1 ;if (is_long_mode (vcpu)) {
arch/x86/vdso/vdso32-setup.c +2 -2
@@ -372,7 +372,7 @@ subsys_initcall(sysenter_setup);/* Register vsyscall32 into the ABI table */ #include <linux/sysctl.h> -static ctl_table abi_table2[] = { +static struct ctl_table abi_table2[] = { { .procname ="vsyscall32" , .data = &sysctl_vsyscall32,
@@ -383,7 +383,7 @@ static ctl_table abi_table2[] = { {} }; -static ctl_table abi_root_table2[] = { +static struct ctl_table abi_root_table2[] = { { .procname ="abi" , .mode =0555 ,
drivers/lguest/x86/core.c +1 -1
@@ -700,7 +700,7 @@ void lguest_arch_setup_regs(struct lg_cpu *cpu, unsigned long start)* interrupts are enabled. We always leave interrupts enabled while * running the Guest. */ - regs->eflags =X86_EFLAGS_IF |X86_EFLAGS_BIT1 ; + regs->eflags =X86_EFLAGS_IF |X86_EFLAGS_FIXED ;/* * The "Extended Instruction Pointer" register says where the Guest is
include/uapi/linux/const.h +3 -0
@@ -21,4 +21,7 @@#define _AT (T ,X ) ((T)(X))#endif +#define _BITUL (x) (_AC(1,UL) << (x)) +#define _BITULL (x) (_AC(1,ULL) << (x)) +#endif /* !(_LINUX_CONST_H) */