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

KVM: x86/mmu: Merge kvm_{enable,disable}_tdp() into a common function 



Combine kvm_enable_tdp() and kvm_disable_tdp() into a single function,
kvm_configure_mmu(), in preparation for doing additional configuration
during hardware setup.  And because having separate helpers is silly.

No functional change intended.

Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 213e0e1f

arch/x86/include/asm/kvm_host.h

+1 −2
Original line number Diff line number Diff line
@@ -1510,8 +1510,7 @@ void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva); 
void kvm_mmu_invpcid_gva(struct kvm_vcpu *vcpu, gva_t gva, unsigned long pcid);

void kvm_mmu_new_cr3(struct kvm_vcpu *vcpu, gpa_t new_cr3, bool skip_tlb_flush);



void kvm_enable_tdp(void);

void kvm_disable_tdp(void);

void kvm_configure_mmu(bool enable_tdp);



static inline gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access,

				  struct x86_exception *exception)

arch/x86/kvm/mmu/mmu.c

+3 −10
Original line number Diff line number Diff line
@@ -5559,18 +5559,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_enable_tdp(void)

void kvm_configure_mmu(bool enable_tdp)

{

	tdp_enabled = true;

	tdp_enabled = enable_tdp;

}

EXPORT_SYMBOL_GPL(kvm_enable_tdp);



void kvm_disable_tdp(void)

{

	tdp_enabled = false;

}

EXPORT_SYMBOL_GPL(kvm_disable_tdp);



EXPORT_SYMBOL_GPL(kvm_configure_mmu);



/* The return value indicates if tlb flush on all vcpus is needed. */

typedef bool (*slot_level_handler) (struct kvm *kvm, struct kvm_rmap_head *rmap_head);

arch/x86/kvm/svm.c

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

		npt_enabled = false;



	if (npt_enabled)

		kvm_enable_tdp();

	else

		kvm_disable_tdp();

	kvm_configure_mmu(npt_enabled);

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



	if (nrips) {

arch/x86/kvm/vmx/vmx.c

+1 −3
Original line number Diff line number Diff line
@@ -5320,7 +5320,6 @@ static void vmx_enable_tdp(void) 
		VMX_EPT_RWX_MASK, 0ull);



	ept_set_mmio_spte_mask();

	kvm_enable_tdp();

}



/*
@@ -7747,8 +7746,7 @@ static __init int hardware_setup(void) 


	if (enable_ept)

		vmx_enable_tdp();

	else

		kvm_disable_tdp();

	kvm_configure_mmu(enable_ept);



	/*

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE