nEPT: Support LOAD_IA32_EFER entry/exit controls for L1
PATCH v3 1/13 nEPT: Support LOAD_IA32_EFER entry/exit controls for L1
From: Nadav Har'El <[email protected]>
Recent KVM, since http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
switch the EFER MSR when EPT is used and the host and guest have different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.
To do this EFER switching, KVM uses VM_ENTRY/EXIT_LOAD_IA32_EFER if available, and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the former (the latter is still unsupported).
Nested entry and exit emulation (prepare_vmcs_02 and load_vmcs12_host_state, respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So all that's left to do in this patch is to properly advertise this feature to L1.
Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are emulated by L0, by using vmx_set_efer (which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.
--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
arch/x86/kvm/vmx.c +16 -7
@@ -2192,7 +2192,8 @@ static __init void nested_vmx_setup_ctls_msrs(void)#else nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR ; + nested_vmx_exit_ctls_high |= (VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR | +VM_EXIT_LOAD_IA32_EFER );/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS,
@@ -2201,8 +2202,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) nested_vmx_entry_ctls_low =VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR ; nested_vmx_entry_ctls_high &=VM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_IA32E_MODE ; - nested_vmx_entry_ctls_high |=VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR ; - + nested_vmx_entry_ctls_high |= (VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR | +VM_ENTRY_LOAD_IA32_EFER );/* cpu-based controls */ rdmsr (MSR_IA32_VMX_PROCBASED_CTLS , nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high);
@@ -7492,10 +7493,18 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) vcpu->arch.cr0_guest_owned_bits &= ~vmcs12->cr0_guest_host_mask;vmcs_writel (CR0_GUEST_HOST_MASK , ~vcpu->arch.cr0_guest_owned_bits); -/* Note: IA32_MODE, LOAD_IA32_EFER are modified by vmx_set_efer below */ -vmcs_write32 (VM_EXIT_CONTROLS , - vmcs12->vm_exit_controls | vmcs_config.vmexit_ctrl); -vmcs_write32 (VM_ENTRY_CONTROLS , vmcs12->vm_entry_controls | +/* L2->L1 exit controls are emulated - the hardware exit is to L0 so +* we should use its exit controls. Note that IA32_MODE, LOAD_IA32_EFER +* bits are further modified by vmx_set_efer() below. +*/ +vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl); + +/* vmcs12's VM_ENTRY_LOAD_IA32_EFER and VM_ENTRY_IA32E_MODE are +* emulated by vmx_set_efer(), below. +*/ +vmcs_write32 (VM_ENTRY_CONTROLS , + (vmcs12->vm_entry_controls & ~VM_ENTRY_LOAD_IA32_EFER & + ~VM_ENTRY_IA32E_MODE ) | (vmcs_config.vmentry_ctrl & ~VM_ENTRY_IA32E_MODE ));if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PAT )
Signature · 1 line
1.8.1.2
PATCH v3 2/13 nEPT: Move gpte_access() and prefetch_invalid_gpte() to paging_tmpl.h
From: Nadav Har'El <[email protected]>
For preparation, we just move gpte_access() and prefetch_invalid_gpte() from mmu.c to paging_tmpl.h.
--- arch/x86/kvm/mmu.c | 30 ------------------------------ arch/x86/kvm/paging_tmpl.h | 40 +++++++++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 35 deletions(-)
arch/x86/kvm/mmu.c +0 -30
@@ -2488,26 +2488,6 @@ static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,return gfn_to_pfn_memslot_atomic (slot, gfn); } -static bool prefetch_invalid_gpte (struct kvm_vcpu *vcpu, -struct kvm_mmu_page *sp,u64 *spte, -u64 gpte) -{ -if (is_rsvd_bits_set (&vcpu->arch.mmu, gpte,PT_PAGE_TABLE_LEVEL )) - goto no_present; - -if (!is_present_gpte (gpte)) - goto no_present; - -if (!(gpte &PT_ACCESSED_MASK )) - goto no_present; - -return false; - -no_present: -drop_spte (vcpu->kvm, spte); -return true; -} -static int direct_pte_prefetch_many (struct kvm_vcpu *vcpu,struct kvm_mmu_page *sp,u64 *start,u64 *end)
@@ -3408,16 +3388,6 @@ static bool sync_mmio_spte(u64 *sptep, gfn_t gfn, unsigned access,return false; } -static inline unsigned gpte_access (struct kvm_vcpu *vcpu,u64 gpte) -{ -unsigned access; - - access = (gpte & (PT_WRITABLE_MASK |PT_USER_MASK )) |ACC_EXEC_MASK ; - access &= ~(gpte >>PT64_NX_SHIFT ); - -return access; -} -static inline bool is_last_gpte (struct kvm_mmu *mmu,unsigned level,unsigned gpte) {unsigned index;
arch/x86/kvm/paging_tmpl.h +35 -5
@@ -103,6 +103,36 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,return (ret != orig_pte); } +static bool FNAME (prefetch_invalid_gpte )(struct kvm_vcpu *vcpu, +struct kvm_mmu_page *sp,u64 *spte, +u64 gpte) +{ +if (is_rsvd_bits_set (&vcpu->arch.mmu, gpte,PT_PAGE_TABLE_LEVEL )) + goto no_present; + +if (!is_present_gpte (gpte)) + goto no_present; + +if (!(gpte &PT_ACCESSED_MASK )) + goto no_present; + +return false; + +no_present: +drop_spte (vcpu->kvm, spte); +return true; +} + +static inline unsigned FNAME (gpte_access )(struct kvm_vcpu *vcpu,u64 gpte) +{ +unsigned access; + + access = (gpte & (PT_WRITABLE_MASK |PT_USER_MASK )) |ACC_EXEC_MASK ; + access &= ~(gpte >>PT64_NX_SHIFT ); + +return access; +} + static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, struct guest_walker *walker,
@@ -225,7 +255,7 @@ retry_walk: } accessed_dirty &= pte; - pte_access = pt_access &gpte_access (vcpu, pte); + pte_access = pt_access &FNAME (gpte_access)(vcpu, pte); walker->ptes[walker->level -1 ] = pte; }while (!is_last_gpte (mmu, walker->level, pte));
@@ -309,13 +339,13 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,gfn_t gfn;pfn_t pfn; -if (prefetch_invalid_gpte (vcpu, sp, spte, gpte)) +if (FNAME (prefetch_invalid_gpte)(vcpu, sp, spte, gpte))return false;pgprintk ("%s: gpte %llx spte %p\n" , __func__, (u64 )gpte, spte); gfn =gpte_to_gfn (gpte); - pte_access = sp->role.access &gpte_access (vcpu, gpte); + pte_access = sp->role.access &FNAME (gpte_access)(vcpu, gpte);protect_clean_gpte (&pte_access, gpte); pfn =pte_prefetch_gfn_to_pfn (vcpu, gfn, no_dirty_log && (pte_access &ACC_WRITE_MASK ));
@@ -782,14 +812,14 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) sizeof(pt_element_t)))return -EINVAL ; -if (prefetch_invalid_gpte (vcpu, sp, &sp->spt[i], gpte)) { +if (FNAME (prefetch_invalid_gpte)(vcpu, sp, &sp->spt[i], gpte)) { vcpu->kvm->tlbs_dirty++;continue ; } gfn =gpte_to_gfn (gpte); pte_access = sp->role.access; - pte_access &=gpte_access (vcpu, gpte); + pte_access &=FNAME (gpte_access)(vcpu, gpte);protect_clean_gpte (&pte_access, gpte);if (sync_mmio_spte (&sp->spt[i], gfn, pte_access, &nr_present))
Signature · 1 line
1.8.1.2
Re: [PATCH v3 02/13] nEPT: Move gpte_access() and prefetch_invalid_gpte() to paging_tmpl.h
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 134 lines
From: Nadav Har'El <[email protected]>
For preparation, we just move
gpte_access()andprefetch_invalid_gpte()frommmu.ctopaging_tmpl.h.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/mmu.c | 30 ------------------------------ arch/x86/kvm/paging_tmpl.h | 40 +++++++++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 35 deletions(-)arch/x86/kvm/mmu.c +0
-30@@ -2488,26 +2488,6 @@ static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,return gfn_to_pfn_memslot_atomic (slot, gfn); } -static bool prefetch_invalid_gpte (struct kvm_vcpu *vcpu, -struct kvm_mmu_page *sp,u64 *spte, -u64 gpte) -{ -if (is_rsvd_bits_set (&vcpu->arch.mmu, gpte,PT_PAGE_TABLE_LEVEL )) - goto no_present; - -if (!is_present_gpte (gpte)) - goto no_present; - -if (!(gpte &PT_ACCESSED_MASK )) - goto no_present; - -return false; - -no_present: -drop_spte (vcpu->kvm, spte); -return true; -} -static int direct_pte_prefetch_many (struct kvm_vcpu *vcpu,struct kvm_mmu_page *sp,u64 *start,u64 *end)@@ -3408,16 +3388,6 @@ static bool sync_mmio_spte(u64 *sptep, gfn_t gfn, unsigned access,return false; } -static inline unsigned gpte_access (struct kvm_vcpu *vcpu,u64 gpte) -{ -unsigned access; - - access = (gpte & (PT_WRITABLE_MASK |PT_USER_MASK )) |ACC_EXEC_MASK ; - access &= ~(gpte >>PT64_NX_SHIFT ); - -return access; -} -static inline bool is_last_gpte (struct kvm_mmu *mmu,unsigned level,unsigned gpte) {unsigned index;arch/x86/kvm/paging_tmpl.h +34
-4@@ -103,6 +103,36 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,return (ret != orig_pte); } +static bool FNAME (prefetch_invalid_gpte )(struct kvm_vcpu *vcpu, +struct kvm_mmu_page *sp,u64 *spte, +u64 gpte) +{ +if (is_rsvd_bits_set (&vcpu->arch.mmu, gpte,PT_PAGE_TABLE_LEVEL )) + goto no_present; + +if (!is_present_gpte (gpte)) + goto no_present; + +if (!(gpte &PT_ACCESSED_MASK )) + goto no_present; + +return false; + +no_present: +drop_spte (vcpu->kvm, spte); +return true; +} + +static inline unsigned FNAME (gpte_access )(struct kvm_vcpu *vcpu,u64 gpte) +{ +unsigned access; + + access = (gpte & (PT_WRITABLE_MASK |PT_USER_MASK )) |ACC_EXEC_MASK ; + access &= ~(gpte >>PT64_NX_SHIFT ); + +return access; +} + static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, struct guest_walker *walker,@@ -225,7 +255,7 @@ retry_walk: } accessed_dirty &= pte; - pte_access = pt_access &gpte_access (vcpu, pte); + pte_access = pt_access &FNAME (gpte_access)(vcpu, pte); walker->ptes[walker->level -1 ] = pte; }while (!is_last_gpte (mmu, walker->level, pte));@@ -309,13 +339,13 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,gfn_t gfn;pfn_t pfn; -if (prefetch_invalid_gpte (vcpu, sp, spte, gpte)) +if (FNAME (prefetch_invalid_gpte)(vcpu, sp, spte, gpte))return false;pgprintk ("%s: gpte %llx spte %p\n" , __func__, (u64 )gpte, spte); gfn =gpte_to_gfn (gpte); - pte_access = sp->role.access &gpte_access (vcpu, gpte); + pte_access = sp->role.access &FNAME (gpte_access)(vcpu, gpte);protect_clean_gpte (&pte_access, gpte); pfn =pte_prefetch_gfn_to_pfn (vcpu, gfn, no_dirty_log && (pte_access &ACC_WRITE_MASK ));@@ -782,14 +812,14 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) sizeof(pt_element_t)))return -EINVAL ; -if (prefetch_invalid_gpte (vcpu, sp, &sp->spt[i], gpte)) { +if (FNAME (prefetch_invalid_gpte)(vcpu, sp, &sp->spt[i], gpte)) { vcpu->kvm->tlbs_dirty++;
arch/x86/kvm/paging_tmpl.h static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) · line 825
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +1
-1continue ; } gfn =gpte_to_gfn (gpte); pte_access = sp->role.access; - pte_access &=gpte_access (vcpu, gpte); + pte_access &=FNAME (gpte_access)(vcpu, gpte);protect_clean_gpte (&pte_access, gpte);if (sync_mmio_spte (&sp->spt[i], gfn, pte_access, &nr_present))
PATCH v3 3/13 nEPT: Add EPT tables support to paging_tmpl.h
In reply to Jun NakajimaFrom: Nadav Har'El <[email protected]>
This is the first patch in a series which adds nested EPT support to KVM's nested VMX. Nested EPT means emulating EPT for an L1 guest so that L1 can use EPT when running a nested guest L2. When L1 uses EPT, it allows the L2 guest to set its own cr3 and take its own page faults without either of L0 or L1 getting involved. This often significanlty improves L2's performance over the previous two alternatives (shadow page tables over EPT, and shadow page tables over shadow page tables).
This patch adds EPT support to paging_tmpl.h.
paging_tmpl.h contains the code for reading and writing page tables. The code for 32-bit and 64-bit tables is very similar, but not identical, so paging_tmpl.h is #include'd twice in mmu.c, once with PTTTYPE=32 and once with PTTYPE=64, and this generates the two sets of similar functions.
There are subtle but important differences between the format of EPT tables and that of ordinary x86 64-bit page tables, so for nested EPT we need a third set of functions to read the guest EPT table and to write the shadow EPT table.
So this patch adds third PTTYPE, PTTYPE_EPT, which creates functions (prefixed with "EPT") which correctly read and write EPT tables.
--- arch/x86/kvm/mmu.c | 5 +++++ arch/x86/kvm/paging_tmpl.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)
arch/x86/kvm/mmu.c +5 -0
@@ -3397,6 +3397,11 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gpreturn mmu->last_pte_bitmap & (1 << index); } +#define PTTYPE_EPT 18/* arbitrary */ +#define PTTYPE PTTYPE_EPT +#include "paging_tmpl.h" +#undef PTTYPE +#define PTTYPE 64#include "paging_tmpl.h" #undef PTTYPE
arch/x86/kvm/paging_tmpl.h +41 -2
134 lines not on this page · raw message
Signature · 1 line
1.8.1.2
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
Quoted 61 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
This is the first patch in a series which adds nested EPT support to KVM's nested VMX. Nested EPT means emulating EPT for an L1 guest so that L1 can use EPT when running a nested guest L2. When L1 uses EPT, it allows the L2 guest to set its own cr3 and take its own page faults without either of L0 or L1 getting involved. This often significanlty improves L2's performance over the previous two alternatives (shadow page tables over EPT, and shadow page tables over shadow page tables).
This patch adds EPT support to
paging_tmpl.h.
paging_tmpl.hcontains the code for reading and writing page tables. The code for 32-bit and 64-bit tables is very similar, but not identical, sopaging_tmpl.his #include'd twice inmmu.c, once with PTTTYPE=32 and once with PTTYPE=64, and this generates the two sets of similar functions.There are subtle but important differences between the format of EPT tables and that of ordinary x86 64-bit page tables, so for nested EPT we need a third set of functions to read the guest EPT table and to write the shadow EPT table.
So this patch adds third PTTYPE,
PTTYPE_EPT, which creates functions (prefixed with "EPT") which correctly read and write EPT tables.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/mmu.c | 5 +++++ arch/x86/kvm/paging_tmpl.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)arch/x86/kvm/mmu.c +5
-0@@ -3397,6 +3397,11 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gpreturn mmu->last_pte_bitmap & (1 << index); } +#define PTTYPE_EPT 18/* arbitrary */ +#define PTTYPE PTTYPE_EPT +#include "paging_tmpl.h" +#undef PTTYPE +#define PTTYPE 64#include "paging_tmpl.h" #undef PTTYPEarch/x86/kvm/paging_tmpl.h +4
-0@@ -50,6 +50,22 @@#define PT_LEVEL_BITS PT32_LEVEL_BITS#define PT_MAX_FULL_LEVELS 2#define CMPXCHG cmpxchg +#elif PTTYPE ==PTTYPE_EPT +#define pt_element_t u64 +#define guest_walker guest_walkerEPT +#define FNAME (name) EPT_##name
arch/x86/kvm/paging_tmpl.h line 66
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+#define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK +#define PT_LVL_ADDR_MASK (lvl) PT64_LVL_ADDR_MASK(lvl) +#define PT_LVL_OFFSET_MASK (lvl) PT64_LVL_OFFSET_MASK(lvl) +#define PT_INDEX (addr, level) PT64_INDEX(addr, level) +#define PT_LEVEL_BITS PT64_LEVEL_BITS +#ifdef CONFIG_X86_64 +#define PT_MAX_FULL_LEVELS 4 +#define CMPXCHG cmpxchg +#else +#define CMPXCHG cmpxchg64
CMPXHG is only used in FNAME(cmpxchg_gpte), but you commented it later. Do we really need it?
arch/x86/kvm/paging_tmpl.h line 67
Quoted 1 line
arch/x86/kvm/paging_tmpl.h +1
-0+#define PT_MAX_FULL_LEVELS 2
And the SDM says:
"It uses a page-walk length of 4, meaning that at most 4 EPT paging-structure entriesare accessed to translate a guest-physical address.", Is My SDM obsolete? Which kind of process supports page-walk length = 2?
It seems your patch is not able to handle the case that the guest uses walk-lenght = 2 which is running on the host with walk-lenght = 4.
(plrease refer to how to handle sp->role.quadrant in FNAME(get_level1_sp_gpa) in the current code.)
Quoted 24 lines
arch/x86/kvm/paging_tmpl.h +6
-0+#endif #else #error Invalid PTTYPE value#endif @@ -80,6 +96,10 @@ static gfn_t gpte_to_gfn_lvl(pt_element_t gpte, int lvl)return (gpte &PT_LVL_ADDR_MASK (lvl)) >>PAGE_SHIFT ; } +#if PTTYPE !=PTTYPE_EPT +/* +* Comment out this for EPT because update_accessed_dirty_bits() is not used. +*/ static int FNAME (cmpxchg_gpte )(struct kvm_vcpu *vcpu,struct kvm_mmu *mmu,pt_element_t __user *ptep_user,unsigned index,pt_element_t orig_pte,pt_element_t new_pte)@@ -102,6 +122,7 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,return (ret != orig_pte); } +#endif static bool FNAME(prefetch_invalid_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, u64 *spte,
arch/x86/kvm/paging_tmpl.h no_present: · line 152
Quoted 7 lines
arch/x86/kvm/paging_tmpl.h +3
-1@@ -126,13 +147,21 @@ no_present:static inline unsigned FNAME (gpte_access )(struct kvm_vcpu *vcpu,u64 gpte) {unsigned access; - +#if PTTYPE ==PTTYPE_EPT + access = (gpte & (VMX_EPT_READABLE_MASK |VMX_EPT_WRITABLE_MASK | +VMX_EPT_EXECUTABLE_MASK ));
It seems wrong. The ACC_XXX definition:
#define ACC_EXEC_MASK 1 #define ACC_WRITE_MASK PT_WRITABLE_MASK #define ACC_USER_MASK PT_USER_MASK #define ACC_ALL (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)
The bits are different with the bits used in EPT page table, for example, your code always see that the execution is not allowed.
Quoted 52 lines
arch/x86/kvm/paging_tmpl.h +10
-1+#else access = (gpte & (PT_WRITABLE_MASK |PT_USER_MASK )) |ACC_EXEC_MASK ; access &= ~(gpte >>PT64_NX_SHIFT ); +#endif return access; } +#if PTTYPE !=PTTYPE_EPT +/* +* EPT A/D bit support is not implemented. +*/ static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, struct guest_walker *walker,@@ -169,6 +198,7 @@ static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, }return 0 ; } +#endif /* * Fetch a guest pte for a guest virtual address @@ -177,7 +207,6 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, gva_t addr, u32 access) { - int ret; pt_element_t pte;pt_element_t __user *uninitialized_var (ptep_user );gfn_t table_gfn;@@ -192,7 +221,9 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,gfn_t gfn;trace_kvm_mmu_pagetable_walk (addr, access); +#if PTTYPE !=PTTYPE_EPT retry_walk: +#endif walker->level = mmu->root_level; pte = mmu->get_cr3 (vcpu);@@ -277,6 +308,7 @@ retry_walk: walker->gfn = real_gpa >>PAGE_SHIFT ; +#if PTTYPE !=PTTYPE_EPT if (!write_fault)protect_clean_gpte (&pte_access, pte);else @@ -287,12 +319,15 @@ retry_walk: accessed_dirty &= pte >> (PT_DIRTY_SHIFT -PT_ACCESSED_SHIFT );
arch/x86/kvm/paging_tmpl.h retry_walk: · line 330
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +3
-0if (unlikely (!accessed_dirty)) { +int ret; + ret =FNAME (update_accessed_dirty_bits)(vcpu, mmu, walker, write_fault);if (unlikely (ret <0 )) goto error;else if (ret) goto retry_walk; } +#endif
There are lots of code in paging_tmpl.h depends on PT_ACCESSED_MASK/PT_DIRTY_MASK. I do not see other parts are adjusted in your patch.
How about redefine PT_ACCESSED_MASK / PT_DIRTY_MASK, something like:
#if PTTYPE == 32PT_ACCESS = PT_ACCESSED_MASK;
......
#elif PTTYPE == 64PT_ACCESS = PT_ACCESSED_MASK;
......
#elif PTTYPE == PTTYPE_EPTPT_ACCESS = 0
#else
.......
I guess the compiler can drop the unnecessary branch when PT_ACCESS == 0. Also, it can help use to remove the untidy "#if PTTYPE != PTTYPE_EPT"
Quoted 28 lines
arch/x86/kvm/paging_tmpl.h +3
-0walker->pt_access = pt_access; walker->pte_access = pte_access;@@ -323,6 +358,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker, access); } +#if PTTYPE !=PTTYPE_EPT static int FNAME (walk_addr_nested )(struct guest_walker *walker,struct kvm_vcpu *vcpu,gva_t addr,u32 access)@@ -330,6 +366,7 @@ static int FNAME(walk_addr_nested)(struct guest_walker *walker,return FNAME (walk_addr_generic)(walker, vcpu, &vcpu->arch.nested_mmu, addr, access); } +#endif static bool FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,@@ -754,6 +791,7 @@ static gpa_t FNAME(gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t vaddr, u32 access,return gpa; } +#if PTTYPE !=PTTYPE_EPT static gpa_t FNAME (gva_to_gpa_nested )(struct kvm_vcpu *vcpu,gva_t vaddr,u32 access,struct x86_exception *exception)
arch/x86/kvm/paging_tmpl.h static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, · line 813
Quoted 4 lines
arch/x86/kvm/paging_tmpl.h +1
-0@@ -772,6 +810,7 @@ static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, return gpa; } +#endif
Strange!
Why does nested ept not need these functions? How to emulate the instruction faulted on L2?
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
Quoted 242 lines · Xiao Guangrong
Quoted 61 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
This is the first patch in a series which adds nested EPT support to KVM's nested VMX. Nested EPT means emulating EPT for an L1 guest so that L1 can use EPT when running a nested guest L2. When L1 uses EPT, it allows the L2 guest to set its own cr3 and take its own page faults without either of L0 or L1 getting involved. This often significanlty improves L2's performance over the previous two alternatives (shadow page tables over EPT, and shadow page tables over shadow page tables).
This patch adds EPT support to
paging_tmpl.h.
paging_tmpl.hcontains the code for reading and writing page tables. The code for 32-bit and 64-bit tables is very similar, but not identical, sopaging_tmpl.his #include'd twice inmmu.c, once with PTTTYPE=32 and once with PTTYPE=64, and this generates the two sets of similar functions.There are subtle but important differences between the format of EPT tables and that of ordinary x86 64-bit page tables, so for nested EPT we need a third set of functions to read the guest EPT table and to write the shadow EPT table.
So this patch adds third PTTYPE,
PTTYPE_EPT, which creates functions (prefixed with "EPT") which correctly read and write EPT tables.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/mmu.c | 5 +++++ arch/x86/kvm/paging_tmpl.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)arch/x86/kvm/mmu.c +5
-0@@ -3397,6 +3397,11 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gpreturn mmu->last_pte_bitmap & (1 << index); } +#define PTTYPE_EPT 18/* arbitrary */ +#define PTTYPE PTTYPE_EPT +#include "paging_tmpl.h" +#undef PTTYPE +#define PTTYPE 64#include "paging_tmpl.h" #undef PTTYPEarch/x86/kvm/paging_tmpl.h +4
-0@@ -50,6 +50,22 @@#define PT_LEVEL_BITS PT32_LEVEL_BITS#define PT_MAX_FULL_LEVELS 2#define CMPXCHG cmpxchg +#elif PTTYPE ==PTTYPE_EPT +#define pt_element_t u64 +#define guest_walker guest_walkerEPT +#define FNAME (name) EPT_##namearch/x86/kvm/paging_tmpl.h line 66
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+#define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK +#define PT_LVL_ADDR_MASK (lvl) PT64_LVL_ADDR_MASK(lvl) +#define PT_LVL_OFFSET_MASK (lvl) PT64_LVL_OFFSET_MASK(lvl) +#define PT_INDEX (addr, level) PT64_INDEX(addr, level) +#define PT_LEVEL_BITS PT64_LEVEL_BITS +#ifdef CONFIG_X86_64 +#define PT_MAX_FULL_LEVELS 4 +#define CMPXCHG cmpxchg +#else +#define CMPXCHG cmpxchg64CMPXHG is only used in
FNAME(cmpxchg_gpte), but you commented it later. Do we really need it?arch/x86/kvm/paging_tmpl.h line 67
Quoted 1 line
arch/x86/kvm/paging_tmpl.h +1
-0+#define PT_MAX_FULL_LEVELS 2And the SDM says:
"It uses a page-walk length of 4, meaning that at most 4 EPT paging-structure entriesare accessed to translate a guest-physical address.", Is My SDM obsolete? Which kind of process supports page-walk length = 2?
It seems your patch is not able to handle the case that the guest uses walk-lenght = 2 which is running on the host with walk-lenght = 4.
(plrease refer to how to handlesp->role.quadrantinFNAME(get_level1_sp_gpa)in the current code.)Quoted 24 lines
arch/x86/kvm/paging_tmpl.h +6
-0+#endif #else #error Invalid PTTYPE value#endif @@ -80,6 +96,10 @@ static gfn_t gpte_to_gfn_lvl(pt_element_t gpte, int lvl)return (gpte &PT_LVL_ADDR_MASK (lvl)) >>PAGE_SHIFT ; } +#if PTTYPE !=PTTYPE_EPT +/* +* Comment out this for EPT because update_accessed_dirty_bits() is not used. +*/ static int FNAME (cmpxchg_gpte )(struct kvm_vcpu *vcpu,struct kvm_mmu *mmu,pt_element_t __user *ptep_user,unsigned index,pt_element_t orig_pte,pt_element_t new_pte)@@ -102,6 +122,7 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,return (ret != orig_pte); } +#endif static bool FNAME(prefetch_invalid_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, u64 *spte,arch/x86/kvm/paging_tmpl.h no_present: · line 152
Quoted 7 lines
arch/x86/kvm/paging_tmpl.h +3
-1@@ -126,13 +147,21 @@ no_present:static inline unsigned FNAME (gpte_access )(struct kvm_vcpu *vcpu,u64 gpte) {unsigned access; - +#if PTTYPE ==PTTYPE_EPT + access = (gpte & (VMX_EPT_READABLE_MASK |VMX_EPT_WRITABLE_MASK | +VMX_EPT_EXECUTABLE_MASK ));It seems wrong. The
ACC_XXXdefinition:#define ACC_EXEC_MASK 1 #define ACC_WRITE_MASK PT_WRITABLE_MASK #define ACC_USER_MASK PT_USER_MASK #define ACC_ALL (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)The bits are different with the bits used in EPT page table, for example, your code always see that the execution is not allowed.
Quoted 52 lines
arch/x86/kvm/paging_tmpl.h +10
-1+#else access = (gpte & (PT_WRITABLE_MASK |PT_USER_MASK )) |ACC_EXEC_MASK ; access &= ~(gpte >>PT64_NX_SHIFT ); +#endif return access; } +#if PTTYPE !=PTTYPE_EPT +/* +* EPT A/D bit support is not implemented. +*/ static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, struct guest_walker *walker,@@ -169,6 +198,7 @@ static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, }return 0 ; } +#endif /* * Fetch a guest pte for a guest virtual address @@ -177,7 +207,6 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, gva_t addr, u32 access) { - int ret; pt_element_t pte;pt_element_t __user *uninitialized_var (ptep_user );gfn_t table_gfn;@@ -192,7 +221,9 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,gfn_t gfn;trace_kvm_mmu_pagetable_walk (addr, access); +#if PTTYPE !=PTTYPE_EPT retry_walk: +#endif walker->level = mmu->root_level; pte = mmu->get_cr3 (vcpu);@@ -277,6 +308,7 @@ retry_walk: walker->gfn = real_gpa >>PAGE_SHIFT ; +#if PTTYPE !=PTTYPE_EPT if (!write_fault)protect_clean_gpte (&pte_access, pte);else @@ -287,12 +319,15 @@ retry_walk: accessed_dirty &= pte >> (PT_DIRTY_SHIFT -PT_ACCESSED_SHIFT );arch/x86/kvm/paging_tmpl.h retry_walk: · line 330
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +3
-0if (unlikely (!accessed_dirty)) { +int ret; + ret =FNAME (update_accessed_dirty_bits)(vcpu, mmu, walker, write_fault);if (unlikely (ret <0 )) goto error;else if (ret) goto retry_walk; } +#endif There are lots of code in
paging_tmpl.hdepends on PT_ACCESSED_MASK/PT_DIRTY_MASK. I do not see other parts are adjusted in your patch.How about redefine
PT_ACCESSED_MASK/PT_DIRTY_MASK, something like:#if PTTYPE == 32
PT_ACCESS=PT_ACCESSED_MASK;
......
#elif PTTYPE == 64PT_ACCESS=PT_ACCESSED_MASK;
......
#elif PTTYPE ==PTTYPE_EPTPT_ACCESS= 0
#else
.......I guess the compiler can drop the unnecessary branch when
PT_ACCESS== 0. Also, it can help use to remove the untidy "#if PTTYPE !=PTTYPE_EPT"Quoted 29 lines
arch/x86/kvm/paging_tmpl.h +3
-0walker->pt_access = pt_access; walker->pte_access = pte_access;@@ -323,6 +358,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker, access); } +#if PTTYPE !=PTTYPE_EPT static int FNAME (walk_addr_nested )(struct guest_walker *walker,struct kvm_vcpu *vcpu,gva_t addr,u32 access)@@ -330,6 +366,7 @@ static int FNAME(walk_addr_nested)(struct guest_walker *walker,return FNAME (walk_addr_generic)(walker, vcpu, &vcpu->arch.nested_mmu, addr, access); } +#endif static bool FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,@@ -754,6 +791,7 @@ static gpa_t FNAME(gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t vaddr, u32 access,return gpa; } +#if PTTYPE !=PTTYPE_EPT static gpa_t FNAME (gva_to_gpa_nested )(struct kvm_vcpu *vcpu,gva_t vaddr,u32 access,struct x86_exception *exception)@@ -772,6 +810,7 @@ static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr,
Quoted 7 lines
arch/x86/kvm/paging_tmpl.h static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, · line 813
Quoted 3 lines
arch/x86/kvm/paging_tmpl.h +1
-0return gpa; } +#endif Strange!
Why does nested ept not need these functions? How to emulate the instruction faulted on L2?
Sorry, i misunderstood it. Have found the reason out.
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
Quoted 8 lines · Xiao Guangrong
Quoted 8 lines
arch/x86/kvm/paging_tmpl.h static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, · line 813
Quoted 5 lines
arch/x86/kvm/paging_tmpl.h +1
-0@@ -772,6 +810,7 @@ static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, return gpa; } +#endif Strange!
Quoted 4 lines
Quoted 1 line
Why does nested ept not need these functions? How to emulate the instruction faulted on L2?
Sorry, i misunderstood it. Have found the reason out.
You can write it down here for future reviewers :)
--
Gleb.
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
Quoted 9 lines · Gleb Natapov
Quoted 8 lines · Xiao Guangrong
Quoted 8 lines
arch/x86/kvm/paging_tmpl.h static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, · line 813
Quoted 5 lines
arch/x86/kvm/paging_tmpl.h +1
-0@@ -772,6 +810,7 @@ static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, return gpa; } +#endif Strange!
Quoted 5 lines
Quoted 4 lines
Quoted 1 line
Why does nested ept not need these functions? How to emulate the instruction faulted on L2?
Sorry, i misunderstood it. Have found the reason out.
You can write it down here for future reviewers :)
Okay.
The functions used to translate L2's gva to L1's gpa are paging32_gva_to_gpa_nested and paging64_gva_to_gpa_nested which are created by PTTYPE == 32 and PTTYPE == 64.
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
Quoted 12 lines · Xiao Guangrong
Quoted 11 lines · Gleb Natapov
Quoted 10 lines · Xiao Guangrong
Quoted 9 lines
arch/x86/kvm/paging_tmpl.h static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, · line 813
Quoted 5 lines
arch/x86/kvm/paging_tmpl.h +1
-0@@ -772,6 +810,7 @@ static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, return gpa; } +#endif Strange!
Why does nested ept not need these functions? How to emulate the instruction faulted on L2?
Quoted 10 lines
Quoted 3 lines
Quoted 2 lines
Sorry, i misunderstood it. Have found the reason out.
You can write it down here for future reviewers :)
Okay.
The functions used to translate L2's gva to L1's gpa are
paging32_gva_to_gpa_nestedandpaging64_gva_to_gpa_nestedwhich are created by PTTYPE == 32 and PTTYPE == 64.
Back to your comments on PT_MAX_FULL_LEVELS:
arch/x86/kvm/paging_tmpl.h line 67
Quoted 6 lines
arch/x86/kvm/paging_tmpl.h +6
-0+#ifdef CONFIG_X86_64 +#define PT_MAX_FULL_LEVELS 4 +#define CMPXCHG cmpxchg +#else +#define CMPXCHG cmpxchg64 +#define PT_MAX_FULL_LEVELS 2
I don't think we need to support nEPT on 32-bit hosts. So, I plan to remove such code. What do you think?
--
Jun
Intel Open Source Technology Center
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
Quoted 26 lines · Jun
Quoted 12 lines · Xiao Guangrong
Quoted 11 lines · Gleb Natapov
Quoted 10 lines · Xiao Guangrong
Quoted 9 lines
arch/x86/kvm/paging_tmpl.h static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, · line 813
Quoted 5 lines
arch/x86/kvm/paging_tmpl.h +1
-0@@ -772,6 +810,7 @@ static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, return gpa; } +#endif Strange!
Why does nested ept not need these functions? How to emulate the instruction faulted on L2?
Quoted 10 lines
Quoted 3 lines
Quoted 2 lines
Sorry, i misunderstood it. Have found the reason out.
You can write it down here for future reviewers :)
Okay.
The functions used to translate L2's gva to L1's gpa are
paging32_gva_to_gpa_nestedandpaging64_gva_to_gpa_nestedwhich are created by PTTYPE == 32 and PTTYPE == 64.Back to your comments on
PT_MAX_FULL_LEVELS:
Quoted 8 lines
arch/x86/kvm/paging_tmpl.h line 67
Quoted 6 lines
arch/x86/kvm/paging_tmpl.h +6
-0+#ifdef CONFIG_X86_64 +#define PT_MAX_FULL_LEVELS 4 +#define CMPXCHG cmpxchg +#else +#define CMPXCHG cmpxchg64 +#define PT_MAX_FULL_LEVELS 2I don't think we need to support nEPT on 32-bit hosts. So, I plan to remove such code. What do you think?
Good to me. :)
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
In reply to Nakajima, JunQuoted 26 lines · Jun
Quoted 12 lines · Xiao Guangrong
Quoted 11 lines · Gleb Natapov
Quoted 10 lines · Xiao Guangrong
Quoted 9 lines
arch/x86/kvm/paging_tmpl.h static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, · line 813
Quoted 5 lines
arch/x86/kvm/paging_tmpl.h +1
-0@@ -772,6 +810,7 @@ static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr, return gpa; } +#endif Strange!
Why does nested ept not need these functions? How to emulate the instruction faulted on L2?
Quoted 10 lines
Quoted 3 lines
Quoted 2 lines
Sorry, i misunderstood it. Have found the reason out.
You can write it down here for future reviewers :)
Okay.
The functions used to translate L2's gva to L1's gpa are
paging32_gva_to_gpa_nestedandpaging64_gva_to_gpa_nestedwhich are created by PTTYPE == 32 and PTTYPE == 64.Back to your comments on
PT_MAX_FULL_LEVELS:
Quoted 9 lines
arch/x86/kvm/paging_tmpl.h line 67
Quoted 6 lines
arch/x86/kvm/paging_tmpl.h +6
-0+#ifdef CONFIG_X86_64 +#define PT_MAX_FULL_LEVELS 4 +#define CMPXCHG cmpxchg +#else +#define CMPXCHG cmpxchg64 +#define PT_MAX_FULL_LEVELS 2I don't think we need to support nEPT on 32-bit hosts. So, I plan to remove such code. What do you think?
Why shouldn't we support nEPT on 32-bit hosts?
--
Gleb.
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
In reply to Xiao GuangrongQuoted 80 lines · Xiao Guangrong
Quoted 61 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
This is the first patch in a series which adds nested EPT support to KVM's nested VMX. Nested EPT means emulating EPT for an L1 guest so that L1 can use EPT when running a nested guest L2. When L1 uses EPT, it allows the L2 guest to set its own cr3 and take its own page faults without either of L0 or L1 getting involved. This often significanlty improves L2's performance over the previous two alternatives (shadow page tables over EPT, and shadow page tables over shadow page tables).
This patch adds EPT support to
paging_tmpl.h.
paging_tmpl.hcontains the code for reading and writing page tables. The code for 32-bit and 64-bit tables is very similar, but not identical, sopaging_tmpl.his #include'd twice inmmu.c, once with PTTTYPE=32 and once with PTTYPE=64, and this generates the two sets of similar functions.There are subtle but important differences between the format of EPT tables and that of ordinary x86 64-bit page tables, so for nested EPT we need a third set of functions to read the guest EPT table and to write the shadow EPT table.
So this patch adds third PTTYPE,
PTTYPE_EPT, which creates functions (prefixed with "EPT") which correctly read and write EPT tables.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/mmu.c | 5 +++++ arch/x86/kvm/paging_tmpl.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)arch/x86/kvm/mmu.c +5
-0@@ -3397,6 +3397,11 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gpreturn mmu->last_pte_bitmap & (1 << index); } +#define PTTYPE_EPT 18/* arbitrary */ +#define PTTYPE PTTYPE_EPT +#include "paging_tmpl.h" +#undef PTTYPE +#define PTTYPE 64#include "paging_tmpl.h" #undef PTTYPEarch/x86/kvm/paging_tmpl.h +4
-0@@ -50,6 +50,22 @@#define PT_LEVEL_BITS PT32_LEVEL_BITS#define PT_MAX_FULL_LEVELS 2#define CMPXCHG cmpxchg +#elif PTTYPE ==PTTYPE_EPT +#define pt_element_t u64 +#define guest_walker guest_walkerEPT +#define FNAME (name) EPT_##namearch/x86/kvm/paging_tmpl.h line 66
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+#define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK +#define PT_LVL_ADDR_MASK (lvl) PT64_LVL_ADDR_MASK(lvl) +#define PT_LVL_OFFSET_MASK (lvl) PT64_LVL_OFFSET_MASK(lvl) +#define PT_INDEX (addr, level) PT64_INDEX(addr, level) +#define PT_LEVEL_BITS PT64_LEVEL_BITS +#ifdef CONFIG_X86_64 +#define PT_MAX_FULL_LEVELS 4 +#define CMPXCHG cmpxchg +#else +#define CMPXCHG cmpxchg64CMPXHG is only used in
FNAME(cmpxchg_gpte), but you commented it later. Do we really need it?arch/x86/kvm/paging_tmpl.h line 67
Quoted 1 line
arch/x86/kvm/paging_tmpl.h +1
-0+#define PT_MAX_FULL_LEVELS 2And the SDM says:
Quoted 9 lines
"It uses a page-walk length of 4, meaning that at most 4 EPT paging-structure entriesare accessed to translate a guest-physical address.", Is My SDM obsolete? Which kind of process supports page-walk length = 2?
It seems your patch is not able to handle the case that the guest uses walk-lenght = 2 which is running on the host with walk-lenght = 4.
(plrease refer to how to handlesp->role.quadrantinFNAME(get_level1_sp_gpa)in the current code.)
But since EPT always has 4 levels on all existing cpus it is not an issue and the only case that we should worry about is guest walk-lenght == host walk-lenght == 4, or have I misunderstood what you mean here?
--
Gleb.
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
Quoted 85 lines · Gleb Natapov
Quoted 84 lines · Xiao Guangrong
Quoted 61 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
This is the first patch in a series which adds nested EPT support to KVM's nested VMX. Nested EPT means emulating EPT for an L1 guest so that L1 can use EPT when running a nested guest L2. When L1 uses EPT, it allows the L2 guest to set its own cr3 and take its own page faults without either of L0 or L1 getting involved. This often significanlty improves L2's performance over the previous two alternatives (shadow page tables over EPT, and shadow page tables over shadow page tables).
This patch adds EPT support to
paging_tmpl.h.
paging_tmpl.hcontains the code for reading and writing page tables. The code for 32-bit and 64-bit tables is very similar, but not identical, sopaging_tmpl.his #include'd twice inmmu.c, once with PTTTYPE=32 and once with PTTYPE=64, and this generates the two sets of similar functions.There are subtle but important differences between the format of EPT tables and that of ordinary x86 64-bit page tables, so for nested EPT we need a third set of functions to read the guest EPT table and to write the shadow EPT table.
So this patch adds third PTTYPE,
PTTYPE_EPT, which creates functions (prefixed with "EPT") which correctly read and write EPT tables.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/mmu.c | 5 +++++ arch/x86/kvm/paging_tmpl.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)arch/x86/kvm/mmu.c +5
-0@@ -3397,6 +3397,11 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gpreturn mmu->last_pte_bitmap & (1 << index); } +#define PTTYPE_EPT 18/* arbitrary */ +#define PTTYPE PTTYPE_EPT +#include "paging_tmpl.h" +#undef PTTYPE +#define PTTYPE 64#include "paging_tmpl.h" #undef PTTYPEarch/x86/kvm/paging_tmpl.h +4
-0@@ -50,6 +50,22 @@#define PT_LEVEL_BITS PT32_LEVEL_BITS#define PT_MAX_FULL_LEVELS 2#define CMPXCHG cmpxchg +#elif PTTYPE ==PTTYPE_EPT +#define pt_element_t u64 +#define guest_walker guest_walkerEPT +#define FNAME (name) EPT_##namearch/x86/kvm/paging_tmpl.h line 66
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+#define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK +#define PT_LVL_ADDR_MASK (lvl) PT64_LVL_ADDR_MASK(lvl) +#define PT_LVL_OFFSET_MASK (lvl) PT64_LVL_OFFSET_MASK(lvl) +#define PT_INDEX (addr, level) PT64_INDEX(addr, level) +#define PT_LEVEL_BITS PT64_LEVEL_BITS +#ifdef CONFIG_X86_64 +#define PT_MAX_FULL_LEVELS 4 +#define CMPXCHG cmpxchg +#else +#define CMPXCHG cmpxchg64CMPXHG is only used in
FNAME(cmpxchg_gpte), but you commented it later. Do we really need it?arch/x86/kvm/paging_tmpl.h line 67
Quoted 1 line
arch/x86/kvm/paging_tmpl.h +1
-0+#define PT_MAX_FULL_LEVELS 2And the SDM says:
"It uses a page-walk length of 4, meaning that at most 4 EPT paging-structure entriesare accessed to translate a guest-physical address.", Is My SDM obsolete? Which kind of process supports page-walk length = 2?
Quoted 7 lines
Quoted 5 lines
It seems your patch is not able to handle the case that the guest uses walk-lenght = 2 which is running on the host with walk-lenght = 4.
(plrease refer to how to handlesp->role.quadrantinFNAME(get_level1_sp_gpa)in the current code.)But since EPT always has 4 levels on all existing cpus it is not an issue and the only case that we should worry about is guest walk-lenght == host walk-lenght == 4, or have I
Yes. I totally agree with you, but...
Quoted 1 line
misunderstood what you mean here?
What confused me is that this patch defines "#define PT_MAX_FULL_LEVELS 2", so i asked the
question: "Which kind of process supports page-walk length = 2".
Sorry, there is a typo in my origin comments. "process" should be "processor" or "CPU".
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
Quoted 94 lines · Xiao Guangrong
Quoted 85 lines · Gleb Natapov
Quoted 84 lines · Xiao Guangrong
Quoted 61 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
This is the first patch in a series which adds nested EPT support to KVM's nested VMX. Nested EPT means emulating EPT for an L1 guest so that L1 can use EPT when running a nested guest L2. When L1 uses EPT, it allows the L2 guest to set its own cr3 and take its own page faults without either of L0 or L1 getting involved. This often significanlty improves L2's performance over the previous two alternatives (shadow page tables over EPT, and shadow page tables over shadow page tables).
This patch adds EPT support to
paging_tmpl.h.
paging_tmpl.hcontains the code for reading and writing page tables. The code for 32-bit and 64-bit tables is very similar, but not identical, sopaging_tmpl.his #include'd twice inmmu.c, once with PTTTYPE=32 and once with PTTYPE=64, and this generates the two sets of similar functions.There are subtle but important differences between the format of EPT tables and that of ordinary x86 64-bit page tables, so for nested EPT we need a third set of functions to read the guest EPT table and to write the shadow EPT table.
So this patch adds third PTTYPE,
PTTYPE_EPT, which creates functions (prefixed with "EPT") which correctly read and write EPT tables.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/mmu.c | 5 +++++ arch/x86/kvm/paging_tmpl.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)arch/x86/kvm/mmu.c +5
-0@@ -3397,6 +3397,11 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gpreturn mmu->last_pte_bitmap & (1 << index); } +#define PTTYPE_EPT 18/* arbitrary */ +#define PTTYPE PTTYPE_EPT +#include "paging_tmpl.h" +#undef PTTYPE +#define PTTYPE 64#include "paging_tmpl.h" #undef PTTYPEarch/x86/kvm/paging_tmpl.h +4
-0@@ -50,6 +50,22 @@#define PT_LEVEL_BITS PT32_LEVEL_BITS#define PT_MAX_FULL_LEVELS 2#define CMPXCHG cmpxchg +#elif PTTYPE ==PTTYPE_EPT +#define pt_element_t u64 +#define guest_walker guest_walkerEPT +#define FNAME (name) EPT_##namearch/x86/kvm/paging_tmpl.h line 66
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+#define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK +#define PT_LVL_ADDR_MASK (lvl) PT64_LVL_ADDR_MASK(lvl) +#define PT_LVL_OFFSET_MASK (lvl) PT64_LVL_OFFSET_MASK(lvl) +#define PT_INDEX (addr, level) PT64_INDEX(addr, level) +#define PT_LEVEL_BITS PT64_LEVEL_BITS +#ifdef CONFIG_X86_64 +#define PT_MAX_FULL_LEVELS 4 +#define CMPXCHG cmpxchg +#else +#define CMPXCHG cmpxchg64CMPXHG is only used in
FNAME(cmpxchg_gpte), but you commented it later. Do we really need it?arch/x86/kvm/paging_tmpl.h line 67
Quoted 1 line
arch/x86/kvm/paging_tmpl.h +1
-0+#define PT_MAX_FULL_LEVELS 2And the SDM says:
"It uses a page-walk length of 4, meaning that at most 4 EPT paging-structure entriesare accessed to translate a guest-physical address.", Is My SDM obsolete? Which kind of process supports page-walk length = 2?
Quoted 7 lines
Quoted 5 lines
It seems your patch is not able to handle the case that the guest uses walk-lenght = 2 which is running on the host with walk-lenght = 4.
(plrease refer to how to handlesp->role.quadrantinFNAME(get_level1_sp_gpa)in the current code.)But since EPT always has 4 levels on all existing cpus it is not an issue and the only case that we should worry about is guest walk-lenght == host walk-lenght == 4, or have I
Quoted 8 lines
Yes. I totally agree with you, but...
Quoted 1 line
misunderstood what you mean here?
What confused me is that this patch defines "#define
PT_MAX_FULL_LEVELS2", so i asked the
question: "Which kind of process supports page-walk length = 2".
Sorry, there is a typo in my origin comments. "process" should be "processor" or "CPU".
That is how I understood it, but then the discussion moved to dropping of nEPT support on 32-bit host. What's the connection? Even on 32bit host the walk is 4 levels. Doesn't shadow page code support 4 levels on 32bit host?
--
Gleb.
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
Quoted 97 lines · Gleb Natapov
Quoted 96 lines · Xiao Guangrong
Quoted 85 lines · Gleb Natapov
Quoted 84 lines · Xiao Guangrong
Quoted 61 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
This is the first patch in a series which adds nested EPT support to KVM's nested VMX. Nested EPT means emulating EPT for an L1 guest so that L1 can use EPT when running a nested guest L2. When L1 uses EPT, it allows the L2 guest to set its own cr3 and take its own page faults without either of L0 or L1 getting involved. This often significanlty improves L2's performance over the previous two alternatives (shadow page tables over EPT, and shadow page tables over shadow page tables).
This patch adds EPT support to
paging_tmpl.h.
paging_tmpl.hcontains the code for reading and writing page tables. The code for 32-bit and 64-bit tables is very similar, but not identical, sopaging_tmpl.his #include'd twice inmmu.c, once with PTTTYPE=32 and once with PTTYPE=64, and this generates the two sets of similar functions.There are subtle but important differences between the format of EPT tables and that of ordinary x86 64-bit page tables, so for nested EPT we need a third set of functions to read the guest EPT table and to write the shadow EPT table.
So this patch adds third PTTYPE,
PTTYPE_EPT, which creates functions (prefixed with "EPT") which correctly read and write EPT tables.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/mmu.c | 5 +++++ arch/x86/kvm/paging_tmpl.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)arch/x86/kvm/mmu.c +5
-0@@ -3397,6 +3397,11 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gpreturn mmu->last_pte_bitmap & (1 << index); } +#define PTTYPE_EPT 18/* arbitrary */ +#define PTTYPE PTTYPE_EPT +#include "paging_tmpl.h" +#undef PTTYPE +#define PTTYPE 64#include "paging_tmpl.h" #undef PTTYPEarch/x86/kvm/paging_tmpl.h +4
-0@@ -50,6 +50,22 @@#define PT_LEVEL_BITS PT32_LEVEL_BITS#define PT_MAX_FULL_LEVELS 2#define CMPXCHG cmpxchg +#elif PTTYPE ==PTTYPE_EPT +#define pt_element_t u64 +#define guest_walker guest_walkerEPT +#define FNAME (name) EPT_##namearch/x86/kvm/paging_tmpl.h line 66
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+#define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK +#define PT_LVL_ADDR_MASK (lvl) PT64_LVL_ADDR_MASK(lvl) +#define PT_LVL_OFFSET_MASK (lvl) PT64_LVL_OFFSET_MASK(lvl) +#define PT_INDEX (addr, level) PT64_INDEX(addr, level) +#define PT_LEVEL_BITS PT64_LEVEL_BITS +#ifdef CONFIG_X86_64 +#define PT_MAX_FULL_LEVELS 4 +#define CMPXCHG cmpxchg +#else +#define CMPXCHG cmpxchg64CMPXHG is only used in
FNAME(cmpxchg_gpte), but you commented it later. Do we really need it?arch/x86/kvm/paging_tmpl.h line 67
Quoted 1 line
arch/x86/kvm/paging_tmpl.h +1
-0+#define PT_MAX_FULL_LEVELS 2And the SDM says:
"It uses a page-walk length of 4, meaning that at most 4 EPT paging-structure entriesare accessed to translate a guest-physical address.", Is My SDM obsolete? Which kind of process supports page-walk length = 2?
Quoted 7 lines
Quoted 5 lines
It seems your patch is not able to handle the case that the guest uses walk-lenght = 2 which is running on the host with walk-lenght = 4.
(plrease refer to how to handlesp->role.quadrantinFNAME(get_level1_sp_gpa)in the current code.)But since EPT always has 4 levels on all existing cpus it is not an issue and the only case that we should worry about is guest walk-lenght == host walk-lenght == 4, or have I
Yes. I totally agree with you, but...
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
misunderstood what you mean here?
What confused me is that this patch defines "#define
PT_MAX_FULL_LEVELS2", so i asked the
question: "Which kind of process supports page-walk length = 2".
Sorry, there is a typo in my origin comments. "process" should be "processor" or "CPU".That is how I understood it, but then the discussion moved to dropping of nEPT support on 32-bit host. What's the connection? Even on 32bit
If EPT supports "walk-level = 2" on 32bit host (maybe it is not true), i thought dropping 32bit support to reduce the complex is worthwhile, otherwise:
a) we need to handle different page size between L0 and L2 and
b) we need to carefully review the code due to lacking PDPT supporting on nept on L2.
I remember that the origin version of NEPT did not support PAE-32bit L2 guest. I have found it out:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/95395
It seems no changes in this version, I have no idea how it was fixed in this version.
Quoted 2 lines
host the walk is 4 levels. Doesn't shadow page code support 4 levels on 32bit host?
Yes, it does. 4 levels is fine on 32bit host.
If EPT only supports 4 levels on both 32bit and 64bit hosts, there is no big difference to support nept on 32bit L2 and 64bit L2.
Re: [PATCH v3 03/13] nEPT: Add EPT tables support to paging_tmpl.h
Quoted 112 lines · Xiao Guangrong
Quoted 97 lines · Gleb Natapov
Quoted 96 lines · Xiao Guangrong
Quoted 85 lines · Gleb Natapov
Quoted 84 lines · Xiao Guangrong
Quoted 61 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
This is the first patch in a series which adds nested EPT support to KVM's nested VMX. Nested EPT means emulating EPT for an L1 guest so that L1 can use EPT when running a nested guest L2. When L1 uses EPT, it allows the L2 guest to set its own cr3 and take its own page faults without either of L0 or L1 getting involved. This often significanlty improves L2's performance over the previous two alternatives (shadow page tables over EPT, and shadow page tables over shadow page tables).
This patch adds EPT support to
paging_tmpl.h.
paging_tmpl.hcontains the code for reading and writing page tables. The code for 32-bit and 64-bit tables is very similar, but not identical, sopaging_tmpl.his #include'd twice inmmu.c, once with PTTTYPE=32 and once with PTTYPE=64, and this generates the two sets of similar functions.There are subtle but important differences between the format of EPT tables and that of ordinary x86 64-bit page tables, so for nested EPT we need a third set of functions to read the guest EPT table and to write the shadow EPT table.
So this patch adds third PTTYPE,
PTTYPE_EPT, which creates functions (prefixed with "EPT") which correctly read and write EPT tables.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/mmu.c | 5 +++++ arch/x86/kvm/paging_tmpl.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)arch/x86/kvm/mmu.c +5
-0@@ -3397,6 +3397,11 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gpreturn mmu->last_pte_bitmap & (1 << index); } +#define PTTYPE_EPT 18/* arbitrary */ +#define PTTYPE PTTYPE_EPT +#include "paging_tmpl.h" +#undef PTTYPE +#define PTTYPE 64#include "paging_tmpl.h" #undef PTTYPEarch/x86/kvm/paging_tmpl.h +4
-0@@ -50,6 +50,22 @@#define PT_LEVEL_BITS PT32_LEVEL_BITS#define PT_MAX_FULL_LEVELS 2#define CMPXCHG cmpxchg +#elif PTTYPE ==PTTYPE_EPT +#define pt_element_t u64 +#define guest_walker guest_walkerEPT +#define FNAME (name) EPT_##namearch/x86/kvm/paging_tmpl.h line 66
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+#define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK +#define PT_LVL_ADDR_MASK (lvl) PT64_LVL_ADDR_MASK(lvl) +#define PT_LVL_OFFSET_MASK (lvl) PT64_LVL_OFFSET_MASK(lvl) +#define PT_INDEX (addr, level) PT64_INDEX(addr, level) +#define PT_LEVEL_BITS PT64_LEVEL_BITS +#ifdef CONFIG_X86_64 +#define PT_MAX_FULL_LEVELS 4 +#define CMPXCHG cmpxchg +#else +#define CMPXCHG cmpxchg64CMPXHG is only used in
FNAME(cmpxchg_gpte), but you commented it later. Do we really need it?arch/x86/kvm/paging_tmpl.h line 67
Quoted 1 line
arch/x86/kvm/paging_tmpl.h +1
-0+#define PT_MAX_FULL_LEVELS 2And the SDM says:
"It uses a page-walk length of 4, meaning that at most 4 EPT paging-structure entriesare accessed to translate a guest-physical address.", Is My SDM obsolete? Which kind of process supports page-walk length = 2?
Quoted 7 lines
Quoted 5 lines
It seems your patch is not able to handle the case that the guest uses walk-lenght = 2 which is running on the host with walk-lenght = 4.
(plrease refer to how to handlesp->role.quadrantinFNAME(get_level1_sp_gpa)in the current code.)But since EPT always has 4 levels on all existing cpus it is not an issue and the only case that we should worry about is guest walk-lenght == host walk-lenght == 4, or have I
Yes. I totally agree with you, but...
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
misunderstood what you mean here?
What confused me is that this patch defines "#define
PT_MAX_FULL_LEVELS2", so i asked the
question: "Which kind of process supports page-walk length = 2".
Sorry, there is a typo in my origin comments. "process" should be "processor" or "CPU".That is how I understood it, but then the discussion moved to dropping of nEPT support on 32-bit host. What's the connection? Even on 32bit
If EPT supports "walk-level = 2" on 32bit host (maybe it is not true), i thought dropping 32bit support to reduce the complex is worthwhile, otherwise:
a) we need to handle different page size between L0 and L2 and
b) we need to carefully review the code due to lacking PDPT supporting on nept on L2.
Quoted 6 lines
I remember that the origin version of NEPT did not support PAE-32bit L2 guest. I have found it out:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/95395It seems no changes in this version, I have no idea how it was fixed in this version.
I think that patches that reloads nested PDPT pointers did that.
Quoted 8 lines
Quoted 2 lines
host the walk is 4 levels. Doesn't shadow page code support 4 levels on 32bit host?
Yes, it does. 4 levels is fine on 32bit host.
If EPT only supports 4 levels on both 32bit and 64bit hosts, there is no big difference to support nept on 32bit L2 and 64bit L2.
OK, that is my understating too. Thanks for confirmation.
--
Gleb.
PATCH v3 4/13 nEPT: Define EPT-specific link_shadow_page()
In reply to Jun NakajimaFrom: Nadav Har'El <[email protected]>
Since link_shadow_page() is used by a routine in mmu.c, add an EPT-specific link_shadow_page() in paging_tmp.h, rather than moving it.
--- arch/x86/kvm/paging_tmpl.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/x86/kvm/paging_tmpl.h +20 -0
@@ -461,6 +461,18 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, } } +#if PTTYPE ==PTTYPE_EPT +static void FNAME (link_shadow_page )(u64 *sptep,struct kvm_mmu_page *sp) +{ +u64 spte; + + spte =__pa (sp->spt) |VMX_EPT_READABLE_MASK |VMX_EPT_WRITABLE_MASK | +VMX_EPT_EXECUTABLE_MASK ; + +mmu_spte_set (sptep, spte); +} +#endif +/* * Fetch a shadow pte for a specific level in the paging hierarchy. * If the guest tries to write a write-protected page, we need to
@@ -513,7 +525,11 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, goto out_gpte_changed; if (sp) +#if PTTYPE ==PTTYPE_EPT +FNAME (link_shadow_page)(it.sptep, sp); +#else link_shadow_page (it.sptep, sp); +#endif } for (;
@@ -533,7 +549,11 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, sp =kvm_mmu_get_page (vcpu, direct_gfn, addr, it.level-1 , true, direct_access, it.sptep); +#if PTTYPE ==PTTYPE_EPT +FNAME (link_shadow_page)(it.sptep, sp); +#else link_shadow_page (it.sptep, sp); +#endif }clear_sp_write_flooding_count (it.sptep);
Signature · 1 line
1.8.1.2
Paolo Bonzini
maintainerRe: [PATCH v3 04/13] nEPT: Define EPT-specific link_shadow_page()
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 22 lines
From: Nadav Har'El <[email protected]>
Since
link_shadow_page()is used by a routine inmmu.c, add an EPT-specificlink_shadow_page()inpaging_tmp.h, rather than moving it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/paging_tmpl.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)arch/x86/kvm/paging_tmpl.h +1
-0@@ -461,6 +461,18 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, } } +#if PTTYPE ==PTTYPE_EPT
arch/x86/kvm/paging_tmpl.h static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, · line 474
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+static void FNAME (link_shadow_page )(u64 *sptep,struct kvm_mmu_page *sp) +{ +u64 spte; + + spte =__pa (sp->spt) |VMX_EPT_READABLE_MASK |VMX_EPT_WRITABLE_MASK | +VMX_EPT_EXECUTABLE_MASK ; + +mmu_spte_set (sptep, spte); +} +#endif
The function is small enough that likely the compiler will inline it. You can just handle it unconditionally with FNAME().
Paolo
Quoted 28 lines
arch/x86/kvm/paging_tmpl.h +8
-0/* * Fetch a shadow pte for a specific level in the paging hierarchy. * If the guest tries to write a write-protected page, we need to @@ -513,7 +525,11 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, goto out_gpte_changed; if (sp) +#if PTTYPE ==PTTYPE_EPT +FNAME (link_shadow_page)(it.sptep, sp); +#else link_shadow_page (it.sptep, sp); +#endif } for (;@@ -533,7 +549,11 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, sp =kvm_mmu_get_page (vcpu, direct_gfn, addr, it.level-1 , true, direct_access, it.sptep); +#if PTTYPE ==PTTYPE_EPT +FNAME (link_shadow_page)(it.sptep, sp); +#else link_shadow_page (it.sptep, sp); +#endif }clear_sp_write_flooding_count (it.sptep);
Re: [PATCH v3 04/13] nEPT: Define EPT-specific link_shadow_page()
In reply to Jun NakajimaQuoted 22 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
Since
link_shadow_page()is used by a routine inmmu.c, add an EPT-specificlink_shadow_page()inpaging_tmp.h, rather than moving it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/paging_tmpl.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)arch/x86/kvm/paging_tmpl.h +1
-0@@ -461,6 +461,18 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, } } +#if PTTYPE ==PTTYPE_EPT
arch/x86/kvm/paging_tmpl.h static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, · line 474
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+static void FNAME (link_shadow_page )(u64 *sptep,struct kvm_mmu_page *sp) +{ +u64 spte; + + spte =__pa (sp->spt) |VMX_EPT_READABLE_MASK |VMX_EPT_WRITABLE_MASK | +VMX_EPT_EXECUTABLE_MASK ; + +mmu_spte_set (sptep, spte); +} +#endif
The only difference between this function and the current link_shadow_page() is shadow_accessed_mask. Can we add a parameter to eliminate this difference, some like:
static void link_shadow_page(u64 *sptep, struct kvm_mmu_page *sp, bool accessed)
{
u64 spte;
spte = __pa(sp->spt) | PT_PRESENT_MASK | PT_WRITABLE_MASK |
shadow_user_mask | shadow_x_mask;
if (accessed)
spte |= shadow_accessed_mask;
mmu_spte_set(sptep, spte);
}?
Re: [PATCH v3 04/13] nEPT: Define EPT-specific link_shadow_page()
Sure. Thanks for the suggestion.
Quoted 57 lines · Xiao Guangrong
Quoted 22 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
Since
link_shadow_page()is used by a routine inmmu.c, add an EPT-specificlink_shadow_page()inpaging_tmp.h, rather than moving it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/paging_tmpl.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)arch/x86/kvm/paging_tmpl.h +1
-0@@ -461,6 +461,18 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, } } +#if PTTYPE ==PTTYPE_EPT arch/x86/kvm/paging_tmpl.h static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, · line 474
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+static void FNAME (link_shadow_page )(u64 *sptep,struct kvm_mmu_page *sp) +{ +u64 spte; + + spte =__pa (sp->spt) |VMX_EPT_READABLE_MASK |VMX_EPT_WRITABLE_MASK | +VMX_EPT_EXECUTABLE_MASK ; + +mmu_spte_set (sptep, spte); +} +#endif The only difference between this function and the current
link_shadow_page()isshadow_accessed_mask. Can we add a parameter to eliminate this difference, some like:static void
link_shadow_page(u64 *sptep, struct kvm_mmu_page *sp, bool accessed){ u64 spte; spte = __pa(sp->spt) | PT_PRESENT_MASK | PT_WRITABLE_MASK | shadow_user_mask | shadow_x_mask; if (accessed) spte |= shadow_accessed_mask; mmu_spte_set(sptep, spte); }?
--
To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Jun Intel Open Source Technology Center
PATCH v3 5/13 nEPT: MMU context for nested EPT
In reply to Jun NakajimaFrom: Nadav Har'El <[email protected]>
KVM's existing shadow MMU code already supports nested TDP. To use it, we need to set up a new "MMU context" for nested EPT, and create a few callbacks for it (nested_ept_*()). This context should also use the EPT versions of the page table access functions (defined in the previous patch). Then, we need to switch back and forth between this nested context and the regular MMU context when switching between L1 and L2 (when L1 runs this L2 with EPT).
--- arch/x86/kvm/mmu.c | 38 ++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/mmu.h | 1 + arch/x86/kvm/vmx.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 92 insertions(+), 1 deletion(-)
arch/x86/kvm/mmu.c +38 -0
@@ -3653,6 +3653,44 @@ int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) }EXPORT_SYMBOL_GPL (kvm_init_shadow_mmu); +int kvm_init_shadow_EPT_mmu (struct kvm_vcpu *vcpu,struct kvm_mmu *context) +{ +ASSERT (vcpu); +ASSERT (!VALID_PAGE (vcpu->arch.mmu.root_hpa)); + + context->shadow_root_level = kvm_x86_ops->get_tdp_level (); + + context->nx =is_nx (vcpu);/* TODO: ? */ + context->new_cr3 = paging_new_cr3; + context->page_fault = EPT_page_fault; + context->gva_to_gpa = EPT_gva_to_gpa; + context->sync_page = EPT_sync_page; + context->invlpg = EPT_invlpg; + context->update_pte = EPT_update_pte; + context->free = paging_free; + context->root_level = context->shadow_root_level; + context->root_hpa =INVALID_PAGE ; + context->direct_map = false; + +/* TODO: reset_rsvds_bits_mask() is not built for EPT, we need +something different. +*/ +reset_rsvds_bits_mask (vcpu, context); + + +/* TODO: I copied these from kvm_init_shadow_mmu, I don't know why +they are done, or why they write to vcpu->arch.mmu and not context +*/ + vcpu->arch.mmu.base_role.cr4_pae = !!is_pae (vcpu); + vcpu->arch.mmu.base_role.cr0_wp =is_write_protection (vcpu); + vcpu->arch.mmu.base_role.smep_andnot_wp = +kvm_read_cr4_bits (vcpu,X86_CR4_SMEP ) && + !is_write_protection (vcpu); + +return 0 ; +} +EXPORT_SYMBOL_GPL (kvm_init_shadow_EPT_mmu); +static int init_kvm_softmmu (struct kvm_vcpu *vcpu) {int r =kvm_init_shadow_mmu (vcpu, vcpu->arch.walk_mmu);
arch/x86/kvm/mmu.h +1 -0
@@ -54,6 +54,7 @@ int kvm_mmu_get_spte_hierarchy(struct kvm_vcpu *vcpu, u64 addr, u64 sptes[4]);void kvm_mmu_set_mmio_spte_mask (u64 mmio_mask);int handle_mmio_page_fault_common (struct kvm_vcpu *vcpu,u64 addr,bool direct);int kvm_init_shadow_mmu (struct kvm_vcpu *vcpu,struct kvm_mmu *context); +int kvm_init_shadow_EPT_mmu (struct kvm_vcpu *vcpu,struct kvm_mmu *context);static inline unsigned int kvm_mmu_available_pages (struct kvm *kvm) {
arch/x86/kvm/vmx.c +53 -1
78 lines not on this page · raw message
Signature · 1 line
1.8.1.2
Re: [PATCH v3 05/13] nEPT: MMU context for nested EPT
Quoted 24 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
KVM's existing shadow MMU code already supports nested TDP. To use it, we need to set up a new "MMU context" for nested EPT, and create a few callbacks for it (nested_ept_*()). This context should also use the EPT versions of the page table access functions (defined in the previous patch). Then, we need to switch back and forth between this nested context and the regular MMU context when switching between L1 and L2 (when L1 runs this L2 with EPT).
Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/mmu.c | 38 ++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/mmu.h | 1 + arch/x86/kvm/vmx.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 92 insertions(+), 1 deletion(-)arch/x86/kvm/mmu.c +0
-0
arch/x86/kvm/mmu.c int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) · line 3661
Quoted 9 lines
arch/x86/kvm/mmu.c +6
-0@@ -3653,6 +3653,44 @@ int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) }EXPORT_SYMBOL_GPL (kvm_init_shadow_mmu); +int kvm_init_shadow_EPT_mmu (struct kvm_vcpu *vcpu,struct kvm_mmu *context) +{ +ASSERT (vcpu); +ASSERT (!VALID_PAGE (vcpu->arch.mmu.root_hpa)); + + context->shadow_root_level = kvm_x86_ops->get_tdp_level ();
That means L1 guest always uses page-walk length == 4? But in your previous patch, it can be 2.
arch/x86/kvm/mmu.c int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) · line 3663
Quoted 2 lines
arch/x86/kvm/mmu.c +2
-0+ + context->nx =is_nx (vcpu);/* TODO: ? */
Hmm? EPT always support NX.
Quoted 4 lines
arch/x86/kvm/mmu.c +4
-0+ context->new_cr3 = paging_new_cr3; + context->page_fault = EPT_page_fault; + context->gva_to_gpa = EPT_gva_to_gpa; + context->sync_page = EPT_sync_page;
arch/x86/kvm/mmu.c int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) · line 3677
Quoted 10 lines
arch/x86/kvm/mmu.c +10
-0+ context->invlpg = EPT_invlpg; + context->update_pte = EPT_update_pte; + context->free = paging_free; + context->root_level = context->shadow_root_level; + context->root_hpa =INVALID_PAGE ; + context->direct_map = false; + +/* TODO: reset_rsvds_bits_mask() is not built for EPT, we need +something different. +*/
Exactly. :)
arch/x86/kvm/mmu.c int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) · line 3688
Quoted 11 lines
arch/x86/kvm/mmu.c +11
-0+reset_rsvds_bits_mask (vcpu, context); + + +/* TODO: I copied these from kvm_init_shadow_mmu, I don't know why +they are done, or why they write to vcpu->arch.mmu and not context +*/ + vcpu->arch.mmu.base_role.cr4_pae = !!is_pae (vcpu); + vcpu->arch.mmu.base_role.cr0_wp =is_write_protection (vcpu); + vcpu->arch.mmu.base_role.smep_andnot_wp = +kvm_read_cr4_bits (vcpu,X86_CR4_SMEP ) && + !is_write_protection (vcpu);
I guess we need not care these since the permission of EPT page does not depend on these.
Quoted 49 lines
arch/x86/kvm/mmu.c +5
-0+ +return 0 ; +} +EXPORT_SYMBOL_GPL (kvm_init_shadow_EPT_mmu); +static int init_kvm_softmmu (struct kvm_vcpu *vcpu) {int r =kvm_init_shadow_mmu (vcpu, vcpu->arch.walk_mmu);arch/x86/kvm/mmu.h +1
-0@@ -54,6 +54,7 @@ int kvm_mmu_get_spte_hierarchy(struct kvm_vcpu *vcpu, u64 addr, u64 sptes[4]);void kvm_mmu_set_mmio_spte_mask (u64 mmio_mask);int handle_mmio_page_fault_common (struct kvm_vcpu *vcpu,u64 addr,bool direct);int kvm_init_shadow_mmu (struct kvm_vcpu *vcpu,struct kvm_mmu *context); +int kvm_init_shadow_EPT_mmu (struct kvm_vcpu *vcpu,struct kvm_mmu *context);static inline unsigned int kvm_mmu_available_pages (struct kvm *kvm) {arch/x86/kvm/vmx.c +14
-0@@ -1045,6 +1045,11 @@ static inline bool nested_cpu_has_virtual_nmis(struct vmcs12 *vmcs12,return vmcs12->pin_based_vm_exec_control &PIN_BASED_VIRTUAL_NMIS ; } +static inline int nested_cpu_has_ept (struct vmcs12 *vmcs12) +{ +return nested_cpu_has2 (vmcs12,SECONDARY_EXEC_ENABLE_EPT ); +} +static inline bool is_exception (u32 intr_info) {return (intr_info & (INTR_INFO_INTR_TYPE_MASK |INTR_INFO_VALID_MASK ))@@ -7311,6 +7316,46 @@ static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry) entry->ecx |=bit (X86_FEATURE_VMX ); } +/* Callbacks for nested_ept_init_mmu_context: */ + +static unsigned long nested_ept_get_cr3 (struct kvm_vcpu *vcpu) +{ +/* return the page table to be shadowed - in our case, EPT12 */ +return get_vmcs12 (vcpu)->ept_pointer; +} + +static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu,
arch/x86/kvm/vmx.c static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry) · line 7337
Quoted 10 lines
arch/x86/kvm/vmx.c +10
-0+ struct x86_exception *fault) +{ +struct vmcs12 *vmcs12; +nested_vmx_vmexit (vcpu); + vmcs12 =get_vmcs12 (vcpu); +/* +* Note no need to set vmcs12->vm_exit_reason as it is already copied +* from vmcs02 in nested_vmx_vmexit() above, i.e., EPT_VIOLATION. +*/ + vmcs12->exit_qualification = fault->error_code;
Hmm, you directly copy the error code from FNAME(walk_addr_generic), but its format is different and i did not see you cook the error code in the previous patches.
Re: [PATCH v3 05/13] nEPT: MMU context for nested EPT
Quoted 28 lines · Xiao Guangrong
Quoted 27 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
KVM's existing shadow MMU code already supports nested TDP. To use it, we need to set up a new "MMU context" for nested EPT, and create a few callbacks for it (nested_ept_*()). This context should also use the EPT versions of the page table access functions (defined in the previous patch). Then, we need to switch back and forth between this nested context and the regular MMU context when switching between L1 and L2 (when L1 runs this L2 with EPT).
Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/mmu.c | 38 ++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/mmu.h | 1 + arch/x86/kvm/vmx.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 92 insertions(+), 1 deletion(-)arch/x86/kvm/mmu.c +0
-0@@ -3653,6 +3653,44 @@ int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) }EXPORT_SYMBOL_GPL (kvm_init_shadow_mmu);
Quoted 9 lines
arch/x86/kvm/mmu.c int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) · line 3661
Quoted 6 lines
arch/x86/kvm/mmu.c +6
-0+int kvm_init_shadow_EPT_mmu (struct kvm_vcpu *vcpu,struct kvm_mmu *context) +{ +ASSERT (vcpu); +ASSERT (!VALID_PAGE (vcpu->arch.mmu.root_hpa)); + + context->shadow_root_level = kvm_x86_ops->get_tdp_level ();That means L1 guest always uses page-walk length == 4? But in your previous patch, it can be 2.
We want to support "page-walk length == 4" only.
Quoted 23 lines
arch/x86/kvm/mmu.c int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) · line 3663
Quoted 3 lines
arch/x86/kvm/mmu.c +2
-0+ + context->nx =is_nx (vcpu);/* TODO: ? */ Hmm? EPT always support NX.
Quoted 4 lines
arch/x86/kvm/mmu.c +4
-0+ context->new_cr3 = paging_new_cr3; + context->page_fault = EPT_page_fault; + context->gva_to_gpa = EPT_gva_to_gpa; + context->sync_page = EPT_sync_page;arch/x86/kvm/mmu.c int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) · line 3677
Quoted 10 lines
arch/x86/kvm/mmu.c +10
-0+ context->invlpg = EPT_invlpg; + context->update_pte = EPT_update_pte; + context->free = paging_free; + context->root_level = context->shadow_root_level; + context->root_hpa =INVALID_PAGE ; + context->direct_map = false; + +/* TODO: reset_rsvds_bits_mask() is not built for EPT, we need +something different. +*/ Exactly. :)
Quoted 14 lines
arch/x86/kvm/mmu.c int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) · line 3688
Quoted 11 lines
arch/x86/kvm/mmu.c +11
-0+reset_rsvds_bits_mask (vcpu, context); + + +/* TODO: I copied these from kvm_init_shadow_mmu, I don't know why +they are done, or why they write to vcpu->arch.mmu and not context +*/ + vcpu->arch.mmu.base_role.cr4_pae = !!is_pae (vcpu); + vcpu->arch.mmu.base_role.cr0_wp =is_write_protection (vcpu); + vcpu->arch.mmu.base_role.smep_andnot_wp = +kvm_read_cr4_bits (vcpu,X86_CR4_SMEP ) && + !is_write_protection (vcpu);I guess we need not care these since the permission of EPT page does not depend on these.
Right. I'll clean up this.
Quoted 56 lines
Quoted 56 lines
arch/x86/kvm/mmu.c +5
-0+ +return 0 ; +} +EXPORT_SYMBOL_GPL (kvm_init_shadow_EPT_mmu); +static int init_kvm_softmmu (struct kvm_vcpu *vcpu) {int r =kvm_init_shadow_mmu (vcpu, vcpu->arch.walk_mmu);arch/x86/kvm/mmu.h +1
-0@@ -54,6 +54,7 @@ int kvm_mmu_get_spte_hierarchy(struct kvm_vcpu *vcpu, u64 addr, u64 sptes[4]);void kvm_mmu_set_mmio_spte_mask (u64 mmio_mask);int handle_mmio_page_fault_common (struct kvm_vcpu *vcpu,u64 addr,bool direct);int kvm_init_shadow_mmu (struct kvm_vcpu *vcpu,struct kvm_mmu *context); +int kvm_init_shadow_EPT_mmu (struct kvm_vcpu *vcpu,struct kvm_mmu *context);static inline unsigned int kvm_mmu_available_pages (struct kvm *kvm) {arch/x86/kvm/vmx.c +20
-0@@ -1045,6 +1045,11 @@ static inline bool nested_cpu_has_virtual_nmis(struct vmcs12 *vmcs12,return vmcs12->pin_based_vm_exec_control &PIN_BASED_VIRTUAL_NMIS ; } +static inline int nested_cpu_has_ept (struct vmcs12 *vmcs12) +{ +return nested_cpu_has2 (vmcs12,SECONDARY_EXEC_ENABLE_EPT ); +} +static inline bool is_exception (u32 intr_info) {return (intr_info & (INTR_INFO_INTR_TYPE_MASK |INTR_INFO_VALID_MASK ))@@ -7311,6 +7316,46 @@ static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry) entry->ecx |=bit (X86_FEATURE_VMX ); } +/* Callbacks for nested_ept_init_mmu_context: */ + +static unsigned long nested_ept_get_cr3 (struct kvm_vcpu *vcpu) +{ +/* return the page table to be shadowed - in our case, EPT12 */ +return get_vmcs12 (vcpu)->ept_pointer; +} + +static void nested_ept_inject_page_fault (struct kvm_vcpu *vcpu, +struct x86_exception *fault) +{ +struct vmcs12 *vmcs12; +nested_vmx_vmexit (vcpu); + vmcs12 =get_vmcs12 (vcpu); +/*
Quoted 9 lines
arch/x86/kvm/vmx.c static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry) · line 7337
Quoted 4 lines
arch/x86/kvm/vmx.c +4
-0+* Note no need to set vmcs12->vm_exit_reason as it is already copied +* from vmcs02 in nested_vmx_vmexit() above, i.e., EPT_VIOLATION. +*/ + vmcs12->exit_qualification = fault->error_code;Hmm, you directly copy the error code from
FNAME(walk_addr_generic), but its format is different and i did not see you cook the error code in the previous patches.
Right. Basically this is the original code from Nadav, and 12, 13 fix/cook the error code.
--
Jun
Intel Open Source Technology Center
PATCH v3 6/13 nEPT: Fix cr3 handling in nested exit and entry
In reply to Jun NakajimaFrom: Nadav Har'El <[email protected]>
The existing code for handling cr3 and related VMCS fields during nested exit and entry wasn't correct in all cases:
If L2 is allowed to control cr3 (and this is indeed the case in nested EPT), during nested exit we must copy the modified cr3 from vmcs02 to vmcs12, and we forgot to do so. This patch adds this copy.
If L0 isn't controlling cr3 when running L2 (i.e., L0 is using EPT), and whoever does control cr3 (L1 or L2) is using PAE, the processor might have saved PDPTEs and we should also save them in vmcs12 (and restore later).
--- arch/x86/kvm/vmx.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
arch/x86/kvm/vmx.c +30 -0
@@ -7608,6 +7608,17 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)kvm_set_cr3 (vcpu, vmcs12->guest_cr3);kvm_mmu_reset_context (vcpu); +/* +* Additionally, except when L0 is using shadow page tables, L1 or +* L2 control guest_cr3 for L2, so they may also have saved PDPTEs +*/ +if (enable_ept) { +vmcs_write64 (GUEST_PDPTR0 , vmcs12->guest_pdptr0); +vmcs_write64 (GUEST_PDPTR1 , vmcs12->guest_pdptr1); +vmcs_write64 (GUEST_PDPTR2 , vmcs12->guest_pdptr2); +vmcs_write64 (GUEST_PDPTR3 , vmcs12->guest_pdptr3); + } +kvm_register_write (vcpu,VCPU_REGS_RSP , vmcs12->guest_rsp);kvm_register_write (vcpu,VCPU_REGS_RIP , vmcs12->guest_rip); }
@@ -7930,6 +7941,25 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) vmcs12->guest_pending_dbg_exceptions =vmcs_readl (GUEST_PENDING_DBG_EXCEPTIONS ); +/* +* In some cases (usually, nested EPT), L2 is allowed to change its +* own CR3 without exiting. If it has changed it, we must keep it. +* Of course, if L0 is using shadow page tables, GUEST_CR3 was defined +* by L0, not L1 or L2, so we mustn't unconditionally copy it to vmcs12. +*/ +if (enable_ept) + vmcs12->guest_cr3 =vmcs_read64 (GUEST_CR3 ); +/* +* Additionally, except when L0 is using shadow page tables, L1 or +* L2 control guest_cr3 for L2, so save their PDPTEs +*/ +if (enable_ept) { + vmcs12->guest_pdptr0 =vmcs_read64 (GUEST_PDPTR0 ); + vmcs12->guest_pdptr1 =vmcs_read64 (GUEST_PDPTR1 ); + vmcs12->guest_pdptr2 =vmcs_read64 (GUEST_PDPTR2 ); + vmcs12->guest_pdptr3 =vmcs_read64 (GUEST_PDPTR3 ); + } + vmcs12->vm_entry_controls = (vmcs12->vm_entry_controls & ~VM_ENTRY_IA32E_MODE ) | (vmcs_read32 (VM_ENTRY_CONTROLS ) &VM_ENTRY_IA32E_MODE );
Signature · 1 line
1.8.1.2
Re: [PATCH v3 06/13] nEPT: Fix cr3 handling in nested exit and entry
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 59 lines
From: Nadav Har'El <[email protected]>
The existing code for handling cr3 and related VMCS fields during nested exit and entry wasn't correct in all cases:
If L2 is allowed to control cr3 (and this is indeed the case in nested EPT), during nested exit we must copy the modified cr3 from vmcs02 to vmcs12, and we forgot to do so. This patch adds this copy.
If L0 isn't controlling cr3 when running L2 (i.e., L0 is using EPT), and whoever does control cr3 (L1 or L2) is using PAE, the processor might have saved PDPTEs and we should also save them in vmcs12 (and restore later).
Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)arch/x86/kvm/vmx.c +23
-0@@ -7608,6 +7608,17 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)kvm_set_cr3 (vcpu, vmcs12->guest_cr3);kvm_mmu_reset_context (vcpu); +/* +* Additionally, except when L0 is using shadow page tables, L1 or +* L2 control guest_cr3 for L2, so they may also have saved PDPTEs +*/ +if (enable_ept) { +vmcs_write64 (GUEST_PDPTR0 , vmcs12->guest_pdptr0); +vmcs_write64 (GUEST_PDPTR1 , vmcs12->guest_pdptr1); +vmcs_write64 (GUEST_PDPTR2 , vmcs12->guest_pdptr2); +vmcs_write64 (GUEST_PDPTR3 , vmcs12->guest_pdptr3); + } +kvm_register_write (vcpu,VCPU_REGS_RSP , vmcs12->guest_rsp);kvm_register_write (vcpu,VCPU_REGS_RIP , vmcs12->guest_rip); }@@ -7930,6 +7941,25 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) vmcs12->guest_pending_dbg_exceptions =vmcs_readl (GUEST_PENDING_DBG_EXCEPTIONS ); +/* +* In some cases (usually, nested EPT), L2 is allowed to change its +* own CR3 without exiting. If it has changed it, we must keep it. +* Of course, if L0 is using shadow page tables, GUEST_CR3 was defined +* by L0, not L1 or L2, so we mustn't unconditionally copy it to vmcs12. +*/ +if (enable_ept) + vmcs12->guest_cr3 =vmcs_read64 (GUEST_CR3 ); +/* +* Additionally, except when L0 is using shadow page tables, L1 or +* L2 control guest_cr3 for L2, so save their PDPTEs +*/
arch/x86/kvm/vmx.c static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7965
Quoted 10 lines
arch/x86/kvm/vmx.c +7
-0+if (enable_ept) { + vmcs12->guest_pdptr0 =vmcs_read64 (GUEST_PDPTR0 ); + vmcs12->guest_pdptr1 =vmcs_read64 (GUEST_PDPTR1 ); + vmcs12->guest_pdptr2 =vmcs_read64 (GUEST_PDPTR2 ); + vmcs12->guest_pdptr3 =vmcs_read64 (GUEST_PDPTR3 ); + } + vmcs12->vm_entry_controls = (vmcs12->vm_entry_controls & ~VM_ENTRY_IA32E_MODE ) | (vmcs_read32 (VM_ENTRY_CONTROLS ) &VM_ENTRY_IA32E_MODE );
Re: [PATCH v3 06/13] nEPT: Fix cr3 handling in nested exit and entry
In reply to Jun NakajimaQuoted 25 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
The existing code for handling cr3 and related VMCS fields during nested exit and entry wasn't correct in all cases:
If L2 is allowed to control cr3 (and this is indeed the case in nested EPT), during nested exit we must copy the modified cr3 from vmcs02 to vmcs12, and we forgot to do so. This patch adds this copy.
If L0 isn't controlling cr3 when running L2 (i.e., L0 is using EPT), and whoever does control cr3 (L1 or L2) is using PAE, the processor might have saved PDPTEs and we should also save them in vmcs12 (and restore later).
Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)arch/x86/kvm/vmx.c +0
-0
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7612
Quoted 5 lines
arch/x86/kvm/vmx.c +2
-0@@ -7608,6 +7608,17 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)kvm_set_cr3 (vcpu, vmcs12->guest_cr3);kvm_mmu_reset_context (vcpu); +/* +* Additionally, except when L0 is using shadow page tables, L1 or
What this "Additionally" corresponds to?
Quoted 13 lines
arch/x86/kvm/vmx.c +9
-0+* L2 control guest_cr3 for L2, so they may also have saved PDPTEs +*/ +if (enable_ept) { +vmcs_write64 (GUEST_PDPTR0 , vmcs12->guest_pdptr0); +vmcs_write64 (GUEST_PDPTR1 , vmcs12->guest_pdptr1); +vmcs_write64 (GUEST_PDPTR2 , vmcs12->guest_pdptr2); +vmcs_write64 (GUEST_PDPTR3 , vmcs12->guest_pdptr3); + } +kvm_register_write (vcpu,VCPU_REGS_RSP , vmcs12->guest_rsp);kvm_register_write (vcpu,VCPU_REGS_RIP , vmcs12->guest_rip); }
arch/x86/kvm/vmx.c static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7950
Quoted 10 lines
arch/x86/kvm/vmx.c +7
-0@@ -7930,6 +7941,25 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) vmcs12->guest_pending_dbg_exceptions =vmcs_readl (GUEST_PENDING_DBG_EXCEPTIONS ); +/* +* In some cases (usually, nested EPT), L2 is allowed to change its +* own CR3 without exiting. If it has changed it, we must keep it. +* Of course, if L0 is using shadow page tables, GUEST_CR3 was defined +* by L0, not L1 or L2, so we mustn't unconditionally copy it to vmcs12. +*/ +if (enable_ept)
Non need separate if for guest_cr3. Put it under if() below.
Quoted 17 lines
arch/x86/kvm/vmx.c +12
-0+ vmcs12->guest_cr3 =vmcs_read64 (GUEST_CR3 ); +/* +* Additionally, except when L0 is using shadow page tables, L1 or +* L2 control guest_cr3 for L2, so save their PDPTEs +*/ +if (enable_ept) { + vmcs12->guest_pdptr0 =vmcs_read64 (GUEST_PDPTR0 ); + vmcs12->guest_pdptr1 =vmcs_read64 (GUEST_PDPTR1 ); + vmcs12->guest_pdptr2 =vmcs_read64 (GUEST_PDPTR2 ); + vmcs12->guest_pdptr3 =vmcs_read64 (GUEST_PDPTR3 ); + } + vmcs12->vm_entry_controls = (vmcs12->vm_entry_controls & ~VM_ENTRY_IA32E_MODE ) | (vmcs_read32 (VM_ENTRY_CONTROLS ) &VM_ENTRY_IA32E_MODE );Signature · 1 line
1.8.1.2
--
Gleb.
PATCH v3 7/13 nEPT: Fix wrong test in kvm_set_cr3
In reply to Jun NakajimaFrom: Nadav Har'El <[email protected]>
kvm_set_cr3() attempts to check if the new cr3 is a valid guest physical address. The problem is that with nested EPT, cr3 is an *L2* physical address, not an L1 physical address as this test expects.
As the comment above this test explains, it isn't necessary, and doesn't correspond to anything a real processor would do. So this patch removes it.
Note that this wrong test could have also theoretically caused problems in nested NPT, not just in nested EPT. However, in practice, the problem was avoided: nested_svm_vmexit()/vmrun() do not call kvm_set_cr3 in the nested NPT case, and instead set the vmcb (and arch.cr3) directly, thus circumventing the problem. Additional potential calls to the buggy function are avoided in that we don't trap cr3 modifications when nested NPT is enabled. However, because in nested VMX we did want to use kvm_set_cr3() (as requested in Avi Kivity's review of the original nested VMX patches), we can't avoid this problem and need to fix it.
--- arch/x86/kvm/x86.c | 11 ----------- 1 file changed, 11 deletions(-)
arch/x86/kvm/x86.c +0 -11
@@ -683,17 +683,6 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)*/ } -/* -* Does the new cr3 value map to physical memory? (Note, we -* catch an invalid cr3 even in real-mode, because it would -* cause trouble later on when we turn on paging anyway.) -* -* A real CPU would silently accept an invalid cr3 and would -* attempt to use it - with largely undefined (and often hard -* to debug) behavior on the guest side. -*/ -if (unlikely (!gfn_to_memslot (vcpu->kvm, cr3 >>PAGE_SHIFT ))) -return 1 ; vcpu->arch.cr3 = cr3;__set_bit (VCPU_EXREG_CR3 , (ulong *)&vcpu->arch.regs_avail); vcpu->arch.mmu.new_cr3 (vcpu);
Signature · 1 line
1.8.1.2
Paolo Bonzini
maintainerRe: [PATCH v3 07/13] nEPT: Fix wrong test in kvm_set_cr3
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 9 lines
From: Nadav Har'El <[email protected]>
kvm_set_cr3()attempts to check if the new cr3 is a valid guest physical address. The problem is that with nested EPT, cr3 is an *L2* physical address, not an L1 physical address as this test expects.As the comment above this test explains, it isn't necessary, and doesn't correspond to anything a real processor would do. So this patch removes it.
Quoted 9 lines
Note that this wrong test could have also theoretically caused problems in nested NPT, not just in nested EPT. However, in practice, the problem was avoided: nested_svm_vmexit()/vmrun() do not call
kvm_set_cr3in the nested NPT case, and instead set the vmcb (and arch.cr3) directly, thus circumventing the problem. Additional potential calls to the buggy function are avoided in that we don't trap cr3 modifications when nested NPT is enabled. However, because in nested VMX we did want to usekvm_set_cr3()(as requested in Avi Kivity's review of the original nested VMX patches), we can't avoid this problem and need to fix it
Makes sense, but did you test what happens (without nesting, and both with/without EPT) if L1 points CR3 at an invalid physical address? Does a basic level of sanity remain?
Paolo
PATCH v3 8/13 nEPT: Some additional comments
In reply to Jun NakajimaFrom: Nadav Har'El <[email protected]>
Some additional comments to preexisting code:
Explain who (L0 or L1) handles EPT violation and misconfiguration exits. Don't mention "shadow on either EPT or shadow" as the only two options.
--- arch/x86/kvm/vmx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/x86/kvm/vmx.c +13 -0
@@ -6540,7 +6540,20 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)return nested_cpu_has2 (vmcs12,SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES );case EXIT_REASON_EPT_VIOLATION : +/* +* L0 always deals with the EPT violation. If nested EPT is +* used, and the nested mmu code discovers that the address is +* missing in the guest EPT table (EPT12), the EPT violation +* will be injected with nested_ept_inject_page_fault() +*/ +return 0 ;case EXIT_REASON_EPT_MISCONFIG : +/* +* L2 never uses directly L1's EPT, but rather L0's own EPT +* table (shadow on EPT) or a merged EPT table that L0 built +* (EPT on EPT). So any problems with the structure of the +* table is L0's fault. +*/ return 0 ;case EXIT_REASON_PREEMPTION_TIMER : return vmcs12->pin_based_vm_exec_control &
Signature · 1 line
1.8.1.2
Re: [PATCH v3 08/13] nEPT: Some additional comments
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 29 lines
From: Nadav Har'El <[email protected]>
Some additional comments to preexisting code:
Explain who (L0 or L1) handles EPT violation and misconfiguration exits. Don't mention "shadow on either EPT or shadow" as the only two options.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)arch/x86/kvm/vmx.c +7
-0@@ -6540,7 +6540,20 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)return nested_cpu_has2 (vmcs12,SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES );case EXIT_REASON_EPT_VIOLATION : +/* +* L0 always deals with the EPT violation. If nested EPT is +* used, and the nested mmu code discovers that the address is +* missing in the guest EPT table (EPT12), the EPT violation +* will be injected with nested_ept_inject_page_fault() +*/ +return 0 ;
arch/x86/kvm/vmx.c static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu) · line 6559
Quoted 10 lines
arch/x86/kvm/vmx.c +6
-0case EXIT_REASON_EPT_MISCONFIG : +/* +* L2 never uses directly L1's EPT, but rather L0's own EPT +* table (shadow on EPT) or a merged EPT table that L0 built +* (EPT on EPT). So any problems with the structure of the +* table is L0's fault. +*/ return 0 ;case EXIT_REASON_PREEMPTION_TIMER : return vmcs12->pin_based_vm_exec_control &
PATCH v3 9/13 nEPT: Advertise EPT to L1
In reply to Jun NakajimaFrom: Nadav Har'El <[email protected]>
Advertise the support of EPT to the L1 guest, through the appropriate MSR.
This is the last patch of the basic Nested EPT feature, so as to allow bisection through this patch series: The guest will not see EPT support until this last patch, and will not attempt to use the half-applied feature.
--- arch/x86/include/asm/vmx.h | 2 ++ arch/x86/kvm/vmx.c | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
arch/x86/include/asm/vmx.h +2 -0
@@ -394,7 +394,9 @@ enum vmcs_field {#define VMX_EPTP_WB_BIT (1ull << 14)#define VMX_EPT_2MB_PAGE_BIT (1ull << 16)#define VMX_EPT_1GB_PAGE_BIT (1ull << 17) +#define VMX_EPT_INVEPT_BIT (1ull << 20)#define VMX_EPT_AD_BIT (1ull << 21) +#define VMX_EPT_EXTENT_INDIVIDUAL_BIT (1ull << 24)#define VMX_EPT_EXTENT_CONTEXT_BIT (1ull << 25)#define VMX_EPT_EXTENT_GLOBAL_BIT (1ull << 26)
arch/x86/kvm/vmx.c +15 -2
@@ -2155,6 +2155,7 @@ static u32 nested_vmx_pinbased_ctls_low, nested_vmx_pinbased_ctls_high;static u32 nested_vmx_exit_ctls_low, nested_vmx_exit_ctls_high;static u32 nested_vmx_entry_ctls_low, nested_vmx_entry_ctls_high;static u32 nested_vmx_misc_low, nested_vmx_misc_high; +static u32 nested_vmx_ept_caps;static __init void nested_vmx_setup_ctls_msrs (void ) {/*
@@ -2242,6 +2243,18 @@ static __init void nested_vmx_setup_ctls_msrs(void)SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |SECONDARY_EXEC_WBINVD_EXITING ; +if (enable_ept) { +/* nested EPT: emulate EPT also to L1 */ + nested_vmx_secondary_ctls_high |=SECONDARY_EXEC_ENABLE_EPT ; + nested_vmx_ept_caps =VMX_EPT_PAGE_WALK_4_BIT ; + nested_vmx_ept_caps |= +VMX_EPT_INVEPT_BIT |VMX_EPT_EXTENT_GLOBAL_BIT | +VMX_EPT_EXTENT_CONTEXT_BIT | +VMX_EPT_EXTENT_INDIVIDUAL_BIT ; + nested_vmx_ept_caps &= vmx_capability.ept; + }else + nested_vmx_ept_caps =0 ; +/* miscellaneous data */ rdmsr (MSR_IA32_VMX_MISC , nested_vmx_misc_low, nested_vmx_misc_high); nested_vmx_misc_low &= VMX_MISC_PREEMPTION_TIMER_RATE_MASK |
@@ -2347,8 +2360,8 @@ static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) nested_vmx_secondary_ctls_high);break ;case MSR_IA32_VMX_EPT_VPID_CAP : -/* Currently, no nested ept or nested vpid */ - *pdata =0 ; +/* Currently, no nested vpid support */ + *pdata = nested_vmx_ept_caps;break ;default :return 0 ;
Signature · 1 line
1.8.1.2
Paolo Bonzini
maintainerRe: [PATCH v3 09/13] nEPT: Advertise EPT to L1
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 8 lines
From: Nadav Har'El <[email protected]>
Advertise the support of EPT to the L1 guest, through the appropriate MSR.
This is the last patch of the basic Nested EPT feature, so as to allow bisection through this patch series: The guest will not see EPT support until this last patch, and will not attempt to use the half-applied feature.
Quoted 7 lines
Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/include/asm/vmx.h | 2 ++ arch/x86/kvm/vmx.c | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
This patch is ok, but it must be placed after patch 10 ("nEPT: Nested INVEPT").
Paolo
Quoted 57 lines
arch/x86/include/asm/vmx.h +2
-0@@ -394,7 +394,9 @@ enum vmcs_field {#define VMX_EPTP_WB_BIT (1ull << 14)#define VMX_EPT_2MB_PAGE_BIT (1ull << 16)#define VMX_EPT_1GB_PAGE_BIT (1ull << 17) +#define VMX_EPT_INVEPT_BIT (1ull << 20)#define VMX_EPT_AD_BIT (1ull << 21) +#define VMX_EPT_EXTENT_INDIVIDUAL_BIT (1ull << 24)#define VMX_EPT_EXTENT_CONTEXT_BIT (1ull << 25)#define VMX_EPT_EXTENT_GLOBAL_BIT (1ull << 26)arch/x86/kvm/vmx.c +15
-2@@ -2155,6 +2155,7 @@ static u32 nested_vmx_pinbased_ctls_low, nested_vmx_pinbased_ctls_high;static u32 nested_vmx_exit_ctls_low, nested_vmx_exit_ctls_high;static u32 nested_vmx_entry_ctls_low, nested_vmx_entry_ctls_high;static u32 nested_vmx_misc_low, nested_vmx_misc_high; +static u32 nested_vmx_ept_caps;static __init void nested_vmx_setup_ctls_msrs (void ) {/* @@ -2242,6 +2243,18 @@ static __init void nested_vmx_setup_ctls_msrs(void)SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |SECONDARY_EXEC_WBINVD_EXITING ; +if (enable_ept) { +/* nested EPT: emulate EPT also to L1 */ + nested_vmx_secondary_ctls_high |=SECONDARY_EXEC_ENABLE_EPT ; + nested_vmx_ept_caps =VMX_EPT_PAGE_WALK_4_BIT ; + nested_vmx_ept_caps |= +VMX_EPT_INVEPT_BIT |VMX_EPT_EXTENT_GLOBAL_BIT | +VMX_EPT_EXTENT_CONTEXT_BIT | +VMX_EPT_EXTENT_INDIVIDUAL_BIT ; + nested_vmx_ept_caps &= vmx_capability.ept; + }else + nested_vmx_ept_caps =0 ; +/* miscellaneous data */ rdmsr (MSR_IA32_VMX_MISC , nested_vmx_misc_low, nested_vmx_misc_high); nested_vmx_misc_low &= VMX_MISC_PREEMPTION_TIMER_RATE_MASK |@@ -2347,8 +2360,8 @@ static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) nested_vmx_secondary_ctls_high);break ;case MSR_IA32_VMX_EPT_VPID_CAP : -/* Currently, no nested ept or nested vpid */ - *pdata =0 ; +/* Currently, no nested vpid support */ + *pdata = nested_vmx_ept_caps;break ;default :return 0 ;
PATCH v3 10/13 nEPT: Nested INVEPT
In reply to Jun NakajimaFrom: Nadav Har'El <[email protected]>
If we let L1 use EPT, we should probably also support the INVEPT instruction.
In our current nested EPT implementation, when L1 changes its EPT table for L2 (i.e., EPT12), L0 modifies the shadow EPT table (EPT02), and in the course of this modification already calls INVEPT. Therefore, when L1 calls INVEPT, we don't really need to do anything. In particular we *don't* need to call the real INVEPT again. All we do in our INVEPT is verify the validity of the call, and its parameters, and then do nothing.
In KVM Forum 2010, Dong et al. presented "Nested Virtualization Friendly KVM" and classified our current nested EPT implementation as "shadow-like virtual EPT". He recommended instead a different approach, which he called "VTLB-like virtual EPT". If we had taken that alternative approach, INVEPT would have had a bigger role: L0 would only rebuild the shadow EPT table when L1 calls INVEPT.
--- arch/x86/include/uapi/asm/vmx.h | 1 + arch/x86/kvm/vmx.c | 83 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+)
arch/x86/include/uapi/asm/vmx.h +1 -0
@@ -65,6 +65,7 @@#define EXIT_REASON_EOI_INDUCED 45#define EXIT_REASON_EPT_VIOLATION 48#define EXIT_REASON_EPT_MISCONFIG 49 +#define EXIT_REASON_INVEPT 50#define EXIT_REASON_PREEMPTION_TIMER 52#define EXIT_REASON_WBINVD 54#define EXIT_REASON_XSETBV 55
arch/x86/kvm/vmx.c +83 -0
101 lines not on this page · raw message
Signature · 1 line
1.8.1.2
Paolo Bonzini
maintainerRe: [PATCH v3 10/13] nEPT: Nested INVEPT
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 4 lines
arch/x86/kvm/vmx.c +4
-0+switch (type) { +case VMX_EPT_EXTENT_GLOBAL : +if (!(nested_vmx_ept_caps &VMX_EPT_EXTENT_GLOBAL_BIT )) + nested_vmx_failValid(vcpu,
arch/x86/kvm/vmx.c static int handle_vmptrst(struct kvm_vcpu *vcpu) · line 6307
Quoted 10 lines
arch/x86/kvm/vmx.c +10
-0+ VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID); + else { +/* +* Do nothing: when L1 changes EPT12, we already +* update EPT02 (the shadow EPT table) and call INVEPT. +* So when L1 calls INVEPT, there's nothing left to do. +*/ +nested_vmx_succeed (vcpu); + } +break ;
Duplicate code:
switch (type) {
case VMX_EPT_EXTENT_GLOBAL
ok = (nested_vmx_ept_caps & VMX_EPT_EXTENT_GLOBAL_BIT) != 0;
break;
...
default:
ok = false;
break;
}
if (ok) {
/* Do nothing: ... */
nested_vmx_succeed(vcpu);
} else {
nested_vmx_failValid(vcpu, ...);
}
break;Paolo
Quoted 21 lines
arch/x86/kvm/vmx.c +21
-0+case VMX_EPT_EXTENT_CONTEXT : +if (!(nested_vmx_ept_caps &VMX_EPT_EXTENT_CONTEXT_BIT )) +nested_vmx_failValid (vcpu, +VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID ); +else { +/* Do nothing */ +nested_vmx_succeed (vcpu); + } +break ; +case VMX_EPT_EXTENT_INDIVIDUAL_ADDR : +if (!(nested_vmx_ept_caps &VMX_EPT_EXTENT_INDIVIDUAL_BIT )) +nested_vmx_failValid (vcpu, +VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID ); +else { +/* Do nothing */ +nested_vmx_succeed (vcpu); + } +break ; +default : +nested_vmx_failValid (vcpu, +VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID );
Re: [PATCH v3 10/13] nEPT: Nested INVEPT
In reply to Jun NakajimaQuoted 6 lines · Jun Nakajima
From: Nadav Har'El <[email protected]>
If we let L1 use EPT, we should probably also support the INVEPT instruction.
In our current nested EPT implementation, when L1 changes its EPT table for L2 (i.e., EPT12), L0 modifies the shadow EPT table (EPT02), and in the course
Hmm?
L0 can not always intercept L1's changes due to unsync shadow pages...
Quoted 2 lines
of this modification already calls INVEPT. Therefore, when L1 calls INVEPT, we don't really need to do anything. In particular we *don't* need to call
So, i can not understand why we need not handle INVEPT.
PATCH v3 11/13 nEPT: Miscelleneous cleanups
In reply to Jun NakajimaFrom: Nadav Har'El <[email protected]>
Some trivial code cleanups not really related to nested EPT.
--- arch/x86/kvm/vmx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/kvm/vmx.c +2 -4
@@ -714,7 +714,6 @@ static void nested_release_page_clean(struct page *page)static u64 construct_eptp (unsigned long root_hpa);static void kvm_cpu_vmxon (u64 addr);static void kvm_cpu_vmxoff (void ); -static void vmx_set_cr3 (struct kvm_vcpu *vcpu,unsigned long cr3);static int vmx_set_tss_addr (struct kvm *kvm,unsigned int addr);static void vmx_set_segment (struct kvm_vcpu *vcpu,struct kvm_segment *var,int seg);
@@ -1039,8 +1038,7 @@ static inline bool nested_cpu_has2(struct vmcs12 *vmcs12, u32 bit) (vmcs12->secondary_vm_exec_control & bit); } -static inline bool nested_cpu_has_virtual_nmis (struct vmcs12 *vmcs12, -struct kvm_vcpu *vcpu) +static inline bool nested_cpu_has_virtual_nmis (struct vmcs12 *vmcs12) {return vmcs12->pin_based_vm_exec_control &PIN_BASED_VIRTUAL_NMIS ; }
@@ -6737,7 +6735,7 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)if (unlikely (!cpu_has_virtual_nmis () && vmx->soft_vnmi_blocked && !(is_guest_mode (vcpu) &&nested_cpu_has_virtual_nmis ( -get_vmcs12 (vcpu), vcpu)))) { +get_vmcs12 (vcpu))))) {if (vmx_interrupt_allowed (vcpu)) { vmx->soft_vnmi_blocked =0 ; } else if (vmx->vnmi_blocked_time > 1000000000LL &&
Signature · 1 line
1.8.1.2
PATCH v3 12/13 nEPT: Move is_rsvd_bits_set() to paging_tmpl.h
In reply to Jun NakajimaMove is_rsvd_bits_set() to paging_tmpl.h so that it can be used to check reserved bits in EPT page table entries as well.
--- arch/x86/kvm/mmu.c | 8 -------- arch/x86/kvm/paging_tmpl.h | 12 ++++++++++-- 2 files changed, 10 insertions(+), 10 deletions(-)
arch/x86/kvm/mmu.c +0 -8
@@ -2468,14 +2468,6 @@ static void nonpaging_new_cr3(struct kvm_vcpu *vcpu)mmu_free_roots (vcpu); } -static bool is_rsvd_bits_set (struct kvm_mmu *mmu,u64 gpte,int level) -{ -int bit7; - - bit7 = (gpte >>7 ) &1 ; -return (gpte & mmu->rsvd_bits_mask[bit7][level-1 ]) !=0 ; -} -static pfn_t pte_prefetch_gfn_to_pfn (struct kvm_vcpu *vcpu,gfn_t gfn,bool no_dirty_log) {
arch/x86/kvm/paging_tmpl.h +10 -2
@@ -124,11 +124,19 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, }#endif +static bool FNAME (is_rsvd_bits_set )(struct kvm_mmu *mmu,u64 gpte,int level) +{ +int bit7; + + bit7 = (gpte >>7 ) &1 ; +return (gpte & mmu->rsvd_bits_mask[bit7][level-1 ]) !=0 ; +} +static bool FNAME (prefetch_invalid_gpte )(struct kvm_vcpu *vcpu,struct kvm_mmu_page *sp,u64 *spte,u64 gpte) { -if (is_rsvd_bits_set (&vcpu->arch.mmu, gpte,PT_PAGE_TABLE_LEVEL )) +if (FNAME (is_rsvd_bits_set)(&vcpu->arch.mmu, gpte,PT_PAGE_TABLE_LEVEL )) goto no_present;if (!is_present_gpte (gpte))
@@ -279,7 +287,7 @@ retry_walk:if (unlikely (!is_present_gpte (pte))) goto error; -if (unlikely (is_rsvd_bits_set (&vcpu->arch.mmu, pte, +if (unlikely (FNAME (is_rsvd_bits_set)(&vcpu->arch.mmu, pte, walker->level))) { errcode |=PFERR_RSVD_MASK |PFERR_PRESENT_MASK ; goto error;
Signature · 1 line
1.8.1.2
PATCH v3 13/13 nEPT: Inject EPT violation/misconfigration
In reply to Jun NakajimaAdd code to detect EPT misconfiguration and inject it to L1 VMM. Also, it injects more correct exit qualification upon EPT violation to L1 VMM. Now L1 can correctly go to ept_misconfig handler (instead of wrongly going to fast_page_fault), it will try to handle mmio page fault, if failed, it is a real EPT misconfiguration.
--- arch/x86/include/asm/kvm_host.h | 4 +++ arch/x86/kvm/mmu.c | 5 --- arch/x86/kvm/mmu.h | 5 +++ arch/x86/kvm/paging_tmpl.h | 26 ++++++++++++++ arch/x86/kvm/vmx.c | 79 +++++++++++++++++++++++++++++++++++++++-- 5 files changed, 111 insertions(+), 8 deletions(-)
arch/x86/include/asm/kvm_host.h +4 -0
@@ -262,6 +262,8 @@ struct kvm_mmu {void (*invlpg)(struct kvm_vcpu *vcpu,gva_t gva);void (*update_pte)(struct kvm_vcpu *vcpu,struct kvm_mmu_page *sp,u64 *spte,const void *pte); +bool (*check_tdp_pte)(u64 pte,int level); +hpa_t root_hpa;int root_level;int shadow_root_level;
@@ -503,6 +505,8 @@ struct kvm_vcpu_arch {* instruction. */ bool write_fault_to_shadow_pgtable; + +unsigned long exit_qualification;/* set at EPT violation at this point */ };struct kvm_lpage_info {
arch/x86/kvm/mmu.c +0 -5
@@ -233,11 +233,6 @@ static bool set_mmio_spte(u64 *sptep, gfn_t gfn, pfn_t pfn, unsigned access)return false; } -static inline u64 rsvd_bits (int s,int e) -{ -return ((1ULL << (e - s +1 )) -1 ) << s; -} -void kvm_mmu_set_mask_ptes (u64 user_mask,u64 accessed_mask,u64 dirty_mask,u64 nx_mask,u64 x_mask) {
arch/x86/kvm/mmu.h +5 -0
@@ -88,6 +88,11 @@ static inline bool is_write_protection(struct kvm_vcpu *vcpu)return kvm_read_cr0_bits (vcpu,X86_CR0_WP ); } +static inline u64 rsvd_bits (int s,int e) +{ +return ((1ULL << (e - s +1 )) -1 ) << s; +} +/* * Will a fault with a given page-fault error code (pfec) cause a permission * fault with the given access (in ACC_* format)?
arch/x86/kvm/paging_tmpl.h +26 -0
@@ -126,10 +126,14 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,static bool FNAME (is_rsvd_bits_set )(struct kvm_mmu *mmu,u64 gpte,int level) { +#if PTTYPE ==PTTYPE_EPT +return (mmu->check_tdp_pte (gpte, level)); +#else int bit7; bit7 = (gpte >>7 ) &1 ;return (gpte & mmu->rsvd_bits_mask[bit7][level-1 ]) !=0 ; +#endif } static bool FNAME(prefetch_invalid_gpte)(struct kvm_vcpu *vcpu,
@@ -352,6 +356,28 @@ error: walker->fault.vector =PF_VECTOR ; walker->fault.error_code_valid = true; walker->fault.error_code = errcode; + +#if PTTYPE ==PTTYPE_EPT +/* +* Use PFERR_RSVD_MASK in erorr_code to to tell if EPT +* misconfiguration requires to be injected. The detection is +* done by is_rsvd_bits_set() above. +* +* We set up the value of exit_qualification to inject: +* [2:0] -- Derive from [2:0] of real exit_qualification at EPT violation +* [5:3] -- Calculated by the page walk of the guest EPT page tables +* [7:8] -- Clear to 0. +* +* The other bits are set to 0. +*/ +if (!(errcode &PFERR_RSVD_MASK )) { +unsigned long exit_qualification = vcpu->arch.exit_qualification; + + pte_access = pt_access & pte; + vcpu->arch.exit_qualification = ((pte_access &0x7 ) <<3 ) | + (exit_qualification &0x7 ); + } +#endif walker->fault.address = addr; walker->fault.nested_page_fault = mmu != vcpu->arch.walk_mmu;
arch/x86/kvm/vmx.c +76 -3
106 lines not on this page · raw message
Signature · 1 line
1.8.1.2
Paolo Bonzini
maintainerRe: [PATCH v3 13/13] nEPT: Inject EPT violation/misconfigration
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
arch/x86/kvm/vmx.c static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu, · line 7445
Quoted 4 lines
arch/x86/kvm/vmx.c +0
-0@@ -7441,10 +7443,81 @@ static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu,* Note no need to set vmcs12->vm_exit_reason as it is already copied * from vmcs02 in nested_vmx_vmexit() above, i.e., EPT_VIOLATION. */
This comment is now wrong.
arch/x86/kvm/vmx.c static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu, · line 7444
Quoted 1 line
arch/x86/kvm/vmx.c +0
-1- vmcs12->exit_qualification = fault->error_code;
And this shows that patch 5 ("nEPT: MMU context for nested EPT") was wrong in this respect. Perhaps this patch should be moved earlier in the series, so that the exit qualification is "bisectably" ok.
1) the updating of exit_qualification in walk_addr_generic should be split out and moved before patch 5;
2) the changes to handle_ept_violation and nested_ept_inject_page_fault (plus fixing the above comment) should also be split out, this time to squash them in patch 5. These two changes ensure that patch 5 can already use the right exit qualification.
3) if needed to make the series bisectable, squash patch 12 into patch 2 and make is_rsvd_bits_set always return 0 in patch 3; then the rest of the handling of reserved bits (including the introduction of check_tdp_pte) will remain here. Otherwise, just squash what's left of
this patch into patch 12 and again change the subject. In either case
the subject will have to change.
Paolo
Quoted 9 lines
arch/x86/kvm/vmx.c +6
-0+if (fault->error_code &PFERR_RSVD_MASK ) + vmcs12->vm_exit_reason =EXIT_REASON_EPT_MISCONFIG ; +else + vmcs12->vm_exit_reason =EXIT_REASON_EPT_VIOLATION ; + + vmcs12->exit_qualification = vcpu->arch.exit_qualification; vmcs12->guest_physical_address = fault->address; }
Re: [PATCH v3 13/13] nEPT: Inject EPT violation/misconfigration
In reply to Jun NakajimaQuoted 77 lines · Jun Nakajima
Add code to detect EPT misconfiguration and inject it to L1 VMM. Also, it injects more correct exit qualification upon EPT violation to L1 VMM. Now L1 can correctly go to
ept_misconfighandler (instead of wrongly going tofast_page_fault), it will try to handle mmio page fault, if failed, it is a real EPT misconfiguration.Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/include/asm/kvm_host.h | 4 +++ arch/x86/kvm/mmu.c | 5 --- arch/x86/kvm/mmu.h | 5 +++ arch/x86/kvm/paging_tmpl.h | 26 ++++++++++++++ arch/x86/kvm/vmx.c | 79 +++++++++++++++++++++++++++++++++++++++-- 5 files changed, 111 insertions(+), 8 deletions(-)arch/x86/include/asm/kvm_host.h +4
-0@@ -262,6 +262,8 @@ struct kvm_mmu {void (*invlpg)(struct kvm_vcpu *vcpu,gva_t gva);void (*update_pte)(struct kvm_vcpu *vcpu,struct kvm_mmu_page *sp,u64 *spte,const void *pte); +bool (*check_tdp_pte)(u64 pte,int level); +hpa_t root_hpa;int root_level;int shadow_root_level;@@ -503,6 +505,8 @@ struct kvm_vcpu_arch {* instruction. */ bool write_fault_to_shadow_pgtable; + +unsigned long exit_qualification;/* set at EPT violation at this point */ };struct kvm_lpage_info {arch/x86/kvm/mmu.c +0
-5@@ -233,11 +233,6 @@ static bool set_mmio_spte(u64 *sptep, gfn_t gfn, pfn_t pfn, unsigned access)return false; } -static inline u64 rsvd_bits (int s,int e) -{ -return ((1ULL << (e - s +1 )) -1 ) << s; -} -void kvm_mmu_set_mask_ptes (u64 user_mask,u64 accessed_mask,u64 dirty_mask,u64 nx_mask,u64 x_mask) {arch/x86/kvm/mmu.h +5
-0@@ -88,6 +88,11 @@ static inline bool is_write_protection(struct kvm_vcpu *vcpu)return kvm_read_cr0_bits (vcpu,X86_CR0_WP ); } +static inline u64 rsvd_bits (int s,int e) +{ +return ((1ULL << (e - s +1 )) -1 ) << s; +} +/* * Will a fault with a given page-fault error code (pfec) cause a permission * fault with the given access (in ACC_* format)? arch/x86/kvm/paging_tmpl.h +0
-0@@ -126,10 +126,14 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,static bool FNAME (is_rsvd_bits_set )(struct kvm_mmu *mmu,u64 gpte,int level)
arch/x86/kvm/paging_tmpl.h static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, · line 137
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +4
-0{ +#if PTTYPE ==PTTYPE_EPT +return (mmu->check_tdp_pte (gpte, level)); +#else int bit7; bit7 = (gpte >>7 ) &1 ;return (gpte & mmu->rsvd_bits_mask[bit7][level-1 ]) !=0 ; +#endif }
It is better that set mmu->check_tdp_pte = is_rsvd_bits_set for the current modes, then this part can be moved to mmu.c
Quoted 18 lines
arch/x86/kvm/paging_tmpl.h +12
-0static bool FNAME(prefetch_invalid_gpte)(struct kvm_vcpu *vcpu,@@ -352,6 +356,28 @@ error: walker->fault.vector =PF_VECTOR ; walker->fault.error_code_valid = true; walker->fault.error_code = errcode; + +#if PTTYPE ==PTTYPE_EPT +/* +* Use PFERR_RSVD_MASK in erorr_code to to tell if EPT +* misconfiguration requires to be injected. The detection is +* done by is_rsvd_bits_set() above. +* +* We set up the value of exit_qualification to inject: +* [2:0] -- Derive from [2:0] of real exit_qualification at EPT violation +* [5:3] -- Calculated by the page walk of the guest EPT page tables +* [7:8] -- Clear to 0. +*
arch/x86/kvm/paging_tmpl.h error: · line 380
Quoted 10 lines
arch/x86/kvm/paging_tmpl.h +10
-0+* The other bits are set to 0. +*/ +if (!(errcode &PFERR_RSVD_MASK )) { +unsigned long exit_qualification = vcpu->arch.exit_qualification; + + pte_access = pt_access & pte; + vcpu->arch.exit_qualification = ((pte_access &0x7 ) <<3 ) | + (exit_qualification &0x7 ); + } +#endif
This specified operations can be move to nested_ept_inject_page_fault()?
Paolo Bonzini
maintainerIl 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 58 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
switch the EFER MSR when EPT is used and the host and guest have different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.To do this EFER switching, KVM uses VM_ENTRY/EXIT_LOAD_IA32_EFER if available, and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the former (the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02andload_vmcs12_host_state, respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So all that's left to do in this patch is to properly advertise this feature to L1.Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are emulated by L0, by using
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/x86/kvm/vmx.c +4
-5@@ -2192,7 +2192,8 @@ static __init void nested_vmx_setup_ctls_msrs(void)#else nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR ; + nested_vmx_exit_ctls_high |= (VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR | +VM_EXIT_LOAD_IA32_EFER );/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS,@@ -2201,8 +2202,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) nested_vmx_entry_ctls_low =VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR ; nested_vmx_entry_ctls_high &=VM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_IA32E_MODE ; - nested_vmx_entry_ctls_high |=VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR ; - + nested_vmx_entry_ctls_high |= (VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR | +VM_ENTRY_LOAD_IA32_EFER );/* cpu-based controls */ rdmsr (MSR_IA32_VMX_PROCBASED_CTLS , nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high);@@ -7492,10 +7493,18 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) vcpu->arch.cr0_guest_owned_bits &= ~vmcs12->cr0_guest_host_mask;vmcs_writel (CR0_GUEST_HOST_MASK , ~vcpu->arch.cr0_guest_owned_bits); -/* Note: IA32_MODE, LOAD_IA32_EFER are modified by vmx_set_efer below */ - vmcs_write32(VM_EXIT_CONTROLS,
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7503
Quoted 10 lines
arch/x86/kvm/vmx.c +8
-2- vmcs12->vm_exit_controls | vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls | +/* L2->L1 exit controls are emulated - the hardware exit is to L0 so +* we should use its exit controls. Note that IA32_MODE, LOAD_IA32_EFER +* bits are further modified by vmx_set_efer() below. +*/ +vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl); + +/* vmcs12's VM_ENTRY_LOAD_IA32_EFER and VM_ENTRY_IA32E_MODE are +* emulated by vmx_set_efer(), below.
VM_ENTRY_LOAD_IA32_EFER is not emulated by vmx_set_efer, so:
/* vmcs12's VM_ENTRY_LOAD_IA32_EFER and VM_ENTRY_IA32E_MODE
* are emulated below. VM_ENTRY_IA32E_MODE is handled in
* vmx_set_efer(). */
Paolo
Quoted 8 lines
arch/x86/kvm/vmx.c +4
-0+*/ +vmcs_write32 (VM_ENTRY_CONTROLS , + (vmcs12->vm_entry_controls & ~VM_ENTRY_LOAD_IA32_EFER & + ~VM_ENTRY_IA32E_MODE ) | (vmcs_config.vmentry_ctrl & ~VM_ENTRY_IA32E_MODE ));if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PAT )
Since this series is pending in mail list for long time. And it's really a big feature for Nested. Also, I doubt the original authors(Jun and Nahav)should not have enough time to continue it. So I will pick it up. :)
See comments below:
Paolo Bonzini wrote on 2013-05-20:
Quoted 71 lines
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 3 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since
http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
Quoted 6 lines
switch the EFER MSR when EPT is used and the host and guest have different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.
To do this EFER switching, KVM uses VM_ENTRY/EXIT_LOAD_IA32_EFER if
available,
Quoted 4 lines
and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the former (the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02and
load_vmcs12_host_state,Quoted 1 line
respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So
all
Quoted 3 lines
that's left to do in this patch is to properly advertise this feature to L1.
Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are emulated by L0, by
using
Quoted 15 lines
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/x86/kvm/vmx.c +0
-0arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 4 lines
arch/x86/kvm/vmx.c +0
-1@@ -2192,7 +2192,8 @@ static __init void nested_vmx_setup_ctls_msrs(void)#else nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+ nested_vmx_exit_ctls_high |=(
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2202
Quoted 6 lines
arch/x86/kvm/vmx.c +1
-0+ VM_EXIT_LOAD_IA32_EFER);/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS,@@ -2201,8 +2202,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) nested_vmx_entry_ctls_low =
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void)
Quoted 3 lines
arch/x86/kvm/vmx.c +0
-1nested_vmx_entry_ctls_high &=VM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_IA32E_MODE ; - nested_vmx_entry_ctls_high |=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2205
Quoted 2 lines
arch/x86/kvm/vmx.c +1
-1- + nested_vmx_entry_ctls_high |=(
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu,
Quoted 5 lines
arch/x86/kvm/vmx.c +1
-0+ VM_ENTRY_LOAD_IA32_EFER);/* cpu-based controls */ rdmsr (MSR_IA32_VMX_PROCBASED_CTLS , nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high);@@ -7492,10 +7493,18 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12)
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-0vcpu->arch.cr0_guest_owned_bits &= ~vmcs12->cr0_guest_host_mask; vmcs_writel(CR0_GUEST_HOST_MASK,~vcpu->arch.cr0_guest_owned_bits);
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-1-/* Note: IA32_MODE, LOAD_IA32_EFER are modified by vmx_set_efer below */
Quoted 8 lines
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7500
Quoted 8 lines
arch/x86/kvm/vmx.c +5
-3-vmcs_write32 (VM_EXIT_CONTROLS , - vmcs12->vm_exit_controls | vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls | +/* L2->L1 exit controls are emulated - the hardware exit is to L0 so +* we should use its exit controls. Note that IA32_MODE, LOAD_IA32_EFER +* bits are further modified by vmx_set_efer() below. +*/ +vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl);
This is wrong. We cannot use L0 exit control directly.LOAD_PERF_GLOBAL_CTRL, LOAD_HOST_EFE, LOAD_HOST_PAT, ACK_INTR_ON_EXIT should use host's exit control. But others, still need use (vmcs12|host).
Quoted 6 lines
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7501
Quoted 2 lines
arch/x86/kvm/vmx.c +2
-0+ +/* vmcs12's VM_ENTRY_LOAD_IA32_EFER and VM_ENTRY_IA32E_MODE are
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7503
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+* emulated by vmx_set_efer(), below.
VM_ENTRY_LOAD_IA32_EFERis not emulated byvmx_set_efer, so:
VM_ENTRY_LOAD_IA32_EFER is hanlded in setup_msrs(), and vmx_set_efer already call it.
Quoted 13 lines
/* vmcs12's
VM_ENTRY_LOAD_IA32_EFERandVM_ENTRY_IA32E_MODE
* are emulated below.VM_ENTRY_IA32E_MODEis handled in
*vmx_set_efer(). */Paolo
Quoted 6 lines
arch/x86/kvm/vmx.c +4
-0+*/ +vmcs_write32 (VM_ENTRY_CONTROLS , + (vmcs12->vm_entry_controls & ~VM_ENTRY_LOAD_IA32_EFER & + ~VM_ENTRY_IA32E_MODE ) | (vmcs_config.vmentry_ctrl & ~VM_ENTRY_IA32E_MODE ));
Quoted 7 lines
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7510
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-0if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PAT )--
To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Best regards,
Yang
Quoted 76 lines · Yang Z
Since this series is pending in mail list for long time. And it's really a big feature for Nested. Also, I doubt the original authors(Jun and Nahav)should not have enough time to continue it. So I will pick it up. :)
See comments below:
Paolo Bonzini wrote on 2013-05-20:
Quoted 71 lines
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 3 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since
http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
Quoted 6 lines
switch the EFER MSR when EPT is used and the host and guest have different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.
To do this EFER switching, KVM uses VM_ENTRY/EXIT_LOAD_IA32_EFER if
available,
Quoted 4 lines
and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the former (the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02and
load_vmcs12_host_state,Quoted 1 line
respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So
all
Quoted 3 lines
that's left to do in this patch is to properly advertise this feature to L1.
Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are emulated by L0, by
using
Quoted 15 lines
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/x86/kvm/vmx.c +0
-0arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 4 lines
arch/x86/kvm/vmx.c +0
-1@@ -2192,7 +2192,8 @@ static __init void nested_vmx_setup_ctls_msrs(void)#else nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+ nested_vmx_exit_ctls_high |=(
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2202
Quoted 6 lines
arch/x86/kvm/vmx.c +1
-0+ VM_EXIT_LOAD_IA32_EFER);/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS,@@ -2201,8 +2202,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) nested_vmx_entry_ctls_low =
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void)
Quoted 3 lines
arch/x86/kvm/vmx.c +0
-1nested_vmx_entry_ctls_high &=VM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_IA32E_MODE ; - nested_vmx_entry_ctls_high |=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2205
Quoted 2 lines
arch/x86/kvm/vmx.c +1
-1- + nested_vmx_entry_ctls_high |=(
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu,
Quoted 5 lines
arch/x86/kvm/vmx.c +1
-0+ VM_ENTRY_LOAD_IA32_EFER);/* cpu-based controls */ rdmsr (MSR_IA32_VMX_PROCBASED_CTLS , nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high);@@ -7492,10 +7493,18 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12)
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-0vcpu->arch.cr0_guest_owned_bits &= ~vmcs12->cr0_guest_host_mask; vmcs_writel(CR0_GUEST_HOST_MASK,~vcpu->arch.cr0_guest_owned_bits);
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-1-/* Note: IA32_MODE, LOAD_IA32_EFER are modified by vmx_set_efer below */
Quoted 11 lines
Quoted 8 lines
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7500
Quoted 8 lines
arch/x86/kvm/vmx.c +5
-3-vmcs_write32 (VM_EXIT_CONTROLS , - vmcs12->vm_exit_controls | vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls | +/* L2->L1 exit controls are emulated - the hardware exit is to L0 so +* we should use its exit controls. Note that IA32_MODE, LOAD_IA32_EFER +* bits are further modified by vmx_set_efer() below. +*/ +vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl);This is wrong. We cannot use L0 exit control directly.
LOAD_PERF_GLOBAL_CTRL,LOAD_HOST_EFE,LOAD_HOST_PAT,ACK_INTR_ON_EXITshould use host's exit control. But others, still need use (vmcs12|host).
I do not see why. We always intercept DR7/PAT/EFER, so save is emulated too. Host address space size always come from L0 and preemption timer is not supported for nested IIRC and when it will be host will have to save it on exit anyway for correct emulation.
Quoted 29 lines
Quoted 6 lines
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7501
Quoted 2 lines
arch/x86/kvm/vmx.c +2
-0+ +/* vmcs12's VM_ENTRY_LOAD_IA32_EFER and VM_ENTRY_IA32E_MODE are
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7503
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+* emulated by vmx_set_efer(), below.
VM_ENTRY_LOAD_IA32_EFERis not emulated byvmx_set_efer, so:
VM_ENTRY_LOAD_IA32_EFERis hanlded insetup_msrs(), andvmx_set_eferalready call it.Quoted 13 lines
/* vmcs12's
VM_ENTRY_LOAD_IA32_EFERandVM_ENTRY_IA32E_MODE
* are emulated below.VM_ENTRY_IA32E_MODEis handled in
*vmx_set_efer(). */Paolo
Quoted 6 lines
arch/x86/kvm/vmx.c +4
-0+*/ +vmcs_write32 (VM_ENTRY_CONTROLS , + (vmcs12->vm_entry_controls & ~VM_ENTRY_LOAD_IA32_EFER & + ~VM_ENTRY_IA32E_MODE ) | (vmcs_config.vmentry_ctrl & ~VM_ENTRY_IA32E_MODE ));Quoted 7 lines
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7510
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-0if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PAT )--
To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 3 lines
Best regards,
Yang
--
Gleb.
Quoted 88 lines · Gleb Natapov
Quoted 76 lines · Yang Z
Since this series is pending in mail list for long time. And it's really a big feature for Nested. Also, I doubt the original authors(Jun and Nahav)should not have enough time to continue it. So I will pick it up. :)
See comments below:
Paolo Bonzini wrote on 2013-05-20:
Quoted 71 lines
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 3 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since
http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
Quoted 6 lines
switch the EFER MSR when EPT is used and the host and guest have different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.
To do this EFER switching, KVM uses VM_ENTRY/EXIT_LOAD_IA32_EFER if
available,
Quoted 4 lines
and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the former (the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02and
load_vmcs12_host_state,Quoted 1 line
respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So
all
Quoted 3 lines
that's left to do in this patch is to properly advertise this feature to L1.
Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are emulated by L0, by
using
Quoted 15 lines
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/x86/kvm/vmx.c +0
-0arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 4 lines
arch/x86/kvm/vmx.c +0
-1@@ -2192,7 +2192,8 @@ static __init void nested_vmx_setup_ctls_msrs(void)#else nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+ nested_vmx_exit_ctls_high |=(
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2202
Quoted 6 lines
arch/x86/kvm/vmx.c +1
-0+ VM_EXIT_LOAD_IA32_EFER);/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS,@@ -2201,8 +2202,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) nested_vmx_entry_ctls_low =
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void)
Quoted 3 lines
arch/x86/kvm/vmx.c +0
-1nested_vmx_entry_ctls_high &=VM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_IA32E_MODE ; - nested_vmx_entry_ctls_high |=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2205
Quoted 2 lines
arch/x86/kvm/vmx.c +1
-1- + nested_vmx_entry_ctls_high |=(
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu,
Quoted 5 lines
arch/x86/kvm/vmx.c +1
-0+ VM_ENTRY_LOAD_IA32_EFER);/* cpu-based controls */ rdmsr (MSR_IA32_VMX_PROCBASED_CTLS , nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high);@@ -7492,10 +7493,18 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12)
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-0vcpu->arch.cr0_guest_owned_bits &= ~vmcs12->cr0_guest_host_mask; vmcs_writel(CR0_GUEST_HOST_MASK,~vcpu->arch.cr0_guest_owned_bits);
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-1-/* Note: IA32_MODE, LOAD_IA32_EFER are modified by vmx_set_efer below */
Quoted 11 lines
Quoted 8 lines
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7500
Quoted 8 lines
arch/x86/kvm/vmx.c +5
-3-vmcs_write32 (VM_EXIT_CONTROLS , - vmcs12->vm_exit_controls | vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls | +/* L2->L1 exit controls are emulated - the hardware exit is to L0 so +* we should use its exit controls. Note that IA32_MODE, LOAD_IA32_EFER +* bits are further modified by vmx_set_efer() below. +*/ +vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl);This is wrong. We cannot use L0 exit control directly.
LOAD_PERF_GLOBAL_CTRL,LOAD_HOST_EFE,LOAD_HOST_PAT,ACK_INTR_ON_EXITshould use host's exit control. But others, still need use (vmcs12|host).
Quoted 4 lines
I do not see why. We always intercept DR7/PAT/EFER, so save is emulated too. Host address space size always come from L0 and preemption timer is not supported for nested IIRC and when it will be host will have to save it on exit anyway for correct emulation.
Preemption timer is already supported and works fine as far as I tested. KVM doesn't use it for L1, so we do not need to save/restore it - IIRC.
Jan
Quoted 89 lines · Jan Kiszka
Quoted 88 lines · Gleb Natapov
Quoted 87 lines · Yang Z
Since this series is pending in mail list for long time. And it's really a big feature for Nested. Also, I doubt the original authors(Jun and Nahav)should not have enough time to continue it. So I will pick it up. :)
See comments below:
Paolo Bonzini wrote on 2013-05-20:
Quoted 71 lines
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 3 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since
http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
Quoted 6 lines
switch the EFER MSR when EPT is used and the host and guest have different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.
To do this EFER switching, KVM uses VM_ENTRY/EXIT_LOAD_IA32_EFER if
available,
Quoted 4 lines
and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the former (the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02and
load_vmcs12_host_state,Quoted 1 line
respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So
all
Quoted 3 lines
that's left to do in this patch is to properly advertise this feature to L1.
Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are emulated by L0, by
using
Quoted 15 lines
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/x86/kvm/vmx.c +0
-0arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 4 lines
arch/x86/kvm/vmx.c +0
-1@@ -2192,7 +2192,8 @@ static __init void nested_vmx_setup_ctls_msrs(void)#else nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+ nested_vmx_exit_ctls_high |=(
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2202
Quoted 6 lines
arch/x86/kvm/vmx.c +1
-0+ VM_EXIT_LOAD_IA32_EFER);/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS,@@ -2201,8 +2202,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) nested_vmx_entry_ctls_low =
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void)
Quoted 3 lines
arch/x86/kvm/vmx.c +0
-1nested_vmx_entry_ctls_high &=VM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_IA32E_MODE ; - nested_vmx_entry_ctls_high |=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2205
Quoted 2 lines
arch/x86/kvm/vmx.c +1
-1- + nested_vmx_entry_ctls_high |=(
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu,
Quoted 5 lines
arch/x86/kvm/vmx.c +1
-0+ VM_ENTRY_LOAD_IA32_EFER);/* cpu-based controls */ rdmsr (MSR_IA32_VMX_PROCBASED_CTLS , nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high);@@ -7492,10 +7493,18 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12)
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-0vcpu->arch.cr0_guest_owned_bits &= ~vmcs12->cr0_guest_host_mask; vmcs_writel(CR0_GUEST_HOST_MASK,~vcpu->arch.cr0_guest_owned_bits);
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-1-/* Note: IA32_MODE, LOAD_IA32_EFER are modified by vmx_set_efer below */
Quoted 8 lines
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7500
Quoted 8 lines
arch/x86/kvm/vmx.c +5
-3-vmcs_write32 (VM_EXIT_CONTROLS , - vmcs12->vm_exit_controls | vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls | +/* L2->L1 exit controls are emulated - the hardware exit is to L0 so +* we should use its exit controls. Note that IA32_MODE, LOAD_IA32_EFER +* bits are further modified by vmx_set_efer() below. +*/ +vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl);This is wrong. We cannot use L0 exit control directly.
LOAD_PERF_GLOBAL_CTRL,LOAD_HOST_EFE,LOAD_HOST_PAT,ACK_INTR_ON_EXITshould use host's exit control. But others, still need use (vmcs12|host).
Quoted 8 lines
Quoted 4 lines
I do not see why. We always intercept DR7/PAT/EFER, so save is emulated too. Host address space size always come from L0 and preemption timer is not supported for nested IIRC and when it will be host will have to save it on exit anyway for correct emulation.
Preemption timer is already supported and works fine as far as I tested. KVM doesn't use it for L1, so we do not need to save/restore it - IIRC.
So what happens if L1 configures it to value X after X/2 ticks L0 exit happen and L0 gets back to L2 directly. The counter will be X again instead of X/2.
--
Gleb.
Quoted 95 lines · Gleb Natapov
Quoted 94 lines · Jan Kiszka
Quoted 92 lines · Gleb Natapov
Quoted 76 lines · Yang Z
Since this series is pending in mail list for long time. And it's really a big feature for Nested. Also, I doubt the original authors(Jun and Nahav)should not have enough time to continue it. So I will pick it up. :)
See comments below:
Paolo Bonzini wrote on 2013-05-20:
Quoted 71 lines
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 3 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since
http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
Quoted 6 lines
switch the EFER MSR when EPT is used and the host and guest have different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.
To do this EFER switching, KVM uses VM_ENTRY/EXIT_LOAD_IA32_EFER if
available,
Quoted 4 lines
and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the former (the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02and
load_vmcs12_host_state,Quoted 1 line
respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So
all
Quoted 3 lines
that's left to do in this patch is to properly advertise this feature to L1.
Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are emulated by L0, by
using
Quoted 15 lines
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/x86/kvm/vmx.c +0
-0arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 4 lines
arch/x86/kvm/vmx.c +0
-1@@ -2192,7 +2192,8 @@ static __init void nested_vmx_setup_ctls_msrs(void)#else nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+ nested_vmx_exit_ctls_high |=(
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2202
Quoted 6 lines
arch/x86/kvm/vmx.c +1
-0+ VM_EXIT_LOAD_IA32_EFER);/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS,@@ -2201,8 +2202,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) nested_vmx_entry_ctls_low =
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void)
Quoted 3 lines
arch/x86/kvm/vmx.c +0
-1nested_vmx_entry_ctls_high &=VM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_IA32E_MODE ; - nested_vmx_entry_ctls_high |=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2205
Quoted 2 lines
arch/x86/kvm/vmx.c +1
-1- + nested_vmx_entry_ctls_high |=(
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu,
Quoted 5 lines
arch/x86/kvm/vmx.c +1
-0+ VM_ENTRY_LOAD_IA32_EFER);/* cpu-based controls */ rdmsr (MSR_IA32_VMX_PROCBASED_CTLS , nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high);@@ -7492,10 +7493,18 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12)
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-0vcpu->arch.cr0_guest_owned_bits &= ~vmcs12->cr0_guest_host_mask; vmcs_writel(CR0_GUEST_HOST_MASK,~vcpu->arch.cr0_guest_owned_bits);
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-1-/* Note: IA32_MODE, LOAD_IA32_EFER are modified by vmx_set_efer below */
Quoted 11 lines
Quoted 8 lines
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · line 7500
Quoted 8 lines
arch/x86/kvm/vmx.c +5
-3-vmcs_write32 (VM_EXIT_CONTROLS , - vmcs12->vm_exit_controls | vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls | +/* L2->L1 exit controls are emulated - the hardware exit is to L0 so +* we should use its exit controls. Note that IA32_MODE, LOAD_IA32_EFER +* bits are further modified by vmx_set_efer() below. +*/ +vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl);This is wrong. We cannot use L0 exit control directly.
LOAD_PERF_GLOBAL_CTRL,LOAD_HOST_EFE,LOAD_HOST_PAT,ACK_INTR_ON_EXITshould use host's exit control. But others, still need use (vmcs12|host).I do not see why. We always intercept DR7/PAT/EFER, so save is emulated too. Host address space size always come from L0 and preemption timer is not supported for nested IIRC and when it will be host will have to save it on exit anyway for correct emulation.
Quoted 6 lines
Quoted 3 lines
Preemption timer is already supported and works fine as far as I tested. KVM doesn't use it for L1, so we do not need to save/restore it - IIRC.
So what happens if L1 configures it to value X after X/2 ticks L0 exit happen and L0 gets back to L2 directly. The counter will be X again instead of X/2.
Likely. Yes, we need to improve our emulation by setting "Save VMX-preemption timer value" or emulate this in software if the hardware lacks support for it (was this flag introduced after the preemption timer itself?).
Jan
Quoted 99 lines · Jan Kiszka
Quoted 98 lines · Gleb Natapov
Quoted 97 lines · Jan Kiszka
Quoted 88 lines · Gleb Natapov
Quoted 76 lines · Yang Z
Since this series is pending in mail list for long time. And it's really a big feature for Nested. Also, I doubt the original authors(Jun and Nahav)should not have enough time to continue it. So I will pick it up. :)
See comments below:
Paolo Bonzini wrote on 2013-05-20:
Quoted 71 lines
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 3 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since
http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
Quoted 6 lines
switch the EFER MSR when EPT is used and the host and guest have different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.
To do this EFER switching, KVM uses VM_ENTRY/EXIT_LOAD_IA32_EFER if
available,
Quoted 4 lines
and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the former (the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02and
load_vmcs12_host_state,Quoted 1 line
respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So
all
Quoted 3 lines
that's left to do in this patch is to properly advertise this feature to L1.
Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are emulated by L0, by
using
Quoted 15 lines
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/x86/kvm/vmx.c +0
-0arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 4 lines
arch/x86/kvm/vmx.c +0
-1@@ -2192,7 +2192,8 @@ static __init void nested_vmx_setup_ctls_msrs(void)#else nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2195
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+ nested_vmx_exit_ctls_high |=(
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2202
Quoted 6 lines
arch/x86/kvm/vmx.c +1
-0+ VM_EXIT_LOAD_IA32_EFER);/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS,@@ -2201,8 +2202,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) nested_vmx_entry_ctls_low =
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2204
Quoted 3 lines
arch/x86/kvm/vmx.c +0
-1nested_vmx_entry_ctls_high &=VM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_IA32E_MODE ; - nested_vmx_entry_ctls_high |=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;arch/x86/kvm/vmx.c static __init void nested_vmx_setup_ctls_msrs(void) · line 2205
Quoted 2 lines
arch/x86/kvm/vmx.c +1
-1- + nested_vmx_entry_ctls_high |=(
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR|arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu,
Quoted 5 lines
arch/x86/kvm/vmx.c +1
-0+ VM_ENTRY_LOAD_IA32_EFER);/* cpu-based controls */ rdmsr (MSR_IA32_VMX_PROCBASED_CTLS , nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high);@@ -7492,10 +7493,18 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12)
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-0vcpu->arch.cr0_guest_owned_bits &= ~vmcs12->cr0_guest_host_mask; vmcs_writel(CR0_GUEST_HOST_MASK,~vcpu->arch.cr0_guest_owned_bits);
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7494
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-1-/* Note: IA32_MODE, LOAD_IA32_EFER are modified by vmx_set_efer below */
Quoted 11 lines
Quoted 8 lines
arch/x86/kvm/vmx.c static void prepare_vmcs02(struct kvm_vcpu *vcpu, · line 7499
Quoted 8 lines
arch/x86/kvm/vmx.c +5
-3-vmcs_write32 (VM_EXIT_CONTROLS , - vmcs12->vm_exit_controls | vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls | +/* L2->L1 exit controls are emulated - the hardware exit is to L0 so +* we should use its exit controls. Note that IA32_MODE, LOAD_IA32_EFER +* bits are further modified by vmx_set_efer() below. +*/ +vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl);This is wrong. We cannot use L0 exit control directly.
LOAD_PERF_GLOBAL_CTRL,LOAD_HOST_EFE,LOAD_HOST_PAT,ACK_INTR_ON_EXITshould use host's exit control. But others, still need use (vmcs12|host).Quoted 4 lines
I do not see why. We always intercept DR7/PAT/EFER, so save is emulated too. Host address space size always come from L0 and preemption timer is not supported for nested IIRC and when it will be host will have to save it on exit anyway for correct emulation.
Preemption timer is already supported and works fine as far as I tested. KVM doesn't use it for L1, so we do not need to save/restore it - IIRC.
Quoted 9 lines
Quoted 3 lines
So what happens if L1 configures it to value X after X/2 ticks L0 exit happen and L0 gets back to L2 directly. The counter will be X again instead of X/2.
Likely. Yes, we need to improve our emulation by setting "Save VMX-preemption timer value" or emulate this in software if the hardware lacks support for it (was this flag introduced after the preemption timer itself?).
Not sure, but my point was that for correct emulation host needs to set
"save preempt timer on vmexit" anyway so all VM_EXIT_CONTROLS are
indeed emulated as far as I see.
--
Gleb.
Gleb Natapov wrote on 2013-07-02:
Quoted 104 lines · Jan Kiszka
Quoted 54 lines · Gleb Natapov
Quoted 53 lines · Jan Kiszka
Quoted 52 lines · Gleb Natapov
Quoted 51 lines · Yang Z
Quoted 50 lines
Since this series is pending in mail list for long time. And it's really a big feature for Nested. Also, I doubt the original authors(Jun and Nahav)should not have enough time to continue it. So I will pick it up. :)
See comments below:
Paolo Bonzini wrote on 2013-05-20:
Quoted 42 lines
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 41 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since
http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
switch the EFER MSR when EPT is used and the host and guest have different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.To do this EFER switching, KVM uses VM_ENTRY/EXIT_LOAD_IA32_EFER if available, and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the former (the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02andload_vmcs12_host_state, respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So all that's left to do in this patch is to properly advertise this feature to L1.Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are emulated by L0, by using
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/x86/kvm/vmx.c index renamed from arch/x86/kvm/vmx.c +0
-0260a919..fb9cae5 100644
arch/x86/kvm/vmx.c +0
-0@@ -2192,7 +2192,8 @@ static __init void
nested_vmx_setup_ctls_msrs(void)#elsearch/x86/kvm/vmx.c +1
-1nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR ; + nested_vmx_exit_ctls_high |= (VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR| +
VM_EXIT_LOAD_IA32_EFER);Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
arch/x86/kvm/vmx.c
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-0/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS, @@ -2201,8 +2202,8@@ static
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 12 lines
__initvoidnested_vmx_setup_ctls_msrs(void)arch/x86/kvm/vmx.c +0
-1nested_vmx_entry_ctls_low =VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR ; nested_vmx_entry_ctls_high &=VM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_IA32E_MODE ; - nested_vmx_entry_ctls_high |=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR; -arch/x86/kvm/vmx.c +1
-0+ nested_vmx_entry_ctls_high |=(
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR| +VM_ENTRY_LOAD_IA32_EFER);arch/x86/kvm/vmx.c +0
-0/* cpu-based controls */ rdmsr(MSR_IA32_VMX_PROCBASED_CTLS, nested_vmx_procbased_ctls_low,Quoted 2 lines
nested_vmx_procbased_ctls_high); @@ -7492,10 +7493,18 @@ static void prepare_vmcs02(structkvm_vcpu*vcpu,struct vmcs12 *vmcs12)
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
vcpu->arch.cr0_guest_owned_bits&=
~vmcs12->cr0_guest_host_mask; vmcs_writel(CR0_GUEST_HOST_MASK,~vcpu->arch.cr0_guest_owned_bits);
arch/x86/kvm/vmx.c
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-1-/* Note: IA32_MODE, LOAD_IA32_EFER are modified by
vmx_set_eferQuoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 8 lines
below */
arch/x86/kvm/vmx.c
Quoted 7 lines
arch/x86/kvm/vmx.c +0
-1- vmcs_write32(VM_EXIT_CONTROLS, - vmcs12->vm_exit_controls |vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS,
vmcs12->vm_entry_controls| + /*L2->L1exit controls are
emulated - the hardware exit is +to L0 so + * we should use its
exit controls. Note thatIA32_MODE,LOAD_IA32_EFER+ * bits are
further modified byvmx_set_efer()below. + */arch/x86/kvm/vmx.c +1
-0+vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl);This is wrong. We cannot use L0 exit control directly.
LOAD_PERF_GLOBAL_CTRL,LOAD_HOST_EFE,LOAD_HOST_PAT,
ACK_INTR_ON_EXITshould use host's exit control. But others, still need use (vmcs12|host).Quoted 13 lines
Quoted 12 lines
Quoted 9 lines
Quoted 5 lines
Quoted 1 line
I do not see why. We always intercept DR7/PAT/EFER, so save is emulated too. Host address space size always come from L0 and preemption timer is not supported for nested IIRC and when it will be host will have to save it on exit anyway for correct emulation.
Preemption timer is already supported and works fine as far as I tested. KVM doesn't use it for L1, so we do not need to save/restore it - IIRC.
So what happens if L1 configures it to value X after X/2 ticks L0 exit happen and L0 gets back to L2 directly. The counter will be X again instead of X/2.
Quoted 9 lines
Quoted 5 lines
Likely. Yes, we need to improve our emulation by setting "Save VMX-preemption timer value" or emulate this in software if the hardware lacks support for it (was this flag introduced after the preemption timer itself?).
Not sure, but my point was that for correct emulation host needs to set "save preempt timer on vmexit" anyway so all
VM_EXIT_CONTROLSare indeed emulated as far as I see.
Ok, here is my summary, please correct me if I am wrong:
bit 2: Save debug controls, the first processor only support 1-setting on it, so just use host's setting is enough
bit 9: Host address space size, it indicate the host's state, so must use host's setting.
bit 12: Load IA32_PERF_GLOBAL_CTRL: same as above.
bit 15 : Acknowledge interrupt on exit: same as above.
bit 19: Load IA32_PAT: same as above.
bit 20: Load IA32_EFER: same as above.
bit 18: Save IA32_PAT, Didn't expose it to L1, so use host' setting is ok.
bit 19: Save IA32_EFER, same as above.
bit 22: Save VMXpreemption timer value, I don't see KVM expose it to L1, but Jan said it's working. Strange! And according gleb's suggestion, it better to always set it.
So, currently, only use host' exit_control for L2 is enough.
Best regards,
Yang
Quoted 110 lines · Yang Z
Gleb Natapov wrote on 2013-07-02:
Quoted 109 lines · Jan Kiszka
Quoted 54 lines · Gleb Natapov
Quoted 53 lines · Jan Kiszka
Quoted 52 lines · Gleb Natapov
Quoted 51 lines · Yang Z
Quoted 50 lines
Since this series is pending in mail list for long time. And it's really a big feature for Nested. Also, I doubt the original authors(Jun and Nahav)should not have enough time to continue it. So I will pick it up. :)
See comments below:
Paolo Bonzini wrote on 2013-05-20:
Quoted 42 lines
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 41 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since
http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
switch the EFER MSR when EPT is used and the host and guest have different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.To do this EFER switching, KVM uses VM_ENTRY/EXIT_LOAD_IA32_EFER if available, and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the former (the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02andload_vmcs12_host_state, respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So all that's left to do in this patch is to properly advertise this feature to L1.Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are emulated by L0, by using
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/x86/kvm/vmx.c index renamed from arch/x86/kvm/vmx.c +0
-0260a919..fb9cae5 100644
arch/x86/kvm/vmx.c +0
-0@@ -2192,7 +2192,8 @@ static __init void
nested_vmx_setup_ctls_msrs(void)#elsearch/x86/kvm/vmx.c +1
-1nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR ; + nested_vmx_exit_ctls_high |= (VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR| +
VM_EXIT_LOAD_IA32_EFER);Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
arch/x86/kvm/vmx.c
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-0/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS, @@ -2201,8 +2202,8@@ static
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 12 lines
__initvoidnested_vmx_setup_ctls_msrs(void)arch/x86/kvm/vmx.c +0
-1nested_vmx_entry_ctls_low =VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR ; nested_vmx_entry_ctls_high &=VM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_IA32E_MODE ; - nested_vmx_entry_ctls_high |=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR; -arch/x86/kvm/vmx.c +1
-0+ nested_vmx_entry_ctls_high |=(
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR| +VM_ENTRY_LOAD_IA32_EFER);arch/x86/kvm/vmx.c +0
-0/* cpu-based controls */ rdmsr(MSR_IA32_VMX_PROCBASED_CTLS, nested_vmx_procbased_ctls_low,Quoted 2 lines
nested_vmx_procbased_ctls_high); @@ -7492,10 +7493,18 @@ static void prepare_vmcs02(structkvm_vcpu*vcpu,struct vmcs12 *vmcs12)
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
vcpu->arch.cr0_guest_owned_bits&=
~vmcs12->cr0_guest_host_mask; vmcs_writel(CR0_GUEST_HOST_MASK,~vcpu->arch.cr0_guest_owned_bits);
arch/x86/kvm/vmx.c
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-1-/* Note: IA32_MODE, LOAD_IA32_EFER are modified by
vmx_set_eferQuoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 8 lines
below */
arch/x86/kvm/vmx.c
Quoted 7 lines
arch/x86/kvm/vmx.c +0
-1- vmcs_write32(VM_EXIT_CONTROLS, - vmcs12->vm_exit_controls |vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS,
vmcs12->vm_entry_controls| + /*L2->L1exit controls are
emulated - the hardware exit is +to L0 so + * we should use its
exit controls. Note thatIA32_MODE,LOAD_IA32_EFER+ * bits are
further modified byvmx_set_efer()below. + */arch/x86/kvm/vmx.c +1
-0+vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl);This is wrong. We cannot use L0 exit control directly.
LOAD_PERF_GLOBAL_CTRL,LOAD_HOST_EFE,LOAD_HOST_PAT,
ACK_INTR_ON_EXITshould use host's exit control. But others, still need use (vmcs12|host).Quoted 18 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 1 line
I do not see why. We always intercept DR7/PAT/EFER, so save is emulated too. Host address space size always come from L0 and preemption timer is not supported for nested IIRC and when it will be host will have to save it on exit anyway for correct emulation.
Quoted 6 lines
Quoted 3 lines
Preemption timer is already supported and works fine as far as I tested. KVM doesn't use it for L1, so we do not need to save/restore it - IIRC.
So what happens if L1 configures it to value X after X/2 ticks L0 exit happen and L0 gets back to L2 directly. The counter will be X again instead of X/2.
Likely. Yes, we need to improve our emulation by setting "Save VMX-preemption timer value" or emulate this in software if the hardware lacks support for it (was this flag introduced after the preemption timer itself?).
Quoted 6 lines
Quoted 4 lines
Not sure, but my point was that for correct emulation host needs to set "save preempt timer on vmexit" anyway so all
VM_EXIT_CONTROLSare indeed emulated as far as I see.Ok, here is my summary, please correct me if I am wrong:
bit 2: Save debug controls, the first processor only support 1-setting on it, so just use host's setting is enough
Not because first processor only supported 1-setting, but because L0 intercepts all changes to DR7 and DEBUGCTL MSR, so L2 cannot change them behind L0 back. If L1 asks to save them in vmcs12 L0 can do it during vmexit emulation.
Quoted 2 lines
bit 9: Host address space size, it indicate the host's state, so must use host's setting. bit 12: Load
IA32_PERF_GLOBAL_CTRL: same as above.
Not sure what "above" do you mean. It is fully emulated during vmexit emulation. We do not want PERF_GLOBAL_CTRL to be loaded during L2->L0 vmexit, we want it to be loaded in L1 after L0 emulates L2->L1 vmexit. But I think there is a bug in current emulation. The code looks like this:
if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL)
vmcs_write64(GUEST_IA32_PERF_GLOBAL_CTRL,
vmcs12->host_ia32_perf_global_ctrl);But GUEST_IA32_PERF_GLOBAL_CTRL will not be loaded during L1 entry unless VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL is set. Why do we assume it is set here?
Quoted 1 line
bit 15 : Acknowledge interrupt on exit: same as above.
Same as bit 9.
Quoted 2 lines
bit 19: Load
IA32_PAT: same as above.
bit 20: LoadIA32_EFER: same as above.
Those two are same as bit 12.
Quoted 2 lines
bit 18: Save
IA32_PAT, Didn't expose it to L1, so use host' setting is ok. bit 19: SaveIA32_EFER, same as above.
Those two are the same a bit 2.
Quoted 2 lines
bit 22: Save VMXpreemption timer value, I don't see KVM expose it to L1, but Jan said it's working. Strange! And according gleb's suggestion, it better to always set it.
It exposed it in nested_vmx_setup_ctls_msrs:
nested_vmx_pinbased_ctls_high &= PIN_BASED_EXT_INTR_MASK |
PIN_BASED_NMI_EXITING | PIN_BASED_VIRTUAL_NMIS | PIN_BASED_VMX_PREEMPTION_TIMER;
According to Gleb's suggestion current emulation is broken and to fix it the bit will have to be set on each L2 entry if L1 is using preemption timer.
Quoted 5 lines
So, currently, only use host'
exit_controlfor L2 is enough.Best regards,
Yang
--
Gleb.
Quoted 145 lines
-----Original Message-----
From: Gleb Natapov [mailto:[email protected]]
Sent: Monday, July 08, 2013 8:38 PM
To: Zhang, Yang Z
Cc: Jan Kiszka; Paolo Bonzini; Nakajima, Jun; [email protected]
Subject: Re: [PATCH v3 01/13] nEPT: SupportLOAD_IA32_EFERentry/exit controls for L1Quoted 9 lines · Yang Z
Gleb Natapov wrote on 2013-07-02:
Quoted 8 lines · Jan Kiszka
Quoted 7 lines · Gleb Natapov
Quoted 6 lines · Jan Kiszka
Quoted 5 lines · Gleb Natapov
Quoted 4 lines · Yang Z
Quoted 3 lines
Since this series is pending in mail list for long time. And it's really a big feature for Nested. Also, I doubt the original authors(Jun and Nahav)should not have enough time to
continue it.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
So I will pick it up. :)
See comments below:
Paolo Bonzini wrote on 2013-05-20:
Quoted 6 lines
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 5 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since
http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
switch the EFER MSR when EPT is used and the host and guesthave
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.
To do this EFER switching, KVM uses
VM_ENTRY/EXIT_LOAD_IA32_EFER
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
if available, and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the
former
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
(the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02andload_vmcs12_host_state, respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So all that's left to do in this patch is to properly advertise this feature to L1.Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are
emulated by
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
L0, by using
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/x86/kvm/vmx.c
Quoted 8 lines
arch/x86/kvm/vmx.c index renamed from arch/x86/kvm/vmx.c +0
-0260a919..fb9cae5 100644
arch/x86/kvm/vmx.c +0
-0@@ -2192,7 +2192,8 @@ static __init void
nested_vmx_setup_ctls_msrs(void)#elsearch/x86/kvm/vmx.c +0
-1nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
arch/x86/kvm/vmx.c
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+ nested_vmx_exit_ctls_high |=(
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSRQuoted 7 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
arch/x86/kvm/vmx.c
Quoted 4 lines
| +
VM_EXIT_LOAD_IA32_EFER);arch/x86/kvm/vmx.c +0
-0/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS, @@ -2201,8 +2202,8@@ static
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
__initvoidnested_vmx_setup_ctls_msrs(void)
nested_vmx_entry_ctls_low=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
nested_vmx_entry_ctls_high&=VM_ENTRY_LOAD_IA32_PAT |Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
VM_ENTRY_IA32E_MODE;arch/x86/kvm/vmx.c +0
-1- nested_vmx_entry_ctls_high |=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR; -arch/x86/kvm/vmx.c +1
-0+ nested_vmx_entry_ctls_high |=(
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR| +VM_ENTRY_LOAD_IA32_EFER);arch/x86/kvm/vmx.c +0
-0/* cpu-based controls */ rdmsr(MSR_IA32_VMX_PROCBASED_CTLS, nested_vmx_procbased_ctls_low,
nested_vmx_procbased_ctls_high); @@ -7492,10 +7493,18 @@static
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
void prepare_vmcs02(struct
kvm_vcpu*vcpu,struct vmcs12 *vmcs12)
Quoted 2 lines
vcpu->arch.cr0_guest_owned_bits&=
~vmcs12->cr0_guest_host_mask;vmcs_writel(CR0_GUEST_HOST_MASK,
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
~vcpu->arch.cr0_guest_owned_bits);
arch/x86/kvm/vmx.c
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-1-/* Note: IA32_MODE, LOAD_IA32_EFER are modified by
vmx_set_eferQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
below */
arch/x86/kvm/vmx.c
Quoted 1 line
arch/x86/kvm/vmx.c +0
-1- vmcs_write32(VM_EXIT_CONTROLS, -vmcs12->vm_exit_controls |Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS,
vmcs12->vm_entry_controls| + /*L2->L1exit controls are
emulated - the hardware exit is +to L0 so + * we should useits
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
exit controls. Note that
IA32_MODE,LOAD_IA32_EFER+ *bits are
Quoted 24 lines
Quoted 24 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
arch/x86/kvm/vmx.c
Quoted 2 lines
further modified by
vmx_set_efer()below. + */arch/x86/kvm/vmx.c +1
-0+vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl);This is wrong. We cannot use L0 exit control directly.
LOAD_PERF_GLOBAL_CTRL,LOAD_HOST_EFE,LOAD_HOST_PAT,
ACK_INTR_ON_EXITshould use host's exit control. But others, still need use (vmcs12|host).Quoted 18 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 1 line
I do not see why. We always intercept DR7/PAT/EFER, so save is emulated too. Host address space size always come from L0 and preemption timer is not supported for nested IIRC and when it will be host will have to save it on exit anyway for correct emulation.
Quoted 6 lines
Quoted 3 lines
Preemption timer is already supported and works fine as far as I tested. KVM doesn't use it for L1, so we do not need to save/restore it - IIRC.
So what happens if L1 configures it to value X after X/2 ticks L0 exit happen and L0 gets back to L2 directly. The counter will be X again instead of X/2.
Likely. Yes, we need to improve our emulation by setting "Save VMX-preemption timer value" or emulate this in software if the hardware lacks support for it (was this flag introduced after the preemption timer itself?).
Quoted 6 lines
Quoted 4 lines
Not sure, but my point was that for correct emulation host needs to set "save preempt timer on vmexit" anyway so all
VM_EXIT_CONTROLSare indeed emulated as far as I see.Ok, here is my summary, please correct me if I am wrong:
bit 2: Save debug controls, the first processor only support 1-setting on it, sojust use host's setting is enough
Not because first processor only supported 1-setting, but because L0 intercepts all changes to DR7 and DEBUGCTL MSR, so L2 cannot change them behind L0 back. If L1 asks to save them in vmcs12 L0 can do it during vmexit emulation.
Quoted 5 lines
Quoted 1 line
bit 9: Host address space size, it indicate the host's state, so must use host's
setting.
Quoted 1 line
bit 12: Load
IA32_PERF_GLOBAL_CTRL: same as above.Not sure what "above" do you mean. It is fully emulated during vmexit emulation. We do not want
PERF_GLOBAL_CTRLto be loaded duringL2->L0
Not understand why PERF_GLOBAL_CTRL/ Load IA32_PAT/ Load IA32_EFER shouldn't be loaded during L2->L0?
Quoted 9 lines
vmexit, we want it to be loaded in L1 after L0 emulates
L2->L1vmexit. But I think there is a bug in current emulation. The code looks like this:if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL) vmcs_write64(GUEST_IA32_PERF_GLOBAL_CTRL, vmcs12->host_ia32_perf_global_ctrl);
Quoted 4 lines
But
GUEST_IA32_PERF_GLOBAL_CTRLwill not be loaded during L1 entry unlessVM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRLis set. Why do we assume it is set
here?
You are right. It seems a bug in current emulation.
Quoted 16 lines
Quoted 2 lines
bit 15 : Acknowledge interrupt on exit: same as above.
Same as bit 9.
Quoted 2 lines
bit 19: Load
IA32_PAT: same as above.
bit 20: LoadIA32_EFER: same as above.Those two are same as bit 12.
Quoted 2 lines
bit 18: Save
IA32_PAT, Didn't expose it to L1, so use host' setting is ok. bit 19: SaveIA32_EFER, same as above.Those two are the same a bit 2.
Quoted 1 line
bit 22: Save VMXpreemption timer value, I don't see KVM expose it to L1, but
Jan said it's working. Strange! And according gleb's suggestion, it better to always set it.
Quoted 1 line
Quoted 13 lines
It exposed it in
nested_vmx_setup_ctls_msrs:
nested_vmx_pinbased_ctls_high&=PIN_BASED_EXT_INTR_MASK|
PIN_BASED_NMI_EXITING|PIN_BASED_VIRTUAL_NMIS|PIN_BASED_VMX_PREEMPTION_TIMER;
According to Gleb's suggestion current emulation is broken and to fix it the bit will have to be set on each L2 entry if L1 is using preemption timer.Quoted 5 lines
So, currently, only use host'
exit_controlfor L2 is enough.Best regards,
Yang
Best regards,
Yang
Quoted 145 lines · Yang Z
Quoted 145 lines
-----Original Message-----
From: Gleb Natapov [mailto:[email protected]]
Sent: Monday, July 08, 2013 8:38 PM
To: Zhang, Yang Z
Cc: Jan Kiszka; Paolo Bonzini; Nakajima, Jun; [email protected]
Subject: Re: [PATCH v3 01/13] nEPT: SupportLOAD_IA32_EFERentry/exit controls for L1Quoted 9 lines · Yang Z
Gleb Natapov wrote on 2013-07-02:
Quoted 8 lines · Jan Kiszka
Quoted 7 lines · Gleb Natapov
Quoted 6 lines · Jan Kiszka
Quoted 5 lines · Gleb Natapov
Quoted 4 lines · Yang Z
Quoted 3 lines
Since this series is pending in mail list for long time. And it's really a big feature for Nested. Also, I doubt the original authors(Jun and Nahav)should not have enough time to
continue it.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
So I will pick it up. :)
See comments below:
Paolo Bonzini wrote on 2013-05-20:
Quoted 6 lines
Il 19/05/2013 06:52, Jun Nakajima ha scritto:
Quoted 5 lines
From: Nadav Har'El <[email protected]>
Recent KVM, since
http://kerneltrap.org/mailarchive/linux-kvm/2010/5/2/6261577
switch the EFER MSR when EPT is used and the host and guesthave
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
different NX bits. So if we add support for nested EPT (L1 guest using EPT to run L2) and want to be able to run recent KVM as L1, we need to allow L1 to use this EFER switching feature.
To do this EFER switching, KVM uses
VM_ENTRY/EXIT_LOAD_IA32_EFER
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
if available, and if it isn't, it uses the generic VM_ENTRY/EXIT_MSR_LOAD. This patch adds support for the
former
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
(the latter is still unsupported).
Nested entry and exit emulation (
prepare_vmcs_02andload_vmcs12_host_state, respectively) already handled VM_ENTRY/EXIT_LOAD_IA32_EFER correctly. So all that's left to do in this patch is to properly advertise this feature to L1.Note that vmcs12's VM_ENTRY/EXIT_LOAD_IA32_EFER are
emulated by
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
L0, by using
vmx_set_efer(which itself sets one of several vmcs02 fields), so we always support this feature, regardless of whether the host supports it.Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Signed-off-by Nadav Har'El <[email protected]>Signed-off-by Jun Nakajima <[email protected]>Signed-off-by Xinhao Xu <[email protected]>--- arch/x86/kvm/vmx.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/x86/kvm/vmx.c
Quoted 8 lines
arch/x86/kvm/vmx.c index renamed from arch/x86/kvm/vmx.c +0
-0260a919..fb9cae5 100644
arch/x86/kvm/vmx.c +0
-0@@ -2192,7 +2192,8 @@ static __init void
nested_vmx_setup_ctls_msrs(void)#elsearch/x86/kvm/vmx.c +0
-1nested_vmx_exit_ctls_high =0 ;#endif - nested_vmx_exit_ctls_high |=
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
arch/x86/kvm/vmx.c
Quoted 1 line
arch/x86/kvm/vmx.c +1
-0+ nested_vmx_exit_ctls_high |=(
VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSRQuoted 7 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
arch/x86/kvm/vmx.c
Quoted 4 lines
| +
VM_EXIT_LOAD_IA32_EFER);arch/x86/kvm/vmx.c +0
-0/* entry controls */ rdmsr(MSR_IA32_VMX_ENTRY_CTLS, @@ -2201,8 +2202,8@@ static
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
__initvoidnested_vmx_setup_ctls_msrs(void)
nested_vmx_entry_ctls_low=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
nested_vmx_entry_ctls_high&=VM_ENTRY_LOAD_IA32_PAT |Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
VM_ENTRY_IA32E_MODE;arch/x86/kvm/vmx.c +0
-1- nested_vmx_entry_ctls_high |=
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR; -arch/x86/kvm/vmx.c +1
-0+ nested_vmx_entry_ctls_high |=(
VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR| +VM_ENTRY_LOAD_IA32_EFER);arch/x86/kvm/vmx.c +0
-0/* cpu-based controls */ rdmsr(MSR_IA32_VMX_PROCBASED_CTLS, nested_vmx_procbased_ctls_low,
nested_vmx_procbased_ctls_high); @@ -7492,10 +7493,18 @@static
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
void prepare_vmcs02(struct
kvm_vcpu*vcpu,struct vmcs12 *vmcs12)
Quoted 2 lines
vcpu->arch.cr0_guest_owned_bits&=
~vmcs12->cr0_guest_host_mask;vmcs_writel(CR0_GUEST_HOST_MASK,
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
~vcpu->arch.cr0_guest_owned_bits);
arch/x86/kvm/vmx.c
Quoted 2 lines
arch/x86/kvm/vmx.c +0
-1-/* Note: IA32_MODE, LOAD_IA32_EFER are modified by
vmx_set_eferQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
below */
arch/x86/kvm/vmx.c
Quoted 1 line
arch/x86/kvm/vmx.c +0
-1- vmcs_write32(VM_EXIT_CONTROLS, -vmcs12->vm_exit_controls |Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
vmcs_config.vmexit_ctrl); - vmcs_write32(VM_ENTRY_CONTROLS,
vmcs12->vm_entry_controls| + /*L2->L1exit controls are
emulated - the hardware exit is +to L0 so + * we should useits
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
exit controls. Note that
IA32_MODE,LOAD_IA32_EFER+ *bits are
Quoted 24 lines
Quoted 24 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
arch/x86/kvm/vmx.c
Quoted 2 lines
further modified by
vmx_set_efer()below. + */arch/x86/kvm/vmx.c +1
-0+vmcs_write32 (VM_EXIT_CONTROLS , vmcs_config.vmexit_ctrl);This is wrong. We cannot use L0 exit control directly.
LOAD_PERF_GLOBAL_CTRL,LOAD_HOST_EFE,LOAD_HOST_PAT,
ACK_INTR_ON_EXITshould use host's exit control. But others, still need use (vmcs12|host).Quoted 18 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 1 line
I do not see why. We always intercept DR7/PAT/EFER, so save is emulated too. Host address space size always come from L0 and preemption timer is not supported for nested IIRC and when it will be host will have to save it on exit anyway for correct emulation.
Quoted 6 lines
Quoted 3 lines
Preemption timer is already supported and works fine as far as I tested. KVM doesn't use it for L1, so we do not need to save/restore it - IIRC.
So what happens if L1 configures it to value X after X/2 ticks L0 exit happen and L0 gets back to L2 directly. The counter will be X again instead of X/2.
Likely. Yes, we need to improve our emulation by setting "Save VMX-preemption timer value" or emulate this in software if the hardware lacks support for it (was this flag introduced after the preemption timer itself?).
Quoted 6 lines
Quoted 4 lines
Not sure, but my point was that for correct emulation host needs to set "save preempt timer on vmexit" anyway so all
VM_EXIT_CONTROLSare indeed emulated as far as I see.Ok, here is my summary, please correct me if I am wrong:
bit 2: Save debug controls, the first processor only support 1-setting on it, sojust use host's setting is enough
Not because first processor only supported 1-setting, but because L0 intercepts all changes to DR7 and DEBUGCTL MSR, so L2 cannot change them behind L0 back. If L1 asks to save them in vmcs12 L0 can do it during vmexit emulation.
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
bit 9: Host address space size, it indicate the host's state, so must use host's
setting.
Quoted 1 line
bit 12: Load
IA32_PERF_GLOBAL_CTRL: same as above.Not sure what "above" do you mean. It is fully emulated during vmexit emulation. We do not want
PERF_GLOBAL_CTRLto be loaded duringL2->L0Not understand why PERF_GLOBAL_CTRL/ Load IA32_PAT/ Load
IA32_EFERshouldn't be loaded duringL2->L0?
Because L0 didn't ask them to be loaded and values that would be loaded are L1 values, not L0's. If L0 requests loading then they should be loaded, but we should be careful to put L0's values in vmcs02.
Quoted 39 lines
Quoted 9 lines
vmexit, we want it to be loaded in L1 after L0 emulates
L2->L1vmexit. But I think there is a bug in current emulation. The code looks like this:if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL) vmcs_write64(GUEST_IA32_PERF_GLOBAL_CTRL, vmcs12->host_ia32_perf_global_ctrl);Quoted 4 lines
But
GUEST_IA32_PERF_GLOBAL_CTRLwill not be loaded during L1 entry unlessVM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRLis set. Why do we assume it is set
here?You are right. It seems a bug in current emulation.
Quoted 24 lines
Quoted 2 lines
bit 15 : Acknowledge interrupt on exit: same as above.
Same as bit 9.
Quoted 2 lines
bit 19: Load
IA32_PAT: same as above.
bit 20: LoadIA32_EFER: same as above.Those two are same as bit 12.
Quoted 2 lines
bit 18: Save
IA32_PAT, Didn't expose it to L1, so use host' setting is ok. bit 19: SaveIA32_EFER, same as above.Those two are the same a bit 2.
Quoted 1 line
bit 22: Save VMXpreemption timer value, I don't see KVM expose it to L1, but
Jan said it's working. Strange! And according gleb's suggestion, it better to always set it.
Quoted 1 line
It exposed it in
nested_vmx_setup_ctls_msrs:
nested_vmx_pinbased_ctls_high&=PIN_BASED_EXT_INTR_MASK|
PIN_BASED_NMI_EXITING|PIN_BASED_VIRTUAL_NMIS|PIN_BASED_VMX_PREEMPTION_TIMER;
According to Gleb's suggestion current emulation is broken and to fix it the bit will have to be set on each L2 entry if L1 is using preemption timer.
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
So, currently, only use host'
exit_controlfor L2 is enough.Best regards,
YangBest regards,
Yang
--
Gleb.