Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1733188
| Path | csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Ram Pai <linuxram@us.ibm.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 3/6] mm: display pkey in smaps if arch_pkeys_enabled() is true |
| Date | Sat, 16 Sep 2017 03:30:02 +0200 |
| Message-ID | <uqa5I-2Li-15@gated-at.bofh.it> (permalink) |
| References | <uqa5H-2Li-3@gated-at.bofh.it> |
| X-Original-To | mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, linux-doc@vger.kernel.org |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=OAiSEmvn0GP1+sSc+27UEPpLNHrQY1TXNfuMlFlyRZc=; b=o8DtqYLyYPQmsKvq0DczP0bg8JKXSyOnfEr+xPO6gV1TLzoepa6c1UzJ/fsd7XaHOs 6ny+nxFrnJ7/F4b4z3dq4fuXcrRgO69qSWYLDdYgweJBf8Ph9PhRLpk5dUzMSKcbN/gR w5S65FxAD3bgzICQnTIFolhSa3WUwv5OdSykKG704S+O0fhUoFsytj3dnfgnuqUcxhIf SOmSCpRx4ptBvSkB3knKHbza9B72Qw4TbFhn9G8r06bq6tZDeX/S6Zb36gWV4gML1omy 8akpg8ylturlcr09onRUkY/L4IPiE1/mXICJdmV1u+IDuabIBGC9gsBzad5sLS3NPTfX pYsA== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=OAiSEmvn0GP1+sSc+27UEPpLNHrQY1TXNfuMlFlyRZc=; b=Y30OnFrKAfym2w1h87W84Asm66GO17jvu8khvPnqF7Aa8UhpPRG+S5IwMVa4YTyIbR vD8tlqiL+93cYhKLN905gTKhOBagHfGlk0Q5gjD2hdbX/W1PzQfRthN5xKAJMHXqelYM qcJGOIM7u1278aQzadEHFaXcdduQJIWryUYYJPzfu16lW9AzVWyfFnfTwt1yPUJqQJ2S y26nCfScBjzTWnbrUvUTAS17hDdu9F+Q8GMyBzZcv3iQb9lMYpruKf7+RUQvZwjlKyCw JnwKNImI+7kbV/fX5LK8qBaEy7rY6dhORBv5u+blYjbEMHiCHX1ctfLcS5ZEF2C8wbHn 0iHg== |
| X-Gm-Message-State | AHPjjUi+dfH5F5bDXZrS3BXkTGOtqE8XHvIz3cQ5zPfn2UO6ARDOyV0J AtNl7GlB1GUFrQ== |
| X-Google-SMTP-Source | AOwi7QA6mdi6ljhoGKTQ/WCiZy72WZPKZ+DqX72M+hwU+mHG01gssiD8MvHLjDE7foMs7sv4I0zQzg== |
| X-Received | by 10.55.140.69 with SMTP id o66mr10481789qkd.312.1505524898234; Fri, 15 Sep 2017 18:21:38 -0700 (PDT) |
| X-Mailer | git-send-email 1.7.1 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 71 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | arnd@arndb.de, akpm@linux-foundation.org, corbet@lwn.net, mingo@redhat.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 |
| X-Original-Date | Fri, 15 Sep 2017 18:21:07 -0700 |
| X-Original-Message-ID | <1505524870-4783-4-git-send-email-linuxram@us.ibm.com> |
| X-Original-References | <1505524870-4783-1-git-send-email-linuxram@us.ibm.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1733188 |
Show key headers only | View raw
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[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
csiph-web