From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Yang, Sheng" Subject: Re: =?iso-8859-1?q?=5BPATCH=5D_KVM=3A_VMX=3A_Enable_Virtu?= =?iso-8859-1?q?al_Processor=09Identification_=28VPID=29?= Date: Fri, 25 Jan 2008 12:12:28 +0800 Message-ID: <200801251212.29031.sheng.yang@intel.com> References: <200801241426.55928.sheng.yang@intel.com> <47987B7C.1080509@qumranet.com> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_tGWmHAlakXExGCD" Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: Avi Kivity Return-path: In-Reply-To: <47987B7C.1080509-atKUWr5tajBWk0Htik3J/w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org --Boundary-00=_tGWmHAlakXExGCD Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thursday 24 January 2008 19:50:20 Avi Kivity wrote: > Yang, Sheng wrote: > > To allow TLB entries to be retained across VM entry and VM exit, the VMM > > can now identify distinct address spaces through a new virtual-processor > > ID (VPID) field of the VMCS. > > > > > > > > +#define VPID_BITMAP_SIZE (1 << 16)*BITS_PER_BYTE > > This is strange; I think that just (1 << 16) would be simpler later on. > > Please also rename to VMX_NR_VPIDS, since this header is generally > implementation independent (just declares vmx constants). > > > static inline struct vcpu_vmx *to_vmx(struct kvm_vcpu *vcpu) > > @@ -86,6 +90,9 @@ static DEFINE_PER_CPU(struct vmcs *, current_vmcs); > > static struct page *vmx_io_bitmap_a; > > static struct page *vmx_io_bitmap_b; > > > > +static DECLARE_BITMAP(vmx_vpid_bitmap, VPID_BITMAP_SIZE / > > BITS_PER_BYTE); > > Like here, you could pass VPID_BITMAP_SIZE. > > > +static void allocate_vpid(struct vcpu_vmx *vmx) > > +{ > > + int vpid; > > + > > + vmx->vpid =3D 0; > > + if (!enable_vpid || !cpu_has_vmx_vpid()) > > + return; > > + spin_lock(&vmx_vpid_lock); > > + vpid =3D find_first_zero_bit(vmx_vpid_bitmap, VPID_BITMAP_SIZE); > > This can overflow since VPID_BITMAP_SIZE is 64K * 8. O... Sorry for silly fault... > > > apic_access_page)); > > > > + if (vmx->vpid !=3D 0) { > > + vmcs_write16(VIRTUAL_PROCESSOR_ID, vmx->vpid); > > + printk(KERN_DEBUG "VPID enabled, VPID is 0x%x\n", vmx->vpid); > > + } > > Please drop the printk(). > > > ap_b); > > > > + set_bit(0, vmx_vpid_bitmap); /* 0 is reversed for host */ > > + > > reversed -> reserved, some letters got reserved here. See also Rik can > Riel's signature. =2E.. > > Need to add vpid support to vmx_flush_tlb() (and perhaps call it from > vmx_set_cr3). Yeah.=20 Here is the updated patch: =2D-- =46rom 111566e3753b1abc24b073ad549fb97819d216cb Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Thu, 17 Jan 2008 15:14:33 +0800 Subject: [PATCH] KVM: VMX: Enable Virtual Processor Identification (VPID) To allow TLB entries to be retained across VM entry and VM exit, the VMM ca= n=20 now identify distinct address spaces through a new virtual-processor ID=20 (VPID) field of the VMCS. Signed-off-by: Sheng Yang =2D-- arch/x86/kvm/vmx.c | 90 ++++++++++++++++++++++++++++++++++++++++= +-- arch/x86/kvm/vmx.h | 6 +++ include/asm-x86/kvm_host.h | 1 + 3 files changed, 92 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 5346e42..18be24a 100644 =2D-- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -37,6 +37,9 @@ MODULE_LICENSE("GPL"); static int bypass_guest_pf =3D 1; module_param(bypass_guest_pf, bool, 0); =20 +static int enable_vpid =3D 1; +module_param(enable_vpid, bool, 0); + struct vmcs { u32 revision_id; u32 abort; @@ -71,6 +74,7 @@ struct vcpu_vmx { unsigned rip; } irq; } rmode; + int vpid; }; =20 static inline struct vcpu_vmx *to_vmx(struct kvm_vcpu *vcpu) @@ -86,6 +90,9 @@ static DEFINE_PER_CPU(struct vmcs *, current_vmcs); static struct page *vmx_io_bitmap_a; static struct page *vmx_io_bitmap_b; =20 +static DECLARE_BITMAP(vmx_vpid_bitmap, VMX_NR_VPIDS); +static DEFINE_SPINLOCK(vmx_vpid_lock); + static struct vmcs_config { int size; int order; @@ -204,6 +211,12 @@ static inline int vm_need_virtualize_apic_accesses(str= uct=20 kvm *kvm) (irqchip_in_kernel(kvm))); } =20 +static inline int cpu_has_vmx_vpid(void) +{ + return (vmcs_config.cpu_based_2nd_exec_ctrl & + SECONDARY_EXEC_ENABLE_VPID); +} + static int __find_msr_index(struct vcpu_vmx *vmx, u32 msr) { int i; @@ -214,6 +227,25 @@ static int __find_msr_index(struct vcpu_vmx *vmx, u32= =20 msr) return -1; } =20 +static inline void __invvpid(int ext, u16 vpid, gva_t gva) +{ + struct { + u64 vpid:16; + u64 rsvd:48; + u64 gva; + } operand =3D {vpid, 0, gva}; + + if (!enable_vpid || !cpu_has_vmx_vpid()) + return; + + asm volatile (ASM_VMX_INVVPID + /* CF=3D=3D1 or ZF=3D=3D1 --> rc =3D -1 */ + "; ja 1f ; ud2 ; 1:\n" + : + : "a" (&operand), "c" (ext) + : "memory"); +} + static struct kvm_msr_entry *find_msr_entry(struct vcpu_vmx *vmx, u32 msr) { int i; @@ -257,6 +289,19 @@ static void vcpu_clear(struct vcpu_vmx *vmx) vmx->launched =3D 0; } =20 +static inline void vpid_sync_vcpu_all(struct vcpu_vmx *vmx) +{ + if (vmx->vpid =3D=3D 0) + return; + + __invvpid(VMX_VPID_EXTENT_SINGLE_CONTEXT, vmx->vpid, 0); +} + +static inline void vpid_sync_all(void) +{ + __invvpid(VMX_VPID_EXTENT_ALL_CONTEXT, 0, 0); +} + static unsigned long vmcs_readl(unsigned long field) { unsigned long value; @@ -493,6 +538,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cp= u) if (vcpu->cpu !=3D cpu) { vcpu_clear(vmx); kvm_migrate_apic_timer(vcpu); + vpid_sync_vcpu_all(vmx); } =20 if (per_cpu(current_vmcs, cpu) !=3D vmx->vmcs) { @@ -973,7 +1019,8 @@ static __init int setup_vmcs_config(struct vmcs_config= =20 *vmcs_conf) if (_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS) { min =3D 0; opt =3D SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES | =2D SECONDARY_EXEC_WBINVD_EXITING; + SECONDARY_EXEC_WBINVD_EXITING | + SECONDARY_EXEC_ENABLE_VPID; if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS2, &_cpu_based_2nd_exec_control) < 0) return -EIO; @@ -1240,6 +1287,11 @@ static void exit_lmode(struct kvm_vcpu *vcpu) =20 #endif =20 +static void vmx_flush_tlb(struct kvm_vcpu *vcpu) +{ + vpid_sync_vcpu_all(to_vmx(vcpu)); +} + static void vmx_decache_cr4_guest_bits(struct kvm_vcpu *vcpu) { vcpu->arch.cr4 &=3D KVM_GUEST_CR4_MASK; @@ -1276,6 +1328,7 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsign= ed=20 long cr0) =20 static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) { + vmx_flush_tlb(vcpu); vmcs_writel(GUEST_CR3, cr3); if (vcpu->arch.cr0 & X86_CR0_PE) vmx_fpu_deactivate(vcpu); @@ -1492,6 +1545,22 @@ out: return r; } =20 +static void allocate_vpid(struct vcpu_vmx *vmx) +{ + int vpid; + + vmx->vpid =3D 0; + if (!enable_vpid || !cpu_has_vmx_vpid()) + return; + spin_lock(&vmx_vpid_lock); + vpid =3D find_first_zero_bit(vmx_vpid_bitmap, VMX_NR_VPIDS); + if (vpid < VMX_NR_VPIDS) { + vmx->vpid =3D vpid; + __set_bit(vpid, vmx_vpid_bitmap); + } + spin_unlock(&vmx_vpid_lock); +} + /* * Sets up the vmcs for emulated real mode. */ @@ -1530,6 +1599,8 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) if (!vm_need_virtualize_apic_accesses(vmx->vcpu.kvm)) exec_control &=3D ~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; + if (vmx->vpid =3D=3D 0) + exec_control &=3D ~SECONDARY_EXEC_ENABLE_VPID; vmcs_write32(SECONDARY_VM_EXEC_CONTROL, exec_control); } =20 @@ -1705,6 +1776,9 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu) vmcs_write64(APIC_ACCESS_ADDR, page_to_phys(vmx->vcpu.kvm->arch.apic_access_page)); =20 + if (vmx->vpid !=3D 0) + vmcs_write16(VIRTUAL_PROCESSOR_ID, vmx->vpid); + vmx->vcpu.arch.cr0 =3D 0x60000010; vmx_set_cr0(&vmx->vcpu, vmx->vcpu.arch.cr0); /* enter rmode */ vmx_set_cr4(&vmx->vcpu, 0); @@ -1714,6 +1788,8 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu) vmx_fpu_activate(&vmx->vcpu); update_exception_bitmap(&vmx->vcpu); =20 + vpid_sync_all(); + return 0; =20 out: @@ -2222,10 +2298,6 @@ static int kvm_handle_exit(struct kvm_run *kvm_run,= =20 struct kvm_vcpu *vcpu) return 0; } =20 =2Dstatic void vmx_flush_tlb(struct kvm_vcpu *vcpu) =2D{ =2D} =2D static void update_tpr_threshold(struct kvm_vcpu *vcpu) { int max_irr, tpr; @@ -2490,6 +2562,10 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu) { struct vcpu_vmx *vmx =3D to_vmx(vcpu); =20 + spin_lock(&vmx_vpid_lock); + if (vmx->vpid !=3D 0) + __clear_bit(vmx->vpid, vmx_vpid_bitmap); + spin_unlock(&vmx_vpid_lock); vmx_free_vmcs(vcpu); kfree(vmx->host_msrs); kfree(vmx->guest_msrs); @@ -2506,6 +2582,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *k= vm,=20 unsigned int id) if (!vmx) return ERR_PTR(-ENOMEM); =20 + allocate_vpid(vmx); + err =3D kvm_vcpu_init(&vmx->vcpu, kvm, id); if (err) goto free_vcpu; @@ -2650,6 +2728,8 @@ static int __init vmx_init(void) memset(iova, 0xff, PAGE_SIZE); kunmap(vmx_io_bitmap_b); =20 + set_bit(0, vmx_vpid_bitmap); /* 0 is reserved for host */ + r =3D kvm_init(&vmx_x86_ops, sizeof(struct vcpu_vmx), THIS_MODULE); if (r) goto out1; diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h index d52ae8d..436ce0f 100644 =2D-- a/arch/x86/kvm/vmx.h +++ b/arch/x86/kvm/vmx.h @@ -49,6 +49,7 @@ * Definitions of Secondary Processor-Based VM-Execution Controls. */ #define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001 +#define SECONDARY_EXEC_ENABLE_VPID 0x00000020 #define SECONDARY_EXEC_WBINVD_EXITING 0x00000040 =20 =20 @@ -65,6 +66,7 @@ =20 /* VMCS Encodings */ enum vmcs_field { + VIRTUAL_PROCESSOR_ID =3D 0x00000000, GUEST_ES_SELECTOR =3D 0x00000800, GUEST_CS_SELECTOR =3D 0x00000802, GUEST_SS_SELECTOR =3D 0x00000804, @@ -321,4 +323,8 @@ enum vmcs_field { =20 #define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT 9 =20 +#define VMX_NR_VPIDS (1 << 16) +#define VMX_VPID_EXTENT_SINGLE_CONTEXT 1 +#define VMX_VPID_EXTENT_ALL_CONTEXT 2 + #endif diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index d6db0de..67ae307 100644 =2D-- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h @@ -600,6 +600,7 @@ static inline void kvm_inject_gp(struct kvm_vcpu *vcpu,= =20 u32 error_code) #define ASM_VMX_VMWRITE_RSP_RDX ".byte 0x0f, 0x79, 0xd4" #define ASM_VMX_VMXOFF ".byte 0x0f, 0x01, 0xc4" #define ASM_VMX_VMXON_RAX ".byte 0xf3, 0x0f, 0xc7, 0x30" +#define ASM_VMX_INVVPID ".byte 0x66, 0x0f, 0x38, 0x81, 0x08" =20 #define MSR_IA32_TIME_STAMP_COUNTER 0x010 =20 =2D-=20 debian.1.5.3.7.1-dirty --Boundary-00=_tGWmHAlakXExGCD Content-Type: text/x-diff; charset="iso-8859-1"; name="0001-KVM-VMX-Enable-Virtual-Processor-Identification-V.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-KVM-VMX-Enable-Virtual-Processor-Identification-V.patch" =46rom 111566e3753b1abc24b073ad549fb97819d216cb Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Thu, 17 Jan 2008 15:14:33 +0800 Subject: [PATCH] KVM: VMX: Enable Virtual Processor Identification (VPID) To allow TLB entries to be retained across VM entry and VM exit, the VMM ca= n now identify distinct address spaces through a new virtual-processor ID (= VPID) field of the VMCS. Signed-off-by: Sheng Yang =2D-- arch/x86/kvm/vmx.c | 90 ++++++++++++++++++++++++++++++++++++++++= +-- arch/x86/kvm/vmx.h | 6 +++ include/asm-x86/kvm_host.h | 1 + 3 files changed, 92 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 5346e42..18be24a 100644 =2D-- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -37,6 +37,9 @@ MODULE_LICENSE("GPL"); static int bypass_guest_pf =3D 1; module_param(bypass_guest_pf, bool, 0); =20 +static int enable_vpid =3D 1; +module_param(enable_vpid, bool, 0); + struct vmcs { u32 revision_id; u32 abort; @@ -71,6 +74,7 @@ struct vcpu_vmx { unsigned rip; } irq; } rmode; + int vpid; }; =20 static inline struct vcpu_vmx *to_vmx(struct kvm_vcpu *vcpu) @@ -86,6 +90,9 @@ static DEFINE_PER_CPU(struct vmcs *, current_vmcs); static struct page *vmx_io_bitmap_a; static struct page *vmx_io_bitmap_b; =20 +static DECLARE_BITMAP(vmx_vpid_bitmap, VMX_NR_VPIDS); +static DEFINE_SPINLOCK(vmx_vpid_lock); + static struct vmcs_config { int size; int order; @@ -204,6 +211,12 @@ static inline int vm_need_virtualize_apic_accesses(str= uct kvm *kvm) (irqchip_in_kernel(kvm))); } =20 +static inline int cpu_has_vmx_vpid(void) +{ + return (vmcs_config.cpu_based_2nd_exec_ctrl & + SECONDARY_EXEC_ENABLE_VPID); +} + static int __find_msr_index(struct vcpu_vmx *vmx, u32 msr) { int i; @@ -214,6 +227,25 @@ static int __find_msr_index(struct vcpu_vmx *vmx, u32 = msr) return -1; } =20 +static inline void __invvpid(int ext, u16 vpid, gva_t gva) +{ + struct { + u64 vpid:16; + u64 rsvd:48; + u64 gva; + } operand =3D {vpid, 0, gva}; + + if (!enable_vpid || !cpu_has_vmx_vpid()) + return; + + asm volatile (ASM_VMX_INVVPID + /* CF=3D=3D1 or ZF=3D=3D1 --> rc =3D -1 */ + "; ja 1f ; ud2 ; 1:\n" + : + : "a" (&operand), "c" (ext) + : "memory"); +} + static struct kvm_msr_entry *find_msr_entry(struct vcpu_vmx *vmx, u32 msr) { int i; @@ -257,6 +289,19 @@ static void vcpu_clear(struct vcpu_vmx *vmx) vmx->launched =3D 0; } =20 +static inline void vpid_sync_vcpu_all(struct vcpu_vmx *vmx) +{ + if (vmx->vpid =3D=3D 0) + return; + + __invvpid(VMX_VPID_EXTENT_SINGLE_CONTEXT, vmx->vpid, 0); +} + +static inline void vpid_sync_all(void) +{ + __invvpid(VMX_VPID_EXTENT_ALL_CONTEXT, 0, 0); +} + static unsigned long vmcs_readl(unsigned long field) { unsigned long value; @@ -493,6 +538,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cp= u) if (vcpu->cpu !=3D cpu) { vcpu_clear(vmx); kvm_migrate_apic_timer(vcpu); + vpid_sync_vcpu_all(vmx); } =20 if (per_cpu(current_vmcs, cpu) !=3D vmx->vmcs) { @@ -973,7 +1019,8 @@ static __init int setup_vmcs_config(struct vmcs_config= *vmcs_conf) if (_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS) { min =3D 0; opt =3D SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES | =2D SECONDARY_EXEC_WBINVD_EXITING; + SECONDARY_EXEC_WBINVD_EXITING | + SECONDARY_EXEC_ENABLE_VPID; if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS2, &_cpu_based_2nd_exec_control) < 0) return -EIO; @@ -1240,6 +1287,11 @@ static void exit_lmode(struct kvm_vcpu *vcpu) =20 #endif =20 +static void vmx_flush_tlb(struct kvm_vcpu *vcpu) +{ + vpid_sync_vcpu_all(to_vmx(vcpu)); +} + static void vmx_decache_cr4_guest_bits(struct kvm_vcpu *vcpu) { vcpu->arch.cr4 &=3D KVM_GUEST_CR4_MASK; @@ -1276,6 +1328,7 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsign= ed long cr0) =20 static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) { + vmx_flush_tlb(vcpu); vmcs_writel(GUEST_CR3, cr3); if (vcpu->arch.cr0 & X86_CR0_PE) vmx_fpu_deactivate(vcpu); @@ -1492,6 +1545,22 @@ out: return r; } =20 +static void allocate_vpid(struct vcpu_vmx *vmx) +{ + int vpid; + + vmx->vpid =3D 0; + if (!enable_vpid || !cpu_has_vmx_vpid()) + return; + spin_lock(&vmx_vpid_lock); + vpid =3D find_first_zero_bit(vmx_vpid_bitmap, VMX_NR_VPIDS); + if (vpid < VMX_NR_VPIDS) { + vmx->vpid =3D vpid; + __set_bit(vpid, vmx_vpid_bitmap); + } + spin_unlock(&vmx_vpid_lock); +} + /* * Sets up the vmcs for emulated real mode. */ @@ -1530,6 +1599,8 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) if (!vm_need_virtualize_apic_accesses(vmx->vcpu.kvm)) exec_control &=3D ~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; + if (vmx->vpid =3D=3D 0) + exec_control &=3D ~SECONDARY_EXEC_ENABLE_VPID; vmcs_write32(SECONDARY_VM_EXEC_CONTROL, exec_control); } =20 @@ -1705,6 +1776,9 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu) vmcs_write64(APIC_ACCESS_ADDR, page_to_phys(vmx->vcpu.kvm->arch.apic_access_page)); =20 + if (vmx->vpid !=3D 0) + vmcs_write16(VIRTUAL_PROCESSOR_ID, vmx->vpid); + vmx->vcpu.arch.cr0 =3D 0x60000010; vmx_set_cr0(&vmx->vcpu, vmx->vcpu.arch.cr0); /* enter rmode */ vmx_set_cr4(&vmx->vcpu, 0); @@ -1714,6 +1788,8 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu) vmx_fpu_activate(&vmx->vcpu); update_exception_bitmap(&vmx->vcpu); =20 + vpid_sync_all(); + return 0; =20 out: @@ -2222,10 +2298,6 @@ static int kvm_handle_exit(struct kvm_run *kvm_run, = struct kvm_vcpu *vcpu) return 0; } =20 =2Dstatic void vmx_flush_tlb(struct kvm_vcpu *vcpu) =2D{ =2D} =2D static void update_tpr_threshold(struct kvm_vcpu *vcpu) { int max_irr, tpr; @@ -2490,6 +2562,10 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu) { struct vcpu_vmx *vmx =3D to_vmx(vcpu); =20 + spin_lock(&vmx_vpid_lock); + if (vmx->vpid !=3D 0) + __clear_bit(vmx->vpid, vmx_vpid_bitmap); + spin_unlock(&vmx_vpid_lock); vmx_free_vmcs(vcpu); kfree(vmx->host_msrs); kfree(vmx->guest_msrs); @@ -2506,6 +2582,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *k= vm, unsigned int id) if (!vmx) return ERR_PTR(-ENOMEM); =20 + allocate_vpid(vmx); + err =3D kvm_vcpu_init(&vmx->vcpu, kvm, id); if (err) goto free_vcpu; @@ -2650,6 +2728,8 @@ static int __init vmx_init(void) memset(iova, 0xff, PAGE_SIZE); kunmap(vmx_io_bitmap_b); =20 + set_bit(0, vmx_vpid_bitmap); /* 0 is reserved for host */ + r =3D kvm_init(&vmx_x86_ops, sizeof(struct vcpu_vmx), THIS_MODULE); if (r) goto out1; diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h index d52ae8d..436ce0f 100644 =2D-- a/arch/x86/kvm/vmx.h +++ b/arch/x86/kvm/vmx.h @@ -49,6 +49,7 @@ * Definitions of Secondary Processor-Based VM-Execution Controls. */ #define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001 +#define SECONDARY_EXEC_ENABLE_VPID 0x00000020 #define SECONDARY_EXEC_WBINVD_EXITING 0x00000040 =20 =20 @@ -65,6 +66,7 @@ =20 /* VMCS Encodings */ enum vmcs_field { + VIRTUAL_PROCESSOR_ID =3D 0x00000000, GUEST_ES_SELECTOR =3D 0x00000800, GUEST_CS_SELECTOR =3D 0x00000802, GUEST_SS_SELECTOR =3D 0x00000804, @@ -321,4 +323,8 @@ enum vmcs_field { =20 #define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT 9 =20 +#define VMX_NR_VPIDS (1 << 16) +#define VMX_VPID_EXTENT_SINGLE_CONTEXT 1 +#define VMX_VPID_EXTENT_ALL_CONTEXT 2 + #endif diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index d6db0de..67ae307 100644 =2D-- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h @@ -600,6 +600,7 @@ static inline void kvm_inject_gp(struct kvm_vcpu *vcpu,= u32 error_code) #define ASM_VMX_VMWRITE_RSP_RDX ".byte 0x0f, 0x79, 0xd4" #define ASM_VMX_VMXOFF ".byte 0x0f, 0x01, 0xc4" #define ASM_VMX_VMXON_RAX ".byte 0xf3, 0x0f, 0xc7, 0x30" +#define ASM_VMX_INVVPID ".byte 0x66, 0x0f, 0x38, 0x81, 0x08" =20 #define MSR_IA32_TIME_STAMP_COUNTER 0x010 =20 =2D-=20 debian.1.5.3.7.1-dirty --Boundary-00=_tGWmHAlakXExGCD Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ --Boundary-00=_tGWmHAlakXExGCD Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kvm-devel mailing list kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org https://lists.sourceforge.net/lists/listinfo/kvm-devel --Boundary-00=_tGWmHAlakXExGCD--