Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3ac1a4b authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: MMU: fix release noslot pfn 



We can not directly call kvm_release_pfn_clean to release the pfn
since we can meet noslot pfn which is used to cache mmio info into
spte

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent ecefbd94

arch/x86/kvm/mmu.c

+1 −2
Original line number Diff line number Diff line
@@ -2497,7 +2497,6 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 
		}

	}



	if (!is_error_pfn(pfn))

	kvm_release_pfn_clean(pfn);

}

virt/kvm/kvm_main.c

+1 −3
Original line number Diff line number Diff line
@@ -1322,9 +1322,7 @@ EXPORT_SYMBOL_GPL(kvm_release_page_clean); 


void kvm_release_pfn_clean(pfn_t pfn)

{

	WARN_ON(is_error_pfn(pfn));



	if (!kvm_is_mmio_pfn(pfn))

	if (!is_error_pfn(pfn) && !kvm_is_mmio_pfn(pfn))

		put_page(pfn_to_page(pfn));

}

EXPORT_SYMBOL_GPL(kvm_release_pfn_clean);