Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1733186 > unrolled thread
| Started by | Ram Pai <linuxram@us.ibm.com> |
|---|---|
| First post | 2017-09-16 03:30 +0200 |
| Last post | 2017-09-22 08:10 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 0/6] mm, x86, powerpc: Memory Protection Keys enhancement Ram Pai <linuxram@us.ibm.com> - 2017-09-16 03:30 +0200
[PATCH 3/6] mm: display pkey in smaps if arch_pkeys_enabled() is true Ram Pai <linuxram@us.ibm.com> - 2017-09-16 03:30 +0200
Re: [PATCH 3/6] mm: display pkey in smaps if arch_pkeys_enabled() is true Balbir Singh <bsingharora@gmail.com> - 2017-09-22 08:10 +0200
Re: [PATCH 3/6] mm: display pkey in smaps if arch_pkeys_enabled() is true Balbir Singh <bsingharora@gmail.com> - 2017-09-22 08:10 +0200
| From | Ram Pai <linuxram@us.ibm.com> |
|---|---|
| Date | 2017-09-16 03:30 +0200 |
| Subject | [PATCH 0/6] mm, x86, powerpc: Memory Protection Keys enhancement |
| Message-ID | <uqa5H-2Li-3@gated-at.bofh.it> |
The patch-series enhances memory protection keys feature.
The patch(1) introduces an additional vma bit to support 32
pkeys. PowerPC supports 32 pkeys.
The patch(2,3) introduces a new interface arch_pkeys_enabled(),
this interface can be used by arch-neutral code to display
protection key value in smap.
The patch(4) introduces a syfs interface, to display the static
attributes of the protection key. Eg: max number of keys.
The last two patches, (5,6) update documentation.
A separate patch series that enhances selftest will follow. The
entire patch series that enables pkeys on powerpc is at
https://github.com/rampai/memorykeys.git memkey.v9-rc1
Testing:
-------
This patches are tested on powerpc platform using a
enhaced set of selftests.
Could not test on x86 since I do not have access to
one with pkey support.
History:
-------
version v3:
(1) sysfs interface - thanks Thiago.
(2) Documentation update.
version v2:
(1) Documentation is updated to better
capture the semantics.
(2) introduced arch_pkeys_enabled() to find
if an arch enables pkeys. Correspond-
ing change in logic that displays key
value in smaps.
(3) code rearranged in many places based on
comments from Dave Hansen, Balbir,
Anshuman.
version v1: Initial version
Ram Pai (5):
mm: introduce an additional vma bit for powerpc pkey
mm, x86 : introduce arch_pkeys_enabled()
mm: display pkey in smaps if arch_pkeys_enabled() is true
Documentation/x86: Move protecton key documentation to arch neutral
directory
Documentation/vm: PowerPC specific updates to memory protection keys
Thiago Jung Bauermann (1):
mm/mprotect, powerpc/mm/pkeys, x86/mm/pkeys: Add sysfs interface
Documentation/vm/protection-keys.txt | 160 +++++++++++++++++++++++++++++++++
Documentation/x86/protection-keys.txt | 85 -----------------
arch/powerpc/include/asm/pkeys.h | 2 +
arch/powerpc/mm/pkeys.c | 20 ++++
arch/x86/include/asm/mmu_context.h | 4 +-
arch/x86/include/asm/pkeys.h | 2 +
arch/x86/kernel/fpu/xstate.c | 5 +
arch/x86/kernel/setup.c | 8 --
arch/x86/mm/pkeys.c | 8 ++
fs/proc/task_mmu.c | 17 ++--
include/linux/mm.h | 16 ++--
include/linux/pkeys.h | 9 ++
mm/mprotect.c | 88 ++++++++++++++++++
13 files changed, 317 insertions(+), 107 deletions(-)
create mode 100644 Documentation/vm/protection-keys.txt
delete mode 100644 Documentation/x86/protection-keys.txt
[toc] | [next] | [standalone]
| From | Ram Pai <linuxram@us.ibm.com> |
|---|---|
| Date | 2017-09-16 03:30 +0200 |
| Subject | [PATCH 3/6] mm: display pkey in smaps if arch_pkeys_enabled() is true |
| Message-ID | <uqa5I-2Li-15@gated-at.bofh.it> |
| In reply to | #1733186 |
Currently the architecture specific code is expected to
display the protection keys in smap for a given vma.
This can lead to redundant code and possibly to divergent
formats in which the key gets displayed.
This patch changes the implementation. It displays the
pkey only if the architecture support pkeys.
x86 arch_show_smap() function is not needed anymore.
Delete it.
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
---
arch/x86/kernel/setup.c | 8 --------
fs/proc/task_mmu.c | 11 ++++++-----
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 3486d04..1953bce 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1340,11 +1340,3 @@ static int __init register_kernel_offset_dumper(void)
return 0;
}
__initcall(register_kernel_offset_dumper);
-
-void arch_show_smap(struct seq_file *m, struct vm_area_struct *vma)
-{
- if (!boot_cpu_has(X86_FEATURE_OSPKE))
- return;
-
- seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma));
-}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index cf25306..667d44a 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -16,6 +16,7 @@
#include <linux/mmu_notifier.h>
#include <linux/page_idle.h>
#include <linux/shmem_fs.h>
+#include <linux/pkeys.h>
#include <asm/elf.h>
#include <linux/uaccess.h>
@@ -714,10 +715,6 @@ static int smaps_hugetlb_range(pte_t *pte, unsigned long hmask,
}
#endif /* HUGETLB_PAGE */
-void __weak arch_show_smap(struct seq_file *m, struct vm_area_struct *vma)
-{
-}
-
static int show_smap(struct seq_file *m, void *v, int is_pid)
{
struct vm_area_struct *vma = v;
@@ -803,7 +800,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
(vma->vm_flags & VM_LOCKED) ?
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)) : 0);
- arch_show_smap(m, vma);
+#ifdef CONFIG_ARCH_HAS_PKEYS
+ if (arch_pkeys_enabled())
+ seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma));
+#endif
+
show_smap_vma_flags(m, vma);
m_cache_vma(m, vma);
return 0;
--
1.7.1
[toc] | [prev] | [next] | [standalone]
| From | Balbir Singh <bsingharora@gmail.com> |
|---|---|
| Date | 2017-09-22 08:10 +0200 |
| Subject | Re: [PATCH 3/6] mm: display pkey in smaps if arch_pkeys_enabled() is true |
| Message-ID | <uspjX-2Dw-5@gated-at.bofh.it> |
| In reply to | #1733188 |
On Fri, 15 Sep 2017 18:21:07 -0700
Ram Pai <linuxram@us.ibm.com> wrote:
> Currently the architecture specific code is expected to
> display the protection keys in smap for a given vma.
> This can lead to redundant code and possibly to divergent
> formats in which the key gets displayed.
>
> This patch changes the implementation. It displays the
> pkey only if the architecture support pkeys.
>
> x86 arch_show_smap() function is not needed anymore.
> Delete it.
>
> Signed-off-by: Ram Pai <linuxram@us.ibm.com>
> ---
> arch/x86/kernel/setup.c | 8 --------
> fs/proc/task_mmu.c | 11 ++++++-----
> 2 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index 3486d04..1953bce 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -1340,11 +1340,3 @@ static int __init register_kernel_offset_dumper(void)
> return 0;
> }
> __initcall(register_kernel_offset_dumper);
> -
> -void arch_show_smap(struct seq_file *m, struct vm_area_struct *vma)
> -{
> - if (!boot_cpu_has(X86_FEATURE_OSPKE))
> - return;
> -
> - seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma));
> -}
> diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
> index cf25306..667d44a 100644
> --- a/fs/proc/task_mmu.c
> +++ b/fs/proc/task_mmu.c
> @@ -16,6 +16,7 @@
> #include <linux/mmu_notifier.h>
> #include <linux/page_idle.h>
> #include <linux/shmem_fs.h>
> +#include <linux/pkeys.h>
>
> #include <asm/elf.h>
> #include <linux/uaccess.h>
> @@ -714,10 +715,6 @@ static int smaps_hugetlb_range(pte_t *pte, unsigned long hmask,
> }
> #endif /* HUGETLB_PAGE */
>
> -void __weak arch_show_smap(struct seq_file *m, struct vm_area_struct *vma)
> -{
> -}
> -
> static int show_smap(struct seq_file *m, void *v, int is_pid)
> {
> struct vm_area_struct *vma = v;
> @@ -803,7 +800,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
> (vma->vm_flags & VM_LOCKED) ?
> (unsigned long)(mss.pss >> (10 + PSS_SHIFT)) : 0);
>
> - arch_show_smap(m, vma);
> +#ifdef CONFIG_ARCH_HAS_PKEYS
> + if (arch_pkeys_enabled())
> + seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma));
> +#endif
Can CONFIG_ARCH_HAS_PKEYS be true, but the kernel compiled without
support for them or it's just not enabled? I think the
earlier per_arch function was better
Balbir
[toc] | [prev] | [next] | [standalone]
| From | Balbir Singh <bsingharora@gmail.com> |
|---|---|
| Date | 2017-09-22 08:10 +0200 |
| Subject | Re: [PATCH 3/6] mm: display pkey in smaps if arch_pkeys_enabled() is true |
| Message-ID | <uspjX-2Dw-11@gated-at.bofh.it> |
| In reply to | #1733188 |
On Fri, 15 Sep 2017 18:21:07 -0700 Ram Pai <linuxram@us.ibm.com> wrote: > +#ifdef CONFIG_ARCH_HAS_PKEYS > + if (arch_pkeys_enabled()) Sorry, I missed this bit in my previous review the patch makes sense > + seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma)); > +#endif > + Balbir
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web