KVM: x86/mmu: Use kernel's PG_LEVEL_* enums
cover KVM: x86/mmu: Use kernel's PG_LEVEL_* enums
Drop KVM's PT_{PAGE_TABLE,DIRECTORY,PDPE}_LEVEL KVM enums in favor of the kernel's PG_LEVEL_{4K,2M,1G} enums, which have far more user friendly names.
The KVM names were presumably intended to abstract away the page size. In practice, the abstraction is only useful for a single line of code, a PSE paging related large page check. For everything else, the abstract names do nothing but obfuscate the code.
Boot tested a PSE kernel under 32-bit KVM and 64-bit KVM, with and without EPT enabled. Patches 2 and 3 generate no binary difference relative to patch 1 when compared via "objdump -d".
Sean Christopherson (3):
KVM: x86/mmu: Tweak PSE hugepage handling to avoid 2M vs 4M conundrum
KVM: x86/mmu: Move max hugepage level to a separate #define
KVM: x86/mmu: Drop KVM's hugepage enums in favor of the kernel's enums
arch/x86/include/asm/kvm_host.h | 13 +--- arch/x86/kvm/mmu/mmu.c | 118 +++++++++++++++----------------- arch/x86/kvm/mmu/page_track.c | 4 +- arch/x86/kvm/mmu/paging_tmpl.h | 18 ++--- arch/x86/kvm/mmu_audit.c | 6 +- arch/x86/kvm/svm/svm.c | 2 +- arch/x86/kvm/vmx/vmx.c | 6 +- arch/x86/kvm/x86.c | 4 +- 8 files changed, 79 insertions(+), 92 deletions(-)
Signature · 1 line
2.26.0
PATCH 1/3 KVM: x86/mmu: Tweak PSE hugepage handling to avoid 2M vs 4M conundrum
Change the PSE hugepage handling in walk_addr_generic() to fire on any page level greater than PT_PAGE_TABLE_LEVEL, a.k.a. PG_LEVEL_4K. PSE paging only has two levels, so "== 2" and "> 1" are functionally the seam, i.e. this is a nop.
A future patch will drop KVM's PT_*_LEVEL enums in favor of the kernel's PG_LEVEL_* enums, at which point "walker->level == PG_LEVEL_2M" is semantically incorrect (though still functionally ok).
No functional change intended.
--- arch/x86/kvm/mmu/paging_tmpl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/mmu/paging_tmpl.h +1 -1
@@ -436,7 +436,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, gfn =gpte_to_gfn_lvl (pte, walker->level); gfn += (addr &PT_LVL_OFFSET_MASK (walker->level)) >>PAGE_SHIFT ; -if (PTTYPE ==32 && walker->level ==PT_DIRECTORY_LEVEL &&is_cpuid_PSE36 ()) +if (PTTYPE ==32 && walker->level >PT_PAGE_TABLE_LEVEL &&is_cpuid_PSE36 ()) gfn +=pse36_gfn_delta (pte); real_gpa = mmu->translate_gpa (vcpu,gfn_to_gpa (gfn), access, &walker->fault);
Signature · 1 line
2.26.0
Re: [PATCH 1/3] KVM: x86/mmu: Tweak PSE hugepage handling to avoid 2M vs 4M conundrum
Quoted 4 lines · Sean Christopherson
Change the PSE hugepage handling in
walk_addr_generic()to fire on any page level greater thanPT_PAGE_TABLE_LEVEL, a.k.a.PG_LEVEL_4K. PSE paging only has two levels, so "== 2" and "> 1" are functionally the seam, i.e. this is a nop.
^ s/seam/same/
Barret
Quoted 27 lines
A future patch will drop KVM's PT_*_LEVEL enums in favor of the kernel's PG_LEVEL_* enums, at which point "
walker->level==PG_LEVEL_2M" is semantically incorrect (though still functionally ok).No functional change intended.
Suggested-by Paolo Bonzini <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/mmu/paging_tmpl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/kvm/mmu/paging_tmpl.h +1
-1@@ -436,7 +436,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, gfn =gpte_to_gfn_lvl (pte, walker->level); gfn += (addr &PT_LVL_OFFSET_MASK (walker->level)) >>PAGE_SHIFT ; -if (PTTYPE ==32 && walker->level ==PT_DIRECTORY_LEVEL &&is_cpuid_PSE36 ()) +if (PTTYPE ==32 && walker->level >PT_PAGE_TABLE_LEVEL &&is_cpuid_PSE36 ()) gfn +=pse36_gfn_delta (pte); real_gpa = mmu->translate_gpa (vcpu,gfn_to_gpa (gfn), access, &walker->fault);
PATCH 2/3 KVM: x86/mmu: Move max hugepage level to a separate #define
In reply to Sean ChristophersonRename PT_MAX_HUGEPAGE_LEVEL to KVM_MAX_HUGEPAGE_LEVEL and make it a separate define in anticipation of dropping KVM's PT_*_LEVEL enums in favor of the kernel's PG_LEVEL_* enums.
No functional change intended.
--- arch/x86/include/asm/kvm_host.h | 5 ++--- arch/x86/kvm/mmu/mmu.c | 17 +++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-)
arch/x86/include/asm/kvm_host.h +2 -3
@@ -114,10 +114,9 @@ enum {PT_PAGE_TABLE_LEVEL =1 ,PT_DIRECTORY_LEVEL =2 , PT_PDPE_LEVEL = 3, -/* set max level to the biggest one */ - PT_MAX_HUGEPAGE_LEVEL = PT_PDPE_LEVEL, }; -#define KVM_NR_PAGE_SIZES (PT_MAX_HUGEPAGE_LEVEL - \ +#define KVM_MAX_HUGEPAGE_LEVEL PT_PDPE_LEVEL +#define KVM_NR_PAGE_SIZES (KVM_MAX_HUGEPAGE_LEVEL - \ PT_PAGE_TABLE_LEVEL + 1)#define KVM_HPAGE_GFN_SHIFT (x) (((x) - 1) * 9)#define KVM_HPAGE_SHIFT (x) (PAGE_SHIFT + KVM_HPAGE_GFN_SHIFT(x))
arch/x86/kvm/mmu/mmu.c +9 -8
@@ -1199,7 +1199,7 @@ static void update_gfn_disallow_lpage_count(struct kvm_memory_slot *slot,struct kvm_lpage_info *linfo;int i; -for (i =PT_DIRECTORY_LEVEL ; i <=PT_MAX_HUGEPAGE_LEVEL ; ++i) { +for (i =PT_DIRECTORY_LEVEL ; i <=KVM_MAX_HUGEPAGE_LEVEL ; ++i) { linfo =lpage_info_slot (gfn, slot, i); linfo->disallow_lpage += count;WARN_ON (linfo->disallow_lpage <0 );
@@ -1763,7 +1763,7 @@ bool kvm_mmu_slot_gfn_write_protect(struct kvm *kvm,int i;bool write_protected = false; -for (i =PT_PAGE_TABLE_LEVEL ; i <=PT_MAX_HUGEPAGE_LEVEL ; ++i) { +for (i =PT_PAGE_TABLE_LEVEL ; i <=KVM_MAX_HUGEPAGE_LEVEL ; ++i) { rmap_head =__gfn_to_rmap (gfn, i, slot); write_protected |=__rmap_write_protect (kvm, rmap_head, true); }
@@ -1952,7 +1952,7 @@ static int kvm_handle_hva_range(struct kvm *kvm, gfn_end =hva_to_gfn_memslot (hva_end +PAGE_SIZE -1 , memslot);for_each_slot_rmap_range (memslot,PT_PAGE_TABLE_LEVEL , -PT_MAX_HUGEPAGE_LEVEL , +KVM_MAX_HUGEPAGE_LEVEL , gfn_start, gfn_end -1 , &iterator) ret |= handler(kvm, iterator.rmap, memslot,
@@ -4214,7 +4214,7 @@ int kvm_tdp_page_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u32 error_code, {int max_level; -for (max_level =PT_MAX_HUGEPAGE_LEVEL ; +for (max_level =KVM_MAX_HUGEPAGE_LEVEL ; max_level >PT_PAGE_TABLE_LEVEL ; max_level--) {int page_num =KVM_PAGES_PER_HPAGE (max_level);
@@ -5641,7 +5641,7 @@ slot_handle_all_level(struct kvm *kvm, struct kvm_memory_slot *memslot, slot_level_handler fn, bool lock_flush_tlb) {return slot_handle_level (kvm, memslot, fn,PT_PAGE_TABLE_LEVEL , -PT_MAX_HUGEPAGE_LEVEL , lock_flush_tlb); +KVM_MAX_HUGEPAGE_LEVEL , lock_flush_tlb); }static __always_inline bool
@@ -5649,7 +5649,7 @@ slot_handle_large_level(struct kvm *kvm, struct kvm_memory_slot *memslot, slot_level_handler fn, bool lock_flush_tlb) {return slot_handle_level (kvm, memslot, fn,PT_PAGE_TABLE_LEVEL +1 , -PT_MAX_HUGEPAGE_LEVEL , lock_flush_tlb); +KVM_MAX_HUGEPAGE_LEVEL , lock_flush_tlb); }static __always_inline bool
@@ -5867,7 +5867,8 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end)continue ;slot_handle_level_range (kvm, memslot, kvm_zap_rmapp, -PT_PAGE_TABLE_LEVEL ,PT_MAX_HUGEPAGE_LEVEL , +PT_PAGE_TABLE_LEVEL , +KVM_MAX_HUGEPAGE_LEVEL , start, end -1 , true); } }
@@ -5889,7 +5890,7 @@ void kvm_mmu_slot_remove_write_access(struct kvm *kvm,spin_lock (&kvm->mmu_lock); flush =slot_handle_level (kvm, memslot, slot_rmap_write_protect, - start_level,PT_MAX_HUGEPAGE_LEVEL , false); + start_level,KVM_MAX_HUGEPAGE_LEVEL , false);spin_unlock (&kvm->mmu_lock);/*
Signature · 1 line
2.26.0
PATCH 3/3 KVM: x86/mmu: Drop KVM's hugepage enums in favor of the kernel's enums
In reply to Sean ChristophersonReplace KVM's PT_PAGE_TABLE_LEVEL, PT_DIRECTORY_LEVEL and PT_PDPE_LEVEL with the kernel's PG_LEVEL_4K, PG_LEVEL_2M and PG_LEVEL_1G. KVM's enums are borderline impossible to remember and result in code that is visually difficult to audit, e.g.
if (!enable_ept)
ept_lpage_level = 0;
else if (cpu_has_vmx_ept_1g_page())
ept_lpage_level = PT_PDPE_LEVEL;
else if (cpu_has_vmx_ept_2m_page())
ept_lpage_level = PT_DIRECTORY_LEVEL;
else
ept_lpage_level = PT_PAGE_TABLE_LEVEL;versus
if (!enable_ept)
ept_lpage_level = 0;
else if (cpu_has_vmx_ept_1g_page())
ept_lpage_level = PG_LEVEL_1G;
else if (cpu_has_vmx_ept_2m_page())
ept_lpage_level = PG_LEVEL_2M;
else
ept_lpage_level = PG_LEVEL_4K;No functional change intended.
--- arch/x86/include/asm/kvm_host.h | 12 +--- arch/x86/kvm/mmu/mmu.c | 107 +++++++++++++++----------------- arch/x86/kvm/mmu/page_track.c | 4 +- arch/x86/kvm/mmu/paging_tmpl.h | 18 +++--- arch/x86/kvm/mmu_audit.c | 6 +- arch/x86/kvm/svm/svm.c | 2 +- arch/x86/kvm/vmx/vmx.c | 6 +- arch/x86/kvm/x86.c | 4 +- 8 files changed, 73 insertions(+), 86 deletions(-)
arch/x86/include/asm/kvm_host.h +3 -9
@@ -110,14 +110,8 @@#define UNMAPPED_GVA (~(gpa_t)0)/* KVM Hugepage definitions for x86 */ -enum { -PT_PAGE_TABLE_LEVEL =1 , -PT_DIRECTORY_LEVEL =2 , -PT_PDPE_LEVEL =3 , -}; -#define KVM_MAX_HUGEPAGE_LEVEL PT_PDPE_LEVEL -#define KVM_NR_PAGE_SIZES (KVM_MAX_HUGEPAGE_LEVEL - \ - PT_PAGE_TABLE_LEVEL + 1) +#define KVM_MAX_HUGEPAGE_LEVEL PG_LEVEL_1G +#define KVM_NR_PAGE_SIZES (KVM_MAX_HUGEPAGE_LEVEL - PG_LEVEL_4K + 1)#define KVM_HPAGE_GFN_SHIFT (x) (((x) - 1) * 9)#define KVM_HPAGE_SHIFT (x) (PAGE_SHIFT + KVM_HPAGE_GFN_SHIFT(x))#define KVM_HPAGE_SIZE (x) (1UL << KVM_HPAGE_SHIFT(x))
@@ -126,7 +120,7 @@ enum {static inline gfn_t gfn_to_index (gfn_t gfn,gfn_t base_gfn,int level) { -/* KVM_HPAGE_GFN_SHIFT(PT_PAGE_TABLE_LEVEL) must be 0. */ +/* KVM_HPAGE_GFN_SHIFT(PG_LEVEL_4K) must be 0. */ return (gfn >>KVM_HPAGE_GFN_SHIFT (level)) - (base_gfn >>KVM_HPAGE_GFN_SHIFT (level)); }
arch/x86/kvm/mmu/mmu.c +50 -57
348 lines not on this page · raw message
arch/x86/kvm/mmu/page_track.c +2 -2
@@ -61,7 +61,7 @@ static void update_gfn_track(struct kvm_memory_slot *slot, gfn_t gfn, {int index, val; - index =gfn_to_index (gfn, slot->base_gfn,PT_PAGE_TABLE_LEVEL ); + index =gfn_to_index (gfn, slot->base_gfn,PG_LEVEL_4K ); val = slot->arch.gfn_track[mode][index];
@@ -151,7 +151,7 @@ bool kvm_page_track_is_active(struct kvm_vcpu *vcpu, gfn_t gfn,if (!slot)return false; - index =gfn_to_index (gfn, slot->base_gfn,PT_PAGE_TABLE_LEVEL ); + index =gfn_to_index (gfn, slot->base_gfn,PG_LEVEL_4K );return !!READ_ONCE (slot->arch.gfn_track[mode][index]); }
arch/x86/kvm/mmu/paging_tmpl.h +9 -9
@@ -75,7 +75,7 @@#define PT_GUEST_ACCESSED_MASK (1 << PT_GUEST_ACCESSED_SHIFT)#define gpte_to_gfn_lvl FNAME(gpte_to_gfn_lvl) -#define gpte_to_gfn (pte) gpte_to_gfn_lvl((pte), PT_PAGE_TABLE_LEVEL) +#define gpte_to_gfn (pte) gpte_to_gfn_lvl((pte), PG_LEVEL_4K)/* * The guest_walker structure emulates the behavior of the hardware page
@@ -198,7 +198,7 @@ static bool FNAME(prefetch_invalid_gpte)(struct kvm_vcpu *vcpu, !(gpte & PT_GUEST_ACCESSED_MASK)) goto no_present; -if (FNAME (is_rsvd_bits_set)(vcpu->arch.mmu, gpte,PT_PAGE_TABLE_LEVEL )) +if (FNAME (is_rsvd_bits_set)(vcpu->arch.mmu, gpte,PG_LEVEL_4K )) goto no_present;return false;
@@ -436,7 +436,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, gfn =gpte_to_gfn_lvl (pte, walker->level); gfn += (addr &PT_LVL_OFFSET_MASK (walker->level)) >>PAGE_SHIFT ; -if (PTTYPE ==32 && walker->level >PT_PAGE_TABLE_LEVEL &&is_cpuid_PSE36 ()) +if (PTTYPE ==32 && walker->level >PG_LEVEL_4K &&is_cpuid_PSE36 ()) gfn +=pse36_gfn_delta (pte); real_gpa = mmu->translate_gpa (vcpu,gfn_to_gpa (gfn), access, &walker->fault);
@@ -552,7 +552,7 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,* we call mmu_set_spte() with host_writable = true because * pte_prefetch_gfn_to_pfn always gets a writable pfn. */ -mmu_set_spte (vcpu, spte, pte_access,0 ,PT_PAGE_TABLE_LEVEL , gfn, pfn, +mmu_set_spte (vcpu, spte, pte_access,0 ,PG_LEVEL_4K , gfn, pfn, true, true);kvm_release_pfn_clean (pfn);
@@ -575,7 +575,7 @@ static bool FNAME(gpte_changed)(struct kvm_vcpu *vcpu,u64 mask;int r, index; -if (level ==PT_PAGE_TABLE_LEVEL ) { +if (level ==PG_LEVEL_4K ) { mask =PTE_PREFETCH_NUM *sizeof (pt_element_t) -1 ; base_gpa = pte_gpa & ~mask; index = (pte_gpa - base_gpa) /sizeof (pt_element_t);
@@ -600,7 +600,7 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, sp =page_header (__pa (sptep)); -if (sp->role.level >PT_PAGE_TABLE_LEVEL ) +if (sp->role.level >PG_LEVEL_4K )return ;if (sp->role.direct)
@@ -828,7 +828,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gpa_t addr, u32 error_code, &walker, user_fault, &vcpu->arch.write_fault_to_shadow_pgtable);if (lpage_disallowed || is_self_change_mapping) - max_level =PT_PAGE_TABLE_LEVEL ; + max_level =PG_LEVEL_4K ;else max_level = walker.level;
@@ -884,7 +884,7 @@ static gpa_t FNAME(get_level1_sp_gpa)(struct kvm_mmu_page *sp) {int offset =0 ; -WARN_ON (sp->role.level !=PT_PAGE_TABLE_LEVEL ); +WARN_ON (sp->role.level !=PG_LEVEL_4K );if (PTTYPE ==32 ) offset = sp->role.quadrant <<PT64_LEVEL_BITS ;
@@ -1070,7 +1070,7 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) host_writable = sp->spt[i] &SPTE_HOST_WRITEABLE ; set_spte_ret |=set_spte (vcpu, &sp->spt[i], - pte_access,PT_PAGE_TABLE_LEVEL , + pte_access,PG_LEVEL_4K , gfn,spte_to_pfn (sp->spt[i]), true, false, host_writable); }
arch/x86/kvm/mmu_audit.c +3 -3
@@ -100,7 +100,7 @@ static void audit_mappings(struct kvm_vcpu *vcpu, u64 *sptep, int level) sp =page_header (__pa (sptep));if (sp->unsync) { -if (level !=PT_PAGE_TABLE_LEVEL ) { +if (level !=PG_LEVEL_4K ) {audit_printk (vcpu->kvm,"unsync sp: %p " "level = %d\n" , sp, level);return ;
@@ -176,7 +176,7 @@ static void check_mappings_rmap(struct kvm *kvm, struct kvm_mmu_page *sp) {int i; -if (sp->role.level !=PT_PAGE_TABLE_LEVEL ) +if (sp->role.level !=PG_LEVEL_4K )return ;for (i =0 ; i <PT64_ENT_PER_PAGE ; ++i) {
@@ -200,7 +200,7 @@ static void audit_write_protection(struct kvm *kvm, struct kvm_mmu_page *sp) slots =kvm_memslots_for_spte_role (kvm, sp->role); slot =__gfn_to_memslot (slots, sp->gfn); - rmap_head =__gfn_to_rmap (sp->gfn,PT_PAGE_TABLE_LEVEL , slot); + rmap_head =__gfn_to_rmap (sp->gfn,PG_LEVEL_4K , slot);for_each_rmap_spte (rmap_head, &iter, sptep) {if (is_writable_pte (*sptep))
arch/x86/kvm/svm/svm.c +1 -1
@@ -891,7 +891,7 @@ static __init int svm_hardware_setup(void)if (npt_enabled && !npt) npt_enabled = false; -kvm_configure_mmu (npt_enabled,PT_PDPE_LEVEL ); +kvm_configure_mmu (npt_enabled,PG_LEVEL_1G );pr_info ("kvm: Nested Paging %sabled\n" , npt_enabled ?"en" :"dis" );if (nrips) {
arch/x86/kvm/vmx/vmx.c +3 -3
@@ -8002,11 +8002,11 @@ static __init int hardware_setup(void)if (!enable_ept) ept_lpage_level =0 ;else if (cpu_has_vmx_ept_1g_page ()) - ept_lpage_level =PT_PDPE_LEVEL ; + ept_lpage_level =PG_LEVEL_1G ;else if (cpu_has_vmx_ept_2m_page ()) - ept_lpage_level =PT_DIRECTORY_LEVEL ; + ept_lpage_level =PG_LEVEL_2M ;else - ept_lpage_level =PT_PAGE_TABLE_LEVEL ; + ept_lpage_level =PG_LEVEL_4K ;kvm_configure_mmu (enable_ept, ept_lpage_level);/*
arch/x86/kvm/x86.c +2 -2
@@ -10017,7 +10017,7 @@ static void kvm_mmu_slot_apply_flags(struct kvm *kvm, {/* Still write protect RO slot */ if (new->flags &KVM_MEM_READONLY ) { -kvm_mmu_slot_remove_write_access (kvm, new,PT_PAGE_TABLE_LEVEL ); +kvm_mmu_slot_remove_write_access (kvm, new,PG_LEVEL_4K );return ; }
@@ -10057,7 +10057,7 @@ static void kvm_mmu_slot_apply_flags(struct kvm *kvm, }else {int level =kvm_dirty_log_manual_protect_and_init_set (kvm) ? -PT_DIRECTORY_LEVEL :PT_PAGE_TABLE_LEVEL ; +PG_LEVEL_2M :PG_LEVEL_4K ;/* * If we're with initial-all-set, we don't need
Signature · 1 line
2.26.0
Quoted 3 lines · Sean Christopherson
Drop KVM's PT_{PAGE_TABLE,DIRECTORY,PDPE}_LEVEL KVM enums in favor of the kernel's PG_LEVEL_{4K,2M,1G} enums, which have far more user friendly names.
thanks for doing this - it fell off my radar.
all 3:
Quoted 25 lines
The KVM names were presumably intended to abstract away the page size. In practice, the abstraction is only useful for a single line of code, a PSE paging related large page check. For everything else, the abstract names do nothing but obfuscate the code.
Boot tested a PSE kernel under 32-bit KVM and 64-bit KVM, with and without EPT enabled. Patches 2 and 3 generate no binary difference relative to patch 1 when compared via "objdump -d".
Sean Christopherson (3):
KVM: x86/mmu: Tweak PSE hugepage handling to avoid 2M vs 4M conundrum
KVM: x86/mmu: Move max hugepage level to a separate #define
KVM: x86/mmu: Drop KVM's hugepage enums in favor of the kernel's enumsarch/x86/include/asm/kvm_host.h | 13 +--- arch/x86/kvm/mmu/mmu.c | 118 +++++++++++++++----------------- arch/x86/kvm/mmu/page_track.c | 4 +- arch/x86/kvm/mmu/paging_tmpl.h | 18 ++--- arch/x86/kvm/mmu_audit.c | 6 +- arch/x86/kvm/svm/svm.c | 2 +- arch/x86/kvm/vmx/vmx.c | 6 +- arch/x86/kvm/x86.c | 4 +- 8 files changed, 79 insertions(+), 92 deletions(-)
Quoted 18 lines · Sean Christopherson
Drop KVM's PT_{PAGE_TABLE,DIRECTORY,PDPE}_LEVEL KVM enums in favor of the kernel's PG_LEVEL_{4K,2M,1G} enums, which have far more user friendly names.
The KVM names were presumably intended to abstract away the page size. In practice, the abstraction is only useful for a single line of code, a PSE paging related large page check. For everything else, the abstract names do nothing but obfuscate the code.
Boot tested a PSE kernel under 32-bit KVM and 64-bit KVM, with and without EPT enabled. Patches 2 and 3 generate no binary difference relative to patch 1 when compared via "objdump -d".
Sean Christopherson (3):
KVM: x86/mmu: Tweak PSE hugepage handling to avoid 2M vs 4M conundrum
KVM: x86/mmu: Move max hugepage level to a separate #define
KVM: x86/mmu: Drop KVM's hugepage enums in favor of the kernel's enums
Quoted 10 lines
arch/x86/include/asm/kvm_host.h | 13 +--- arch/x86/kvm/mmu/mmu.c | 118 +++++++++++++++----------------- arch/x86/kvm/mmu/page_track.c | 4 +- arch/x86/kvm/mmu/paging_tmpl.h | 18 ++--- arch/x86/kvm/mmu_audit.c | 6 +- arch/x86/kvm/svm/svm.c | 2 +- arch/x86/kvm/vmx/vmx.c | 6 +- arch/x86/kvm/x86.c | 4 +- 8 files changed, 79 insertions(+), 92 deletions(-)
Queued, thanks.
Paolo