summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm/book3s_32_mmu.c
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2014-07-10 19:22:03 +0200
committerAlexander Graf <agraf@suse.de>2014-07-28 15:23:10 +0200
commit2e27ecc961044a2c5c05a4283888352961886a87 (patch)
tree405aa1316d2b59f5adc56396d6ffe85baf9ed250 /arch/powerpc/kvm/book3s_32_mmu.c
parent17824b5afcf273f6fc3e04df2d2a9d90d5c864fd (diff)
downloadlinux-stable-2e27ecc961044a2c5c05a4283888352961886a87.tar.gz
linux-stable-2e27ecc961044a2c5c05a4283888352961886a87.tar.bz2
linux-stable-2e27ecc961044a2c5c05a4283888352961886a87.zip
KVM: PPC: Book3S: Stop PTE lookup on write errors
When a page lookup failed because we're not allowed to write to the page, we should not overwrite that value with another lookup on the second PTEG which will return "page not found". Instead, we should just tell the caller that we had a permission problem. This fixes Mac OS X guests looping endlessly in page lookup code for me. Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kvm/book3s_32_mmu.c')
-rw-r--r--arch/powerpc/kvm/book3s_32_mmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_32_mmu.c b/arch/powerpc/kvm/book3s_32_mmu.c
index 93503bbdae43..cd0b0730e29e 100644
--- a/arch/powerpc/kvm/book3s_32_mmu.c
+++ b/arch/powerpc/kvm/book3s_32_mmu.c
@@ -335,7 +335,7 @@ static int kvmppc_mmu_book3s_32_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
if (r < 0)
r = kvmppc_mmu_book3s_32_xlate_pte(vcpu, eaddr, pte,
data, iswrite, true);
- if (r < 0)
+ if (r == -ENOENT)
r = kvmppc_mmu_book3s_32_xlate_pte(vcpu, eaddr, pte,
data, iswrite, false);