Skip to contentSkip to conversation

Unify sys_mmap*

PATCH In review Al Viro 4 participants 5 messages Dec 7, 2009 – Dec 8, 2009

Subsystems (17)
Memory management Arm (32-bit) x86 PowerPC +13 more subsystems
lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 13/19 Unify sys_mmap*

New helper - sys_mmap_pgoff(); switch syscalls to using it.

Signed-off-by Al Viro <[email protected]>
---
 arch/alpha/kernel/osf_sys.c               |   19 ++-----
 arch/arm/kernel/entry-common.S            |    4 +-
 arch/arm/kernel/sys_arm.c                 |   30 +----------
 arch/avr32/include/asm/syscalls.h         |    4 --
 arch/avr32/kernel/sys_avr32.c             |   31 -----------
 arch/avr32/kernel/syscall-stubs.S         |    2 +-
 arch/blackfin/kernel/sys_bfin.c           |   33 -----------
 arch/blackfin/mach-common/entry.S         |    2 +-
 arch/cris/kernel/sys_cris.c               |   30 +---------
 arch/frv/kernel/sys_frv.c                 |   66 +----------------------
 arch/h8300/kernel/sys_h8300.c             |   83 +----------------------------
 arch/h8300/kernel/syscalls.S              |    2 +-
 arch/ia64/kernel/sys_ia64.c               |   37 +------------
 arch/m32r/kernel/sys_m32r.c               |   24 --------
 arch/m32r/kernel/syscall_table.S          |    2 +-
 arch/m68k/kernel/sys_m68k.c               |   79 ++--------------------------
 arch/m68knommu/kernel/sys_m68k.c          |   38 +------------
 arch/m68knommu/kernel/syscalltable.S      |    2 +-
 arch/microblaze/kernel/sys_microblaze.c   |   38 +------------
 arch/microblaze/kernel/syscall_table.S    |    2 +-
 arch/mips/kernel/linux32.c                |   19 +------
 arch/mips/kernel/syscall.c                |   29 +---------
 arch/mn10300/kernel/entry.S               |    2 +-
 arch/mn10300/kernel/sys_mn10300.c         |   31 +----------
 arch/parisc/kernel/sys_parisc.c           |   30 ++---------
 arch/powerpc/kernel/syscalls.c            |   15 +-----
 arch/s390/kernel/compat_linux.c           |   32 +----------
 arch/s390/kernel/sys_s390.c               |   30 +----------
 arch/score/kernel/sys_score.c             |   21 +------
 arch/sh/kernel/sys_sh.c                   |   28 +---------
 arch/sparc/kernel/sys_sparc_32.c          |   31 ++---------
 arch/sparc/kernel/sys_sparc_64.c          |   22 ++------
 arch/um/kernel/syscall.c                  |   28 +---------
 arch/um/sys-i386/shared/sysdep/syscalls.h |    4 --
 arch/x86/ia32/ia32entry.S                 |    2 +-
 arch/x86/ia32/sys_ia32.c                  |   43 +---------------
 arch/x86/include/asm/sys_ia32.h           |    3 -
 arch/x86/include/asm/syscalls.h           |    2 -
 arch/x86/kernel/sys_i386_32.c             |   27 +---------
 arch/x86/kernel/sys_x86_64.c              |   17 +------
 arch/x86/kernel/syscall_table_32.S        |    2 +-
 arch/xtensa/include/asm/syscall.h         |    2 -
 arch/xtensa/include/asm/unistd.h          |    2 +-
 arch/xtensa/kernel/syscall.c              |   25 ---------
 include/linux/syscalls.h                  |    4 ++
 mm/util.c                                 |   29 ++++++++++
 46 files changed, 105 insertions(+), 903 deletions(-)
arch/alpha/kernel/osf_sys.c +6 -13
index 9a3334a..62619f2 100644
@@ -178,25 +178,18 @@ SYSCALL_DEFINE6(osf_mmap, unsigned long, addr, unsigned long, len,
 		unsigned long, prot, unsigned long, flags, unsigned long, fd,
 		unsigned long, off)
 {
-	struct file *file = NULL;
-	unsigned long ret = -EBADF;
+	unsigned long ret = -EINVAL;
 
 #if 0
 	if (flags & (_MAP_HASSEMAPHORE | _MAP_INHERIT | _MAP_UNALIGNED))
 		printk("%s: unimplemented OSF mmap flags %04lx\n", 
 			current->comm, flags);
 #endif
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	down_write(&current->mm->mmap_sem);
-	ret = do_mmap(file, addr, len, prot, flags, off);
-	up_write(&current->mm->mmap_sem);
-	if (file)
-		fput(file);
+	if ((off + PAGE_ALIGN(len)) < off)
+		goto out;
+	if (off & ~PAGE_MASK)
+		goto out;
+	ret = sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
  out:
 	return ret;
 }
