Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5212213a authored by Ram Pai's avatar Ram Pai Committed by Michael Ellerman
Browse files

mm, powerpc, x86: define VM_PKEY_BITx bits if CONFIG_ARCH_HAS_PKEYS is enabled 



VM_PKEY_BITx are defined only if CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
is enabled. Powerpc also needs these bits. Hence lets define the
VM_PKEY_BITx bits for any architecture that enables
CONFIG_ARCH_HAS_PKEYS.

Reviewed-by: default avatarDave Hansen <dave.hansen@intel.com>
Signed-off-by: default avatarRam Pai <linuxram@us.ibm.com>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6da6c0db

arch/powerpc/include/asm/pkeys.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ extern u32 initial_allocation_mask; /* bits set for reserved keys */ 
# define VM_PKEY_BIT2	VM_HIGH_ARCH_2

# define VM_PKEY_BIT3	VM_HIGH_ARCH_3

# define VM_PKEY_BIT4	VM_HIGH_ARCH_4

#elif !defined(VM_PKEY_BIT4)

# define VM_PKEY_BIT4	VM_HIGH_ARCH_4

#endif



#define ARCH_VM_PKEY_FLAGS (VM_PKEY_BIT0 | VM_PKEY_BIT1 | VM_PKEY_BIT2 | \

fs/proc/task_mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -673,13 +673,13 @@ 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

#ifdef CONFIG_ARCH_HAS_PKEYS

		/* These come out via ProtectionKey: */

		[ilog2(VM_PKEY_BIT0)]	= "",

		[ilog2(VM_PKEY_BIT1)]	= "",

		[ilog2(VM_PKEY_BIT2)]	= "",

		[ilog2(VM_PKEY_BIT3)]	= "",

#endif

#endif /* CONFIG_ARCH_HAS_PKEYS */

	};

	size_t i;

include/linux/mm.h

+5 −4
Original line number Diff line number Diff line
@@ -228,15 +228,16 @@ extern unsigned int kobjsize(const void *objp); 
#define VM_HIGH_ARCH_4	BIT(VM_HIGH_ARCH_BIT_4)

#endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */



#if defined(CONFIG_X86)

# define VM_PAT		VM_ARCH_1	/* PAT reserves whole VMA at once (x86) */

#if defined (CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS)

#ifdef CONFIG_ARCH_HAS_PKEYS

# define VM_PKEY_SHIFT	VM_HIGH_ARCH_BIT_0

# define VM_PKEY_BIT0	VM_HIGH_ARCH_0	/* A protection key is a 4-bit value */

# define VM_PKEY_BIT1	VM_HIGH_ARCH_1

# define VM_PKEY_BIT2	VM_HIGH_ARCH_2

# define VM_PKEY_BIT3	VM_HIGH_ARCH_3

#endif

#endif /* CONFIG_ARCH_HAS_PKEYS */



#if defined(CONFIG_X86)

# define VM_PAT		VM_ARCH_1	/* PAT reserves whole VMA at once (x86) */

#elif defined(CONFIG_PPC)

# define VM_SAO		VM_ARCH_1	/* Strong Access Ordering (powerpc) */

#elif defined(CONFIG_PARISC)