Skip to content

Commit 2c86c44

Browse files
Lai Jiangshansean-jc
authored andcommitted
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: Lai Jiangshan <jiangshan.ljs@antgroup.com> Link: https://lore.kernel.org/r/20230216235321.735214-1-jiangshanlai@gmail.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 9ebc3f5 commit 2c86c44

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

arch/x86/kvm/mmu/mmu.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5792,6 +5792,7 @@ void kvm_mmu_invalidate_addr(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
57925792
mmu->invlpg(vcpu, addr, mmu->prev_roots[i].hpa);
57935793
}
57945794
}
5795+
EXPORT_SYMBOL_GPL(kvm_mmu_invalidate_addr);
57955796

57965797
void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva)
57975798
{

arch/x86/kvm/vmx/nested.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ static bool nested_ept_root_matches(hpa_t root_hpa, u64 root_eptp, u64 eptp)
358358
static void nested_ept_invalidate_addr(struct kvm_vcpu *vcpu, gpa_t eptp,
359359
gpa_t addr)
360360
{
361+
unsigned long roots = 0;
361362
uint i;
362363
struct kvm_mmu_root_info *cached_root;
363364

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

369370
if (nested_ept_root_matches(cached_root->hpa, cached_root->pgd,
370371
eptp))
371-
vcpu->arch.mmu->invlpg(vcpu, addr, cached_root->hpa);
372+
roots |= KVM_MMU_ROOT_PREVIOUS(i);
372373
}
374+
if (roots)
375+
kvm_mmu_invalidate_addr(vcpu, vcpu->arch.mmu, addr, roots);
373376
}
374377

375378
static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu,

0 commit comments

Comments
 (0)