From d802827a96752324d307a89ee8b0df5b2d826164 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Thu, 3 Jul 2008 18:33:02 -0300 Subject: [PATCH] --- yaml --- r: 103751 b: refs/heads/master c: 5a4c92880493945678315a6df810f7a21f55b985 h: refs/heads/master i: 103749: b0d1a5c3a574c974d6353e18a6be452615537a00 103747: 01502e01a027ac44ce0269fcd5bc946daf84d674 103743: 1c0185141ccdbe1938474b0a5ec593d5a703d3bf v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/mmu.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 31c7f525ce65..77851abd8ac2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e37c2998a5a0b00134f6227167694b710f57ac0 +refs/heads/master: 5a4c92880493945678315a6df810f7a21f55b985 diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c index 1fd8e3b58cc0..ff7cf632175b 100644 --- a/trunk/arch/x86/kvm/mmu.c +++ b/trunk/arch/x86/kvm/mmu.c @@ -1987,6 +1987,8 @@ static int mmu_shrink(int nr_to_scan, gfp_t gfp_mask) list_for_each_entry(kvm, &vm_list, vm_list) { int npages; + if (!down_read_trylock(&kvm->slots_lock)) + continue; spin_lock(&kvm->mmu_lock); npages = kvm->arch.n_alloc_mmu_pages - kvm->arch.n_free_mmu_pages; @@ -1999,6 +2001,7 @@ static int mmu_shrink(int nr_to_scan, gfp_t gfp_mask) nr_to_scan--; spin_unlock(&kvm->mmu_lock); + up_read(&kvm->slots_lock); } if (kvm_freed) list_move_tail(&kvm_freed->vm_list, &vm_list);