Kernel userspace access/execution prevention with hash translation
Subsystems (3)
v2 cover Kernel userspace access/execution prevention with hash translation
This patch series implements KUAP and KUEP with hash translation mode using memory keys. The kernel now uses memory protection key 3 to control access to the kernel. Kernel page table entries are now configured with key 3. Access to locations configured with any other key value is denied when in kernel mode (MSR_PR=0). This includes userspace which is by default configured with key 0.
Changes from V1:
* Rebased on latest kernel
* Depends on the below patch sets.
https://lore.kernel.org/linuxppc-dev/[email protected]
https://lore.kernel.org/linuxppc-dev/[email protected]
https://lore.kernel.org/linuxppc-dev/[email protected]
Aneesh Kumar K.V (28):
powerpc/book3s64/pkeys: Enable MMU_FTR_PKEY powerpc/book3s64/kuep: Add MMU_FTR_KUEP powerpc/book3s64/pkeys: Use execute_pkey_disable static key powerpc/book3s64/pkeys: Use MMU_FTR_PKEY instead of pkey_disabled
static key
powerpc/book3s64/kuap: Move KUAP related function outside radix powerpc/book3s64/kuep: Move KUEP related function outside radix powerpc/book3s64/kuap: Rename MMU_FTR_RADIX_KUAP to MMU_FTR_KUAP powerpc/book3s64/kuap/kuep: Make KUAP and KUEP a subfeature of
PPC_MEM_KEYS
powerpc/book3s64/kuap: Move UAMOR setup to key init function powerpc/book3s64/kuap: Use Key 3 for kernel mapping with hash
translation
powerpc/exec: Set thread.regs early during exec powerpc/book3s64/pkeys: Store/restore userspace AMR correctly on entry
and exit from kernel
powerpc/book3s64/kuep: Store/restore userspace IAMR correctly on entry
and exit from kernel
powerpc/book3s64/pkeys: Inherit correctly on fork. powerpc/book3s64/pkeys: Reset userspace AMR correctly on exec powerpc/ptrace-view: Use pt_regs values instead of thread_struct based
one.
powerpc/book3s64/pkeys: Don't update SPRN_AMR when in kernel mode. powerpc/book3s64/kuap: Restrict access to userspace based on userspace
AMR
powerpc/book3s64/kuap: Improve error reporting with KUAP powerpc/book3s64/kuap: Use Key 3 to implement KUAP with hash
translation.
powerpc/book3s64/kuep: Use Key 3 to implement KUEP with hash
translation.
powerpc/book3s64/hash/kuap: Enable kuap on hash powerpc/book3s64/hash/kuep: Enable KUEP on hash powerpc/book3s64/keys: Print information during boot. powerpc/selftest/ptrave-pkey: Rename variables to make it easier to
follow code
powerpc/selftest/ptrace-pkey: Update the test to mark an invalid pkey
correctly
powerpc/selftest/ptrace-pkey: IAMR and uamor cannot be updated by
ptrace
powerpc/book3s64/keys/kuap: Reset AMR/IAMR values on kexec
arch/powerpc/include/asm/book3s/32/kup.h | 4 +- .../powerpc/include/asm/book3s/64/hash-pkey.h | 24 +- arch/powerpc/include/asm/book3s/64/hash.h | 3 +- .../powerpc/include/asm/book3s/64/kup-radix.h | 187 --------- arch/powerpc/include/asm/book3s/64/kup.h | 385 ++++++++++++++++++ arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 + arch/powerpc/include/asm/book3s/64/mmu.h | 6 + arch/powerpc/include/asm/book3s/64/pkeys.h | 2 +- arch/powerpc/include/asm/kup.h | 20 +- arch/powerpc/include/asm/mmu.h | 17 +- arch/powerpc/include/asm/mmu_context.h | 2 +- arch/powerpc/include/asm/nohash/32/kup-8xx.h | 4 +- arch/powerpc/include/asm/pkeys.h | 24 +- arch/powerpc/include/asm/processor.h | 5 - arch/powerpc/include/asm/ptrace.h | 6 +- arch/powerpc/kernel/asm-offsets.c | 4 + arch/powerpc/kernel/entry_64.S | 6 +- arch/powerpc/kernel/exceptions-64s.S | 4 +- arch/powerpc/kernel/misc_64.S | 14 - arch/powerpc/kernel/process.c | 54 ++- arch/powerpc/kernel/prom.c | 5 + arch/powerpc/kernel/ptrace/ptrace-view.c | 23 +- arch/powerpc/kernel/smp.c | 5 + arch/powerpc/kernel/syscall_64.c | 30 +- arch/powerpc/kernel/traps.c | 6 - arch/powerpc/kexec/core_64.c | 3 + arch/powerpc/mm/book3s64/hash_4k.c | 2 +- arch/powerpc/mm/book3s64/hash_64k.c | 4 +- arch/powerpc/mm/book3s64/hash_hugepage.c | 2 +- arch/powerpc/mm/book3s64/hash_hugetlbpage.c | 2 +- arch/powerpc/mm/book3s64/hash_pgtable.c | 2 +- arch/powerpc/mm/book3s64/hash_utils.c | 10 +- arch/powerpc/mm/book3s64/pgtable.c | 3 + arch/powerpc/mm/book3s64/pkeys.c | 221 +++++----- arch/powerpc/mm/book3s64/radix_pgtable.c | 36 -- arch/powerpc/mm/fault.c | 2 +- arch/powerpc/platforms/Kconfig.cputype | 4 +- .../selftests/powerpc/ptrace/ptrace-pkey.c | 53 +-- 38 files changed, 723 insertions(+), 462 deletions(-) delete mode 100644 arch/powerpc/include/asm/book3s/64/kup-radix.h create mode 100644 arch/powerpc/include/asm/book3s/64/kup.h
Signature · 1 line
2.26.2
PATCH v2 1/28 powerpc/book3s64/pkeys: Enable MMU_FTR_PKEY
Parse storage keys related device tree entry in early_init_devtree and enable MMU feature MMU_FTR_PKEY if pkeys are supported.
MMU feature is used instead of CPU feature because this enables us to group MMU_FTR_KUAP and MMU_FTR_PKEY in asm feature fixup code.
--- arch/powerpc/include/asm/book3s/64/mmu.h | 6 +++ arch/powerpc/include/asm/mmu.h | 6 +++ arch/powerpc/kernel/prom.c | 5 +++ arch/powerpc/mm/book3s64/pkeys.c | 54 ++++++++++++++---------- 4 files changed, 48 insertions(+), 23 deletions(-)
arch/powerpc/include/asm/book3s/64/mmu.h +6 -0
@@ -209,6 +209,12 @@ extern int mmu_io_psize;void mmu_early_init_devtree (void );void hash__early_init_devtree (void );void radix__early_init_devtree (void ); +#ifdef CONFIG_PPC_MEM_KEYS +void pkey_early_init_devtree (void ); +#else +static inline void pkey_early_init_devtree (void ) {} +#endif +extern void hash__early_init_mmu (void );extern void radix__early_init_mmu (void );static inline void early_init_mmu (void )
arch/powerpc/include/asm/mmu.h +6 -0
@@ -23,6 +23,7 @@/* Radix page table supported and enabled */ #define MMU_FTR_TYPE_RADIX ASM_CONST(0x00000040) +#define MMU_FTR_PKEY ASM_CONST(0x00000080)/* * Individual features below.
@@ -176,6 +177,9 @@ enum { MMU_FTR_RADIX_KUAP |#endif /* CONFIG_PPC_KUAP */ #endif /* CONFIG_PPC_RADIX_MMU */ +#ifdef CONFIG_PPC_MEM_KEYS +MMU_FTR_PKEY | +#endif 0, };
@@ -364,6 +368,8 @@ extern void setup_initial_memory_limit(phys_addr_t first_memblock_base, phys_addr_t first_memblock_size);static inline void mmu_early_init_devtree (void ) { } +static inline void pkey_early_init_devtree (void ) {} +extern void *abatron_pteptrs[2 ];#endif /* __ASSEMBLY__ */ #endif
arch/powerpc/kernel/prom.c +5 -0
@@ -791,6 +791,11 @@ void __init early_init_devtree(void *params)/* Now try to figure out if we are running on LPAR and so on */ pseries_probe_fw_features (); +/* +* Initialize pkey features and default AMR/IAMR values +*/ +pkey_early_init_devtree (); +#ifdef CONFIG_PPC_PS3 /* Identify PS3 firmware */ if (of_flat_dt_is_compatible (of_get_flat_dt_root (),"sony,ps3" ))
arch/powerpc/mm/book3s64/pkeys.c +31 -23
103 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 2/28 powerpc/book3s64/kuep: Add MMU_FTR_KUEP
In reply to Aneesh Kumar K.VThis will be used to enable/disable Kernel Userspace Execution Prevention (KUEP).
--- arch/powerpc/include/asm/mmu.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/powerpc/include/asm/mmu.h +5 -0
@@ -24,6 +24,7 @@/* Radix page table supported and enabled */ #define MMU_FTR_TYPE_RADIX ASM_CONST(0x00000040)#define MMU_FTR_PKEY ASM_CONST(0x00000080) +#define MMU_FTR_KUEP ASM_CONST(0x00000100)/* * Individual features below.
@@ -180,6 +181,10 @@ enum {#ifdef CONFIG_PPC_MEM_KEYS MMU_FTR_PKEY |#endif +#ifdef CONFIG_PPC_KUEP +MMU_FTR_KUEP | +#endif /* CONFIG_PPC_KUAP */ + 0, };
Signature · 1 line
2.26.2
PATCH v2 3/28 powerpc/book3s64/pkeys: Use execute_pkey_disable static key
In reply to Aneesh Kumar K.VUse execute_pkey_disabled static key to check for execute key support instead of pkey_disabled.
--- arch/powerpc/include/asm/pkeys.h | 10 +--------- arch/powerpc/mm/book3s64/pkeys.c | 5 ++++- 2 files changed, 5 insertions(+), 10 deletions(-)
arch/powerpc/include/asm/pkeys.h +1 -9
@@ -126,15 +126,7 @@ static inline int mm_pkey_free(struct mm_struct *mm, int pkey)* Try to dedicate one of the protection keys to be used as an * execute-only protection key. */ -extern int __execute_only_pkey (struct mm_struct *mm); -static inline int execute_only_pkey (struct mm_struct *mm) -{ -if (static_branch_likely (&pkey_disabled)) -return -1 ; - -return __execute_only_pkey (mm); -} - +extern int execute_only_pkey (struct mm_struct *mm);extern int __arch_override_mprotect_pkey (struct vm_area_struct *vma,int prot,int pkey); static inline int arch_override_mprotect_pkey(struct vm_area_struct *vma,
arch/powerpc/mm/book3s64/pkeys.c +4 -1
@@ -345,8 +345,11 @@ void thread_pkey_regs_init(struct thread_struct *thread)write_uamor (default_uamor); } -int __execute_only_pkey (struct mm_struct *mm) +int execute_only_pkey (struct mm_struct *mm) { +if (static_branch_likely (&execute_pkey_disabled)) +return -1 ; +return mm->context.execute_only_pkey; }
Signature · 1 line
2.26.2
PATCH v2 4/28 powerpc/book3s64/pkeys: Use MMU_FTR_PKEY instead of pkey_disabled static key
In reply to Aneesh Kumar K.VInstead of pkey_disabled static key use mmu feature MMU_FTR_PKEY.
--- arch/powerpc/include/asm/book3s/64/pkeys.h | 2 +- arch/powerpc/include/asm/pkeys.h | 14 ++++++-------- arch/powerpc/mm/book3s64/pkeys.c | 16 +++++++--------- 3 files changed, 14 insertions(+), 18 deletions(-)
arch/powerpc/include/asm/book3s/64/pkeys.h +1 -1
@@ -7,7 +7,7 @@static inline u64 vmflag_to_pte_pkey_bits (u64 vm_flags) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return 0x0UL ;if (radix_enabled ())
arch/powerpc/include/asm/pkeys.h +6 -8
@@ -11,7 +11,6 @@#include <linux/jump_label.h> #include <asm/firmware.h> -DECLARE_STATIC_KEY_FALSE (pkey_disabled);extern int max_pkey;extern u32 reserved_allocation_mask;/* bits set for reserved keys */
@@ -38,7 +37,7 @@ static inline u64 pkey_to_vmflag_bits(u16 pkey)static inline int vma_pkey (struct vm_area_struct *vma) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return 0 ;return (vma->vm_flags &ARCH_VM_PKEY_FLAGS ) >>VM_PKEY_SHIFT ; }
@@ -93,9 +92,8 @@ static inline int mm_pkey_alloc(struct mm_struct *mm)u32 all_pkeys_mask = (u32)(~(0x0 ));int ret; -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return -1 ; -/* * Are we out of pkeys? We must handle this specially because ffz() * behavior is undefined if there are no zeros.
@@ -111,7 +109,7 @@ static inline int mm_pkey_alloc(struct mm_struct *mm)static inline int mm_pkey_free (struct mm_struct *mm,int pkey) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return -1 ;if (!mm_pkey_is_allocated (mm, pkey))
@@ -132,7 +130,7 @@ extern int __arch_override_mprotect_pkey(struct vm_area_struct *vma,static inline int arch_override_mprotect_pkey (struct vm_area_struct *vma,int prot,int pkey) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return 0 ;/*
@@ -150,7 +148,7 @@ extern int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey,static inline int arch_set_user_pkey_access (struct task_struct *tsk,int pkey,unsigned long init_val) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return -EINVAL ;/*
@@ -167,7 +165,7 @@ static inline int arch_set_user_pkey_access(struct task_struct *tsk, int pkey,static inline bool arch_pkeys_enabled (void ) { -return !static_branch_likely (&pkey_disabled); +return mmu_has_feature (MMU_FTR_PKEY ); }extern void pkey_mm_init (struct mm_struct *mm);
arch/powerpc/mm/book3s64/pkeys.c +7 -9
@@ -13,7 +13,6 @@#include <linux/of_fdt.h> -DEFINE_STATIC_KEY_FALSE (pkey_disabled);DEFINE_STATIC_KEY_FALSE (execute_pkey_disabled);int max_pkey;/* Maximum key value supported */ /*
@@ -114,7 +113,6 @@ void __init pkey_early_init_devtree(void) pkeys_total =scan_pkey_feature ();if (!pkeys_total) {/* No support for pkey. Mark it disabled */ -static_branch_enable (&pkey_disabled);return ; }
@@ -202,7 +200,7 @@ void __init pkey_early_init_devtree(void)void pkey_mm_init (struct mm_struct *mm) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return ;mm_pkey_allocation_map (mm) = initial_allocation_mask; mm->context.execute_only_pkey = execute_only_key;
@@ -306,7 +304,7 @@ int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey,void thread_pkey_regs_save (struct thread_struct *thread) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return ;/*
@@ -320,7 +318,7 @@ void thread_pkey_regs_save(struct thread_struct *thread)void thread_pkey_regs_restore (struct thread_struct *new_thread,struct thread_struct *old_thread) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return ;if (old_thread->amr != new_thread->amr)
@@ -333,7 +331,7 @@ void thread_pkey_regs_restore(struct thread_struct *new_thread,void thread_pkey_regs_init (struct thread_struct *thread) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return ; thread->amr = default_amr;
@@ -408,7 +406,7 @@ static bool pkey_access_permitted(int pkey, bool write, bool execute)bool arch_pte_access_permitted (u64 pte,bool write,bool execute) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return true;return pkey_access_permitted (pte_to_pkey_bits (pte), write, execute);
@@ -425,7 +423,7 @@ bool arch_pte_access_permitted(u64 pte, bool write, bool execute)bool arch_vma_access_permitted (struct vm_area_struct *vma,bool write,bool execute,bool foreign) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return true;/* * Do not enforce our key-permissions on a foreign vma.
@@ -438,7 +436,7 @@ bool arch_vma_access_permitted(struct vm_area_struct *vma, bool write,void arch_dup_pkeys (struct mm_struct *oldmm,struct mm_struct *mm) { -if (static_branch_likely (&pkey_disabled)) +if (!mmu_has_feature (MMU_FTR_PKEY ))return ;/* Duplicate the oldmm pkey state in mm: */
Signature · 1 line
2.26.2
PATCH v2 5/28 powerpc/book3s64/kuap: Move KUAP related function outside radix
In reply to Aneesh Kumar K.VThe next set of patches adds support for kuap with hash translation. In preparation for that rename/move kuap related functions to non radix names.
---
.../asm/book3s/64/{kup-radix.h => kup.h} | 6 +++---
arch/powerpc/include/asm/kup.h | 2 +-
arch/powerpc/kernel/syscall_64.c | 2 +-
arch/powerpc/mm/book3s64/pkeys.c | 18 ++++++++++++++++++
arch/powerpc/mm/book3s64/radix_pgtable.c | 18 ------------------
5 files changed, 23 insertions(+), 23 deletions(-)
rename arch/powerpc/include/asm/book3s/64/{kup-radix.h => kup.h} (97%)arch/powerpc/include/asm/book3s/64/kup.h renamed from arch/powerpc/include/asm/book3s/64/kup-radix.h +3 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_POWERPC_BOOK3S_64_KUP_RADIX_H -#define _ASM_POWERPC_BOOK3S_64_KUP_RADIX_H +#ifndef _ASM_POWERPC_BOOK3S_64_KUP_H +#define _ASM_POWERPC_BOOK3S_64_KUP_H#include <linux/const.h> #include <asm/reg.h>
@@ -184,4 +184,4 @@ static inline unsigned long kuap_get_and_check_amr(void)#endif /* __ASSEMBLY__ */ -#endif /* _ASM_POWERPC_BOOK3S_64_KUP_RADIX_H */ +#endif /* _ASM_POWERPC_BOOK3S_64_KUP_H */
arch/powerpc/include/asm/kup.h +1 -1
@@ -13,7 +13,7 @@#define KUAP_CURRENT 4#ifdef CONFIG_PPC64 -#include <asm/book3s/64/kup-radix.h> +#include <asm/book3s/64/kup.h> #endif #ifdef CONFIG_PPC_8xx#include <asm/nohash/32/kup-8xx.h>
arch/powerpc/kernel/syscall_64.c +1 -1
@@ -2,7 +2,7 @@#include <linux/err.h> #include <asm/asm-prototypes.h> -#include <asm/book3s/64/kup-radix.h> +#include <asm/book3s/64/kup.h> #include <asm/cputime.h> #include <asm/hw_irq.h> #include <asm/kprobes.h>
arch/powerpc/mm/book3s64/pkeys.c +18 -0
@@ -198,6 +198,24 @@ void __init pkey_early_init_devtree(void)return ; } +#ifdef CONFIG_PPC_KUAP +void __init setup_kuap (bool disabled) +{ +if (disabled || !early_radix_enabled ()) +return ; + +if (smp_processor_id () == boot_cpuid) { +pr_info ("Activating Kernel Userspace Access Prevention\n" ); + cur_cpu_spec->mmu_features |=MMU_FTR_RADIX_KUAP ; + } + +/* Make sure userspace can't change the AMR */ +mtspr (SPRN_UAMOR ,0 ); +mtspr (SPRN_AMR ,AMR_KUAP_BLOCKED ); +isync (); +} +#endif +void pkey_mm_init (struct mm_struct *mm) {if (!mmu_has_feature (MMU_FTR_PKEY ))
arch/powerpc/mm/book3s64/radix_pgtable.c +0 -18
@@ -526,24 +526,6 @@ void setup_kuep(bool disabled) }#endif -#ifdef CONFIG_PPC_KUAP -void setup_kuap (bool disabled) -{ -if (disabled || !early_radix_enabled ()) -return ; - -if (smp_processor_id () == boot_cpuid) { -pr_info ("Activating Kernel Userspace Access Prevention\n" ); - cur_cpu_spec->mmu_features |=MMU_FTR_RADIX_KUAP ; - } - -/* Make sure userspace can't change the AMR */ -mtspr (SPRN_UAMOR ,0 ); -mtspr (SPRN_AMR ,AMR_KUAP_BLOCKED ); -isync (); -} -#endif -void __init radix__early_init_mmu (void ) {unsigned long lpcr;
Signature · 1 line
2.26.2
PATCH v2 6/28 powerpc/book3s64/kuep: Move KUEP related function outside radix
In reply to Aneesh Kumar K.VThe next set of patches adds support for kuep with hash translation. In preparation for that rename/move kuap related functions to non radix names.
Also set MMU_FTR_KUEP and add the missing isync().
--- arch/powerpc/include/asm/book3s/64/kup.h | 1 + arch/powerpc/mm/book3s64/pkeys.c | 21 +++++++++++++++++++++ arch/powerpc/mm/book3s64/radix_pgtable.c | 18 ------------------ 3 files changed, 22 insertions(+), 18 deletions(-)
arch/powerpc/include/asm/book3s/64/kup.h +1 -0
@@ -7,6 +7,7 @@#define AMR_KUAP_BLOCK_READ UL(0x4000000000000000)#define AMR_KUAP_BLOCK_WRITE UL(0x8000000000000000) +#define AMR_KUEP_BLOCKED (1UL << 62)#define AMR_KUAP_BLOCKED (AMR_KUAP_BLOCK_READ | AMR_KUAP_BLOCK_WRITE)#define AMR_KUAP_SHIFT 62
arch/powerpc/mm/book3s64/pkeys.c +21 -0
@@ -198,6 +198,27 @@ void __init pkey_early_init_devtree(void)return ; } +#ifdef CONFIG_PPC_KUEP +void __init setup_kuep (bool disabled) +{ +if (disabled || !early_radix_enabled ()) +return ; + +if (smp_processor_id () == boot_cpuid) { +pr_info ("Activating Kernel Userspace Execution Prevention\n" ); + cur_cpu_spec->mmu_features |=MMU_FTR_KUEP ; + } + +/* +* Radix always uses key0 of the IAMR to determine if an access is +* allowed. We set bit 0 (IBM bit 1) of key0, to prevent instruction +* fetch. +*/ +mtspr (SPRN_IAMR ,AMR_KUEP_BLOCKED ); +isync (); +} +#endif +#ifdef CONFIG_PPC_KUAP void __init setup_kuap (bool disabled) {
arch/powerpc/mm/book3s64/radix_pgtable.c +0 -18
@@ -508,24 +508,6 @@ static void radix_init_amor(void)mtspr (SPRN_AMOR , (3ul <<62 )); } -#ifdef CONFIG_PPC_KUEP -void setup_kuep (bool disabled) -{ -if (disabled || !early_radix_enabled ()) -return ; - -if (smp_processor_id () == boot_cpuid) -pr_info ("Activating Kernel Userspace Execution Prevention\n" ); - -/* -* Radix always uses key0 of the IAMR to determine if an access is -* allowed. We set bit 0 (IBM bit 1) of key0, to prevent instruction -* fetch. -*/ -mtspr (SPRN_IAMR , (1ul <<62 )); -} -#endif -void __init radix__early_init_mmu (void ) {unsigned long lpcr;
Signature · 1 line
2.26.2
PATCH v2 7/28 powerpc/book3s64/kuap: Rename MMU_FTR_RADIX_KUAP to MMU_FTR_KUAP
In reply to Aneesh Kumar K.VThe next set of patches adds support for kuap with hash translation. In preparation for that rename/move kuap related functions to non radix names.
--- arch/powerpc/include/asm/book3s/64/kup.h | 18 +++++++++--------- arch/powerpc/include/asm/mmu.h | 6 +++--- arch/powerpc/mm/book3s64/pkeys.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-)
arch/powerpc/include/asm/book3s/64/kup.h +9 -9
@@ -24,7 +24,7 @@ mtspr SPRN_AMR, \gpr2 /* No isync required, see kuap_restore_amr() */ 998: - END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_RADIX_KUAP, 67) + END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_KUAP, 67) #endif .endm
@@ -36,7 +36,7 @@ sldi \gpr2, \gpr2, AMR_KUAP_SHIFT 999: tdne \gpr1, \gpr2 EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE) - END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_RADIX_KUAP, 67) + END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_KUAP, 67) #endif .endm
@@ -56,7 +56,7 @@ mtspr SPRN_AMR, \gpr2 isync 99: - END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_RADIX_KUAP, 67) + END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_KUAP, 67) #endif .endm
@@ -69,7 +69,7 @@static inline void kuap_restore_amr (struct pt_regs *regs,unsigned long amr) { -if (mmu_has_feature (MMU_FTR_RADIX_KUAP )) { +if (mmu_has_feature (MMU_FTR_KUAP )) {if (unlikely (regs->kuap != amr)) {isync ();mtspr (SPRN_AMR , regs->kuap);
@@ -84,7 +84,7 @@ static inline void kuap_restore_amr(struct pt_regs *regs, unsigned long amr)static inline unsigned long kuap_get_and_check_amr (void ) { -if (mmu_has_feature (MMU_FTR_RADIX_KUAP )) { +if (mmu_has_feature (MMU_FTR_KUAP )) {unsigned long amr =mfspr (SPRN_AMR );if (IS_ENABLED (CONFIG_PPC_KUAP_DEBUG ))/* kuap_check_amr() */ WARN_ON_ONCE (amr !=AMR_KUAP_BLOCKED );
@@ -95,7 +95,7 @@ static inline unsigned long kuap_get_and_check_amr(void)static inline void kuap_check_amr (void ) { -if (IS_ENABLED (CONFIG_PPC_KUAP_DEBUG ) &&mmu_has_feature (MMU_FTR_RADIX_KUAP )) +if (IS_ENABLED (CONFIG_PPC_KUAP_DEBUG ) &&mmu_has_feature (MMU_FTR_KUAP ))WARN_ON_ONCE (mfspr (SPRN_AMR ) !=AMR_KUAP_BLOCKED ); }
@@ -106,7 +106,7 @@ static inline void kuap_check_amr(void)static inline unsigned long get_kuap (void ) { -if (!early_mmu_has_feature (MMU_FTR_RADIX_KUAP )) +if (!early_mmu_has_feature (MMU_FTR_KUAP ))return 0 ;return mfspr (SPRN_AMR );
@@ -114,7 +114,7 @@ static inline unsigned long get_kuap(void)static inline void set_kuap (unsigned long value) { -if (!early_mmu_has_feature (MMU_FTR_RADIX_KUAP )) +if (!early_mmu_has_feature (MMU_FTR_KUAP ))return ;/*
@@ -164,7 +164,7 @@ static inline void restore_user_access(unsigned long flags)static inline bool bad_kuap_fault (struct pt_regs *regs,unsigned long address,bool is_write) { -return WARN (mmu_has_feature (MMU_FTR_RADIX_KUAP ) && +return WARN (mmu_has_feature (MMU_FTR_KUAP ) && (regs->kuap & (is_write ?AMR_KUAP_BLOCK_WRITE :AMR_KUAP_BLOCK_READ )),"Bug: %s fault blocked by AMR!" , is_write ?"Write" :"Read" ); }
arch/powerpc/include/asm/mmu.h +3 -3
@@ -112,7 +112,7 @@/* * Supports KUAP (key 0 controlling userspace addresses) on radix */ -#define MMU_FTR_RADIX_KUAP ASM_CONST(0x80000000) +#define MMU_FTR_KUAP ASM_CONST(0x80000000)/* MMU feature bit sets for various CPUs */ #define MMU_FTRS_DEFAULT_HPTE_ARCH_V2 \
@@ -174,10 +174,10 @@ enum {#endif #ifdef CONFIG_PPC_RADIX_MMU MMU_FTR_TYPE_RADIX | +#endif /* CONFIG_PPC_RADIX_MMU */ #ifdef CONFIG_PPC_KUAP - MMU_FTR_RADIX_KUAP | + MMU_FTR_KUAP |#endif /* CONFIG_PPC_KUAP */ -#endif /* CONFIG_PPC_RADIX_MMU */ #ifdef CONFIG_PPC_MEM_KEYS MMU_FTR_PKEY |#endif
arch/powerpc/mm/book3s64/pkeys.c +1 -1
@@ -227,7 +227,7 @@ void __init setup_kuap(bool disabled)if (smp_processor_id () == boot_cpuid) {pr_info ("Activating Kernel Userspace Access Prevention\n" ); - cur_cpu_spec->mmu_features |=MMU_FTR_RADIX_KUAP ; + cur_cpu_spec->mmu_features |=MMU_FTR_KUAP ; }/* Make sure userspace can't change the AMR */
Signature · 1 line
2.26.2
PATCH v2 8/28 powerpc/book3s64/kuap/kuep: Make KUAP and KUEP a subfeature of PPC_MEM_KEYS
In reply to Aneesh Kumar K.VThe next set of patches adds support for kuap with hash translation. Hence make KUAP a BOOK3S_64 feature. Also make it a subfeature of PPC_MEM_KEYS. Hash translation is going to use pkeys to support KUAP/KUEP. Adding this dependency reduces the code complexity and enables us to move some of the initialization code to pkeys.c
--- arch/powerpc/platforms/Kconfig.cputype | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/Kconfig.cputype +2 -2
@@ -99,6 +99,8 @@ config PPC_BOOK3S_64 select ARCH_SUPPORTS_NUMA_BALANCING select IRQ_WORK select PPC_MM_SLICES + select PPC_HAVE_KUAP if PPC_MEM_KEYS + select PPC_HAVE_KUEP if PPC_MEM_KEYS config PPC_BOOK3E_64 bool "Embedded processors"
@@ -350,8 +352,6 @@ config PPC_RADIX_MMU bool "Radix MMU Support" depends on PPC_BOOK3S_64 select ARCH_HAS_GIGANTIC_PAGE - select PPC_HAVE_KUEP - select PPC_HAVE_KUAP default y help Enable support for the Power ISA 3.0 Radix style MMU. Currently this
Signature · 1 line
2.26.2
PATCH v2 9/28 powerpc/book3s64/kuap: Move UAMOR setup to key init function
In reply to Aneesh Kumar K.VWith hash translation, the kernel will use key 3 for implementing KUAP feature. Hence the default UAMOR value depends on what other keys are marked reserved. Move the UAMOR initialization to pkeys init.
--- arch/powerpc/include/asm/book3s/64/kup.h | 2 ++ arch/powerpc/kernel/smp.c | 5 +++++ arch/powerpc/mm/book3s64/pkeys.c | 25 +++++++++++++++++++----- 3 files changed, 27 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/book3s/64/kup.h +2 -0
@@ -67,6 +67,8 @@#include <asm/mmu.h> #include <asm/ptrace.h> +extern u64 default_uamor; +static inline void kuap_restore_amr (struct pt_regs *regs,unsigned long amr) {if (mmu_has_feature (MMU_FTR_KUAP )) {
arch/powerpc/kernel/smp.c +5 -0
@@ -59,6 +59,7 @@#include <asm/asm-prototypes.h> #include <asm/cpu_has_feature.h> #include <asm/ftrace.h> +#include <asm/kup.h> #ifdef DEBUG #include <asm/udbg.h>
@@ -1256,6 +1257,10 @@ void start_secondary(void *unused)mmgrab (&init_mm); current->active_mm = &init_mm; +#ifdef CONFIG_PPC_MEM_KEYS +mtspr (SPRN_UAMOR , default_uamor); +#endif +smp_store_cpu_info (cpu);set_dec (tb_ticks_per_jiffy);preempt_disable ();
arch/powerpc/mm/book3s64/pkeys.c +20 -5
@@ -23,7 +23,7 @@ static u32 initial_allocation_mask; /* Bits set for the initially allocated kstatic u64 default_amr;static u64 default_iamr;/* Allow all keys to be modified by default */ -static u64 default_uamor = ~0x0UL ; +u64 default_uamor = ~0x0UL ;/* * Key used to implement PROT_EXEC mmap. Denies READ/WRITE * We pick key 2 because 0 is special key and 1 is reserved as per ISA.
@@ -112,8 +112,16 @@ void __init pkey_early_init_devtree(void)/* scan the device tree for pkey feature */ pkeys_total =scan_pkey_feature ();if (!pkeys_total) { -/* No support for pkey. Mark it disabled */ -return ; +/* +* No key support but on radix we can use key 0 +* to implement kuap. +*/ +if (early_radix_enabled ()) +/* +* Make sure userspace can't change the AMR +*/ + default_uamor =0 ; + goto err_out; } cur_cpu_spec->mmu_features |=MMU_FTR_PKEY ;
@@ -195,6 +203,12 @@ void __init pkey_early_init_devtree(void)*/ initial_allocation_mask |= reserved_allocation_mask; +err_out: +/* +* Setup uamor on boot cpu +*/ +mtspr (SPRN_UAMOR , default_uamor); +return ; }
@@ -230,8 +244,9 @@ void __init setup_kuap(bool disabled) cur_cpu_spec->mmu_features |=MMU_FTR_KUAP ; } -/* Make sure userspace can't change the AMR */ -mtspr (SPRN_UAMOR ,0 ); +/* +* Set the default kernel AMR values on all cpus. +*/ mtspr (SPRN_AMR ,AMR_KUAP_BLOCKED );isync (); }
Signature · 1 line
2.26.2
PATCH v2 10/28 powerpc/book3s64/kuap: Use Key 3 for kernel mapping with hash translation
In reply to Aneesh Kumar K.VThis patch updates kernel hash page table entries to use storage key 3 for its mapping. This implies all kernel access will now use key 3 to control READ/WRITE. The patch also prevents the allocation of key 3 from userspace and UAMOR value is updated such that userspace cannot modify key 3.
--- .../powerpc/include/asm/book3s/64/hash-pkey.h | 24 ++++++++++++++----- arch/powerpc/include/asm/book3s/64/hash.h | 3 ++- arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 + arch/powerpc/include/asm/mmu_context.h | 2 +- arch/powerpc/mm/book3s64/hash_4k.c | 2 +- arch/powerpc/mm/book3s64/hash_64k.c | 4 ++-- arch/powerpc/mm/book3s64/hash_hugepage.c | 2 +- arch/powerpc/mm/book3s64/hash_hugetlbpage.c | 2 +- arch/powerpc/mm/book3s64/hash_pgtable.c | 2 +- arch/powerpc/mm/book3s64/hash_utils.c | 10 ++++---- arch/powerpc/mm/book3s64/pkeys.c | 4 ++++ 11 files changed, 38 insertions(+), 18 deletions(-)
arch/powerpc/include/asm/book3s/64/hash-pkey.h +18 -6
@@ -2,6 +2,9 @@#ifndef _ASM_POWERPC_BOOK3S_64_HASH_PKEY_H#define _ASM_POWERPC_BOOK3S_64_HASH_PKEY_H +/* We use key 3 for KERNEL */ +#define HASH_DEFAULT_KERNEL_KEY (HPTE_R_KEY_BIT0 | HPTE_R_KEY_BIT1) +static inline u64 hash__vmflag_to_pte_pkey_bits (u64 vm_flags) { return (((vm_flags & VM_PKEY_BIT0) ? H_PTE_PKEY_BIT0 : 0x0UL) |
@@ -11,13 +14,22 @@ static inline u64 hash__vmflag_to_pte_pkey_bits(u64 vm_flags) ((vm_flags & VM_PKEY_BIT4) ? H_PTE_PKEY_BIT4 : 0x0UL)); } -static inline u64 pte_to_hpte_pkey_bits (u64 pteflags) +static inline u64 pte_to_hpte_pkey_bits (u64 pteflags,unsigned long flags) { -return (((pteflags &H_PTE_PKEY_BIT4 ) ?HPTE_R_KEY_BIT4 :0x0UL ) | - ((pteflags &H_PTE_PKEY_BIT3 ) ?HPTE_R_KEY_BIT3 :0x0UL ) | - ((pteflags &H_PTE_PKEY_BIT2 ) ?HPTE_R_KEY_BIT2 :0x0UL ) | - ((pteflags &H_PTE_PKEY_BIT1 ) ?HPTE_R_KEY_BIT1 :0x0UL ) | - ((pteflags &H_PTE_PKEY_BIT0 ) ?HPTE_R_KEY_BIT0 :0x0UL )); +unsigned long pte_pkey; + + pte_pkey = (((pteflags &H_PTE_PKEY_BIT4 ) ?HPTE_R_KEY_BIT4 :0x0UL ) | + ((pteflags &H_PTE_PKEY_BIT3 ) ?HPTE_R_KEY_BIT3 :0x0UL ) | + ((pteflags &H_PTE_PKEY_BIT2 ) ?HPTE_R_KEY_BIT2 :0x0UL ) | + ((pteflags &H_PTE_PKEY_BIT1 ) ?HPTE_R_KEY_BIT1 :0x0UL ) | + ((pteflags &H_PTE_PKEY_BIT0 ) ?HPTE_R_KEY_BIT0 :0x0UL )); + +if (mmu_has_feature (MMU_FTR_KUAP )) { +if ((pte_pkey ==0 ) && (flags &HPTE_USE_KERNEL_KEY )) +return HASH_DEFAULT_KERNEL_KEY ; + } + +return pte_pkey; }static inline u16 hash__pte_to_pkey_bits (u64 pteflags)
arch/powerpc/include/asm/book3s/64/hash.h +2 -1
@@ -145,7 +145,8 @@ extern void hash__mark_initmem_nx(void);extern void hpte_need_flush (struct mm_struct *mm,unsigned long addr,pte_t *ptep,unsigned long pte,int huge); -extern unsigned long htab_convert_pte_flags (unsigned long pteflags); +extern unsigned long htab_convert_pte_flags (unsigned long pteflags, +unsigned long flags);/* Atomic PTE updates */ static inline unsigned long hash__pte_update(struct mm_struct *mm, unsigned long addr,
arch/powerpc/include/asm/book3s/64/mmu-hash.h +1 -0
@@ -452,6 +452,7 @@ static inline unsigned long hpt_hash(unsigned long vpn,#define HPTE_LOCAL_UPDATE 0x1#define HPTE_NOHPTE_UPDATE 0x2 +#define HPTE_USE_KERNEL_KEY 0x4 extern int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid, pte_t *ptep, unsigned long trap,
arch/powerpc/include/asm/mmu_context.h +1 -1
@@ -286,7 +286,7 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,#define thread_pkey_regs_init (thread)#define arch_dup_pkeys (oldmm, mm) -static inline u64 pte_to_hpte_pkey_bits (u64 pteflags) +static inline u64 pte_to_hpte_pkey_bits (u64 pteflags,unsigned long flags) {return 0x0UL ; }
arch/powerpc/mm/book3s64/hash_4k.c +1 -1
@@ -54,7 +54,7 @@ int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid,* PP bits. _PAGE_USER is already PP bit 0x2, so we only * need to add in 0x1 if it's a read-only user page */ - rflags =htab_convert_pte_flags (new_pte); + rflags =htab_convert_pte_flags (new_pte, flags); rpte =__real_pte (__pte (old_pte), ptep,PTRS_PER_PTE ); if (cpu_has_feature(CPU_FTR_NOEXECUTE) &&
arch/powerpc/mm/book3s64/hash_64k.c +2 -2
@@ -72,7 +72,7 @@ int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid,* Handle the subpage protection bits */ subpg_pte = new_pte & ~subpg_prot; - rflags =htab_convert_pte_flags (subpg_pte); + rflags =htab_convert_pte_flags (subpg_pte, flags);if (cpu_has_feature (CPU_FTR_NOEXECUTE ) && !cpu_has_feature (CPU_FTR_COHERENT_ICACHE )) {
@@ -260,7 +260,7 @@ int __hash_page_64K(unsigned long ea, unsigned long access, new_pte |= _PAGE_DIRTY; }while (!pte_xchg (ptep,__pte (old_pte),__pte (new_pte))); - rflags =htab_convert_pte_flags (new_pte); + rflags =htab_convert_pte_flags (new_pte, flags); rpte =__real_pte (__pte (old_pte), ptep,PTRS_PER_PTE ); if (cpu_has_feature(CPU_FTR_NOEXECUTE) &&
arch/powerpc/mm/book3s64/hash_hugepage.c +1 -1
@@ -57,7 +57,7 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,if (!(old_pmd & (H_PAGE_THP_HUGE | _PAGE_DEVMAP)))return 0 ; - rflags =htab_convert_pte_flags (new_pmd); + rflags =htab_convert_pte_flags (new_pmd, flags);#if 0 if (!cpu_has_feature (CPU_FTR_COHERENT_ICACHE )) {
arch/powerpc/mm/book3s64/hash_hugetlbpage.c +1 -1
@@ -72,7 +72,7 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,if (old_pte & (H_PAGE_THP_HUGE | _PAGE_DEVMAP))return 0 ; - rflags =htab_convert_pte_flags (new_pte); + rflags =htab_convert_pte_flags (new_pte, flags);if (unlikely (mmu_psize ==MMU_PAGE_16G )) offset =PTRS_PER_PUD ;else
arch/powerpc/mm/book3s64/hash_pgtable.c +1 -1
@@ -454,7 +454,7 @@ void hash__mark_initmem_nx(void) start = (unsigned long )__init_begin; end = (unsigned long )__init_end; - pp =htab_convert_pte_flags (pgprot_val (PAGE_KERNEL )); + pp =htab_convert_pte_flags (pgprot_val (PAGE_KERNEL ),HPTE_USE_KERNEL_KEY );WARN_ON (!hash__change_memory_range (start, end, pp)); }
arch/powerpc/mm/book3s64/hash_utils.c +6 -4
@@ -183,7 +183,7 @@ static struct mmu_psize_def mmu_psize_defaults_gp[] = {* - We make sure R is always set and never lost * - C is _PAGE_DIRTY, and *should* always be set for a writeable mapping */ -unsigned long htab_convert_pte_flags (unsigned long pteflags) +unsigned long htab_convert_pte_flags (unsigned long pteflags,unsigned long flags) {unsigned long rflags =0 ;
@@ -237,7 +237,7 @@ unsigned long htab_convert_pte_flags(unsigned long pteflags)*/ rflags |=HPTE_R_M ; - rflags |=pte_to_hpte_pkey_bits (pteflags); + rflags |=pte_to_hpte_pkey_bits (pteflags, flags);return rflags; }
@@ -252,7 +252,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, shift = mmu_psize_defs[psize].shift; step =1 << shift; - prot =htab_convert_pte_flags (prot); + prot =htab_convert_pte_flags (prot,HPTE_USE_KERNEL_KEY );DBG ("htab_bolt_mapping(%lx..%lx -> %lx (%lx,%d,%d)\n" , vstart, vend, pstart, prot, psize, ssize);
@@ -1295,12 +1295,14 @@ int hash_page_mm(struct mm_struct *mm, unsigned long ea, vsid =get_kernel_vsid (ea, mmu_kernel_ssize); psize = mmu_vmalloc_psize; ssize = mmu_kernel_ssize; + flags |=HPTE_USE_KERNEL_KEY ;break ;case IO_REGION_ID : vsid =get_kernel_vsid (ea, mmu_kernel_ssize); psize = mmu_io_psize; ssize = mmu_kernel_ssize; + flags |=HPTE_USE_KERNEL_KEY ;break ;default :/*
@@ -1894,7 +1896,7 @@ static void kernel_map_linear_page(unsigned long vaddr, unsigned long lmi)unsigned long hash;unsigned long vsid =get_kernel_vsid (vaddr, mmu_kernel_ssize);unsigned long vpn =hpt_vpn (vaddr, vsid, mmu_kernel_ssize); -unsigned long mode =htab_convert_pte_flags (pgprot_val (PAGE_KERNEL )); +unsigned long mode =htab_convert_pte_flags (pgprot_val (PAGE_KERNEL ),HPTE_USE_KERNEL_KEY );long ret; hash =hpt_hash (vpn,PAGE_SHIFT , mmu_kernel_ssize);
arch/powerpc/mm/book3s64/pkeys.c +4 -0
@@ -189,6 +189,10 @@ void __init pkey_early_init_devtree(void) reserved_allocation_mask |= (0x1 <<1 ); default_uamor &= ~(0x3ul <<pkeyshift (1 )); +/* handle key 3 which is used by kernel for KAUP */ + reserved_allocation_mask |= (0x1 <<3 ); + default_uamor &= ~(0x3ul <<pkeyshift (3 )); +/* * Prevent the usage of OS reserved keys. Update UAMOR * for those keys. Also mark the rest of the bits in the
Signature · 1 line
2.26.2
PATCH v2 11/28 powerpc/exec: Set thread.regs early during exec
In reply to Aneesh Kumar K.VIn later patches during exec, we would like to access default regs.kuap to control access to the user mapping. Having thread.regs set early makes the code changes simpler.
--- arch/powerpc/kernel/process.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
arch/powerpc/kernel/process.c +12 -12
@@ -1462,9 +1462,18 @@ void flush_thread(void)#ifdef CONFIG_PPC_BOOK3S_64 void arch_setup_new_exec (void ) { -if (radix_enabled ()) -return ; -hash__setup_new_exec (); +if (!radix_enabled ()) +hash__setup_new_exec (); + +/* +* If we exec out of a kernel thread then thread.regs will not be +* set. Do it now. +*/ +if (!current->thread.regs) { +struct pt_regs *regs =task_stack_page (current) +THREAD_SIZE ; + current->thread.regs = regs -1 ; + } + }#endif
@@ -1689,15 +1698,6 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)#endif #endif -/* -* If we exec out of a kernel thread then thread.regs will not be -* set. Do it now. -*/ -if (!current->thread.regs) { -struct pt_regs *regs =task_stack_page (current) +THREAD_SIZE ; - current->thread.regs = regs -1 ; - } -#ifdef CONFIG_PPC_TRANSACTIONAL_MEM /* * Clear any transactional state, we're exec()ing. The cause is
Signature · 1 line
2.26.2
PATCH v2 12/28 powerpc/book3s64/pkeys: Store/restore userspace AMR correctly on entry and exit from kernel
In reply to Aneesh Kumar K.VThis prepare kernel to operate with a different value than userspace AMR. For this, AMR needs to be saved and restored on entry and return from the kernel.
With KUAP we modify kernel AMR when accessing user address from the kernel via copy_to/from_user interfaces.
If MMU_FTR_KEY is enabled we always use the key mechanism to implement KUAP feature. If MMU_FTR_KEY is not supported and if we support MMU_FTR_KUAP (radix translation on POWER9), we can skip restoring AMR on return to userspace. Userspace won't be using AMR in that specific config.
--- arch/powerpc/include/asm/book3s/64/kup.h | 129 +++++++++++++++++++---- arch/powerpc/kernel/entry_64.S | 6 +- arch/powerpc/kernel/exceptions-64s.S | 4 +- arch/powerpc/kernel/syscall_64.c | 25 ++++- 4 files changed, 136 insertions(+), 28 deletions(-)
arch/powerpc/include/asm/book3s/64/kup.h +107 -22
@@ -13,18 +13,47 @@#ifdef __ASSEMBLY__ -.macro kuap_restore_amr gpr1, gpr2 -#ifdef CONFIG_PPC_KUAP +.macro kuap_restore_user_amr gpr1 +#if defined(CONFIG_PPC_MEM_KEYS )BEGIN_MMU_FTR_SECTION_NESTED (67 ) - mfspr \gpr1, SPRN_AMR +/* +* AMR is going to be different when +* returning to userspace. +*/ + ld \gpr1, STACK_REGS_KUAP(r1) +isync + mtspr SPRN_AMR, \gpr1 + +/* No isync required, see kuap_restore_user_amr() */ + END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_PKEY , 67) +#endif +.endm + +.macro kuap_restore_kernel_amr gpr1, gpr2 +#if defined(CONFIG_PPC_MEM_KEYS) + BEGIN_MMU_FTR_SECTION_NESTED(67) + b 99f // handle_pkey_restore_amr + END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_PKEY , 67) + + BEGIN_MMU_FTR_SECTION_NESTED(68) + b 99f // handle_kuap_restore_amr + MMU_FTR_SECTION_ELSE_NESTED(68) + b 100f // skip_restore_amr + ALT_MMU_FTR_SECTION_END_NESTED_IFSET(MMU_FTR_KUAP, 68) + +99: + /* + * AMR is going to be mostly the same since we are + * returning to the kernel. Compare and do a mtspr. + */ ld \gpr2, STACK_REGS_KUAP(r1) + mfspr \gpr1, SPRN_AMR cmpd \gpr1, \gpr2 - beq 998f + beq 100f isync mtspr SPRN_AMR, \gpr2 /* No isync required, see kuap_restore_amr() */ -998: -END_MMU_FTR_SECTION_NESTED_IFSET (MMU_FTR_KUAP ,67 ) +100: // skip_restore_amr #endif .endm
@@ -40,38 +69,89 @@#endif .endm +/* +* MMU_FTR_PKEY and MMU_FTR_KUAP can both be enabled on a platform. We prefer +* PKEY over KUAP if both can be enabled on the platform. +* +* With KUAP only enabled on exception if we are coming from userspace we don't +* save the AMR at all, because the expectation is that userspace can't change +* the AMR if KUAP feature is enabled. +*/ .macro kuap_save_amr_and_lock gpr1, gpr2, use_cr, msr_pr_cr -#ifdef CONFIG_PPC_KUAP +#if defined(CONFIG_PPC_MEM_KEYS) + BEGIN_MMU_FTR_SECTION_NESTED(67) + b 101f // handle_pkey_save_amr + END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_PKEY , 67) + + BEGIN_MMU_FTR_SECTION_NESTED(68) + b 99f // handle_kuap_save_amr + MMU_FTR_SECTION_ELSE_NESTED(68) + b 100f // skip_save_amr + ALT_MMU_FTR_SECTION_END_NESTED_IFSET(MMU_FTR_KUAP, 68) + + +99: // handle_kuap_save_amr .ifnb \msr_pr_cr - bne \msr_pr_cr, 99f + /* + * We avoid changing AMR outside the kernel + * hence skip this completely. + */ + bne \msr_pr_cr, 100f // from userspace .endif + +101: // handle_pkey_save_amr mfspr \gpr1, SPRN_AMR std \gpr1, STACK_REGS_KUAP(r1) - li \gpr2, (AMR_KUAP_BLOCKED >> AMR_KUAP_SHIFT) - sldi \gpr2, \gpr2, AMR_KUAP_SHIFT + + /* + * update kernel AMR with AMR_KUAP_BLOCKED only + * if KUAP feature is enabled + */ + BEGIN_MMU_FTR_SECTION_NESTED(69) + LOAD_REG_IMMEDIATE(\gpr2, AMR_KUAP_BLOCKED) cmpd \use_cr, \gpr1, \gpr2 - beq \use_cr, 99f - // We don't isync here because we very recently entered via rfid + beq \use_cr, 102f + /* + * We don't isync here because we very recently entered via an interrupt + */ mtspr SPRN_AMR, \gpr2 isync -99: - END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_KUAP, 67) +102: + END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_KUAP, 69) + +100: // skip_save_amr #endif .endm #else /* !__ASSEMBLY__ */ -#ifdef CONFIG_PPC_KUAP +#ifdef CONFIG_PPC_MEM_KEYS#include <asm/mmu.h> #include <asm/ptrace.h> extern u64 default_uamor; -static inline void kuap_restore_amr (struct pt_regs *regs,unsigned long amr) +static inline void kuap_restore_user_amr (struct pt_regs *regs) { -if (mmu_has_feature (MMU_FTR_KUAP )) { +if (!mmu_has_feature (MMU_FTR_PKEY )) +return ; + +isync (); +mtspr (SPRN_AMR , regs->kuap); +/* +* No isync required here because we are about to rfi +* back to previous context before any user accesses +* would be made, which is a CSI. +*/ +} + +static inline void kuap_restore_kernel_amr (struct pt_regs *regs, +unsigned long amr) +{ +if (mmu_has_feature (MMU_FTR_KUAP ) ||mmu_has_feature (MMU_FTR_PKEY )) { +if (unlikely (regs->kuap != amr)) {isync ();mtspr (SPRN_AMR , regs->kuap);
@@ -86,7 +166,7 @@ static inline void kuap_restore_amr(struct pt_regs *regs, unsigned long amr)static inline unsigned long kuap_get_and_check_amr (void ) { -if (mmu_has_feature (MMU_FTR_KUAP )) { +if (mmu_has_feature (MMU_FTR_KUAP ) ||mmu_has_feature (MMU_FTR_PKEY )) {unsigned long amr =mfspr (SPRN_AMR );if (IS_ENABLED (CONFIG_PPC_KUAP_DEBUG ))/* kuap_check_amr() */ WARN_ON_ONCE (amr !=AMR_KUAP_BLOCKED );
@@ -97,7 +177,8 @@ static inline unsigned long kuap_get_and_check_amr(void)static inline void kuap_check_amr (void ) { -if (IS_ENABLED (CONFIG_PPC_KUAP_DEBUG ) &&mmu_has_feature (MMU_FTR_KUAP )) +if (IS_ENABLED (CONFIG_PPC_KUAP_DEBUG ) && + (mmu_has_feature (MMU_FTR_KUAP ) ||mmu_has_feature (MMU_FTR_PKEY )))WARN_ON_ONCE (mfspr (SPRN_AMR ) !=AMR_KUAP_BLOCKED ); }
@@ -170,8 +251,12 @@ bad_kuap_fault(struct pt_regs *regs, unsigned long address, bool is_write) (regs->kuap & (is_write ?AMR_KUAP_BLOCK_WRITE :AMR_KUAP_BLOCK_READ )), "Bug: %s fault blocked by AMR!", is_write ? "Write" : "Read"); } -#else /* CONFIG_PPC_KUAP */ -static inline void kuap_restore_amr (struct pt_regs *regs,unsigned long amr) +#else /* CONFIG_PPC_MEM_KEYS */ +static inline void kuap_restore_user_amr (struct pt_regs *regs) +{ +} + +static inline void kuap_restore_kernel_amr (struct pt_regs *regs,unsigned long amr) { }
@@ -183,7 +268,7 @@ static inline unsigned long kuap_get_and_check_amr(void) {return 0 ; } -#endif /* CONFIG_PPC_KUAP */ +#endif /* CONFIG_PPC_MEM_KEYS */ #endif /* __ASSEMBLY__ */
arch/powerpc/kernel/entry_64.S +4 -2
@@ -481,8 +481,8 @@ _ASM_NOKPROBE_SYMBOL(fast_interrupt_return) kuap_check_amr r3, r4 ld r5,_MSR(r1) andi. r0,r5,MSR_PR - bne .Lfast_user_interrupt_return - kuap_restore_amr r3, r4 + bne .Lfast_user_interrupt_return_amr + kuap_restore_kernel_amr r3, r4 andi. r0,r5,MSR_RI li r3,0 /* 0 return value, no EMULATE_STACK_STORE */ bne+ .Lfast_kernel_interrupt_return
@@ -502,6 +502,8 @@ _ASM_NOKPROBE_SYMBOL(interrupt_return) cmpdi r3,0 bne- .Lrestore_nvgprs +.Lfast_user_interrupt_return_amr: + kuap_restore_user_amr r3 .Lfast_user_interrupt_return: ld r11,_NIP(r1) ld r12,_MSR(r1)
arch/powerpc/kernel/exceptions-64s.S +2 -2
@@ -971,7 +971,7 @@ EXC_COMMON_BEGIN(system_reset_common) ld r10,SOFTE(r1) stb r10,PACAIRQSOFTMASK(r13) - kuap_restore_amr r9, r10 + kuap_restore_kernel_amr r9, r10 EXCEPTION_RESTORE_REGS RFI_TO_USER_OR_KERNEL
@@ -2757,7 +2757,7 @@ EXC_COMMON_BEGIN(soft_nmi_common) ld r10,SOFTE(r1) stb r10,PACAIRQSOFTMASK(r13) - kuap_restore_amr r9, r10 + kuap_restore_kernel_amr r9, r10 EXCEPTION_RESTORE_REGS hsrr=0 RFI_TO_KERNEL
arch/powerpc/kernel/syscall_64.c +23 -2
@@ -35,7 +35,20 @@ notrace long system_call_exception(long r3, long r4, long r5,BUG_ON (!FULL_REGS (regs));BUG_ON (regs->softe !=IRQS_ENABLED ); -kuap_check_amr (); +#ifdef CONFIG_PPC_MEM_KEYS +if (mmu_has_feature (MMU_FTR_PKEY )) { +unsigned long amr; +/* +* When entering from userspace we mostly have the AMR +* different from kernel default values. Hence don't compare. +*/ + amr =mfspr (SPRN_AMR ); + regs->kuap = amr; +mtspr (SPRN_AMR ,AMR_KUAP_BLOCKED ); +isync (); + } else +#endif +kuap_check_amr ();account_cpu_user_entry ();
@@ -208,6 +221,10 @@ notrace unsigned long syscall_exit_prepare(unsigned long r3,account_cpu_user_exit (); +/* +* We do this at the end so that we do context switch with KERNEL AMR +*/ +kuap_restore_user_amr (regs);return ret; }
@@ -300,6 +317,10 @@ notrace unsigned long interrupt_exit_user_prepare(struct pt_regs *regs, unsignedaccount_cpu_user_exit (); +/* +* We do this at the end so that we do context switch with KERNEL AMR +*/ +kuap_restore_user_amr (regs);return ret; }
@@ -378,7 +399,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs, unsign* mtmsr, which would cause RAW stalls. Hence, we take the AMR value * from the check above. */ -kuap_restore_amr (regs, amr); +kuap_restore_kernel_amr (regs, amr);return ret; }
Signature · 1 line
2.26.2
PATCH v2 13/28 powerpc/book3s64/kuep: Store/restore userspace IAMR correctly on entry and exit from kernel
In reply to Aneesh Kumar K.VThis prepare kernel to operate with a different value than userspace IAMR. For this, IAMR needs to be saved and restored on entry and return from the kernel.
If MMU_FTR_KEY is enabled we always use the key mechanism to implement KUEP feature. If MMU_FTR_KEY is not supported and if we support MMU_FTR_KUEP (radix translation on POWER9), we can skip restoring IAMR on return to userspace. Userspace won't be using IAMR in that specific config.
We don't need to save/restore IAMR on reentry into the kernel due to interrupt because the kernel doesn't modify IAMR internally.
--- arch/powerpc/include/asm/book3s/64/kup.h | 46 ++++++++++++++++++++++-- arch/powerpc/include/asm/ptrace.h | 6 +++- arch/powerpc/kernel/asm-offsets.c | 4 +++ arch/powerpc/kernel/syscall_64.c | 7 ++-- 4 files changed, 58 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/book3s/64/kup.h +44 -2
@@ -17,15 +17,26 @@#if defined(CONFIG_PPC_MEM_KEYS )BEGIN_MMU_FTR_SECTION_NESTED (67 )/* -* AMR is going to be different when +* AMR and IAMR are going to be different when * returning to userspace. */ ld \gpr1, STACK_REGS_KUAP(r1)isync mtspr SPRN_AMR, \gpr1 + /* + * Restore IAMR only when returning to userspace + */ + ld \gpr1, STACK_REGS_KUEP(r1) + mtspr SPRN_IAMR, \gpr1/* No isync required, see kuap_restore_user_amr() */ END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_PKEY , 67) + + /* + * We don't check KUEP feature here, because if FTR_PKEY + * is not enabled we don't need to restore IAMR on + * return to usespace. + */ #endif .endm
@@ -53,6 +64,9 @@isync mtspr SPRN_AMR, \gpr2 /* No isync required, see kuap_restore_amr() */ + /* + * No need to restore IAMR when returning to kernel space. + */ 100: // skip_restore_amr #endif .endm
@@ -90,6 +104,12 @@ b 100f // skip_save_amrALT_MMU_FTR_SECTION_END_NESTED_IFSET (MMU_FTR_KUAP ,68 ) +/* +* We don't check KUEP feature here, because if FTR_PKEY +* is not enabled we don't need to save IAMR on +* entry from usespace. That is handled by either +* handle_kuap_save_amr or skip_save_amr +*/ 99: // handle_kuap_save_amr .ifnb \msr_pr_cr
@@ -120,6 +140,25 @@ 102: END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_KUAP, 69) + .ifnb \msr_pr_cr + beq \msr_pr_cr, 103f // from kernel space + mfspr \gpr1, SPRN_IAMR + std \gpr1, STACK_REGS_KUEP(r1) + + /* + * update kernel IAMR with AMR_KUEP_BLOCKED only + * if KUAP feature is enabled + */ + BEGIN_MMU_FTR_SECTION_NESTED(70) + LOAD_REG_IMMEDIATE(\gpr2, AMR_KUEP_BLOCKED) + cmpd \use_cr, \gpr1, \gpr2 + beq \use_cr, 103f + mtspr SPRN_IAMR, \gpr2 + isync +103: + END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_KUEP, 70) + .endif + 100: // skip_save_amr #endif .endm
@@ -140,13 +179,13 @@ static inline void kuap_restore_user_amr(struct pt_regs *regs)isync ();mtspr (SPRN_AMR , regs->kuap); +mtspr (SPRN_IAMR , regs->kuep);/* * No isync required here because we are about to rfi * back to previous context before any user accesses * would be made, which is a CSI. */ } -static inline void kuap_restore_kernel_amr (struct pt_regs *regs,unsigned long amr) {
@@ -162,6 +201,9 @@ static inline void kuap_restore_kernel_amr(struct pt_regs *regs,*/ } } +/* +* No need to restore IAMR when returning to kernel space. +*/ }static inline unsigned long kuap_get_and_check_amr (void )
arch/powerpc/include/asm/ptrace.h +5 -1
@@ -56,8 +56,12 @@ struct pt_regs#ifdef CONFIG_PPC_KUAP unsigned long kuap;#endif +#ifdef CONFIG_PPC_KUEP +unsigned long kuep; +#endif + }; -unsigned long __pad[2 ];/* Maintain 16 byte interrupt stack alignment */ +unsigned long __pad[4 ];/* Maintain 16 byte interrupt stack alignment */ }; };#endif
arch/powerpc/kernel/asm-offsets.c +4 -0
@@ -353,6 +353,10 @@ int main(void)#ifdef CONFIG_PPC_KUAP STACK_PT_REGS_OFFSET (STACK_REGS_KUAP , kuap);#endif +#ifdef CONFIG_PPC_KUEP +STACK_PT_REGS_OFFSET (STACK_REGS_KUEP , kuep); +#endif +#if defined(CONFIG_PPC32 )#if defined(CONFIG_BOOKE ) || defined(CONFIG_40x)
arch/powerpc/kernel/syscall_64.c +5 -2
@@ -37,14 +37,17 @@ notrace long system_call_exception(long r3, long r4, long r5,#ifdef CONFIG_PPC_MEM_KEYS if (mmu_has_feature (MMU_FTR_PKEY )) { -unsigned long amr; +unsigned long amr, iamr;/* -* When entering from userspace we mostly have the AMR +* When entering from userspace we mostly have the AMR/IAMR * different from kernel default values. Hence don't compare. */ amr =mfspr (SPRN_AMR ); + iamr =mfspr (SPRN_IAMR ); regs->kuap = amr; + regs->kuep = iamr;mtspr (SPRN_AMR ,AMR_KUAP_BLOCKED ); +mtspr (SPRN_IAMR ,AMR_KUEP_BLOCKED );isync (); } else#endif
Signature · 1 line
2.26.2
PATCH v2 14/28 powerpc/book3s64/pkeys: Inherit correctly on fork.
In reply to Aneesh Kumar K.VChild thread.kuap value is inherited from the parent in copy_thread_tls. We still need to make sure when the child returns from a fork in the kernel we start with the kernel default AMR value.
--- arch/powerpc/kernel/process.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/powerpc/kernel/process.c +7 -0
@@ -1677,6 +1677,13 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp, childregs->ppr =DEFAULT_PPR ; p->thread.tidr =0 ; +#endif +/* +* Run with the current AMR value of the kernel +*/ +#if defined(CONFIG_PPC_MEM_KEYS ) + kregs->kuap =AMR_KUAP_BLOCKED ; + kregs->kuep =AMR_KUEP_BLOCKED ;#endif kregs->nip =ppc_function_entry (f);return 0 ;
Signature · 1 line
2.26.2
PATCH v2 15/28 powerpc/book3s64/pkeys: Reset userspace AMR correctly on exec
In reply to Aneesh Kumar K.VOn fork, we inherit from the parent and on exec, we should switch to default_amr values.
Also, avoid changing the AMR register value within the kernel. The kernel now runs with different AMR values.
--- arch/powerpc/include/asm/book3s/64/kup.h | 2 ++ arch/powerpc/kernel/process.c | 19 ++++++++++++++++++- arch/powerpc/mm/book3s64/pkeys.c | 18 ++---------------- 3 files changed, 22 insertions(+), 17 deletions(-)
arch/powerpc/include/asm/book3s/64/kup.h +2 -0
@@ -171,6 +171,8 @@#include <asm/ptrace.h> extern u64 default_uamor; +extern u64 default_amr; +extern u64 default_iamr;static inline void kuap_restore_user_amr (struct pt_regs *regs) {
arch/powerpc/kernel/process.c +18 -1
@@ -1474,7 +1474,25 @@ void arch_setup_new_exec(void) current->thread.regs = regs - 1; } +#ifdef CONFIG_PPC_MEM_KEYS + current->thread.regs->kuap = default_amr; + current->thread.regs->kuep = default_iamr; +#endif + } +#else +void arch_setup_new_exec (void ) +{ +/* +* If we exec out of a kernel thread then thread.regs will not be +* set. Do it now. +*/ +if (!current->thread.regs) { +struct pt_regs *regs =task_stack_page (current) +THREAD_SIZE ; + current->thread.regs = regs -1 ; + } +} +#endif #ifdef CONFIG_PPC64
@@ -1809,7 +1827,6 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp) current->thread.load_tm =0 ;#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */ -thread_pkey_regs_init (¤t->thread); }EXPORT_SYMBOL (start_thread);
arch/powerpc/mm/book3s64/pkeys.c +2 -16
@@ -20,8 +20,8 @@ int max_pkey; /* Maximum key value supported */*/ u32 reserved_allocation_mask;static u32 initial_allocation_mask;/* Bits set for the initially allocated keys */ -static u64 default_amr; -static u64 default_iamr; +u64 default_amr; +u64 default_iamr;/* Allow all keys to be modified by default */ u64 default_uamor = ~0x0UL ;/*
@@ -387,20 +387,6 @@ void thread_pkey_regs_restore(struct thread_struct *new_thread,write_uamor (new_thread->uamor); } -void thread_pkey_regs_init (struct thread_struct *thread) -{ -if (!mmu_has_feature (MMU_FTR_PKEY )) -return ; - - thread->amr = default_amr; - thread->iamr = default_iamr; - thread->uamor = default_uamor; - -write_amr (default_amr); -write_iamr (default_iamr); -write_uamor (default_uamor); -} -int execute_only_pkey (struct mm_struct *mm) {if (static_branch_likely (&execute_pkey_disabled))
Signature · 1 line
2.26.2
PATCH v2 16/28 powerpc/ptrace-view: Use pt_regs values instead of thread_struct based one.
In reply to Aneesh Kumar K.VWe will remove thread.amr/iamr/uamor in a later patch
--- arch/powerpc/kernel/ptrace/ptrace-view.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
arch/powerpc/kernel/ptrace/ptrace-view.c +17 -6
@@ -488,14 +488,25 @@ static int pkey_active(struct task_struct *target, const struct user_regset *regstatic int pkey_get (struct task_struct *target,const struct user_regset *regset,unsigned int pos,unsigned int count,void *kbuf,void __user *ubuf) { -BUILD_BUG_ON (TSO (amr) +sizeof (unsigned long ) !=TSO (iamr)); -BUILD_BUG_ON (TSO (iamr) +sizeof (unsigned long ) !=TSO (uamor)); +int ret;if (!arch_pkeys_enabled ())return -ENODEV ; -return user_regset_copyout (&pos, &count, &kbuf, &ubuf, &target->thread.amr, -0 ,ELF_NPKEY *sizeof (unsigned long )); + ret =user_regset_copyout (&pos, &count, &kbuf, &ubuf, &target->thread.regs->kuap, +0 ,1 *sizeof (unsigned long )); +if (ret) + goto err_out; + + ret =user_regset_copyout (&pos, &count, &kbuf, &ubuf, &target->thread.regs->kuep, +1 *sizeof (unsigned long ),2 *sizeof (unsigned long )); +if (ret) + goto err_out; + + ret =user_regset_copyout (&pos, &count, &kbuf, &ubuf, &default_uamor, +2 *sizeof (unsigned long ),3 *sizeof (unsigned long )); +err_out: +return ret; } static int pkey_set(struct task_struct *target, const struct user_regset *regset,
@@ -518,8 +529,8 @@ static int pkey_set(struct task_struct *target, const struct user_regset *regsetreturn ret;/* UAMOR determines which bits of the AMR can be set from userspace. */ - target->thread.amr = (new_amr & target->thread.uamor) | - (target->thread.amr & ~target->thread.uamor); + target->thread.regs->kuap = (new_amr & default_uamor) | + (target->thread.regs->kuap & ~default_uamor);return 0 ; }
Signature · 1 line
2.26.2
PATCH v2 17/28 powerpc/book3s64/pkeys: Don't update SPRN_AMR when in kernel mode.
In reply to Aneesh Kumar K.VNow that kernel correctly store/restore userspace AMR/IAMR values, avoid manipulating AMR and IAMR from the kernel on behalf of userspace.
--- arch/powerpc/include/asm/book3s/64/kup.h | 23 ++++++++ arch/powerpc/include/asm/processor.h | 5 -- arch/powerpc/kernel/process.c | 4 -- arch/powerpc/kernel/traps.c | 6 -- arch/powerpc/mm/book3s64/pkeys.c | 71 ++++-------------------- 5 files changed, 34 insertions(+), 75 deletions(-)
arch/powerpc/include/asm/book3s/64/kup.h +23 -0
@@ -174,6 +174,29 @@ extern u64 default_uamor;extern u64 default_amr;extern u64 default_iamr; +/* +* For kernel thread that doesn't have thread.regs return +* default AMR/IAMR values. +*/ +static inline u64 current_thread_amr (void ) +{ +if (current->thread.regs) +return current->thread.regs->kuap; +return AMR_KUAP_BLOCKED ; +} + +static inline u64 current_thread_iamr (void ) +{ +if (current->thread.regs) +return current->thread.regs->kuep; +return AMR_KUEP_BLOCKED ; +} + +static inline u64 read_uamor (void ) +{ +return default_uamor; +} +static inline void kuap_restore_user_amr (struct pt_regs *regs) {if (!mmu_has_feature (MMU_FTR_PKEY ))
arch/powerpc/include/asm/processor.h +0 -5
@@ -234,11 +234,6 @@ struct thread_struct {struct thread_vr_state ckvr_state;/* Checkpointed VR state */ unsigned long ckvrsave;/* Checkpointed VRSAVE */ #endif /* CONFIG_PPC_TRANSACTIONAL_MEM */ -#ifdef CONFIG_PPC_MEM_KEYS -unsigned long amr; -unsigned long iamr; -unsigned long uamor; -#endif #ifdef CONFIG_KVM_BOOK3S_32_HANDLER void * kvm_shadow_vcpu;/* KVM internal data */ #endif /* CONFIG_KVM_BOOK3S_32_HANDLER */
arch/powerpc/kernel/process.c +0 -4
@@ -585,7 +585,6 @@ static void save_all(struct task_struct *tsk)__giveup_spe (tsk);msr_check_and_clear (msr_all_available); -thread_pkey_regs_save (&tsk->thread); }void flush_all_to_thread (struct task_struct *tsk)
@@ -1097,8 +1096,6 @@ static inline void save_sprs(struct thread_struct *t) t->tar =mfspr (SPRN_TAR ); }#endif - -thread_pkey_regs_save (t); } static inline void restore_sprs(struct thread_struct *old_thread,
@@ -1139,7 +1136,6 @@ static inline void restore_sprs(struct thread_struct *old_thread,mtspr (SPRN_TIDR , new_thread->tidr);#endif -thread_pkey_regs_restore (new_thread, old_thread); } struct task_struct *__switch_to(struct task_struct *prev,
arch/powerpc/kernel/traps.c +0 -6
@@ -348,12 +348,6 @@ static bool exception_common(int signr, struct pt_regs *regs, int code, current->thread.trap_nr = code; -/* -* Save all the pkey registers AMR/IAMR/UAMOR. Eg: Core dumps need -* to capture the content, if the task gets killed. -*/ -thread_pkey_regs_save (¤t->thread); -return true; }
arch/powerpc/mm/book3s64/pkeys.c +11 -60
114 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 18/28 powerpc/book3s64/kuap: Restrict access to userspace based on userspace AMR
In reply to Aneesh Kumar K.VIf an application has configured address protection such that read/write is denied using pkey even the kernel should receive a FAULT on accessing the same.
This patch use user AMR value stored in pt_regs.kuap to achieve the same.
--- arch/powerpc/include/asm/book3s/64/kup.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/book3s/64/kup.h +9 -3
@@ -279,14 +279,20 @@ static inline void set_kuap(unsigned long value) static __always_inline void allow_user_access(void __user *to, const void __user *from,unsigned long size,unsigned long dir) { +unsigned long thread_amr =0 ; +// This is written so we can resolve to a single case at build time BUILD_BUG_ON (!__builtin_constant_p (dir)); + +if (mmu_has_feature (MMU_FTR_PKEY )) + thread_amr =current_thread_amr (); +if (dir ==KUAP_READ ) -set_kuap (AMR_KUAP_BLOCK_WRITE ); +set_kuap (thread_amr |AMR_KUAP_BLOCK_WRITE );else if (dir ==KUAP_WRITE ) -set_kuap (AMR_KUAP_BLOCK_READ ); +set_kuap (thread_amr |AMR_KUAP_BLOCK_READ );else if (dir ==KUAP_READ_WRITE ) -set_kuap (0 ); +set_kuap (thread_amr);else BUILD_BUG (); }
Signature · 1 line
2.26.2
PATCH v2 19/28 powerpc/book3s64/kuap: Improve error reporting with KUAP
In reply to Aneesh Kumar K.VWith hash translation use DSISR_KEYFAULT to identify a wrong access. With Radix we look at the AMR value and type of fault.
--- arch/powerpc/include/asm/book3s/32/kup.h | 4 +-- arch/powerpc/include/asm/book3s/64/kup.h | 28 ++++++++++++++++---- arch/powerpc/include/asm/kup.h | 4 +-- arch/powerpc/include/asm/nohash/32/kup-8xx.h | 4 +-- arch/powerpc/mm/fault.c | 2 +- 5 files changed, 30 insertions(+), 12 deletions(-)
arch/powerpc/include/asm/book3s/32/kup.h +2 -2
@@ -176,8 +176,8 @@ static inline void restore_user_access(unsigned long flags)allow_user_access (to, to, end - addr,KUAP_READ_WRITE ); } -static inline bool -bad_kuap_fault (struct pt_regs *regs,unsigned long address,bool is_write) +static inline bool bad_kuap_fault (struct pt_regs *regs,unsigned long address, +bool is_write,unsigned long error_code) {unsigned long begin = regs->kuap &0xf0000000 ;unsigned long end = regs->kuap <<28 ;
arch/powerpc/include/asm/book3s/64/kup.h +23 -5
@@ -317,13 +317,31 @@ static inline void restore_user_access(unsigned long flags) set_kuap(flags); } -static inline bool -bad_kuap_fault (struct pt_regs *regs,unsigned long address,bool is_write) +#define RADIX_KUAP_BLOCK_READ UL(0x4000000000000000) +#define RADIX_KUAP_BLOCK_WRITE UL(0x8000000000000000) + +static inline bool bad_kuap_fault (struct pt_regs *regs,unsigned long address, +bool is_write,unsigned long error_code) { -return WARN (mmu_has_feature (MMU_FTR_KUAP ) && - (regs->kuap & (is_write ?AMR_KUAP_BLOCK_WRITE :AMR_KUAP_BLOCK_READ )), -"Bug: %s fault blocked by AMR!" , is_write ?"Write" :"Read" ); +if (!mmu_has_feature (MMU_FTR_KUAP )) +return false; + +if (radix_enabled ()) { +/* +* Will be a storage protection fault. +* Only check the details of AMR[0] +*/ +return WARN ((regs->kuap & (is_write ?RADIX_KUAP_BLOCK_WRITE :RADIX_KUAP_BLOCK_READ )), +"Bug: %s fault blocked by AMR!" , is_write ?"Write" :"Read" ); + } +/* +* We don't want to WARN here because userspace can setup +* keys such that a kernel access to user address can cause +* fault +*/ +return !!(error_code &DSISR_KEYFAULT ); } +#else /* CONFIG_PPC_MEM_KEYS */ static inline void kuap_restore_user_amr (struct pt_regs *regs) {
arch/powerpc/include/asm/kup.h +2 -2
@@ -57,8 +57,8 @@ static inline void prevent_user_access(void __user *to, const void __user *from, unsigned long size, unsigned long dir) { }static inline unsigned long prevent_user_access_return (void ) {return 0UL ; }static inline void restore_user_access (unsigned long flags) { } -static inline bool -bad_kuap_fault (struct pt_regs *regs,unsigned long address,bool is_write) +static inline bool bad_kuap_fault (struct pt_regs *regs,unsigned long address, +bool is_write,unsigned long error_code) {return false; }
arch/powerpc/include/asm/nohash/32/kup-8xx.h +2 -2
@@ -60,8 +60,8 @@ static inline void restore_user_access(unsigned long flags)mtspr (SPRN_MD_AP , flags); } -static inline bool -bad_kuap_fault (struct pt_regs *regs,unsigned long address,bool is_write) +static inline bool bad_kuap_fault (struct pt_regs *regs,unsigned long address, +bool is_write,unsigned long error_code) {return WARN (!((regs->kuap ^MD_APG_KUAP ) &0xf0000000 ),"Bug: fault blocked by AP register !" );
arch/powerpc/mm/fault.c +1 -1
@@ -233,7 +233,7 @@ static bool bad_kernel_fault(struct pt_regs *regs, unsigned long error_code,// Read/write fault in a valid region (the exception table search passed // above), but blocked by KUAP is bad, it can never succeed. -if (bad_kuap_fault (regs, address, is_write)) +if (bad_kuap_fault (regs, address, is_write, error_code))return true;// What's left? Kernel fault on user in well defined regions (extable
Signature · 1 line
2.26.2
PATCH v2 20/28 powerpc/book3s64/kuap: Use Key 3 to implement KUAP with hash translation.
In reply to Aneesh Kumar K.VRadix use AMR Key 0 and hash translation use AMR key 3.
--- arch/powerpc/include/asm/book3s/64/kup.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/book3s/64/kup.h +4 -5
@@ -5,11 +5,10 @@#include <linux/const.h> #include <asm/reg.h> -#define AMR_KUAP_BLOCK_READ UL(0x4000000000000000) -#define AMR_KUAP_BLOCK_WRITE UL(0x8000000000000000) +#define AMR_KUAP_BLOCK_READ UL(0x5455555555555555) +#define AMR_KUAP_BLOCK_WRITE UL(0xa8aaaaaaaaaaaaaa)#define AMR_KUEP_BLOCKED (1UL << 62)#define AMR_KUAP_BLOCKED (AMR_KUAP_BLOCK_READ | AMR_KUAP_BLOCK_WRITE) -#define AMR_KUAP_SHIFT 62#ifdef __ASSEMBLY__
@@ -75,8 +74,8 @@#ifdef CONFIG_PPC_KUAP_DEBUG BEGIN_MMU_FTR_SECTION_NESTED (67 ) mfspr \gpr1, SPRN_AMR - li \gpr2, (AMR_KUAP_BLOCKED >> AMR_KUAP_SHIFT) - sldi \gpr2, \gpr2, AMR_KUAP_SHIFT +/* Prevent access to userspace using any key values */ + LOAD_REG_IMMEDIATE(\gpr2, AMR_KUAP_BLOCKED) 999: tdne \gpr1, \gpr2 EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE)END_MMU_FTR_SECTION_NESTED_IFSET (MMU_FTR_KUAP ,67 )
Signature · 1 line
2.26.2
PATCH v2 21/28 powerpc/book3s64/kuep: Use Key 3 to implement KUEP with hash translation.
In reply to Aneesh Kumar K.VRadix use IAMR Key 0 and hash translation use IAMR key 3.
--- arch/powerpc/include/asm/book3s/64/kup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/book3s/64/kup.h +1 -1
@@ -7,7 +7,7 @@#define AMR_KUAP_BLOCK_READ UL(0x5455555555555555)#define AMR_KUAP_BLOCK_WRITE UL(0xa8aaaaaaaaaaaaaa) -#define AMR_KUEP_BLOCKED (1UL << 62) +#define AMR_KUEP_BLOCKED UL(0x5455555555555555)#define AMR_KUAP_BLOCKED (AMR_KUAP_BLOCK_READ | AMR_KUAP_BLOCK_WRITE)#ifdef __ASSEMBLY__
Signature · 1 line
2.26.2
PATCH v2 22/28 powerpc/book3s64/hash/kuap: Enable kuap on hash
In reply to Aneesh Kumar K.V--- arch/powerpc/mm/book3s64/pkeys.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/powerpc/mm/book3s64/pkeys.c +6 -1
@@ -240,7 +240,12 @@ void __init setup_kuep(bool disabled)#ifdef CONFIG_PPC_KUAP void __init setup_kuap (bool disabled) { -if (disabled || !early_radix_enabled ()) +if (disabled) +return ; +/* +* On hash if PKEY feature is not enabled, disable KUAP too. +*/ +if (!early_radix_enabled () && !early_mmu_has_feature (MMU_FTR_PKEY ))return ;if (smp_processor_id () == boot_cpuid) {
Signature · 1 line
2.26.2
PATCH v2 23/28 powerpc/book3s64/hash/kuep: Enable KUEP on hash
In reply to Aneesh Kumar K.V--- arch/powerpc/mm/book3s64/pkeys.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/powerpc/mm/book3s64/pkeys.c +6 -1
@@ -219,7 +219,12 @@ void __init pkey_early_init_devtree(void)#ifdef CONFIG_PPC_KUEP void __init setup_kuep (bool disabled) { -if (disabled || !early_radix_enabled ()) +if (disabled) +return ; +/* +* On hash if PKEY feature is not enabled, disable KUAP too. +*/ +if (!early_radix_enabled () && !early_mmu_has_feature (MMU_FTR_PKEY ))return ;if (smp_processor_id () == boot_cpuid) {
Signature · 1 line
2.26.2
PATCH v2 24/28 powerpc/book3s64/keys: Print information during boot.
In reply to Aneesh Kumar K.V--- arch/powerpc/mm/book3s64/pkeys.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/mm/book3s64/pkeys.c +1 -0
@@ -207,6 +207,7 @@ void __init pkey_early_init_devtree(void)*/ initial_allocation_mask |= reserved_allocation_mask; +pr_info ("Enabling Memory keys with max key count %d" , max_pkey); err_out:/* * Setup uamor on boot cpu
Signature · 1 line
2.26.2
PATCH v2 25/28 powerpc/selftest/ptrave-pkey: Rename variables to make it easier to follow code
In reply to Aneesh Kumar K.VRename variable to indicate that they are invalid values which we will use to test ptrace update of pkeys.
--- .../selftests/powerpc/ptrace/ptrace-pkey.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-)
tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +13 -13
@@ -44,7 +44,7 @@ struct shared_info {unsigned long amr2;/* AMR value that ptrace should refuse to write to the child. */ -unsigned long amr3; +unsigned long invalid_amr;/* IAMR value the parent expects to read from the child. */ unsigned long expected_iamr;
@@ -57,8 +57,8 @@ struct shared_info {* (even though they're valid ones) because userspace doesn't have * access to those registers. */ -unsigned long new_iamr; -unsigned long new_uamor; +unsigned long invalid_iamr; +unsigned long invalid_uamor; };static int sys_pkey_alloc (unsigned long flags,unsigned long init_access_rights)
@@ -100,7 +100,7 @@ static int child(struct shared_info *info) info->amr1 |=3ul <<pkeyshift (pkey1); info->amr2 |=3ul <<pkeyshift (pkey2); - info->amr3 |= info->amr2 |3ul <<pkeyshift (pkey3); + info->invalid_amr |= info->amr2 |3ul <<pkeyshift (pkey3);if (disable_execute) info->expected_iamr |=1ul <<pkeyshift (pkey1);
@@ -111,8 +111,8 @@ static int child(struct shared_info *info) info->expected_uamor |=3ul <<pkeyshift (pkey1) |3ul <<pkeyshift (pkey2); - info->new_iamr |=1ul <<pkeyshift (pkey1) |1ul <<pkeyshift (pkey2); - info->new_uamor |=3ul <<pkeyshift (pkey1); + info->invalid_iamr |=1ul <<pkeyshift (pkey1) |1ul <<pkeyshift (pkey2); + info->invalid_uamor |=3ul <<pkeyshift (pkey1);/* * We won't use pkey3. We just want a plausible but invalid key to test
@@ -196,9 +196,9 @@ static int parent(struct shared_info *info, pid_t pid)PARENT_SKIP_IF_UNSUPPORTED (ret, &info->child_sync);PARENT_FAIL_IF (ret, &info->child_sync); - info->amr1 = info->amr2 = info->amr3 = regs[0 ]; - info->expected_iamr = info->new_iamr = regs[1 ]; - info->expected_uamor = info->new_uamor = regs[2 ]; + info->amr1 = info->amr2 = info->invalid_amr = regs[0 ]; + info->expected_iamr = info->invalid_iamr = regs[1 ]; + info->expected_uamor = info->invalid_uamor = regs[2 ];/* Wake up child so that it can set itself up. */ ret =prod_child (&info->child_sync);
@@ -234,10 +234,10 @@ static int parent(struct shared_info *info, pid_t pid)return ret;/* Write invalid AMR value in child. */ - ret =ptrace_write_regs (pid,NT_PPC_PKEY , &info->amr3,1 ); + ret =ptrace_write_regs (pid,NT_PPC_PKEY , &info->invalid_amr,1 );PARENT_FAIL_IF (ret, &info->child_sync); -printf ("%-30s AMR: %016lx\n" , ptrace_write_running, info->amr3); +printf ("%-30s AMR: %016lx\n" , ptrace_write_running, info->invalid_amr);/* Wake up child so that it can verify it didn't change. */ ret =prod_child (&info->child_sync);
@@ -249,7 +249,7 @@ static int parent(struct shared_info *info, pid_t pid)/* Try to write to IAMR. */ regs[0 ] = info->amr1; - regs[1 ] = info->new_iamr; + regs[1 ] = info->invalid_iamr; ret =ptrace_write_regs (pid,NT_PPC_PKEY , regs,2 );PARENT_FAIL_IF (!ret, &info->child_sync);
@@ -257,7 +257,7 @@ static int parent(struct shared_info *info, pid_t pid) ptrace_write_running, regs[0], regs[1]);/* Try to write to IAMR and UAMOR. */ - regs[2 ] = info->new_uamor; + regs[2 ] = info->invalid_uamor; ret =ptrace_write_regs (pid,NT_PPC_PKEY , regs,3 );PARENT_FAIL_IF (!ret, &info->child_sync);
Signature · 1 line
2.26.2
PATCH v2 26/28 powerpc/selftest/ptrace-pkey: Update the test to mark an invalid pkey correctly
In reply to Aneesh Kumar K.V--- .../selftests/powerpc/ptrace/ptrace-pkey.c | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-)
tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +12 -18
@@ -66,11 +66,6 @@ static int sys_pkey_alloc(unsigned long flags, unsigned long init_access_rights)return syscall (__NR_pkey_alloc, flags, init_access_rights); } -static int sys_pkey_free (int pkey) -{ -return syscall (__NR_pkey_free, pkey); -} -static int child (struct shared_info *info) {unsigned long reg;
@@ -100,7 +95,11 @@ static int child(struct shared_info *info) info->amr1 |=3ul <<pkeyshift (pkey1); info->amr2 |=3ul <<pkeyshift (pkey2); - info->invalid_amr |= info->amr2 |3ul <<pkeyshift (pkey3); +/* +* invalid amr value where we try to force write +* things which are deined by a uamor setting. +*/ + info->invalid_amr = info->amr2 | (~0x0UL & ~info->expected_uamor);if (disable_execute) info->expected_iamr |=1ul <<pkeyshift (pkey1);
@@ -111,17 +110,12 @@ static int child(struct shared_info *info) info->expected_uamor |=3ul <<pkeyshift (pkey1) |3ul <<pkeyshift (pkey2); - info->invalid_iamr |=1ul <<pkeyshift (pkey1) |1ul <<pkeyshift (pkey2); - info->invalid_uamor |=3ul <<pkeyshift (pkey1); -/* -* We won't use pkey3. We just want a plausible but invalid key to test -* whether ptrace will let us write to AMR bits we are not supposed to. -* -* This also tests whether the kernel restores the UAMOR permissions -* after a key is freed. +* Create an IAMR value different from expected value. +* Kernel will reject an IAMR and UAMOR change. */ -sys_pkey_free (pkey3); + info->invalid_iamr = info->expected_iamr | (1ul <<pkeyshift (pkey1) |1ul <<pkeyshift (pkey2)); + info->invalid_uamor = info->expected_uamor & ~(0x3ul <<pkeyshift (pkey1));printf ("%-30s AMR: %016lx pkey1: %d pkey2: %d pkey3: %d\n" , user_write, info->amr1, pkey1, pkey2, pkey3);
@@ -196,9 +190,9 @@ static int parent(struct shared_info *info, pid_t pid)PARENT_SKIP_IF_UNSUPPORTED (ret, &info->child_sync);PARENT_FAIL_IF (ret, &info->child_sync); - info->amr1 = info->amr2 = info->invalid_amr = regs[0 ]; - info->expected_iamr = info->invalid_iamr = regs[1 ]; - info->expected_uamor = info->invalid_uamor = regs[2 ]; + info->amr1 = info->amr2 = regs[0 ]; + info->expected_iamr = regs[1 ]; + info->expected_uamor = regs[2 ];/* Wake up child so that it can set itself up. */ ret =prod_child (&info->child_sync);
Signature · 1 line
2.26.2
PATCH v2 27/28 powerpc/selftest/ptrace-pkey: IAMR and uamor cannot be updated by ptrace
In reply to Aneesh Kumar K.VBoth IAMR and uamor are privileged and cannot be updated by userspace. Hence we also don't allow ptrace interface to update them. Don't update them in the test. Also expected_iamr is only changed if we can allocate a DISABLE_EXECUTE pkey.
--- tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +3 -6
@@ -101,15 +101,12 @@ static int child(struct shared_info *info)*/ info->invalid_amr = info->amr2 | (~0x0UL & ~info->expected_uamor); +/* +* if PKEY_DISABLE_EXECUTE succeeded we should update the expected_iamr +*/ if (disable_execute) info->expected_iamr |=1ul <<pkeyshift (pkey1); -else - info->expected_iamr &= ~(1ul <<pkeyshift (pkey1)); - - info->expected_iamr &= ~(1ul <<pkeyshift (pkey2) |1ul <<pkeyshift (pkey3)); - info->expected_uamor |=3ul <<pkeyshift (pkey1) | -3ul <<pkeyshift (pkey2);/* * Create an IAMR value different from expected value. * Kernel will reject an IAMR and UAMOR change.
Signature · 1 line
2.26.2
PATCH v2 28/28 powerpc/book3s64/keys/kuap: Reset AMR/IAMR values on kexec
In reply to Aneesh Kumar K.VWe can kexec into a kernel that doesn't use memory keys for kernel mapping (such as an older kernel which doesn't support kuap/kuep with hash translation). We need to make sure we reset the AMR/IAMR value on kexec otherwise, the new kernel will use key 0 for kernel mapping and the old AMR value prevents access to key 0.
This patch also removes reset if IAMR and AMOR in kexec_sequence. Reset of AMOR is not needed and the IAMR reset is partial (it doesn't do the reset on secondary cpus) and is redundant with this patch.
--- arch/powerpc/include/asm/book3s/64/kup.h | 20 ++++++++++++++++++++ arch/powerpc/include/asm/kup.h | 14 ++++++++++++++ arch/powerpc/kernel/misc_64.S | 14 -------------- arch/powerpc/kexec/core_64.c | 3 +++ arch/powerpc/mm/book3s64/pgtable.c | 3 +++ 5 files changed, 40 insertions(+), 14 deletions(-)
arch/powerpc/include/asm/book3s/64/kup.h +20 -0
@@ -341,6 +341,26 @@ static inline bool bad_kuap_fault(struct pt_regs *regs, unsigned long address, return !!(error_code & DSISR_KEYFAULT); } +#define reset_kuap reset_kuap +static inline void reset_kuap (void ) +{ +if (mmu_has_feature (MMU_FTR_KUAP )) { +mtspr (SPRN_AMR ,0 ); +/* Do we need isync()? We are going via a kexec reset */ +isync (); + } +} + +#define reset_kuep reset_kuep +static inline void reset_kuep (void ) +{ +if (mmu_has_feature (MMU_FTR_KUEP )) { +mtspr (SPRN_IAMR ,0 ); +/* Do we need isync()? We are going via a kexec reset */ +isync (); + } +} +#else /* CONFIG_PPC_MEM_KEYS */ static inline void kuap_restore_user_amr (struct pt_regs *regs) {
arch/powerpc/include/asm/kup.h +14 -0
@@ -101,6 +101,20 @@ static inline void prevent_current_access_user(void)prevent_user_access (NULL ,NULL , ~0UL ,KUAP_CURRENT ); } +#ifndef reset_kuap +#define reset_kuap reset_kuap +static inline void reset_kuap (void ) +{ +} +#endif + +#ifndef reset_kuep +#define reset_kuep reset_kuep +static inline void reset_kuep (void ) +{ +} +#endif +#endif /* !__ASSEMBLY__ */ #endif /* _ASM_POWERPC_KUAP_H_ */
arch/powerpc/kernel/misc_64.S +0 -14
@@ -413,20 +413,6 @@ _GLOBAL(kexec_sequence) li r0,0 std r0,16(r1) -BEGIN_FTR_SECTION - /* - * This is the best time to turn AMR/IAMR off. - * key 0 is used in radix for supervisor<->user - * protection, but on hash key 0 is reserved - * ideally we want to enter with a clean state. - * NOTE, we rely on r0 being 0 from above. - */ - mtspr SPRN_IAMR,r0 -BEGIN_FTR_SECTION_NESTED(42) - mtspr SPRN_AMOR,r0 -END_FTR_SECTION_NESTED_IFSET(CPU_FTR_HVMODE, 42) -END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) - /* save regs for local vars on new stack. * yes, we won't go back, but ... */
arch/powerpc/kexec/core_64.c +3 -0
@@ -152,6 +152,9 @@ static void kexec_smp_down(void *arg)if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down (0 ,1 ); +reset_kuap (); +reset_kuep (); +kexec_smp_wait ();/* NOTREACHED */ }
arch/powerpc/mm/book3s64/pgtable.c +3 -0
@@ -168,6 +168,9 @@ void mmu_cleanup_all(void)radix__mmu_cleanup_all (); else if (mmu_hash_ops.hpte_clear_all) mmu_hash_ops.hpte_clear_all(); + +reset_kuap (); +reset_kuep (); }#ifdef CONFIG_MEMORY_HOTPLUG
Signature · 1 line
2.26.2
Re: [PATCH v2 15/28] powerpc/book3s64/pkeys: Reset userspace AMR correctly on exec
In reply to Aneesh Kumar K.VQuoted 101 lines · Aneesh Kumar K.V
On fork, we inherit from the parent and on exec, we should switch to
default_amrvalues.Also, avoid changing the AMR register value within the kernel. The kernel now runs with different AMR values.
Signed-off-by Aneesh Kumar K.V <[email protected]>--- arch/powerpc/include/asm/book3s/64/kup.h | 2 ++ arch/powerpc/kernel/process.c | 19 ++++++++++++++++++- arch/powerpc/mm/book3s64/pkeys.c | 18 ++---------------- 3 files changed, 22 insertions(+), 17 deletions(-)arch/powerpc/include/asm/book3s/64/kup.h +2
-0@@ -171,6 +171,8 @@#include <asm/ptrace.h> extern u64 default_uamor; +extern u64 default_amr; +extern u64 default_iamr;static inline void kuap_restore_user_amr (struct pt_regs *regs) {arch/powerpc/kernel/process.c +18
-1@@ -1474,7 +1474,25 @@ void arch_setup_new_exec(void) current->thread.regs = regs - 1; } +#ifdef CONFIG_PPC_MEM_KEYS + current->thread.regs->kuap = default_amr; + current->thread.regs->kuep = default_iamr; +#endif + } +#else +void arch_setup_new_exec (void ) +{ +/* +* If we exec out of a kernel thread then thread.regs will not be +* set. Do it now. +*/ +if (!current->thread.regs) { +struct pt_regs *regs =task_stack_page (current) +THREAD_SIZE ; + current->thread.regs = regs -1 ; + } +} +#endif #ifdef CONFIG_PPC64 @@ -1809,7 +1827,6 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp) current->thread.load_tm =0 ;#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */ -thread_pkey_regs_init (¤t->thread); }EXPORT_SYMBOL (start_thread);arch/powerpc/mm/book3s64/pkeys.c +2
-16@@ -20,8 +20,8 @@ int max_pkey; /* Maximum key value supported */*/ u32 reserved_allocation_mask;static u32 initial_allocation_mask;/* Bits set for the initially allocated keys */ -static u64 default_amr; -static u64 default_iamr; +u64 default_amr; +u64 default_iamr;/* Allow all keys to be modified by default */ u64 default_uamor = ~0x0UL ;/* @@ -387,20 +387,6 @@ void thread_pkey_regs_restore(struct thread_struct *new_thread,write_uamor (new_thread->uamor); } -void thread_pkey_regs_init (struct thread_struct *thread) -{ -if (!mmu_has_feature (MMU_FTR_PKEY )) -return ; - - thread->amr = default_amr; - thread->iamr = default_iamr; - thread->uamor = default_uamor; - -write_amr (default_amr); -write_iamr (default_iamr); -write_uamor (default_uamor); -} -int execute_only_pkey (struct mm_struct *mm) {if (static_branch_likely (&execute_pkey_disabled))Signature · 1 line
2.26.2
Needs this change to fix build error.
--- arch/powerpc/include/asm/thread_info.h | 2 -- 1 file changed, 2 deletions(-)
arch/powerpc/include/asm/thread_info.h +0 -2
@@ -77,10 +77,8 @@ struct thread_info {/* how to get the thread information struct from C */ extern int arch_dup_task_struct (struct task_struct *dst,struct task_struct *src); -#ifdef CONFIG_PPC_BOOK3S_64 void arch_setup_new_exec (void );#define arch_setup_new_exec arch_setup_new_exec -#endif #endif /* __ASSEMBLY__ */
Signature · 1 line
2.26.2