arch/arm/kernel/entry-common.S +2 -2
index f0fe95b..2c1db77 100644
@@ -416,12 +416,12 @@ sys_mmap2:
 		tst	r5, #PGOFF_MASK
 		moveq	r5, r5, lsr #PAGE_SHIFT - 12
 		streq	r5, [sp, #4]
-		beq	do_mmap2
+		beq	sys_mmap_pgoff
 		mov	r0, #-EINVAL
 		mov	pc, lr
 #else
 		str	r5, [sp, #4]
-		b	do_mmap2
+		b	sys_mmap_pgoff
 #endif
 ENDPROC(sys_mmap2)
arch/arm/kernel/sys_arm.c +1 -29
index 3b89744..ae4027b 100644
@@ -28,34 +28,6 @@
 #include <linux/ipc.h>
 #include <linux/uaccess.h>
 
-/* common code for old and new mmaps */
-inline long do_mmap2(
-	unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags,
-	unsigned long fd, unsigned long pgoff)
-{
-	int error = -EINVAL;
-	struct file * file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-	error = -EBADF;
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return error;
-}
-
 struct mmap_arg_struct {
 	unsigned long addr;
 	unsigned long len;

@@ -77,7 +49,7 @@ asmlinkage int old_mmap(struct mmap_arg_struct __user *arg)
 	if (a.offset & ~PAGE_MASK)
 		goto out;
 
-	error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
+	error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
 out:
 	return error;
 }
arch/avr32/include/asm/syscalls.h +0 -4
index 483d666..66a1972 100644
@@ -29,10 +29,6 @@ asmlinkage int sys_sigaltstack(const stack_t __user *, stack_t __user *,
 			       struct pt_regs *);
 asmlinkage int sys_rt_sigreturn(struct pt_regs *);
 
-/* kernel/sys_avr32.c */
-asmlinkage long sys_mmap2(unsigned long, unsigned long, unsigned long,
-			  unsigned long, unsigned long, off_t);
-
 /* mm/cache.c */
 asmlinkage int sys_cacheflush(int, void __user *, size_t);
arch/avr32/kernel/sys_avr32.c +0 -31
index 5d2daea..459349b 100644
@@ -5,39 +5,8 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/file.h>
-#include <linux/mm.h>
 #include <linux/unistd.h>
 
-#include <asm/mman.h>
-#include <asm/uaccess.h>
-#include <asm/syscalls.h>
-
-asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-			  unsigned long prot, unsigned long flags,
-			  unsigned long fd, off_t offset)
-{
-	int error = -EBADF;
-	struct file *file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			return error;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, offset);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-	return error;
-}
-
 int kernel_execve(const char *file, char **argv, char **envp)
 {
 	register long scno asm("r8") = __NR_execve;
arch/avr32/kernel/syscall-stubs.S +1 -1
index f7244cd..0447a3e 100644
@@ -61,7 +61,7 @@ __sys_execve:
 __sys_mmap2:
 	pushm	lr
 	st.w	--sp, ARG6
-	call	sys_mmap2
+	call	sys_mmap_pgoff
 	sub	sp, -4
 	popm	pc
arch/blackfin/kernel/sys_bfin.c +0 -33
index afcef12..2e7f8e1 100644
@@ -22,39 +22,6 @@
 #include <asm/cacheflush.h>
 #include <asm/dma.h>
 
-/* common code for old and new mmaps */
-static inline long
-do_mmap2(unsigned long addr, unsigned long len,
-	 unsigned long prot, unsigned long flags,
-	 unsigned long fd, unsigned long pgoff)
-{
-	int error = -EBADF;
-	struct file *file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
- out:
-	return error;
-}
-
-asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-			  unsigned long prot, unsigned long flags,
-			  unsigned long fd, unsigned long pgoff)
-{
-	return do_mmap2(addr, len, prot, flags, fd, pgoff);
-}
-
 asmlinkage void *sys_sram_alloc(size_t size, unsigned long flags)
 {
 	return sram_alloc_with_lsl(size, flags);
arch/blackfin/mach-common/entry.S +1 -1
index 94a0375..1d8f00a 100644
@@ -1422,7 +1422,7 @@ ENTRY(_sys_call_table)
 	.long _sys_ni_syscall	/* streams2 */
 	.long _sys_vfork		/* 190 */
 	.long _sys_getrlimit
-	.long _sys_mmap2
+	.long _sys_mmap_pgoff
 	.long _sys_truncate64
 	.long _sys_ftruncate64
 	.long _sys_stat64	/* 195 */
arch/cris/kernel/sys_cris.c +3 -27
index 2ad962c..c2bbb1a 100644
@@ -26,31 +26,6 @@
 #include <asm/uaccess.h>
 #include <asm/segment.h>
 
-/* common code for old and new mmaps */
-static inline long
-do_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
-        unsigned long flags, unsigned long fd, unsigned long pgoff)
-{
-        int error = -EBADF;
-        struct file * file = NULL;
-
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-        if (!(flags & MAP_ANONYMOUS)) {
-                file = fget(fd);
-                if (!file)
-                        goto out;
-        }
-
-        down_write(&current->mm->mmap_sem);
-        error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-        up_write(&current->mm->mmap_sem);
-
-        if (file)
-                fput(file);
-out:
-        return error;
-}
-
 asmlinkage unsigned long old_mmap(unsigned long __user *args)
 {        
 	unsigned long buffer[6];

@@ -63,7 +38,7 @@ asmlinkage unsigned long old_mmap(unsigned long __user *args)
 	if (buffer[5] & ~PAGE_MASK) /* verify that offset is on page boundary */
 		goto out;
 
-	err = do_mmap2(buffer[0], buffer[1], buffer[2], buffer[3],
+	err = sys_mmap_pgoff(buffer[0], buffer[1], buffer[2], buffer[3],
                        buffer[4], buffer[5] >> PAGE_SHIFT);
 out:
 	return err;

@@ -73,7 +48,8 @@ asmlinkage long
 sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
           unsigned long flags, unsigned long fd, unsigned long pgoff)
 {
-        return do_mmap2(addr, len, prot, flags, fd, pgoff);
+	/* bug(?): 8Kb pages here */
+        return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
 }
 
 /*
arch/frv/kernel/sys_frv.c +2 -64

80 lines not on this page · raw message

arch/h8300/kernel/sys_h8300.c +2 -81

98 lines not on this page · raw message

arch/h8300/kernel/syscalls.S +1 -1
index 4eb67fa..2d69881 100644
@@ -206,7 +206,7 @@ SYMBOL_NAME_LABEL(sys_call_table)
 	.long SYMBOL_NAME(sys_ni_syscall)	/* streams2 */
 	.long SYMBOL_NAME(sys_vfork)            /* 190 */
 	.long SYMBOL_NAME(sys_getrlimit)
-	.long SYMBOL_NAME(sys_mmap2)
+	.long SYMBOL_NAME(sys_mmap_pgoff)
 	.long SYMBOL_NAME(sys_truncate64)
 	.long SYMBOL_NAME(sys_ftruncate64)
 	.long SYMBOL_NAME(sys_stat64)		/* 195 */
arch/ia64/kernel/sys_ia64.c +2 -35
index 92ed83f..ae384a2 100644
@@ -185,39 +185,6 @@ int ia64_mmap_check(unsigned long addr, unsigned long len,
 	return 0;
 }
 
-static inline unsigned long
-do_mmap2 (unsigned long addr, unsigned long len, int prot, int flags, int fd, unsigned long pgoff)
-{
-	struct file *file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			return -EBADF;
-
-		if (!file->f_op || !file->f_op->mmap) {
-			addr = -ENODEV;
-			goto out;
-		}
-	}
-
-	/* Careful about overflows.. */
-	len = PAGE_ALIGN(len);
-	if (!len || len > TASK_SIZE) {
-		addr = -EINVAL;
-		goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	addr = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-out:	if (file)
-		fput(file);
-	return addr;
-}
-
 /*
  * mmap2() is like mmap() except that the offset is expressed in units
  * of PAGE_SIZE (instead of bytes).  This allows to mmap2() (pieces

@@ -226,7 +193,7 @@ out:	if (file)
 asmlinkage unsigned long
 sys_mmap2 (unsigned long addr, unsigned long len, int prot, int flags, int fd, long pgoff)
 {
-	addr = do_mmap2(addr, len, prot, flags, fd, pgoff);
+	addr = sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
 	if (!IS_ERR((void *) addr))
 		force_successful_syscall_return();
 	return addr;

@@ -238,7 +205,7 @@ sys_mmap (unsigned long addr, unsigned long len, int prot, int flags, int fd, lo
 	if (offset_in_page(off) != 0)
 		return -EINVAL;
 
-	addr = do_mmap2(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
+	addr = sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
 	if (!IS_ERR((void *) addr))
 		force_successful_syscall_return();
 	return addr;
arch/m32r/kernel/sys_m32r.c +0 -24
index 305ac85..d3c865c 100644
@@ -76,30 +76,6 @@ asmlinkage int sys_tas(int __user *addr)
 	return oldval;
 }
 
-asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags,
-	unsigned long fd, unsigned long pgoff)
-{
-	int error = -EBADF;
-	struct file *file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return error;
-}
-
 /*
  * sys_ipc() is the de-multiplexer for the SysV IPC calls..
  *
arch/m32r/kernel/syscall_table.S +1 -1
index aa3bf4c..60536e2 100644
@@ -191,7 +191,7 @@ ENTRY(sys_call_table)
 	.long sys_ni_syscall		/* streams2 */
 	.long sys_vfork			/* 190 */
 	.long sys_getrlimit
-	.long sys_mmap2
+	.long sys_mmap_pgoff
 	.long sys_truncate64
 	.long sys_ftruncate64
 	.long sys_stat64		/* 195 */
arch/m68k/kernel/sys_m68k.c +4 -75

98 lines not on this page · raw message

arch/m68knommu/kernel/sys_m68k.c +2 -36
index efdd090..b67cbc7 100644
@@ -27,39 +27,6 @@
 #include <asm/cacheflush.h>
 #include <asm/unistd.h>
 
-/* common code for old and new mmaps */
-static inline long do_mmap2(
-	unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags,
-	unsigned long fd, unsigned long pgoff)
-{
-	int error = -EBADF;
-	struct file * file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return error;
-}
-
-asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags,
-	unsigned long fd, unsigned long pgoff)
-{
-	return do_mmap2(addr, len, prot, flags, fd, pgoff);
-}
-
 /*
  * Perform the select(nd, in, out, ex, tv) and mmap() system
  * calls. Linux/m68k cloned Linux/i386, which didn't use to be able to

@@ -88,9 +55,8 @@ asmlinkage int old_mmap(struct mmap_arg_struct *arg)
 	if (a.offset & ~PAGE_MASK)
 		goto out;
 
-	a.flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-	error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
+	error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
+				a.offset >> PAGE_SHIFT);
 out:
 	return error;
 }
arch/m68knommu/kernel/syscalltable.S +1 -1
index 23535cc..486837e 100644
@@ -210,7 +210,7 @@ ENTRY(sys_call_table)
 	.long sys_ni_syscall	/* streams2 */
 	.long sys_vfork		/* 190 */
 	.long sys_getrlimit
