This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
Re: Possible bug in sysdeps/unix/sysv/linux/powerpc/mmap64.c
On Sat, May 19, 2001 at 11:47:30PM -0700, Geoff Keating wrote:
> > and posix/tst-mmap.c in glibc does the same. To me, Linux/PPC doesn't
> > follow the Linux/glibc ABI. Did I miss something?
>
> This is not the glibc ABI, it is the syscall ABI. There's no
> necessary relationship between the two. The kernel is free to return
> EINVAL for additional values of OFFSET, if the actual page size is
> larger than 4k. I don't believe any hardware can support page sizes
> less than 4k, so that case won't occur.
>
Thanks for clearing this up. How about this patch? If it is a Linux
thing, each port doesn't need to have its own version of the same
thing.
----
2001-05-19 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/powerpc/mmap64.c: Moved to ...
* sysdeps/unix/sysv/linux/mmap64.c: Here.
* sysdeps/unix/sysv/linux/mmap64.c (PAGE_SHIFT): Define if
not defined.
* sysdeps/unix/sysv/linux/hppa/mmap64.c : Removed.
* sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c: Likewise.
--- libc/sysdeps/unix/sysv/linux/hppa/mmap64.c.mmap64 Wed Apr 25 13:19:03 2001
+++ libc/sysdeps/unix/sysv/linux/hppa/mmap64.c Sat May 19 23:45:13 2001
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/powerpc/mmap64.c>
--- libc/sysdeps/unix/sysv/linux/mmap64.c.mmap64 Fri Jul 9 08:15:45 1999
+++ libc/sysdeps/unix/sysv/linux/mmap64.c Sat May 19 23:43:37 2001
@@ -1,6 +1,6 @@
-/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Daniel Jacobowitz <dan@debian.org>, 1999.
+ Contributed by Jakub Jelinek <jakub@redhat.com>, 1999.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -19,21 +19,63 @@
#include <errno.h>
#include <unistd.h>
+#include <sys/mman.h>
#include <sysdep.h>
#include <sys/syscall.h>
+#include <bp-checks.h>
-#include <sys/mman.h>
+#include "kernel-features.h"
+
+#ifndef PAGE_SHIFT
+#define PAGE_SHIFT 12
+#endif
+
+#ifdef __NR_mmap2
+extern void *__unbounded __syscall_mmap2(void *__unbounded, size_t,
+ int, int, int, off_t);
+#ifndef __ASSUME_MMAP2_SYSCALL
+static int have_no_mmap2;
+#endif
+#endif
-__ptr_t
-__mmap64 (addr, len, prot, flags, fd, offset)
- __ptr_t addr;
- size_t len;
- int prot;
- int flags;
- int fd;
- off64_t offset;
+void *
+__mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset)
{
+ if (offset & ((1 << PAGE_SHIFT)-1))
+ {
+ __set_errno (EINVAL);
+ return MAP_FAILED;
+ }
+#ifdef __NR_mmap2
+# ifndef __ASSUME_MMAP2_SYSCALL
+ if (! have_no_mmap2)
+# endif
+ {
+# ifndef __ASSUME_MMAP2_SYSCALL
+ int saved_errno = errno;
+# endif
+ void *result;
+ __ptrvalue (result) =
+ (void *__unbounded) INLINE_SYSCALL (mmap2, 6, __ptrvalue (addr),
+ len, prot, flags, fd,
+ (off_t) (offset >> PAGE_SHIFT));
+# if __BOUNDED_POINTERS__
+ __ptrlow (result) = __ptrvalue (result);
+ __ptrhigh (result) = __ptrvalue (result) + len;
+# endif
+# ifndef __ASSUME_MMAP2_SYSCALL
+ if (result != MAP_FAILED || errno != ENOSYS)
+# endif
+ return result;
+
+# ifndef __ASSUME_MMAP2_SYSCALL
+ __set_errno (saved_errno);
+ have_no_mmap2 = 1;
+# endif
+ }
+#endif
+#ifndef __ASSUME_MMAP2_SYSCALL
if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len))
{
__set_errno (EINVAL);
@@ -41,6 +83,7 @@ __mmap64 (addr, len, prot, flags, fd, of
}
return __mmap (addr, len, prot, flags, fd, (off_t) offset);
+#endif
}
weak_alias (__mmap64, mmap64)
--- libc/sysdeps/unix/sysv/linux/powerpc/mmap64.c.mmap64 Fri Apr 27 21:25:21 2001
+++ libc/sysdeps/unix/sysv/linux/powerpc/mmap64.c Sat May 19 23:45:13 2001
@@ -1,88 +0,0 @@
-/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Jakub Jelinek <jakub@redhat.com>, 1999.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <errno.h>
-#include <unistd.h>
-#include <sys/mman.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-#include <bp-checks.h>
-
-#include "kernel-features.h"
-
-/* This is always the constant 12 for this routine, even if the actual
- page size is larger. */
-#define PAGE_SHIFT 12
-
-#ifdef __NR_mmap2
-extern void *__unbounded __syscall_mmap2(void *__unbounded, size_t,
- int, int, int, off_t);
-#ifndef __ASSUME_MMAP2_SYSCALL
-static int have_no_mmap2;
-#endif
-#endif
-
-void *
-__mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset)
-{
- if (offset & ((1 << PAGE_SHIFT)-1))
- {
- __set_errno (EINVAL);
- return MAP_FAILED;
- }
-#ifdef __NR_mmap2
-# ifndef __ASSUME_MMAP2_SYSCALL
- if (! have_no_mmap2)
-# endif
- {
-# ifndef __ASSUME_MMAP2_SYSCALL
- int saved_errno = errno;
-# endif
- void *result;
- __ptrvalue (result) = INLINE_SYSCALL (mmap2, 6, __ptrvalue (addr), len,
- prot, flags, fd,
- (off_t) (offset >> PAGE_SHIFT));
-# if __BOUNDED_POINTERS__
- __ptrlow (result) = __ptrvalue (result);
- __ptrhigh (result) = __ptrvalue (result) + len;
-# endif
-# ifndef __ASSUME_MMAP2_SYSCALL
- if (result != MAP_FAILED || errno != ENOSYS)
-# endif
- return result;
-
-# ifndef __ASSUME_MMAP2_SYSCALL
- __set_errno (saved_errno);
- have_no_mmap2 = 1;
-# endif
- }
-#endif
-#ifndef __ASSUME_MMAP2_SYSCALL
- if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len))
- {
- __set_errno (EINVAL);
- return MAP_FAILED;
- }
-
- return __mmap (addr, len, prot, flags, fd, (off_t) offset);
-#endif
-}
-
-weak_alias (__mmap64, mmap64)
--- libc/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c.mmap64 Thu Jul 6 19:19:05 2000
+++ libc/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c Sat May 19 23:45:13 2001
@@ -1,80 +0,0 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Jakub Jelinek <jakub@redhat.com>, 1999.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <errno.h>
-#include <unistd.h>
-#include <sys/mman.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-#include <bp-checks.h>
-
-#include "kernel-features.h"
-
-#ifdef __NR_mmap2
-extern void *__unbounded __syscall_mmap2 (void *__unbounded, size_t,
- int, int, int, off_t);
-# ifndef __ASSUME_MMAP2_SYSCALL
-static int have_no_mmap2;
-# endif
-#endif
-
-__ptr_t
-__mmap64 (__ptr_t addr, size_t len, int prot, int flags, int fd, off64_t offset)
-{
-#ifdef __NR_mmap2
- if (
-# ifndef __ASSUME_MMAP2_SYSCALL
- ! have_no_mmap2 &&
-# endif
- ! (offset & 4095))
- {
-# ifndef __ASSUME_MMAP2_SYSCALL
- int saved_errno = errno;
-# endif
- /* This will be always 12, no matter what page size is. */
- __ptr_t result;
- __ptrvalue (result) =
- (void *__unbounded) INLINE_SYSCALL (mmap2, 6, addr, len, prot, flags,
- fd, (off_t) (offset >> 12));
-# if __BOUNDED_POINTERS__
- __ptrlow (result) = __ptrvalue (result);
- __ptrhigh (result) = __ptrvalue (result) + len;
-# endif
-# ifndef __ASSUME_MMAP2_SYSCALL
- if (result != (__ptr_t) -1 || errno != ENOSYS)
-# endif
- return result;
-
-# ifndef __ASSUME_MMAP2_SYSCALL
- __set_errno (saved_errno);
- have_no_mmap2 = 1;
-# endif
- }
-#endif
- if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len))
- {
- __set_errno (EINVAL);
- return MAP_FAILED;
- }
-
- return __mmap (addr, len, prot, flags, fd, (off_t) offset);
-}
-
-weak_alias (__mmap64, mmap64)