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

KVM: x86/mmu: Use fast invalidate mechanism to zap MMIO sptes 



Use the fast invalidate mechasim to zap MMIO sptes on a MMIO generation
wrap.  The fast invalidate flow was reintroduced to fix a livelock bug
in kvm_mmu_zap_all() that can occur if kvm_mmu_zap_all() is invoked when
the guest has live vCPUs.  I.e. using kvm_mmu_zap_all() to handle the
MMIO generation wrap is theoretically susceptible to the livelock bug.

This effectively reverts commit 4771450c ("Revert "KVM: MMU: drop
kvm_mmu_zap_mmio_sptes""), i.e. restores the behavior of commit
a8eca9dc ("KVM: MMU: drop kvm_mmu_zap_mmio_sptes").

Note, this actually fixes commit 571c5af0 ("KVM: x86/mmu:
Voluntarily reschedule as needed when zapping MMIO sptes"), but there
is no need to incrementally revert back to using fast invalidate, e.g.
doing so doesn't provide any bisection or stability benefits.

Fixes: 571c5af0 ("KVM: x86/mmu: Voluntarily reschedule as needed when zapping MMIO sptes")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fac026da

arch/x86/kvm/mmu.c

+3 −14
Original line number Diff line number Diff line
@@ -403,8 +403,6 @@ static void mark_mmio_spte(struct kvm_vcpu *vcpu, u64 *sptep, u64 gfn, 
	mask |= (gpa & shadow_nonpresent_or_rsvd_mask)

		<< shadow_nonpresent_or_rsvd_mask_len;



	page_header(__pa(sptep))->mmio_cached = true;



	trace_mark_mmio_spte(sptep, gfn, access, gen);

	mmu_spte_set(sptep, mask);

}
@@ -5948,7 +5946,7 @@ void kvm_mmu_slot_set_dirty(struct kvm *kvm, 
}

EXPORT_SYMBOL_GPL(kvm_mmu_slot_set_dirty);



static void __kvm_mmu_zap_all(struct kvm *kvm, bool mmio_only)

void kvm_mmu_zap_all(struct kvm *kvm)

{

	struct kvm_mmu_page *sp, *node;

	LIST_HEAD(invalid_list);
@@ -5957,14 +5955,10 @@ static void __kvm_mmu_zap_all(struct kvm *kvm, bool mmio_only) 
	spin_lock(&kvm->mmu_lock);

restart:

	list_for_each_entry_safe(sp, node, &kvm->arch.active_mmu_pages, link) {

		if (mmio_only && !sp->mmio_cached)

			continue;

		if (sp->role.invalid && sp->root_count)

			continue;

		if (__kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list, &ign)) {

			WARN_ON_ONCE(mmio_only);

		if (__kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list, &ign))

			goto restart;

		}

		if (cond_resched_lock(&kvm->mmu_lock))

			goto restart;

	}
@@ -5973,11 +5967,6 @@ restart: 
	spin_unlock(&kvm->mmu_lock);

}



void kvm_mmu_zap_all(struct kvm *kvm)

{

	return __kvm_mmu_zap_all(kvm, false);

}



void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen)

{

	WARN_ON(gen & KVM_MEMSLOT_GEN_UPDATE_IN_PROGRESS);
@@ -5999,7 +5988,7 @@ void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen) 
	 */

	if (unlikely(gen == 0)) {

		kvm_debug_ratelimited("kvm: zapping shadow pages for mmio generation wraparound\n");

		__kvm_mmu_zap_all(kvm, true);

		kvm_mmu_zap_all_fast(kvm);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE