From: Ram Pai <linuxram@us.ibm.com>
To: mpe@ellerman.id.au, mingo@redhat.com, akpm@linux-foundation.org,
corbet@lwn.net, arnd@arndb.de
Cc: linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org,
x86@kernel.org, linux-arch@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org, dave.hansen@intel.com,
benh@kernel.crashing.org, paulus@samba.org,
khandual@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com,
bsingharora@gmail.com, hbabu@us.ibm.com, mhocko@kernel.org,
bauerman@linux.vnet.ibm.com, ebiederm@xmission.com,
linuxram@us.ibm.com
Subject: [PATCH v10 15/27] powerpc: Program HPTE key protection bits
Date: Thu, 18 Jan 2018 17:50:36 -0800 [thread overview]
Message-ID: <1516326648-22775-16-git-send-email-linuxram@us.ibm.com> (raw)
In-Reply-To: <1516326648-22775-1-git-send-email-linuxram@us.ibm.com>
Map the PTE protection key bits to the HPTE key protection bits,
while creating HPTE entries.
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
---
arch/powerpc/include/asm/book3s/64/mmu-hash.h | 5 +++++
arch/powerpc/include/asm/mmu_context.h | 6 ++++++
arch/powerpc/include/asm/pkeys.h | 9 +++++++++
arch/powerpc/mm/hash_utils_64.c | 1 +
4 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h
index e91e115..50ed64f 100644
--- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h
+++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h
@@ -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)
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
index 3ba571d..209f127 100644
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
@@ -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__ */
diff --git a/arch/powerpc/include/asm/pkeys.h b/arch/powerpc/include/asm/pkeys.h
index f65dedd..523d66c 100644
--- a/arch/powerpc/include/asm/pkeys.h
+++ b/arch/powerpc/include/asm/pkeys.h
@@ -73,6 +73,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)
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 8bd841a..dc0f76e 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -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;
}
--
1.7.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2018-01-19 1:52 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-19 1:50 [PATCH v10 00/27] powerpc, mm: Memory Protection Keys Ram Pai
2018-01-19 1:50 ` [PATCH v10 01/27] mm, powerpc, x86: define VM_PKEY_BITx bits if CONFIG_ARCH_HAS_PKEYS is enabled Ram Pai
2018-01-21 15:34 ` Aneesh Kumar K.V
2018-01-23 6:37 ` Ram Pai
2018-01-19 1:50 ` [PATCH v10 02/27] mm, powerpc, x86: introduce an additional vma bit for powerpc pkey Ram Pai
2018-01-19 1:50 ` [PATCH v10 03/27] powerpc: initial pkey plumbing Ram Pai
2018-01-22 3:34 ` [v10,03/27] " Michael Ellerman
2018-01-19 1:50 ` [PATCH v10 04/27] powerpc: track allocation status of all pkeys Ram Pai
2018-01-19 1:50 ` [PATCH v10 05/27] powerpc: helper function to read,write AMR,IAMR,UAMOR registers Ram Pai
2018-01-19 1:50 ` [PATCH v10 06/27] powerpc: helper functions to initialize AMR, IAMR and UAMOR registers Ram Pai
2018-01-19 1:50 ` [PATCH v10 07/27] powerpc: cleanup AMR, IAMR when a key is allocated or freed Ram Pai
2018-01-19 1:50 ` [PATCH v10 08/27] powerpc: implementation for arch_set_user_pkey_access() Ram Pai
2018-01-19 1:50 ` [PATCH v10 09/27] powerpc: ability to create execute-disabled pkeys Ram Pai
2018-01-19 1:50 ` [PATCH v10 10/27] powerpc: store and restore the pkey state across context switches Ram Pai
2018-01-19 1:50 ` [PATCH v10 11/27] powerpc: introduce execute-only pkey Ram Pai
2018-01-19 1:50 ` [PATCH v10 12/27] powerpc: ability to associate pkey to a vma Ram Pai
2018-01-19 1:50 ` [PATCH v10 13/27] powerpc: implementation for arch_override_mprotect_pkey() Ram Pai
2018-01-19 1:50 ` [PATCH v10 14/27] powerpc: map vma key-protection bits to pte key bits Ram Pai
2018-01-19 1:50 ` Ram Pai [this message]
2018-01-19 1:50 ` [PATCH v10 16/27] powerpc: helper to validate key-access permissions of a pte Ram Pai
2018-01-19 1:50 ` [PATCH v10 17/27] powerpc: check key protection for user page access Ram Pai
2018-01-19 1:50 ` [PATCH v10 18/27] powerpc: implementation for arch_vma_access_permitted() Ram Pai
2018-01-19 1:50 ` [PATCH v10 19/27] powerpc: Handle exceptions caused by pkey violation Ram Pai
2018-01-19 1:50 ` [PATCH v10 20/27] powerpc: introduce get_mm_addr_key() helper Ram Pai
2018-01-19 1:50 ` [PATCH v10 21/27] powerpc: Deliver SEGV signal on pkey violation Ram Pai
2018-01-19 1:50 ` [PATCH v10 22/27] powerpc/ptrace: Add memory protection key regset Ram Pai
2018-01-19 1:50 ` [PATCH v10 23/27] powerpc: Enable pkey subsystem Ram Pai
2018-01-19 1:50 ` [PATCH v10 24/27] powerpc: sys_pkey_alloc() and sys_pkey_free() system calls Ram Pai
2018-01-19 1:50 ` [PATCH v10 25/27] powerpc: sys_pkey_mprotect() system call Ram Pai
2018-01-19 1:50 ` [PATCH v10 26/27] mm, x86 : introduce arch_pkeys_enabled() Ram Pai
2018-01-19 1:50 ` [PATCH v10 27/27] mm: display pkey in smaps if arch_pkeys_enabled() is true Ram Pai
2018-01-19 16:09 ` Eric W. Biederman
2018-01-19 16:50 ` Ram Pai
2018-01-19 17:04 ` Eric W. Biederman
2018-01-30 12:16 ` Michal Hocko
2018-01-30 16:28 ` Ram Pai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1516326648-22775-16-git-send-email-linuxram@us.ibm.com \
--to=linuxram@us.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=arnd@arndb.de \
--cc=bauerman@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bsingharora@gmail.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@intel.com \
--cc=ebiederm@xmission.com \
--cc=hbabu@us.ibm.com \
--cc=khandual@linux.vnet.ibm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mhocko@kernel.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).