Commit d381b05e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fix from Paolo Bonzini:
 "A lone x86 patch, for a bug found while developing a backport to
  stable versions"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86/mmu: preserve pending TLB flush across calls to kvm_tdp_mmu_zap_sp
parents 4ea51e0e 315f02c6

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -5906,7 +5906,7 @@ static void kvm_recover_nx_lpages(struct kvm *kvm) 
				      lpage_disallowed_link);

		WARN_ON_ONCE(!sp->lpage_disallowed);

		if (is_tdp_mmu_page(sp)) {

			flush = kvm_tdp_mmu_zap_sp(kvm, sp);

			flush |= kvm_tdp_mmu_zap_sp(kvm, sp);

		} else {

			kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list);

			WARN_ON_ONCE(sp->lpage_disallowed);