aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm
diff options
context:
space:
mode:
authorHollis Blanchard <hollisb@us.ibm.com>2008-05-21 19:22:54 -0400
committerAvi Kivity <avi@qumranet.com>2008-06-06 14:22:33 -0400
commit905fa4b9d6e2c9fd1c9ad84e3abe83021f498f53 (patch)
treed26440a247f76a7f0b440973621bf2ca764e6697 /arch/powerpc/kvm
parent52435b7c7a29f7dd7947c8c204494d7f52f14813 (diff)
KVM: ppc: Use a read lock around MMU operations, and release it on error
gfn_to_page() and kvm_release_page_clean() are called from other contexts with mmap_sem locked only for reading. Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/powerpc/kvm')
-rw-r--r--arch/powerpc/kvm/44x_tlb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
index aa649c7db99b..1c48d6164bd5 100644
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
@@ -142,18 +142,19 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, u64 asid,
142 stlbe = &vcpu->arch.shadow_tlb[victim]; 142 stlbe = &vcpu->arch.shadow_tlb[victim];
143 143
144 /* Get reference to new page. */ 144 /* Get reference to new page. */
145 down_write(&current->mm->mmap_sem); 145 down_read(&current->mm->mmap_sem);
146 new_page = gfn_to_page(vcpu->kvm, gfn); 146 new_page = gfn_to_page(vcpu->kvm, gfn);
147 if (is_error_page(new_page)) { 147 if (is_error_page(new_page)) {
148 printk(KERN_ERR "Couldn't get guest page!\n"); 148 printk(KERN_ERR "Couldn't get guest page!\n");
149 kvm_release_page_clean(new_page); 149 kvm_release_page_clean(new_page);
150 up_read(&current->mm->mmap_sem);
150 return; 151 return;
151 } 152 }
152 hpaddr = page_to_phys(new_page); 153 hpaddr = page_to_phys(new_page);
153 154
154 /* Drop reference to old page. */ 155 /* Drop reference to old page. */
155 kvmppc_44x_shadow_release(vcpu, victim); 156 kvmppc_44x_shadow_release(vcpu, victim);
156 up_write(&current->mm->mmap_sem); 157 up_read(&current->mm->mmap_sem);
157 158
158 vcpu->arch.shadow_pages[victim] = new_page; 159 vcpu->arch.shadow_pages[victim] = new_page;
159 160