Commit c1192f84 authored Feb 12, 2016 by Dave Hansen Committed by Ingo Molnar Feb 18, 2016

x86/mm/pkeys: Dump pkey from VMA in /proc/pid/smaps



The protection key can now be just as important as read/write
permissions on a VMA.  We need some debug mechanism to help
figure out if it is in play.  smaps seems like a logical
place to expose it.

arch/x86/kernel/setup.c is a bit of a weirdo place to put
this code, but it already had seq_file.h and there was not
a much better existing place to put it.

We also use no #ifdef.  If protection keys is .config'd out we
will effectively get the same function as if we used the weak
generic function.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Baoquan He <bhe@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jerome Marchand <jmarchan@redhat.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Laurent Dufour <ldufour@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mark Salter <msalter@redhat.com>
Cc: Mark Williamson <mwilliamson@undo-software.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20160212210227.4F8EB3F8@viggo.jf.intel.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent c0b17b5b

arch/x86/kernel/setup.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@
		#include <asm/alternative.h>
		#include <asm/prom.h>
		#include <asm/microcode.h>
		#include <asm/mmu_context.h>

		/*
		* max_low_pfn_mapped: highest direct mapped pfn under 4GB
		@@ -1282,3 +1283,11 @@ 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));
		}

fs/proc/task_mmu.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -660,11 +660,20 @@ static void show_smap_vma_flags(struct seq_file m, struct vm_area_struct vma)
		[ilog2(VM_MERGEABLE)] = "mg",
		[ilog2(VM_UFFD_MISSING)]= "um",
		[ilog2(VM_UFFD_WP)] = "uw",
		#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
		/* These come out via ProtectionKey: */
		[ilog2(VM_PKEY_BIT0)] = "",
		[ilog2(VM_PKEY_BIT1)] = "",
		[ilog2(VM_PKEY_BIT2)] = "",
		[ilog2(VM_PKEY_BIT3)] = "",
		#endif
		};
		size_t i;

		seq_puts(m, "VmFlags: ");
		for (i = 0; i < BITS_PER_LONG; i++) {
		if (!mnemonics[i][0])
		continue;
		if (vma->vm_flags & (1UL << i)) {
		seq_printf(m, "%c%c ",
		mnemonics[i][0], mnemonics[i][1]);
		@@ -702,6 +711,10 @@ 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;
		@@ -783,6 +796,7 @@ 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);
		show_smap_vma_flags(m, vma);
		m_cache_vma(m, vma);
		return 0;

Admin message