-	.long sys_mmap2
+	.long sys_mmap_pgoff
 	.long sys_truncate64
 	.long sys_ftruncate64
 	.long sys_stat64	/* 195 */
arch/microblaze/kernel/sys_microblaze.c +3 -35
index 07cabed..9f3c205 100644
@@ -62,46 +62,14 @@ out:
 	return error;
 }
 
-asmlinkage long
-sys_mmap2(unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags,
-	unsigned long fd, unsigned long pgoff)
-{
-	struct file *file = NULL;
-	int ret = -EBADF;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file) {
-			printk(KERN_INFO "no fd in mmap\r\n");
-			goto out;
-		}
-	}
-
-	down_write(&current->mm->mmap_sem);
-	ret = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-	if (file)
-		fput(file);
-out:
-	return ret;
-}
-
 asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
 			unsigned long prot, unsigned long flags,
 			unsigned long fd, off_t pgoff)
 {
-	int err = -EINVAL;
-
-	if (pgoff & ~PAGE_MASK) {
-		printk(KERN_INFO "no pagemask in mmap\r\n");
-		goto out;
-	}
+	if (pgoff & ~PAGE_MASK)
+		return -EINVAL;
 
-	err = sys_mmap2(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
-out:
-	return err;
+	return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
 }
 
 /*
arch/microblaze/kernel/syscall_table.S +1 -1
index ecec191..eb50ce5 100644
@@ -196,7 +196,7 @@ ENTRY(sys_call_table)
 	.long sys_ni_syscall		/* reserved for streams2 */
 	.long sys_vfork		/* 190 */
 	.long sys_getrlimit
-	.long sys_mmap2			/* mmap2 */
+	.long sys_mmap_pgoff		/* mmap2 */
 	.long sys_truncate64
 	.long sys_ftruncate64
 	.long sys_stat64		/* 195 */
arch/mips/kernel/linux32.c +2 -17
index b77fefa..ea4a746 100644
@@ -67,28 +67,13 @@ SYSCALL_DEFINE6(32_mmap2, unsigned long, addr, unsigned long, len,
 	unsigned long, prot, unsigned long, flags, unsigned long, fd,
 	unsigned long, pgoff)
 {
-	struct file * file = NULL;
 	unsigned long error;
 
 	error = -EINVAL;
 	if (pgoff & (~PAGE_MASK >> 12))
 		goto out;
-	pgoff >>= PAGE_SHIFT-12;
-
-	if (!(flags & MAP_ANONYMOUS)) {
-		error = -EBADF;
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-	if (file)
-		fput(file);
-
+	error = sys_mmap_pgoff(addr, len, prot, flags, fd,
+			       pgoff >> (PAGE_SHIFT-12));
 out:
 	return error;
 }
arch/mips/kernel/syscall.c +2 -27
index fe0d798..c25b2e7 100644
@@ -129,31 +129,6 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
 	}
 }
 
-/* common code for old and new mmaps */
-static inline unsigned long
-do_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
-        unsigned long flags, unsigned long fd, unsigned long pgoff)
-{
-	unsigned long error = -EBADF;
-	struct file * file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return error;
-}
-
 SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,
 	unsigned long, prot, unsigned long, flags, unsigned long,
 	fd, off_t, offset)

@@ -164,7 +139,7 @@ SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,
 	if (offset & ~PAGE_MASK)
 		goto out;
 
-	result = do_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
+	result = sys_mmap_pgoff(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
 
 out:
 	return result;

@@ -177,7 +152,7 @@ SYSCALL_DEFINE6(mips_mmap2, unsigned long, addr, unsigned long, len,
 	if (pgoff & (~PAGE_MASK >> 12))
 		return -EINVAL;
 
-	return do_mmap2(addr, len, prot, flags, fd, pgoff >> (PAGE_SHIFT-12));
+	return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff >> (PAGE_SHIFT-12));
 }
 
 save_static_function(sys_fork);
arch/mn10300/kernel/entry.S +1 -1
index a94e7ea..c9ee6c0 100644
@@ -578,7 +578,7 @@ ENTRY(sys_call_table)
 	.long sys_ni_syscall	/* reserved for streams2 */
 	.long sys_vfork		/* 190 */
 	.long sys_getrlimit
-	.long sys_mmap2
+	.long sys_mmap_pgoff
 	.long sys_truncate64
 	.long sys_ftruncate64
 	.long sys_stat64	/* 195 */
arch/mn10300/kernel/sys_mn10300.c +1 -30
index ec4100d..17cc6ce 100644
@@ -23,42 +23,13 @@
 
 #include <asm/uaccess.h>
 
-/*
- * memory mapping syscall
- */
-asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-			  unsigned long prot, unsigned long flags,
-			  unsigned long fd, unsigned long pgoff)
-{
-	struct file *file = NULL;
-	long error = -EINVAL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-	error = -EBADF;
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return error;
-}
-
 asmlinkage long old_mmap(unsigned long addr, unsigned long len,
 			 unsigned long prot, unsigned long flags,
 			 unsigned long fd, unsigned long offset)
 {
 	if (offset & ~PAGE_MASK)
 		return -EINVAL;
-	return sys_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
+	return sys_mmap_pgoff(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
 }
 
 struct sel_arg_struct {
arch/parisc/kernel/sys_parisc.c +4 -26
index 71b3195..9147391 100644
@@ -110,37 +110,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
 	return addr;
 }
 
-static unsigned long do_mmap2(unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags, unsigned long fd,
-	unsigned long pgoff)
-{
-	struct file * file = NULL;
-	unsigned long error = -EBADF;
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file != NULL)
-		fput(file);
-out:
-	return error;
-}
-
 asmlinkage unsigned long sys_mmap2(unsigned long addr, unsigned long len,
 	unsigned long prot, unsigned long flags, unsigned long fd,
 	unsigned long pgoff)
 {
 	/* Make sure the shift for mmap2 is constant (12), no matter what PAGE_SIZE
 	   we have. */
-	return do_mmap2(addr, len, prot, flags, fd, pgoff >> (PAGE_SHIFT - 12));
+	return sys_mmap_pgoff(addr, len, prot, flags, fd,
+			      pgoff >> (PAGE_SHIFT - 12));
 }
 
 asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len,

@@ -148,7 +125,8 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len,
 		unsigned long offset)
 {
 	if (!(offset & ~PAGE_MASK)) {
-		return do_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
+		return sys_mmap_pgoff(addr, len, prot, flags, fd,
+					offset >> PAGE_SHIFT);
 	} else {
 		return -EINVAL;
 	}
arch/powerpc/kernel/syscalls.c +1 -14
index c04832c..3370e62 100644
@@ -140,7 +140,6 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len,
 			unsigned long prot, unsigned long flags,
 			unsigned long fd, unsigned long off, int shift)
 {
-	struct file * file = NULL;
 	unsigned long ret = -EINVAL;
 
 	if (!arch_validate_prot(prot))

@@ -151,20 +150,8 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len,
 			goto out;
 		off >>= shift;
 	}
-		
-	ret = -EBADF;
-	if (!(flags & MAP_ANONYMOUS)) {
-		if (!(file = fget(fd)))
-			goto out;
-	}
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
 
-	down_write(&current->mm->mmap_sem);
-	ret = do_mmap_pgoff(file, addr, len, prot, flags, off);
-	up_write(&current->mm->mmap_sem);
-	if (file)
-		fput(file);
+	ret = sys_mmap_pgoff(addr, len, prot, flags, fd, off);
 out:
 	return ret;
 }
arch/s390/kernel/compat_linux.c +3 -29
index c5a9fba..9c746c0 100644
@@ -683,33 +683,6 @@ struct mmap_arg_struct_emu31 {
 	u32	offset;
 };
 
-/* common code for old and new mmaps */
-static inline long do_mmap2(
-	unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags,
-	unsigned long fd, unsigned long pgoff)
-{
-	struct file * file = NULL;
-	unsigned long error = -EBADF;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:    
-	return error;
-}
-
-
 asmlinkage unsigned long
 old32_mmap(struct mmap_arg_struct_emu31 __user *arg)
 {

@@ -723,7 +696,8 @@ old32_mmap(struct mmap_arg_struct_emu31 __user *arg)
 	if (a.offset & ~PAGE_MASK)
 		goto out;
 
-	error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT); 
+	error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
+			       a.offset >> PAGE_SHIFT);
 out:
 	return error;
 }

@@ -736,7 +710,7 @@ sys32_mmap2(struct mmap_arg_struct_emu31 __user *arg)
 
 	if (copy_from_user(&a, arg, sizeof(a)))
 		goto out;
-	error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset);
+	error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd, a.offset);
 out:
 	return error;
 }
arch/s390/kernel/sys_s390.c +2 -28
index e9d94f6..86a74c9 100644
@@ -32,32 +32,6 @@
 #include <asm/uaccess.h>
 #include "entry.h"
 
-/* common code for old and new mmaps */
-static inline long do_mmap2(
-	unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags,
-	unsigned long fd, unsigned long pgoff)
-{
-	long error = -EBADF;
-	struct file * file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return error;
-}
-
 /*
  * Perform the select(nd, in, out, ex, tv) and mmap() system
  * calls. Linux for S/390 isn't able to handle more than 5

@@ -81,7 +55,7 @@ SYSCALL_DEFINE1(mmap2, struct mmap_arg_struct __user *, arg)
 
 	if (copy_from_user(&a, arg, sizeof(a)))
 		goto out;
-	error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset);
+	error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd, a.offset);
 out:
 	return error;
 }

@@ -98,7 +72,7 @@ SYSCALL_DEFINE1(s390_old_mmap, struct mmap_arg_struct __user *, arg)
 	if (a.offset & ~PAGE_MASK)
 		goto out;
 
-	error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
+	error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
 out:
 	return error;
 }
arch/score/kernel/sys_score.c +3 -18
index 0012494..5299a47 100644
@@ -36,33 +36,18 @@ asmlinkage long
 sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
 	  unsigned long flags, unsigned long fd, unsigned long pgoff)
 {
-	int error = -EBADF;
-	struct file *file = NULL;
-
 	if (pgoff & (~PAGE_MASK >> 12))
 		return -EINVAL;
 
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			return error;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-
-	return error;
+	return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
+	/* sic - almost certainly should shift pgoff as well */
 }
 
 asmlinkage long
 sys_mmap(unsigned long addr, unsigned long len, unsigned long prot,
 	unsigned long flags, unsigned long fd, off_t pgoff)
 {
+	/* where's the alignment check? */
 	return sys_mmap2(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
 }
arch/sh/kernel/sys_sh.c +2 -26
index 8aa5d1c..71399cd 100644
@@ -28,37 +28,13 @@
 #include <asm/cacheflush.h>
 #include <asm/cachectl.h>
 
-static inline long
-do_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
-	 unsigned long flags, int fd, unsigned long pgoff)
-{
-	int error = -EBADF;
-	struct file *file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return error;
-}
-
 asmlinkage int old_mmap(unsigned long addr, unsigned long len,
 	unsigned long prot, unsigned long flags,
 	int fd, unsigned long off)
 {
 	if (off & ~PAGE_MASK)
 		return -EINVAL;
-	return do_mmap2(addr, len, prot, flags, fd, off>>PAGE_SHIFT);
+	return sys_mmap_pgoff(addr, len, prot, flags, fd, off>>PAGE_SHIFT);
 }
 
 asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,

@@ -74,7 +50,7 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
 
 	pgoff >>= PAGE_SHIFT - 12;
 
-	return do_mmap2(addr, len, prot, flags, fd, pgoff);
+	return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
 }
 
 /*
arch/sparc/kernel/sys_sparc_32.c +4 -27
index 10c43be..36f6f26 100644
@@ -234,31 +234,6 @@ int sparc_mmap_check(unsigned long addr, unsigned long len)
 }
 
 /* Linux version of mmap */
-static unsigned long do_mmap2(unsigned long addr, unsigned long len,
-	unsigned long prot, unsigned long flags, unsigned long fd,
-	unsigned long pgoff)
-{
-	struct file * file = NULL;
-	unsigned long retval = -EBADF;
-
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	len = PAGE_ALIGN(len);
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-	down_write(&current->mm->mmap_sem);
-	retval = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return retval;
-}
 
 asmlinkage unsigned long sys_mmap2(unsigned long addr, unsigned long len,
 	unsigned long prot, unsigned long flags, unsigned long fd,

@@ -266,14 +241,16 @@ asmlinkage unsigned long sys_mmap2(unsigned long addr, unsigned long len,
 {
 	/* Make sure the shift for mmap2 is constant (12), no matter what PAGE_SIZE
 	   we have. */
-	return do_mmap2(addr, len, prot, flags, fd, pgoff >> (PAGE_SHIFT - 12));
+	return sys_mmap_pgoff(addr, len, prot, flags, fd,
+			      pgoff >> (PAGE_SHIFT - 12));
 }
 
 asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len,
 	unsigned long prot, unsigned long flags, unsigned long fd,
 	unsigned long off)
 {
-	return do_mmap2(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
+	/* no alignment check? */
+	return sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
 }
 
 long sparc_remap_file_pages(unsigned long start, unsigned long size,
arch/sparc/kernel/sys_sparc_64.c +6 -16
index d498b32..8f9cd58 100644
@@ -572,23 +572,13 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
 		unsigned long, prot, unsigned long, flags, unsigned long, fd,
 		unsigned long, off)
 {
-	struct file * file = NULL;
-	unsigned long retval = -EBADF;
+	unsigned long retval = -EINVAL;
 
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	len = PAGE_ALIGN(len);
-
-	down_write(&current->mm->mmap_sem);
-	retval = do_mmap(file, addr, len, prot, flags, off);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
+	if ((off + PAGE_ALIGN(len)) < off)
+		goto out;
+	if (off & ~PAGE_MASK)
+		goto out;
+	retval = sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
 out:
 	return retval;
 }
arch/um/kernel/syscall.c +2 -26
index a4625c7..cccab85 100644
@@ -8,6 +8,7 @@
 #include "linux/mm.h"
 #include "linux/sched.h"
 #include "linux/utsname.h"
+#include "linux/syscalls.h"
 #include "asm/current.h"
 #include "asm/mman.h"
 #include "asm/uaccess.h"

@@ -37,31 +38,6 @@ long sys_vfork(void)
 	return ret;
 }
 
-/* common code for old and new mmaps */
-long sys_mmap2(unsigned long addr, unsigned long len,
-	       unsigned long prot, unsigned long flags,
-	       unsigned long fd, unsigned long pgoff)
-{
-	long error = -EBADF;
-	struct file * file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
- out:
-	return error;
-}
-
 long old_mmap(unsigned long addr, unsigned long len,
 	      unsigned long prot, unsigned long flags,
 	      unsigned long fd, unsigned long offset)

@@ -70,7 +46,7 @@ long old_mmap(unsigned long addr, unsigned long len,
 	if (offset & ~PAGE_MASK)
 		goto out;
 
-	err = sys_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
+	err = sys_mmap_pgoff(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
  out:
 	return err;
 }
arch/um/sys-i386/shared/sysdep/syscalls.h +0 -4
index 9056981..e778767 100644
@@ -20,7 +20,3 @@ extern syscall_handler_t *sys_call_table[];
 #define EXECUTE_SYSCALL(syscall, regs) \
 	((long (*)(struct syscall_args)) \
 	 (*sys_call_table[syscall]))(SYSCALL_ARGS(&regs->regs))
-
-extern long sys_mmap2(unsigned long addr, unsigned long len,
-		      unsigned long prot, unsigned long flags,
-		      unsigned long fd, unsigned long pgoff);
arch/x86/ia32/ia32entry.S +1 -1
index 581b056..5294d84 100644
@@ -696,7 +696,7 @@ ia32_sys_call_table:
 	.quad quiet_ni_syscall		/* streams2 */
 	.quad stub32_vfork            /* 190 */
 	.quad compat_sys_getrlimit
-	.quad sys32_mmap2
+	.quad sys_mmap_pgoff
 	.quad sys32_truncate64
 	.quad sys32_ftruncate64
 	.quad sys32_stat64		/* 195 */
arch/x86/ia32/sys_ia32.c +1 -42

62 lines not on this page · raw message

arch/x86/include/asm/sys_ia32.h +0 -3
index 72a6dcd..77c1184 100644
@@ -62,9 +62,6 @@ asmlinkage long sys32_pwrite(unsigned int, char __user *, u32, u32, u32);
 asmlinkage long sys32_personality(unsigned long);
 asmlinkage long sys32_sendfile(int, int, compat_off_t __user *, s32);
 
-asmlinkage long sys32_mmap2(unsigned long, unsigned long, unsigned long,
-			    unsigned long, unsigned long, unsigned long);
-
 struct oldold_utsname;
 struct old_utsname;
 asmlinkage long sys32_olduname(struct oldold_utsname __user *);
arch/x86/include/asm/syscalls.h +0 -2
index 372b76e..1bb6e39 100644
@@ -55,8 +55,6 @@ struct sel_arg_struct;
 struct oldold_utsname;
 struct old_utsname;
 
-asmlinkage long sys_mmap2(unsigned long, unsigned long, unsigned long,
-			  unsigned long, unsigned long, unsigned long);
 asmlinkage int old_mmap(struct mmap_arg_struct __user *);
 asmlinkage int old_select(struct sel_arg_struct __user *);
 asmlinkage int sys_ipc(uint, int, int, int, void __user *, long);
arch/x86/kernel/sys_i386_32.c +1 -26
index 1884a8d..dee1ff7 100644
@@ -24,31 +24,6 @@
 
 #include <asm/syscalls.h>
 
-asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-			  unsigned long prot, unsigned long flags,
-			  unsigned long fd, unsigned long pgoff)
-{
-	int error = -EBADF;
-	struct file *file = NULL;
-	struct mm_struct *mm = current->mm;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return error;
-}
-
 /*
  * Perform the select(nd, in, out, ex, tv) and mmap() system
  * calls. Linux/i386 didn't use to be able to handle more than

@@ -77,7 +52,7 @@ asmlinkage int old_mmap(struct mmap_arg_struct __user *arg)
 	if (a.offset & ~PAGE_MASK)
 		goto out;
 
-	err = sys_mmap2(a.addr, a.len, a.prot, a.flags,
+	err = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags,
 			a.fd, a.offset >> PAGE_SHIFT);
 out:
 	return err;
arch/x86/kernel/sys_x86_64.c +1 -16
index 45e00eb..8aa2057 100644
@@ -23,26 +23,11 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
 		unsigned long, fd, unsigned long, off)
 {
 	long error;
-	struct file *file;
-
 	error = -EINVAL;
 	if (off & ~PAGE_MASK)
 		goto out;
 
-	error = -EBADF;
-	file = NULL;
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, off >> PAGE_SHIFT);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
+	error = sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
 out:
 	return error;
 }
arch/x86/kernel/syscall_table_32.S +1 -1
index 0157cd2..76d70a4 100644
@@ -191,7 +191,7 @@ ENTRY(sys_call_table)
 	.long sys_ni_syscall	/* reserved for streams2 */
 	.long ptregs_vfork	/* 190 */
 	.long sys_getrlimit
-	.long sys_mmap2
+	.long sys_mmap_pgoff
 	.long sys_truncate64
 	.long sys_ftruncate64
 	.long sys_stat64	/* 195 */
arch/xtensa/include/asm/syscall.h +0 -2
index 05cebf8..4352dbe 100644
@@ -13,8 +13,6 @@ struct sigaction;
 asmlinkage long xtensa_execve(char*, char**, char**, struct pt_regs*);
 asmlinkage long xtensa_clone(unsigned long, unsigned long, struct pt_regs*);
 asmlinkage long xtensa_pipe(int __user *);
-asmlinkage long xtensa_mmap2(unsigned long, unsigned long, unsigned long,
-    			     unsigned long, unsigned long, unsigned long);
 asmlinkage long xtensa_ptrace(long, long, long, long);
 asmlinkage long xtensa_sigreturn(struct pt_regs*);
 asmlinkage long xtensa_rt_sigreturn(struct pt_regs*);
arch/xtensa/include/asm/unistd.h +1 -1
index c092c8f..9a5c354 100644
@@ -189,7 +189,7 @@ __SYSCALL( 79, sys_fremovexattr, 2)
 /* File Map / Shared Memory Operations */
 
 #define __NR_mmap2 				 80
-__SYSCALL( 80, xtensa_mmap2, 6)
+__SYSCALL( 80, sys_mmap_pgoff, 6)
 #define __NR_munmap 				 81
 __SYSCALL( 81, sys_munmap, 2)
 #define __NR_mprotect 				 82
arch/xtensa/kernel/syscall.c +0 -25
index ac15ecb..1e67bab 100644
@@ -57,31 +57,6 @@ asmlinkage long xtensa_pipe(int __user *userfds)
 	return error;
 }
 
-
-asmlinkage long xtensa_mmap2(unsigned long addr, unsigned long len,
-   			     unsigned long prot, unsigned long flags,
-			     unsigned long fd, unsigned long pgoff)
-{
-	int error = -EBADF;
-	struct file * file = NULL;
-
-	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-	if (!(flags & MAP_ANONYMOUS)) {
-		file = fget(fd);
-		if (!file)
-			goto out;
-	}
-
-	down_write(&current->mm->mmap_sem);
-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-	up_write(&current->mm->mmap_sem);
-
-	if (file)
-		fput(file);
-out:
-	return error;
-}
-
 asmlinkage long xtensa_shmat(int shmid, char __user *shmaddr, int shmflg)
 {
 	unsigned long ret;
include/linux/syscalls.h +4 -0
index a990ace..93515c6 100644
@@ -879,4 +879,8 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
 asmlinkage long sys_perf_event_open(
 		struct perf_event_attr __user *attr_uptr,
 		pid_t pid, int cpu, int group_fd, unsigned long flags);
+
+asmlinkage long sys_mmap_pgoff(unsigned long addr, unsigned long len,
+			unsigned long prot, unsigned long flags,
+			unsigned long fd, unsigned long pgoff);
 #endif
mm/util.c +29 -0
index 7c35ad9..3bf81b2 100644
@@ -4,6 +4,10 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/sched.h>
+#include <linux/hugetlb.h>
+#include <linux/syscalls.h>
+#include <linux/mman.h>
+#include <linux/file.h>
 #include <asm/uaccess.h>
 
 #define CREATE_TRACE_POINTS

@@ -268,6 +272,31 @@ int __attribute__((weak)) get_user_pages_fast(unsigned long start,
 }
 EXPORT_SYMBOL_GPL(get_user_pages_fast);
 
+SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
+		unsigned long, prot, unsigned long, flags,
+		unsigned long, fd, unsigned long, pgoff)
+{
+	struct file * file = NULL;
+	unsigned long retval = -EBADF;
+
+	if (!(flags & MAP_ANONYMOUS)) {
+		file = fget(fd);
+		if (!file)
+			goto out;
+	}
+
+	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
+
+	down_write(&current->mm->mmap_sem);
+	retval = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
+	up_write(&current->mm->mmap_sem);
+
+	if (file)
+		fput(file);
+out:
+	return retval;
+}
+
 /* Tracepoints definitions. */
 EXPORT_TRACEPOINT_SYMBOL(kmalloc);
 EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc);
Signature · 1 line
1.5.6.5
maintainer
#1 lore raw
Quoted 84 lines · Al Viro

New helper - sys_mmap_pgoff(); switch syscalls to using it.

Signed-off-by Al Viro <[email protected]>

---
 arch/alpha/kernel/osf_sys.c               |   19 ++----- arch/arm/kernel/entry-common.S            |    4 +- arch/arm/kernel/sys_arm.c                 |   30 +---------- arch/avr32/include/asm/syscalls.h         |    4 -- arch/avr32/kernel/sys_avr32.c             |   31 ----------- arch/avr32/kernel/syscall-stubs.S         |    2 +- arch/blackfin/kernel/sys_bfin.c           |   33 ----------- arch/blackfin/mach-common/entry.S         |    2 +- arch/cris/kernel/sys_cris.c               |   30 +--------- arch/frv/kernel/sys_frv.c                 |   66 +---------------------- arch/h8300/kernel/sys_h8300.c             |   83 +----------------------------

 arch/h8300/kernel/syscalls.S              |    2 +-
 arch/ia64/kernel/sys_ia64.c               |   37 +------------
 arch/m32r/kernel/sys_m32r.c               |   24 --------

 arch/m32r/kernel/syscall_table.S          |    2 +- arch/m68k/kernel/sys_m68k.c               |   79 ++-------------------------- arch/m68knommu/kernel/sys_m68k.c          |   38 +------------ arch/m68knommu/kernel/syscalltable.S      |    2 +- arch/microblaze/kernel/sys_microblaze.c   |   38 +------------ arch/microblaze/kernel/syscall_table.S    |    2 +- arch/mips/kernel/linux32.c                |   19 +------ arch/mips/kernel/syscall.c                |   29 +--------- arch/mn10300/kernel/entry.S               |    2 +- arch/mn10300/kernel/sys_mn10300.c         |   31 +---------- arch/parisc/kernel/sys_parisc.c           |   30 ++--------- arch/powerpc/kernel/syscalls.c            |   15 +----- arch/s390/kernel/compat_linux.c           |   32 +---------- arch/s390/kernel/sys_s390.c               |   30 +---------- arch/score/kernel/sys_score.c             |   21 +------ arch/sh/kernel/sys_sh.c                   |   28 +--------- arch/sparc/kernel/sys_sparc_32.c          |   31 ++--------- arch/sparc/kernel/sys_sparc_64.c          |   22 ++------ arch/um/kernel/syscall.c                  |   28 +--------- arch/um/sys-i386/shared/sysdep/syscalls.h |    4 -- arch/x86/ia32/ia32entry.S                 |    2 +- arch/x86/ia32/sys_ia32.c                  |   43 +--------------- arch/x86/include/asm/sys_ia32.h           |    3 - arch/x86/include/asm/syscalls.h           |    2 - arch/x86/kernel/sys_i386_32.c             |   27 +--------- arch/x86/kernel/sys_x86_64.c              |   17 +------ arch/x86/kernel/syscall_table_32.S        |    2 +- arch/xtensa/include/asm/syscall.h         |    2 - arch/xtensa/include/asm/unistd.h          |    2 +- arch/xtensa/kernel/syscall.c              |   25 --------- include/linux/syscalls.h                  |    4 ++
 mm/util.c                                 |   29 ++++++++++

 46 files changed, 105 insertions(+), 903 deletions(-)
arch/m68k/kernel/sys_m68k.c +0 -22
index 7deb402..fdab0f0 100644
@@ -29,37 +29,12 @@
  #include <asm/page.h>
  #include <asm/unistd.h>
 
-/* common code for old and new mmaps */
-static inline long do_mmap2(
-       unsigned long addr, unsigned long len,
-       unsigned long prot, unsigned long flags,
-       unsigned long fd, unsigned long pgoff)
-{
-       int error = -EBADF;
-       struct file * file = NULL;
-
-       flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-       if (!(flags & MAP_ANONYMOUS)) {
-               file = fget(fd);
-               if (!file)
-                       goto out;
-       }
-
-       down_write(&current->mm->mmap_sem);
-       error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-       up_write(&current->mm->mmap_sem);
-
-       if (file)
-               fput(file);

arch/m68k/kernel/sys_m68k.c line 36

Quoted 10 lines
arch/m68k/kernel/sys_m68k.c +1 -5
-out:
-       return error;
-}
-
  asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
        unsigned long prot, unsigned long flags,
        unsigned long fd, unsigned long pgoff)
  {
-       return do_mmap2(addr, len, prot, flags, fd, pgoff);
+       /* this is wrong for sun3, BTW */

Can you please add the why part to the comment?
Thanks!

Quoted 62 lines
arch/m68k/kernel/sys_m68k.c +3 -47
+       return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
  }
 
  /*

@@ -90,57 +65,11 @@ asmlinkage int old_mmap(struct mmap_arg_struct __user *arg)
        if (a.offset & ~PAGE_MASK)
                goto out;
 
-       a.flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-       error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
-out:
-       return error;
-}
-
-#if 0
-struct mmap_arg_struct64 {
-       __u32 addr;
-       __u32 len;
-       __u32 prot;
-       __u32 flags;
-       __u64 offset; /* 64 bits */
-       __u32 fd;
-};
-
-asmlinkage long sys_mmap64(struct mmap_arg_struct64 *arg)
-{
-       int error = -EFAULT;
-       struct file * file = NULL;
-       struct mmap_arg_struct64 a;
-       unsigned long pgoff;
-
-       if (copy_from_user(&a, arg, sizeof(a)))
-               return -EFAULT;
-
-       if ((long)a.offset & ~PAGE_MASK)
-               return -EINVAL;
-
-       pgoff = a.offset >> PAGE_SHIFT;
-       if ((a.offset >> PAGE_SHIFT) != pgoff)
-               return -EINVAL;
-
-       if (!(a.flags & MAP_ANONYMOUS)) {
-               error = -EBADF;
-               file = fget(a.fd);
-               if (!file)
-                       goto out;
-       }
-       a.flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-       down_write(&current->mm->mmap_sem);
-       error = do_mmap_pgoff(file, a.addr, a.len, a.prot, a.flags, pgoff);
-       up_write(&current->mm->mmap_sem);
-       if (file)
-               fput(file);
+       error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
+                              a.offset >> PAGE_SHIFT);

 out:
       return error;
 }
-#endif

Quoted 2 lines

 struct sel_arg_struct {
       unsigned long n;

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#2 lore raw
Quoted 11 lines · Geert Uytterhoeven
Quoted 6 lines · Al Viro

??asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, ?? ?? ?? ??unsigned long prot, unsigned long flags,
?? ?? ?? ??unsigned long fd, unsigned long pgoff)
??{
- ?? ?? ?? return do_mmap2(addr, len, prot, flags, fd, pgoff);
+ ?? ?? ?? /* this is wrong for sun3, BTW */

Can you please add the why part to the comment?
Thanks!

Try libc mmap64() with e.g. 65536 as the last argument. On mac and sun3. Compare the results...

Basically, sun3 has larger pages and forgets to compensate. Corresponding part in libc (actual libc6 m68k binary) is

	movel %d6,%d2
	moveq #20,%d0
	lsll %d0,%d2
	movel %d7,%d1
	moveq #12,%d3
	lsrl %d3,%d1
	orl %d2,%d1
	moveal %d1,%a0		/* a0 = d6d7 >> 12 */
	movel %a3,%d5
	movel %a4,%d4
	movel %a5,%d3
	movel %a2,%d2
	%fp@(8),%d1
 	moveq #63,%d0
	notb %d0		/* 256 ^ 63, i.e. 192, i.e. __NR_mmap2 */
	trap #0

It does the last argument of mmap2 in 4Kb units (as on almost all targets; ia64 is the exception, but it's actually not used by libc - they have mmap64 aliased to mmap and using sys_mmap, not sys_mmap2).

So sun3 ought to shift the argument down by 1 before passing it to do_mmap_pgoff() (or sys_mmap_pgoff() with these patches) - mm/mmap.c stuff really expects the argument in PAGE_SIZE units.

Generally I'd agree that existing behaviour is a part of ABI, however weird it might be, but since it's actually wrong for the only libc user of the syscall *and* differs from the behaviour on other subarchitectures...

#3 lore raw
In reply to Al Viro

[email protected] 写于 2009-12-07 11:54:00:

Quoted 4 lines

New helper - sys_mmap_pgoff(); switch syscalls to using it.

Signed-off-by Al Viro <[email protected]>
Quoted 11 lines
---
 arch/alpha/kernel/osf_sys.c               |   19 ++-----
 arch/arm/kernel/entry-common.S            |    4 +-
 arch/arm/kernel/sys_arm.c                 |   30 +----------
 arch/avr32/include/asm/syscalls.h         |    4 --
 arch/avr32/kernel/sys_avr32.c             |   31 -----------
 arch/avr32/kernel/syscall-stubs.S         |    2 +-
 arch/blackfin/kernel/sys_bfin.c           |   33 -----------
 arch/blackfin/mach-common/entry.S         |    2 +-
 arch/cris/kernel/sys_cris.c               |   30 +---------
 arch/frv/kernel/sys_frv.c                 |   66 
+----------------------
>  arch/h8300/kernel/sys_h8300.c             |   83 
+----------------------------
>  arch/h8300/kernel/syscalls.S              |    2 +-
>  arch/ia64/kernel/sys_ia64.c               |   37 +------------
>  arch/m32r/kernel/sys_m32r.c               |   24 --------
>  arch/m32r/kernel/syscall_table.S          |    2 +-
>  arch/m68k/kernel/sys_m68k.c               |   79

++--------------------------

Quoted 32 lines
 arch/m68knommu/kernel/sys_m68k.c          |   38 +------------
 arch/m68knommu/kernel/syscalltable.S      |    2 +-
 arch/microblaze/kernel/sys_microblaze.c   |   38 +------------
 arch/microblaze/kernel/syscall_table.S    |    2 +-
 arch/mips/kernel/linux32.c                |   19 +------
 arch/mips/kernel/syscall.c                |   29 +---------
 arch/mn10300/kernel/entry.S               |    2 +-
 arch/mn10300/kernel/sys_mn10300.c         |   31 +----------
 arch/parisc/kernel/sys_parisc.c           |   30 ++---------
 arch/powerpc/kernel/syscalls.c            |   15 +-----
 arch/s390/kernel/compat_linux.c           |   32 +----------
 arch/s390/kernel/sys_s390.c               |   30 +----------
 arch/score/kernel/sys_score.c             |   21 +------
 arch/sh/kernel/sys_sh.c                   |   28 +---------
 arch/sparc/kernel/sys_sparc_32.c          |   31 ++---------
 arch/sparc/kernel/sys_sparc_64.c          |   22 ++------
 arch/um/kernel/syscall.c                  |   28 +---------
 arch/um/sys-i386/shared/sysdep/syscalls.h |    4 --
 arch/x86/ia32/ia32entry.S                 |    2 +-
 arch/x86/ia32/sys_ia32.c                  |   43 +---------------
 arch/x86/include/asm/sys_ia32.h           |    3 -
 arch/x86/include/asm/syscalls.h           |    2 -
 arch/x86/kernel/sys_i386_32.c             |   27 +---------
 arch/x86/kernel/sys_x86_64.c              |   17 +------
 arch/x86/kernel/syscall_table_32.S        |    2 +-
 arch/xtensa/include/asm/syscall.h         |    2 -
 arch/xtensa/include/asm/unistd.h          |    2 +-
 arch/xtensa/kernel/syscall.c              |   25 ---------
 include/linux/syscalls.h                  |    4 ++
 mm/util.c                                 |   29 ++++++++++
 46 files changed, 105 insertions(+), 903 deletions(-)

Review

Quoted 1 line
(quoted diff) +0 -0

b/arch/score/kernel/sys_score.c

Quoted 30 lines

index 0012494..5299a47 100644

arch/score/kernel/sys_score.c +2 -18
@@ -36,33 +36,18 @@ asmlinkage long
 sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
      unsigned long flags, unsigned long fd, unsigned long pgoff)
 {
-   int error = -EBADF;
-   struct file *file = NULL;
-
    if (pgoff & (~PAGE_MASK >> 12))
       return -EINVAL;
 
-   flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-   if (!(flags & MAP_ANONYMOUS)) {
-      file = fget(fd);
-      if (!file)
-         return error;
-   }
-
-   down_write(&current->mm->mmap_sem);
-   error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-   up_write(&current->mm->mmap_sem);
-
-   if (file)
-      fput(file);
-
-   return error;
+   return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
+   /* sic - almost certainly should shift pgoff as well */

arch/score/kernel/sys_score.c asmlinkage long · line 53

Quoted 10 lines
arch/score/kernel/sys_score.c +1 -0
 }
 
 asmlinkage long
 sys_mmap(unsigned long addr, unsigned long len, unsigned long prot,
    unsigned long flags, unsigned long fd, off_t pgoff)
 {
+   /* where's the alignment check? */
    return sys_mmap2(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
 }

It's ok for your update, even

     if (pgoff & (~PAGE_MASK >> 12))
        return -EINVAL;

code haven't use anymore, you could remove it.

In addition, the sys_mmap should like this.

asmlinkage long
sys_mmap(unsigned long addr, unsigned long len, unsigned long prot,
unsigned long flags, unsigned long fd, off_t pgoff)

{
        unsigned long result;

        result = -EINVAL;
        if (pgoff & ~PAGE_MASK)
                goto out;

        result = sys_mmap2(addr, len, prot, flags, fd, pgoff >> 
PAGE_SHIFT);
out:
        return result;
}

Thanks
liqin

#4 lore raw
Quoted 41 lines · On Tue, Dec 08, 2009 at 10:36:29AM +0800, [email protected] wrote:
Quoted 29 lines
arch/score/kernel/sys_score.c +2 -18
@@ -36,33 +36,18 @@ asmlinkage long
 sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
      unsigned long flags, unsigned long fd, unsigned long pgoff)
 {
-   int error = -EBADF;
-   struct file *file = NULL;
-
    if (pgoff & (~PAGE_MASK >> 12))
       return -EINVAL;
 
-   flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-   if (!(flags & MAP_ANONYMOUS)) {
-      file = fget(fd);
-      if (!file)
-         return error;
-   }
-
-   down_write(&current->mm->mmap_sem);
-   error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-   up_write(&current->mm->mmap_sem);
-
-   if (file)
-      fput(file);
-
-   return error;
+   return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
+   /* sic - almost certainly should shift pgoff as well */

arch/score/kernel/sys_score.c asmlinkage long · line 53

Quoted 10 lines
arch/score/kernel/sys_score.c +1 -0
 }
 
 asmlinkage long
 sys_mmap(unsigned long addr, unsigned long len, unsigned long prot,
    unsigned long flags, unsigned long fd, off_t pgoff)
 {
+   /* where's the alignment check? */
    return sys_mmap2(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
 }

It's ok for your update, even

Quoted 3 lines
     if (pgoff & (~PAGE_MASK >> 12))
        return -EINVAL;

code haven't use anymore, you could remove it.

The sys_mmap2() simply disappears - it's exactly the same as sys_mmap_pgoff(). Good.

Quoted 5 lines

In addition, the sys_mmap should like this.

asmlinkage long
sys_mmap(unsigned long addr, unsigned long len, unsigned long prot,
unsigned long flags, unsigned long fd, off_t pgoff)

Quoted 12 lines
{
        unsigned long result;

        result = -EINVAL;
        if (pgoff & ~PAGE_MASK)
                goto out;

        result = sys_mmap2(addr, len, prot, flags, fd, pgoff >> 
PAGE_SHIFT);
out:
        return result;
}

s/sys_mmap2/sys_mmap_pgoff/ and for pity sake, s/\<pgoff\>/offset/ ;-)

Quoted 2 lines

Thanks
liqin

OK, will fold sys_mmap2 replacement with sys_mmap_pgoff into that patch, adding a missing chech on top of it - I'd rather keep that one an equivalent transformation.