summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIzik Eidus <ieidus@redhat.com>2009-09-18 20:08:01 -0300
committerGreg Kroah-Hartman <gregkh@suse.de>2009-10-05 08:27:53 -0700
commit0af8b3ad950ea4687cfee0cc5e7af9d941fd02ff (patch)
tree2ebf0888cf2a068bc1a0da989e2eff7ef0b49d77
parente38c35b0881a7706b3cbedd7cfe5165fb0371442 (diff)
downloadlinux-stable-0af8b3ad950ea4687cfee0cc5e7af9d941fd02ff.tar.gz
linux-stable-0af8b3ad950ea4687cfee0cc5e7af9d941fd02ff.tar.bz2
linux-stable-0af8b3ad950ea4687cfee0cc5e7af9d941fd02ff.zip
KVM: MMU: make __kvm_mmu_free_some_pages handle empty list
(cherry picked from commit 3b80fffe2b31fb716d3ebe729c54464ee7856723) First check if the list is empty before attempting to look at list entries. Signed-off-by: Izik Eidus <ieidus@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/x86/kvm/mmu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index d7ce26babbbe..a1c5e34e15fd 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2612,7 +2612,8 @@ EXPORT_SYMBOL_GPL(kvm_mmu_unprotect_page_virt);
void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
{
- while (vcpu->kvm->arch.n_free_mmu_pages < KVM_REFILL_PAGES) {
+ while (vcpu->kvm->arch.n_free_mmu_pages < KVM_REFILL_PAGES &&
+ !list_empty(&vcpu->kvm->arch.active_mmu_pages)) {
struct kvm_mmu_page *sp;
sp = container_of(vcpu->kvm->arch.active_mmu_pages.prev,