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

Commit aafd4562 authored by Mike Kravetz's avatar Mike Kravetz Committed by Linus Torvalds
Browse files

mm: arch: consolidate mmap hugetlb size encodings 

A non-default huge page size can be encoded in the flags argument of the
mmap system call.  The definitions for these encodings are in arch
specific header files.  However, all architectures use the same values.

Consolidate all the definitions in the primary user header file
(uapi/linux/mman.h).  Include definitions for all known huge page sizes.
Use the generic encoding definitions in hugetlb_encode.h as the basis
for these definitions.

Link: http://lkml.kernel.org/r/1501527386-10736-3-git-send-email-mike.kravetz@oracle.com


Signed-off-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Davidlohr Bueso <dbueso@suse.de>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e652f694

arch/alpha/include/uapi/asm/mman.h

+0 −11
Original line number Diff line number Diff line
@@ -67,17 +67,6 @@ 
/* compatibility flags */

#define MAP_FILE	0



/*

 * When MAP_HUGETLB is set bits [26:31] encode the log2 of the huge page size.

 * This gives us 6 bits, which is enough until someone invents 128 bit address

 * spaces.

 *

 * Assume these are all power of twos.

 * When 0 use the default page size.

 */

#define MAP_HUGE_SHIFT	26

#define MAP_HUGE_MASK	0x3f



#define PKEY_DISABLE_ACCESS	0x1

#define PKEY_DISABLE_WRITE	0x2

#define PKEY_ACCESS_MASK	(PKEY_DISABLE_ACCESS |\

arch/mips/include/uapi/asm/mman.h

+0 −11
Original line number Diff line number Diff line
@@ -94,17 +94,6 @@ 
/* compatibility flags */

#define MAP_FILE	0



/*

 * When MAP_HUGETLB is set bits [26:31] encode the log2 of the huge page size.

 * This gives us 6 bits, which is enough until someone invents 128 bit address

 * spaces.

 *

 * Assume these are all power of twos.

 * When 0 use the default page size.

 */

#define MAP_HUGE_SHIFT	26

#define MAP_HUGE_MASK	0x3f



#define PKEY_DISABLE_ACCESS	0x1

#define PKEY_DISABLE_WRITE	0x2

#define PKEY_ACCESS_MASK	(PKEY_DISABLE_ACCESS |\

arch/parisc/include/uapi/asm/mman.h

+0 −11
Original line number Diff line number Diff line
@@ -64,17 +64,6 @@ 
#define MAP_FILE	0

#define MAP_VARIABLE	0



/*

 * When MAP_HUGETLB is set bits [26:31] encode the log2 of the huge page size.

 * This gives us 6 bits, which is enough until someone invents 128 bit address

 * spaces.

 *

 * Assume these are all power of twos.

 * When 0 use the default page size.

 */

#define MAP_HUGE_SHIFT	26

#define MAP_HUGE_MASK	0x3f



#define PKEY_DISABLE_ACCESS	0x1

#define PKEY_DISABLE_WRITE	0x2

#define PKEY_ACCESS_MASK	(PKEY_DISABLE_ACCESS |\

arch/powerpc/include/uapi/asm/mman.h

+0 −16
Original line number Diff line number Diff line
@@ -29,20 +29,4 @@ 
#define MAP_STACK	0x20000		/* give out an address that is best suited for process/thread stacks */

#define MAP_HUGETLB	0x40000		/* create a huge page mapping */



/*

 * When MAP_HUGETLB is set, bits [26:31] of the flags argument to mmap(2),

 * encode the log2 of the huge page size. A value of zero indicates that the

 * default huge page size should be used. To use a non-default huge page size,

 * one of these defines can be used, or the size can be encoded by hand. Note

 * that on most systems only a subset, or possibly none, of these sizes will be

 * available.

 */

#define MAP_HUGE_512KB	(19 << MAP_HUGE_SHIFT)	/* 512KB HugeTLB Page */

#define MAP_HUGE_1MB	(20 << MAP_HUGE_SHIFT)	/* 1MB   HugeTLB Page */

#define MAP_HUGE_2MB	(21 << MAP_HUGE_SHIFT)	/* 2MB   HugeTLB Page */

#define MAP_HUGE_8MB	(23 << MAP_HUGE_SHIFT)	/* 8MB   HugeTLB Page */

#define MAP_HUGE_16MB	(24 << MAP_HUGE_SHIFT)	/* 16MB  HugeTLB Page */

#define MAP_HUGE_1GB	(30 << MAP_HUGE_SHIFT)	/* 1GB   HugeTLB Page */

#define MAP_HUGE_16GB	(34 << MAP_HUGE_SHIFT)	/* 16GB  HugeTLB Page */



#endif /* _UAPI_ASM_POWERPC_MMAN_H */

arch/x86/include/uapi/asm/mman.h

+0 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 


#define MAP_32BIT	0x40		/* only give out 32bit addresses */



#define MAP_HUGE_2MB    (21 << MAP_HUGE_SHIFT)

#define MAP_HUGE_1GB    (30 << MAP_HUGE_SHIFT)



#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS

/*

 * Take the 4 protection key bits out of the vma->vm_flags