kvmppc: protection keys fix
Subsystems (2)
PATCH 1/1 kvmppc: protection keys fix
kvmppc_do_h_enter() hcall, clobbers the high-order two bits of the protection key, in the lower pte (ptel). Any pkey number above 7, hence fails to operate correctly.
The following patch, preserves the pkey bits.
Acked-by Balbir Singh <[email protected]>
Reviewed-by Paul Mackerras <[email protected]>
Signed-off-by Ram Pai <[email protected]>
--- 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 deletion(-)
arch/powerpc/include/asm/book3s/64/mmu-hash.h +1 -0
@@ -104,6 +104,7 @@#define HPTE_R_C ASM_CONST(0x0000000000000080)#define HPTE_R_R ASM_CONST(0x0000000000000100)#define HPTE_R_KEY_LO ASM_CONST(0x0000000000000e00) +#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)
arch/powerpc/kvm/book3s_hv_rm_mmu.c +1 -1
@@ -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)
Signature · 1 line
1.8.3.1