diff options
| author | David S. Miller <davem@davemloft.net> | 2013-09-18 20:58:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-13 00:22:33 +0100 |
| commit | c920745e6964bd4b9315a17b018d83fad66010d3 (patch) | |
| tree | 07a872bac01d893a5a494b12ece22404ba159dce /arch/sparc | |
| parent | Merge tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-c920745e6964bd4b9315a17b018d83fad66010d3.tar.xz linux-c920745e6964bd4b9315a17b018d83fad66010d3.zip | |
sparc64: Clean up 64-bit mmap exclusion defines.
Older UltraSPARC chips had an address space hole due to the MMU only
supporting 44-bit virtual addresses.
The top end of this hole also has the same value as the current
definition of PAGE_OFFSET, so this can be confusing.
Consolidate the defines for the userspace mmap exclusion range into
page_64.h and use them in sys_sparc_64.c and hugetlbpage.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Bob Picco <bob.picco@oracle.com>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/page_64.h | 17 | ||||
| -rw-r--r-- | arch/sparc/kernel/sys_sparc_64.c | 3 | ||||
| -rw-r--r-- | arch/sparc/mm/hugetlbpage.c | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/page_64.h index e15538899f3d..d95931247feb 100644 --- a/arch/sparc/include/asm/page_64.h +++ b/arch/sparc/include/asm/page_64.h @@ -93,9 +93,22 @@ typedef unsigned long pgprot_t; typedef pte_t *pgtable_t; +/* These two values define the virtual address space range in which we + * must forbid 64-bit user processes from making mappings. It + * represents the virtual address space hole present in most early + * sparc64 chips including UltraSPARC-I. The next two defines specify + * the actual exclusion region we enforce, wherein we use a 4GB red + * zone on each side of the VA hole. + */ +#define SPARC64_VA_HOLE_TOP _AC(0xfffff80000000000,UL) +#define SPARC64_VA_HOLE_BOTTOM _AC(0x0000080000000000,UL) + +#define VA_EXCLUDE_START (SPARC64_VA_HOLE_BOTTOM - (1UL << 32UL)) +#define VA_EXCLUDE_END (SPARC64_VA_HOLE_TOP + (1UL << 32UL)) + #define TASK_UNMAPPED_BASE (test_thread_flag(TIF_32BIT) ? \ - (_AC(0x0000000070000000,UL)) : \ - (_AC(0xfffff80000000000,UL) + (1UL << 32UL))) + _AC(0x0000000070000000,UL) : \ + VA_EXCLUDE_END) #include <asm-generic/memory_model.h> diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index 51561b8b15ba..d05eb9c1d846 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -39,9 +39,6 @@ asmlinkage unsigned long sys_getpagesize(void) return PAGE_SIZE; } -#define VA_EXCLUDE_START (0x0000080000000000UL - (1UL << 32UL)) -#define VA_EXCLUDE_END (0xfffff80000000000UL + (1UL << 32UL)) - /* Does addr --> addr+len fall within 4GB of the VA-space hole or * overflow past the end of the 64-bit address space? */ diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c index 96399646570a..30963178d7e9 100644 --- a/arch/sparc/mm/hugetlbpage.c +++ b/arch/sparc/mm/hugetlbpage.c @@ -21,8 +21,6 @@ /* Slightly simplified from the non-hugepage variant because by * definition we don't have to worry about any page coloring stuff */ -#define VA_EXCLUDE_START (0x0000080000000000UL - (1UL << 32UL)) -#define VA_EXCLUDE_END (0xfffff80000000000UL + (1UL << 32UL)) static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp, unsigned long addr, |