All of lore.kernel.org
 help / color / mirror / Atom feed
* [RFC PATCH] kvmppc: protection keys fix
@ 2017-07-28 16:22 Ram Pai
  2017-07-31  5:35 ` Paul Mackerras
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Ram Pai @ 2017-07-28 16:22 UTC (permalink / raw)
  To: kvm-ppc

kvmppc_do_h_enter() hcall, clobbers the high-order two bits of
the protection key in the lower pte (ptel). Hence
any pkey  number above 7 fails to behave.

The following patch, preserves the pkey bits.

Signed-off-by: Ram Pai <linuxram@us.ibm.com>
---
 arch/powerpc/include/asm/book3s/64/mmu-hash.h |    1 +
 arch/powerpc/kvm/book3s_hv_rm_mmu.c           |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h
index 369f9ff..f07a1c0 100644
--- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h
+++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h
@@ -109,6 +109,7 @@
 #define HPTE_R_KEY_BIT2		ASM_CONST(0x0000000000000800)
 #define HPTE_R_KEY_BIT3		ASM_CONST(0x0000000000000400)
 #define HPTE_R_KEY_BIT4		ASM_CONST(0x0000000000000200)
+#define HPTE_R_KEY		(HPTE_R_KEY_LO | HPTE_R_KEY_HI)
 
 #define HPTE_V_1TB_SEG		ASM_CONST(0x4000000000000000)
 #define HPTE_V_VRMA_MASK	ASM_CONST(0x4001ffffff000000)
diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c
index ce6f212..d9462ab 100644
--- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c
@@ -268,7 +268,7 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,
 	if (!realmode)
 		local_irq_restore(irq_flags);
 
-	ptel &= ~(HPTE_R_PP0 - psize);
+	ptel &= HPTE_R_KEY | HPTE_R_PP0 | (psize-1);
 	ptel |= pa;
 
 	if (pa)
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2017-08-31  3:41 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-28 16:22 [RFC PATCH] kvmppc: protection keys fix Ram Pai
2017-07-31  5:35 ` Paul Mackerras
2017-07-31  5:56 ` Balbir Singh
2017-08-02  8:49 ` Aneesh Kumar K.V
2017-08-02  9:54 ` Paul Mackerras
2017-08-17 15:58 ` Ram Pai
2017-08-17 20:54 ` Thiago Jung Bauermann
2017-08-17 22:01 ` Ram Pai
2017-08-18  0:02 ` Paul Mackerras
2017-08-18 17:24 ` Ram Pai
2017-08-31  3:41 ` Paul Mackerras

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.