diff options
| author |   Alexey Kardashevskiy <aik@ozlabs.ru> | 2017-03-24 17:49:22 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@ozlabs.org> | 2017-04-20 11:38:14 +1000 |
| commit | 96df2267695199b9377bd641c7eb68c393b81b0b (patch) | |
| tree | 45bfa5980f9b72b4635b2de84a267b90c49b074d /arch/powerpc/kvm/book3s_64_mmu.c | |
| parent | KVM: PPC: Book3S PR: Exit KVM on failed mapping (diff) | |
| download | linux-dev-96df2267695199b9377bd641c7eb68c393b81b0b.tar.xz linux-dev-96df2267695199b9377bd641c7eb68c393b81b0b.zip | |
KVM: PPC: Book3S PR: Preserve storage control bits
PR KVM page fault handler performs eaddr to pte translation for a guest,
however kvmppc_mmu_book3s_64_xlate() does not preserve WIMG bits
(storage control) in the kvmppc_pte struct. If PR KVM is running as
a second level guest under HV KVM, and PR KVM tries inserting HPT entry,
this fails in HV KVM if it already has this mapping.
This preserves WIMG bits between kvmppc_mmu_book3s_64_xlate() and
kvmppc_mmu_map_page().
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kvm/book3s_64_mmu.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_64_mmu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c index 70153578131a..29ebe2fd5867 100644 --- a/arch/powerpc/kvm/book3s_64_mmu.c +++ b/arch/powerpc/kvm/book3s_64_mmu.c @@ -319,6 +319,7 @@ do_second: gpte->may_execute = true; gpte->may_read = false; gpte->may_write = false; + gpte->wimg = r & HPTE_R_WIMG; switch (pp) { case 0: |