Skip to content

Commit 8c8560b

Browse files
Sean Christophersonbonzini
authored andcommitted
KVM: x86/mmu: Use KVM_REQ_TLB_FLUSH_CURRENT for MMU specific flushes
Flush only the current ASID/context when requesting a TLB flush due to a change in the current vCPU's MMU to avoid blasting away TLB entries associated with other ASIDs/contexts, e.g. entries cached for L1 when a change in L2's MMU requires a flush. Signed-off-by: Sean Christopherson <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent eeeb4f6 commit 8c8560b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

arch/x86/kvm/mmu/mmu.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2309,7 +2309,7 @@ static void kvm_mmu_flush_or_zap(struct kvm_vcpu *vcpu,
23092309
return;
23102310

23112311
if (local_flush)
2312-
kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
2312+
kvm_make_request(KVM_REQ_TLB_FLUSH_CURRENT, vcpu);
23132313
}
23142314

23152315
#ifdef CONFIG_KVM_MMU_AUDIT
@@ -2516,11 +2516,11 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,
25162516
break;
25172517

25182518
WARN_ON(!list_empty(&invalid_list));
2519-
kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
2519+
kvm_make_request(KVM_REQ_TLB_FLUSH_CURRENT, vcpu);
25202520
}
25212521

25222522
if (sp->unsync_children)
2523-
kvm_make_request(KVM_REQ_MMU_SYNC, vcpu);
2523+
kvm_make_request(KVM_REQ_TLB_FLUSH_CURRENT, vcpu);
25242524

25252525
__clear_sp_write_flooding_count(sp);
25262526
trace_kvm_mmu_get_page(sp, false);
@@ -3121,7 +3121,7 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep,
31213121
if (set_spte_ret & SET_SPTE_WRITE_PROTECTED_PT) {
31223122
if (write_fault)
31233123
ret = RET_PF_EMULATE;
3124-
kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
3124+
kvm_make_request(KVM_REQ_TLB_FLUSH_CURRENT, vcpu);
31253125
}
31263126

31273127
if (set_spte_ret & SET_SPTE_NEED_REMOTE_TLB_FLUSH || flush)
@@ -4310,7 +4310,7 @@ static bool fast_cr3_switch(struct kvm_vcpu *vcpu, gpa_t new_cr3,
43104310
kvm_make_request(KVM_REQ_LOAD_MMU_PGD, vcpu);
43114311
if (!skip_tlb_flush) {
43124312
kvm_make_request(KVM_REQ_MMU_SYNC, vcpu);
4313-
kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
4313+
kvm_make_request(KVM_REQ_TLB_FLUSH_CURRENT, vcpu);
43144314
}
43154315

43164316
/*
@@ -5179,7 +5179,7 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu)
51795179
if (r)
51805180
goto out;
51815181
kvm_mmu_load_pgd(vcpu);
5182-
kvm_x86_ops.tlb_flush_all(vcpu);
5182+
kvm_x86_ops.tlb_flush_current(vcpu);
51835183
out:
51845184
return r;
51855185
}

0 commit comments

Comments
 (0)