Commit 83013059 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Specify max TDP level via kvm_configure_mmu() 



Capture the max TDP level during kvm_configure_mmu() instead of using a
kvm_x86_ops hook to do it at every vCPU creation.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200716034122.5998-10-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1d92d2e8

arch/x86/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -1133,7 +1133,6 @@ struct kvm_x86_ops { 
	int (*sync_pir_to_irr)(struct kvm_vcpu *vcpu);

	int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);

	int (*set_identity_map_addr)(struct kvm *kvm, u64 ident_addr);

	int (*get_max_tdp_level)(void);

	u64 (*get_mt_mask)(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio);



	void (*load_mmu_pgd)(struct kvm_vcpu *vcpu, unsigned long pgd,
@@ -1509,7 +1508,8 @@ void kvm_mmu_invpcid_gva(struct kvm_vcpu *vcpu, gva_t gva, unsigned long pcid); 
void kvm_mmu_new_pgd(struct kvm_vcpu *vcpu, gpa_t new_pgd, bool skip_tlb_flush,

		     bool skip_mmu_sync);



void kvm_configure_mmu(bool enable_tdp, int tdp_page_level);

void kvm_configure_mmu(bool enable_tdp, int tdp_max_root_level,

		       int tdp_huge_page_level);



static inline u16 kvm_read_ldt(void)

{

arch/x86/kvm/mmu/mmu.c

+6 −3
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ module_param_named(flush_on_reuse, force_flush_and_sync_on_reuse, bool, 0644); 
bool tdp_enabled = false;



static int max_huge_page_level __read_mostly;

static int max_tdp_level __read_mostly;



enum {

	AUDIT_PRE_PAGE_FAULT,
@@ -4849,10 +4850,10 @@ static union kvm_mmu_role kvm_calc_mmu_role_common(struct kvm_vcpu *vcpu, 
static inline int kvm_mmu_get_tdp_level(struct kvm_vcpu *vcpu)

{

	/* Use 5-level TDP if and only if it's useful/necessary. */

	if (vcpu->arch.max_tdp_level == 5 && cpuid_maxphyaddr(vcpu) <= 48)

	if (max_tdp_level == 5 && cpuid_maxphyaddr(vcpu) <= 48)

		return 4;



	return vcpu->arch.max_tdp_level;

	return max_tdp_level;

}



static union kvm_mmu_role
@@ -5580,9 +5581,11 @@ void kvm_mmu_invpcid_gva(struct kvm_vcpu *vcpu, gva_t gva, unsigned long pcid) 
}

EXPORT_SYMBOL_GPL(kvm_mmu_invpcid_gva);



void kvm_configure_mmu(bool enable_tdp, int tdp_huge_page_level)

void kvm_configure_mmu(bool enable_tdp, int tdp_max_root_level,

		       int tdp_huge_page_level)

{

	tdp_enabled = enable_tdp;

	max_tdp_level = tdp_max_root_level;



	/*

	 * max_huge_page_level reflects KVM's MMU capabilities irrespective

arch/x86/kvm/svm/svm.c

+1 −2
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ static __init int svm_hardware_setup(void) 
	if (npt_enabled && !npt)

		npt_enabled = false;



	kvm_configure_mmu(npt_enabled, PG_LEVEL_1G);

	kvm_configure_mmu(npt_enabled, get_max_npt_level(), PG_LEVEL_1G);

	pr_info("kvm: Nested Paging %sabled\n", npt_enabled ? "en" : "dis");



	if (nrips) {
@@ -4109,7 +4109,6 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { 


	.set_tss_addr = svm_set_tss_addr,

	.set_identity_map_addr = svm_set_identity_map_addr,

	.get_max_tdp_level = get_max_npt_level,

	.get_mt_mask = svm_get_mt_mask,



	.get_exit_info = svm_get_exit_info,

arch/x86/kvm/vmx/vmx.c

+1 −2
Original line number Diff line number Diff line
@@ -7959,7 +7959,6 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { 


	.set_tss_addr = vmx_set_tss_addr,

	.set_identity_map_addr = vmx_set_identity_map_addr,

	.get_max_tdp_level = vmx_get_max_tdp_level,

	.get_mt_mask = vmx_get_mt_mask,



	.get_exit_info = vmx_get_exit_info,
@@ -8110,7 +8109,7 @@ static __init int hardware_setup(void) 
		ept_lpage_level = PG_LEVEL_2M;

	else

		ept_lpage_level = PG_LEVEL_4K;

	kvm_configure_mmu(enable_ept, ept_lpage_level);

	kvm_configure_mmu(enable_ept, vmx_get_max_tdp_level(), ept_lpage_level);



	/*

	 * Only enable PML when hardware supports PML feature, and both EPT

arch/x86/kvm/x86.c

+0 −1
Original line number Diff line number Diff line
@@ -9520,7 +9520,6 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) 
	fx_init(vcpu);



	vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);

	vcpu->arch.max_tdp_level = kvm_x86_ops.get_max_tdp_level();



	vcpu->arch.pat = MSR_IA32_CR_PAT_DEFAULT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE