Commit 2c86c444 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Sean Christopherson
Browse files

KVM: x86/mmu: Use kvm_mmu_invalidate_addr() in nested_ept_invalidate_addr() 



Use kvm_mmu_invalidate_addr() instead open calls to mmu->invlpg().

No functional change intended.

Signed-off-by: default avatarLai Jiangshan <jiangshan.ljs@antgroup.com>
Link: https://lore.kernel.org/r/20230216235321.735214-1-jiangshanlai@gmail.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 9ebc3f51

arch/x86/kvm/mmu/mmu.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -5792,6 +5792,7 @@ void kvm_mmu_invalidate_addr(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, 
			mmu->invlpg(vcpu, addr, mmu->prev_roots[i].hpa);

			mmu->invlpg(vcpu, addr, mmu->prev_roots[i].hpa);

	}

	}

}

}

EXPORT_SYMBOL_GPL(kvm_mmu_invalidate_addr);





void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva)

void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva)

{

{

arch/x86/kvm/vmx/nested.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -358,6 +358,7 @@ static bool nested_ept_root_matches(hpa_t root_hpa, u64 root_eptp, u64 eptp) 
static void nested_ept_invalidate_addr(struct kvm_vcpu *vcpu, gpa_t eptp,

static void nested_ept_invalidate_addr(struct kvm_vcpu *vcpu, gpa_t eptp,

				       gpa_t addr)

				       gpa_t addr)

{

{

	unsigned long roots = 0;

	uint i;

	uint i;

	struct kvm_mmu_root_info *cached_root;

	struct kvm_mmu_root_info *cached_root;
@@ -368,8 +369,10 @@ static void nested_ept_invalidate_addr(struct kvm_vcpu *vcpu, gpa_t eptp, 




		if (nested_ept_root_matches(cached_root->hpa, cached_root->pgd,

		if (nested_ept_root_matches(cached_root->hpa, cached_root->pgd,

					    eptp))

					    eptp))

			vcpu->arch.mmu->invlpg(vcpu, addr, cached_root->hpa);

			roots |= KVM_MMU_ROOT_PREVIOUS(i);

	}

	}

	if (roots)

		kvm_mmu_invalidate_addr(vcpu, vcpu->arch.mmu, addr, roots);

}

}





static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu,

static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu,