openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: x86/mmu: Rename max_page_level to max_huge_page_level 

Rename max_page_level to explicitly call out that it tracks the max huge
page level so as to avoid confusion when a future patch moves the max
TDP level, i.e. max root level, into the MMU and kvm_configure_mmu().

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200716034122.5998-9-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2020-07-15 20:41:21 -07:00 committed by Paolo Bonzini
parent d468d94b7b
commit 1d92d2e8e7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/kvm/mmu/mmu.c
View File

@ -92,7 +92,7 @@ module_param_named(flush_on_reuse, force_flush_and_sync_on_reuse, bool, 0644);
*/ */
bool tdp_enabled = false; bool tdp_enabled = false;
static int max_page_level __read_mostly; static int max_huge_page_level __read_mostly;
enum { enum {
AUDIT_PRE_PAGE_FAULT, AUDIT_PRE_PAGE_FAULT,
@ -3256,7 +3256,7 @@ static int kvm_mmu_hugepage_adjust(struct kvm_vcpu *vcpu, gfn_t gfn,
if (!slot) if (!slot)
return PG_LEVEL_4K; return PG_LEVEL_4K;
max_level = min(max_level, max_page_level); max_level = min(max_level, max_huge_page_level);
for ( ; max_level > PG_LEVEL_4K; max_level--) { for ( ; max_level > PG_LEVEL_4K; max_level--) {
linfo = lpage_info_slot(gfn, slot, max_level); linfo = lpage_info_slot(gfn, slot, max_level);
if (!linfo->disallow_lpage) if (!linfo->disallow_lpage)
@ -5580,23 +5580,23 @@ void kvm_mmu_invpcid_gva(struct kvm_vcpu *vcpu, gva_t gva, unsigned long pcid)
} }
EXPORT_SYMBOL_GPL(kvm_mmu_invpcid_gva); EXPORT_SYMBOL_GPL(kvm_mmu_invpcid_gva);
void kvm_configure_mmu(bool enable_tdp, int tdp_page_level) void kvm_configure_mmu(bool enable_tdp, int tdp_huge_page_level)
{ {
tdp_enabled = enable_tdp; tdp_enabled = enable_tdp;
/* /*
* max_page_level reflects the capabilities of KVM's MMU irrespective * max_huge_page_level reflects KVM's MMU capabilities irrespective
* of kernel support, e.g. KVM may be capable of using 1GB pages when * of kernel support, e.g. KVM may be capable of using 1GB pages when
* the kernel is not. But, KVM never creates a page size greater than * the kernel is not. But, KVM never creates a page size greater than
* what is used by the kernel for any given HVA, i.e. the kernel's * what is used by the kernel for any given HVA, i.e. the kernel's
* capabilities are ultimately consulted by kvm_mmu_hugepage_adjust(). * capabilities are ultimately consulted by kvm_mmu_hugepage_adjust().
*/ */
if (tdp_enabled) if (tdp_enabled)
max_page_level = tdp_page_level; max_huge_page_level = tdp_huge_page_level;
else if (boot_cpu_has(X86_FEATURE_GBPAGES)) else if (boot_cpu_has(X86_FEATURE_GBPAGES))
max_page_level = PG_LEVEL_1G; max_huge_page_level = PG_LEVEL_1G;
else else
max_page_level = PG_LEVEL_2M; max_huge_page_level = PG_LEVEL_2M;
} }
EXPORT_SYMBOL_GPL(kvm_configure_mmu); EXPORT_SYMBOL_GPL(kvm_configure_mmu);