Commit 6f6c3c33 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Move arch_get_unmapped_area and gang to new file. 



It never really belonged into syscall.c and it's about to become well more
complex.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 9c1e8a91

arch/mips/kernel/syscall.c

+0 −113
Original line number Diff line number Diff line
@@ -10,12 +10,9 @@ 
#include <linux/capability.h>

#include <linux/errno.h>

#include <linux/linkage.h>

#include <linux/mm.h>

#include <linux/fs.h>

#include <linux/smp.h>

#include <linux/mman.h>

#include <linux/ptrace.h>

#include <linux/sched.h>

#include <linux/string.h>

#include <linux/syscalls.h>

#include <linux/file.h>
@@ -25,11 +22,9 @@ 
#include <linux/msg.h>

#include <linux/shm.h>

#include <linux/compiler.h>

#include <linux/module.h>

#include <linux/ipc.h>

#include <linux/uaccess.h>

#include <linux/slab.h>

#include <linux/random.h>

#include <linux/elf.h>



#include <asm/asm.h>
@@ -66,114 +61,6 @@ asmlinkage int sysm_pipe(nabi_no_regargs volatile struct pt_regs regs) 
	return res;

}



unsigned long shm_align_mask = PAGE_SIZE - 1;	/* Sane caches */



EXPORT_SYMBOL(shm_align_mask);



#define COLOUR_ALIGN(addr,pgoff)				\

	((((addr) + shm_align_mask) & ~shm_align_mask) +	\

	 (((pgoff) << PAGE_SHIFT) & shm_align_mask))



unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,

	unsigned long len, unsigned long pgoff, unsigned long flags)

{

	struct vm_area_struct * vmm;

	int do_color_align;



	if (len > TASK_SIZE)

		return -ENOMEM;



	if (flags & MAP_FIXED) {

		/* Even MAP_FIXED mappings must reside within TASK_SIZE.  */

		if (TASK_SIZE - len < addr)

			return -EINVAL;



		/*

		 * We do not accept a shared mapping if it would violate

		 * cache aliasing constraints.

		 */

		if ((flags & MAP_SHARED) &&

		    ((addr - (pgoff << PAGE_SHIFT)) & shm_align_mask))

			return -EINVAL;

		return addr;

	}



	do_color_align = 0;

	if (filp || (flags & MAP_SHARED))

		do_color_align = 1;

	if (addr) {

		if (do_color_align)

			addr = COLOUR_ALIGN(addr, pgoff);

		else

			addr = PAGE_ALIGN(addr);

		vmm = find_vma(current->mm, addr);

		if (TASK_SIZE - len >= addr &&

		    (!vmm || addr + len <= vmm->vm_start))

			return addr;

	}

	addr = current->mm->mmap_base;

	if (do_color_align)

		addr = COLOUR_ALIGN(addr, pgoff);

	else

		addr = PAGE_ALIGN(addr);



	for (vmm = find_vma(current->mm, addr); ; vmm = vmm->vm_next) {

		/* At this point:  (!vmm || addr < vmm->vm_end). */

		if (TASK_SIZE - len < addr)

			return -ENOMEM;

		if (!vmm || addr + len <= vmm->vm_start)

			return addr;

		addr = vmm->vm_end;

		if (do_color_align)

			addr = COLOUR_ALIGN(addr, pgoff);

	}

}



void arch_pick_mmap_layout(struct mm_struct *mm)

{

	unsigned long random_factor = 0UL;



	if (current->flags & PF_RANDOMIZE) {

		random_factor = get_random_int();

		random_factor = random_factor << PAGE_SHIFT;

		if (TASK_IS_32BIT_ADDR)

			random_factor &= 0xfffffful;

		else

			random_factor &= 0xffffffful;

	}



	mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;

	mm->get_unmapped_area = arch_get_unmapped_area;

	mm->unmap_area = arch_unmap_area;

}



static inline unsigned long brk_rnd(void)

{

	unsigned long rnd = get_random_int();



	rnd = rnd << PAGE_SHIFT;

	/* 8MB for 32bit, 256MB for 64bit */

	if (TASK_IS_32BIT_ADDR)

		rnd = rnd & 0x7ffffful;

	else

		rnd = rnd & 0xffffffful;



	return rnd;

}



unsigned long arch_randomize_brk(struct mm_struct *mm)

