Messages in this thread Patch in this message | | | Date | Thu, 01 Oct 2009 16:31:25 -0700 | From | Greg KH <> | Subject | [patch 09/30] KVM: MMU: make __kvm_mmu_free_some_pages handle empty list |
| |
2.6.30-stable review patch. If anyone has any objections, please let us know.
------------------ From: Izik Eidus <ieidus@redhat.com>
(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> --- arch/x86/kvm/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
--- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2612,7 +2612,8 @@ EXPORT_SYMBOL_GPL(kvm_mmu_unprotect_page 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,
| |