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/include/asm/kvm_host.h | |
parent | bd9166ffe624000140fc6b606b256df01fc0d060 (diff) | |
download | linux-stable-96df2267695199b9377bd641c7eb68c393b81b0b.tar.gz linux-stable-96df2267695199b9377bd641c7eb68c393b81b0b.tar.bz2 linux-stable-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/include/asm/kvm_host.h')
-rw-r--r-- | arch/powerpc/include/asm/kvm_host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h index 2acc691ed9d0..0f3ac09cbfe0 100644 --- a/arch/powerpc/include/asm/kvm_host.h +++ b/arch/powerpc/include/asm/kvm_host.h @@ -342,6 +342,7 @@ struct kvmppc_pte { bool may_read : 1; bool may_write : 1; bool may_execute : 1; + unsigned long wimg; u8 page_size; /* MMU_PAGE_xxx */ }; |