{

	unsigned long base = mm->brk;

	unsigned long ret;



	ret = PAGE_ALIGN(base + brk_rnd());



	if (ret < mm->brk)

		return mm->brk;



	return ret;

}



SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,

	unsigned long, prot, unsigned long, flags, unsigned long,

	fd, off_t, offset)

arch/mips/mm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
#



obj-y				+= cache.o dma-default.o extable.o fault.o \

				   init.o tlbex.o tlbex-fault.o uasm.o page.o

				   init.o mmap.o tlbex.o tlbex-fault.o uasm.o \

				   page.o



obj-$(CONFIG_32BIT)		+= ioremap.o pgtable-32.o

obj-$(CONFIG_64BIT)		+= pgtable-64.o

arch/mips/mm/mmap.c

0 → 100644
+122 −0
Original line number Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 2011 Wind River Systems,

 *   written by Ralf Baechle <ralf@linux-mips.org>

 */

#include <linux/errno.h>

#include <linux/mm.h>

#include <linux/mman.h>

#include <linux/module.h>

#include <linux/random.h>

#include <linux/sched.h>



unsigned long shm_align_mask = PAGE_SIZE - 1;	/* Sane caches */



EXPORT_SYMBOL(shm_align_mask);



#define COLOUR_ALIGN(addr,pgoff)				\

	((((addr) + shm_align_mask) & ~shm_align_mask) +	\

	 (((pgoff) << PAGE_SHIFT) & shm_align_mask))



unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,

	unsigned long len, unsigned long pgoff, unsigned long flags)

{

	struct vm_area_struct * vmm;

	int do_color_align;



	if (len > TASK_SIZE)

		return -ENOMEM;



	if (flags & MAP_FIXED) {

		/* Even MAP_FIXED mappings must reside within TASK_SIZE.  */

		if (TASK_SIZE - len < addr)

			return -EINVAL;



		/*

		 * We do not accept a shared mapping if it would violate

		 * cache aliasing constraints.

		 */

		if ((flags & MAP_SHARED) &&

		    ((addr - (pgoff << PAGE_SHIFT)) & shm_align_mask))

			return -EINVAL;

		return addr;

	}



	do_color_align = 0;

	if (filp || (flags & MAP_SHARED))

		do_color_align = 1;

	if (addr) {

		if (do_color_align)

			addr = COLOUR_ALIGN(addr, pgoff);

		else

			addr = PAGE_ALIGN(addr);

		vmm = find_vma(current->mm, addr);

		if (TASK_SIZE - len >= addr &&

		    (!vmm || addr + len <= vmm->vm_start))

			return addr;

	}

	addr = current->mm->mmap_base;

	if (do_color_align)

		addr = COLOUR_ALIGN(addr, pgoff);

	else

		addr = PAGE_ALIGN(addr);



	for (vmm = find_vma(current->mm, addr); ; vmm = vmm->vm_next) {

		/* At this point:  (!vmm || addr < vmm->vm_end). */

		if (TASK_SIZE - len < addr)

			return -ENOMEM;

		if (!vmm || addr + len <= vmm->vm_start)

			return addr;

		addr = vmm->vm_end;

		if (do_color_align)

			addr = COLOUR_ALIGN(addr, pgoff);

	}

}



void arch_pick_mmap_layout(struct mm_struct *mm)

{

	unsigned long random_factor = 0UL;



	if (current->flags & PF_RANDOMIZE) {

		random_factor = get_random_int();

		random_factor = random_factor << PAGE_SHIFT;

		if (TASK_IS_32BIT_ADDR)

			random_factor &= 0xfffffful;

		else

			random_factor &= 0xffffffful;

	}



	mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;

	mm->get_unmapped_area = arch_get_unmapped_area;

	mm->unmap_area = arch_unmap_area;

}



static inline unsigned long brk_rnd(void)

{

	unsigned long rnd = get_random_int();



	rnd = rnd << PAGE_SHIFT;

	/* 8MB for 32bit, 256MB for 64bit */

	if (TASK_IS_32BIT_ADDR)

		rnd = rnd & 0x7ffffful;

	else

		rnd = rnd & 0xffffffful;



	return rnd;

}



unsigned long arch_randomize_brk(struct mm_struct *mm)

{

	unsigned long base = mm->brk;

	unsigned long ret;



	ret = PAGE_ALIGN(base + brk_rnd());



	if (ret < mm->brk)

		return mm->brk;



	return ret;

}