UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: PPC: Book3S PR: Don't keep scanning HPTEG after we find a match 

The loop in kvmppc_mmu_book3s_64_xlate() that looks up a translation
in the guest hashed page table (HPT) keeps going if it finds an
HPTE that matches but doesn't allow access.  This is incorrect; it
is different from what the hardware does, and there should never be
more than one matching HPTE anyway.  This fixes it to stop when any
matching HPTE is found.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Paul Mackerras 2013-06-22 17:14:48 +10:00 committed by Alexander Graf
parent bc1bc4e392
commit 6ed1485f65
1 changed files with 2 additions and 12 deletions
arch/powerpc/kvm
book3s_64_mmu.c

14
arch/powerpc/kvm/book3s_64_mmu.c
View File

@ -167,7 +167,6 @@ static int kvmppc_mmu_book3s_64_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
int i; int i;
u8 key = 0; u8 key = 0;
bool found = false; bool found = false;
bool perm_err = false;
int second = 0; int second = 0;
ulong mp_ea = vcpu->arch.magic_page_ea; ulong mp_ea = vcpu->arch.magic_page_ea;
@ -248,11 +247,6 @@ do_second:
break; break;
} }
if (!gpte->may_read) {
perm_err = true;
continue;
}
dprintk("KVM MMU: Translated 0x%lx [0x%llx] -> 0x%llx " dprintk("KVM MMU: Translated 0x%lx [0x%llx] -> 0x%llx "
"-> 0x%lx\n", "-> 0x%lx\n",
eaddr, avpn, gpte->vpage, gpte->raddr); eaddr, avpn, gpte->vpage, gpte->raddr);
@ -281,6 +275,8 @@ do_second:
if (pteg[i+1] != oldr) if (pteg[i+1] != oldr)
copy_to_user((void __user *)ptegp, pteg, sizeof(pteg)); copy_to_user((void __user *)ptegp, pteg, sizeof(pteg));
if (!gpte->may_read)
return -EPERM;
return 0; return 0;
} else { } else {
dprintk("KVM MMU: No PTE found (ea=0x%lx sdr1=0x%llx " dprintk("KVM MMU: No PTE found (ea=0x%lx sdr1=0x%llx "
@ -296,13 +292,7 @@ do_second:
} }
} }
no_page_found: no_page_found:
if (perm_err)
return -EPERM;
return -ENOENT; return -ENOENT;
no_seg_found: no_seg_found: