From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20924 invoked by alias); 16 Nov 2009 09:32:06 -0000 Received: (qmail 20908 invoked by uid 22791); 16 Nov 2009 09:32:05 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 16 Nov 2009 09:31:02 +0000 Received: from sunsite.mff.cuni.cz (localhost [127.0.0.1]) by sunsite.mff.cuni.cz (8.14.3/8.14.3) with ESMTP id nAG9Ux6E025423; Mon, 16 Nov 2009 10:30:59 +0100 Received: (from jj@localhost) by sunsite.mff.cuni.cz (8.14.3/8.14.3/Submit) id nAG9Uxv8025422; Mon, 16 Nov 2009 10:30:59 +0100 Date: Mon, 16 Nov 2009 09:32:00 -0000 From: Jakub Jelinek To: Glibc hackers Cc: Ryan Arnold Subject: [PATCH] Fix sync_file_range on ppc/ppc64 Message-ID: <20091116093058.GK3047@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2009-11/txt/msg00002.txt.bz2 Hi! I've noticed that sync_file_range is a stub on ppc/ppc64. The kernel on these arches provides sync_file_range2 syscall with swapped parameters. The following completely untested patch ought to fix this. BTW, on all arches, the glibc prototypes for sync_file_range (as well as sync_file_range.c) use from and to argument names, while kernel uses offset and nbytes. As the kernel uses endbyte = offset + nbytes, I'd say naming the arguments this way is very confusing. As this is a second busted syscall wrapper for ppc/ppc64 discovered in the last fortnight, maybe it would be best if somebody went through all the recently added syscalls (last 6 years or so) and verified the wrappers on ppc/ppc64 match the kernel ABI. 2009-11-16 Jakub Jelinek * sysdeps/unix/sysv/linux/sync_file_range.c (sync_file_range): Implement using sync_file_range2 syscall if __NR_sync_file_range2 is defined. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c: New file. --- libc/sysdeps/unix/sysv/linux/sync_file_range.c.jj 2009-05-16 19:23:46.000000000 +0200 +++ libc/sysdeps/unix/sysv/linux/sync_file_range.c 2009-11-16 10:11:22.000000000 +0100 @@ -1,5 +1,5 @@ /* Selective file content synch'ing. - Copyright (C) 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -34,6 +34,14 @@ sync_file_range (int fd, __off64_t from, __LONG_LONG_PAIR ((long) (to >> 32), (long) to), flags); } +#elif defined __NR_sync_file_range2 +int +sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) +{ + return INLINE_SYSCALL (sync_file_range2, 6, fd, flags, + __LONG_LONG_PAIR ((long) (from >> 32), (long) from), + __LONG_LONG_PAIR ((long) (to >> 32), (long) to)); +} #else int sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) --- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c.jj 2009-11-16 10:15:24.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c 2009-11-16 10:16:04.000000000 +0100 @@ -0,0 +1,44 @@ +/* Selective file content synch'ing. + Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +#include +#include + + +#if defined __NR_sync_file_range2 +int +sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) +{ + return INLINE_SYSCALL (sync_file_range2, 4, fd, flags, from, to); +} +#else +int +sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (sync_file_range) + +# include +#endif Jakub