Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6590ca5 authored by Ram Pai's avatar Ram Pai Committed by Michael Ellerman
Browse files

powerpc: Program HPTE key protection bits 



Map the PTE protection key bits to the HPTE key protection bits,
while creating HPTE  entries.

Acked-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarRam Pai <linuxram@us.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent eb95d016

arch/powerpc/include/asm/book3s/64/mmu-hash.h

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ 
#define HPTE_R_PP0		ASM_CONST(0x8000000000000000)

#define HPTE_R_TS		ASM_CONST(0x4000000000000000)

#define HPTE_R_KEY_HI		ASM_CONST(0x3000000000000000)

#define HPTE_R_KEY_BIT0		ASM_CONST(0x2000000000000000)

#define HPTE_R_KEY_BIT1		ASM_CONST(0x1000000000000000)

#define HPTE_R_RPN_SHIFT	12

#define HPTE_R_RPN		ASM_CONST(0x0ffffffffffff000)

#define HPTE_R_RPN_3_0		ASM_CONST(0x01fffffffffff000)
@@ -104,6 +106,9 @@ 
#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_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)

arch/powerpc/include/asm/mmu_context.h

+6 −0
Original line number Diff line number Diff line
@@ -203,6 +203,12 @@ static inline int vma_pkey(struct vm_area_struct *vma) 
{

	return 0;

}



static inline u64 pte_to_hpte_pkey_bits(u64 pteflags)

{

	return 0x0UL;

}



#endif /* CONFIG_PPC_MEM_KEYS */



#endif /* __KERNEL__ */

arch/powerpc/include/asm/pkeys.h

+9 −0
Original line number Diff line number Diff line
@@ -62,6 +62,15 @@ static inline int vma_pkey(struct vm_area_struct *vma) 


#define arch_max_pkey() pkeys_total



static inline u64 pte_to_hpte_pkey_bits(u64 pteflags)

{

	return (((pteflags & H_PTE_PKEY_BIT0) ? HPTE_R_KEY_BIT0 : 0x0UL) |

		((pteflags & H_PTE_PKEY_BIT1) ? HPTE_R_KEY_BIT1 : 0x0UL) |

		((pteflags & H_PTE_PKEY_BIT2) ? HPTE_R_KEY_BIT2 : 0x0UL) |

		((pteflags & H_PTE_PKEY_BIT3) ? HPTE_R_KEY_BIT3 : 0x0UL) |

		((pteflags & H_PTE_PKEY_BIT4) ? HPTE_R_KEY_BIT4 : 0x0UL));

}



#define pkey_alloc_mask(pkey) (0x1 << pkey)



#define mm_pkey_allocation_map(mm) (mm->context.pkey_allocation_map)

arch/powerpc/mm/hash_utils_64.c

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ unsigned long htab_convert_pte_flags(unsigned long pteflags) 
		 */

		rflags |= HPTE_R_M;



	rflags |= pte_to_hpte_pkey_bits(pteflags);

	return rflags;

}