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

KVM: nVMX: Rename nested_ept_get_cr3() to nested_ept_get_eptp() 



Rename the accessor for vmcs12.EPTP to use "eptp" instead of "cr3".  The
accessor has no relation to cr3 whatsoever, other than it being assigned
to the also poorly named kvm_mmu->get_cr3() hook.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bb1fcc70

arch/x86/kvm/vmx/nested.c

+2 −2
Original line number Diff line number Diff line
@@ -353,9 +353,9 @@ static void nested_ept_init_mmu_context(struct kvm_vcpu *vcpu) 
			to_vmx(vcpu)->nested.msrs.ept_caps &

			VMX_EPT_EXECUTE_ONLY_BIT,

			nested_ept_ad_enabled(vcpu),

			nested_ept_get_cr3(vcpu));

			nested_ept_get_eptp(vcpu));

	vcpu->arch.mmu->set_cr3           = vmx_set_cr3;

	vcpu->arch.mmu->get_cr3           = nested_ept_get_cr3;

	vcpu->arch.mmu->get_cr3           = nested_ept_get_eptp;

	vcpu->arch.mmu->inject_page_fault = nested_ept_inject_page_fault;

	vcpu->arch.mmu->get_pdptr         = kvm_pdptr_read;

arch/x86/kvm/vmx/nested.h

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline int vmx_has_valid_vmcs12(struct kvm_vcpu *vcpu) 
		vmx->nested.hv_evmcs;

}



static inline unsigned long nested_ept_get_cr3(struct kvm_vcpu *vcpu)

static inline unsigned long nested_ept_get_eptp(struct kvm_vcpu *vcpu)

{

	/* return the page table to be shadowed - in our case, EPT12 */

	return get_vmcs12(vcpu)->ept_pointer;
@@ -68,7 +68,7 @@ static inline unsigned long nested_ept_get_cr3(struct kvm_vcpu *vcpu) 


static inline bool nested_ept_ad_enabled(struct kvm_vcpu *vcpu)

{

	return nested_ept_get_cr3(vcpu) & VMX_EPTP_AD_ENABLE_BIT;

	return nested_ept_get_eptp(vcpu) & VMX_EPTP_AD_ENABLE_BIT;

}



/*

arch/x86/kvm/vmx/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -2986,7 +2986,7 @@ void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) 
static int get_ept_level(struct kvm_vcpu *vcpu)

{

	if (is_guest_mode(vcpu) && nested_cpu_has_ept(get_vmcs12(vcpu)))

		return vmx_eptp_page_walk_level(nested_ept_get_cr3(vcpu));

		return vmx_eptp_page_walk_level(nested_ept_get_eptp(vcpu));

	if (cpu_has_vmx_ept_5levels() && (cpuid_maxphyaddr(vcpu) > 48))

		return 5;

	return 4;

CRA Git | Maintained and supported by SUSTech CRA and CCSE