From patchwork Mon May 8 15:26:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 20303 Received: (qmail 53446 invoked by alias); 8 May 2017 15:27:03 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 53233 invoked by uid 89); 8 May 2017 15:27:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=EXTRA, 66, 3727 X-HELO: mail-qk0-f179.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=iWY7gAlYY2Gc4d8tTOkFNAZnYyR5nw/rE+g5NR4L7Z0=; b=SBbV0bR+r7uumxhehRCuhCql5+bAA3lvqSSU3uWoavd/m9YWzTKqMOsoDE4hyAzx52 IJ6ow+RzEAY8Tl9ul2OFsaWeDqfNwIbvrsBuqDzar3y9Poy1mBFaFJqYMrfZjgCJAV5s b8FxgODLqpPpytohyGkgBRUvQtcffzsj8O3nVSAZLLmt8iOBfb0vVvz4tmIr8iy5goJw JfhlHmH+Hpo/Qx8M2p4e+UtKWEhsWqxdvN8NyeHWj6N/dfl1B9LyfhuzVDvxyrjMLMfz EiXUK3pizyg+gDJPpvsXBonhBYnpYZYMpWa+tB8e0Z7RAJ0pCbR/lCdLO+Im7M71zh+1 USpA== X-Gm-Message-State: AODbwcBV08GF3D4KAK7I1vJ1ySNYVxhdbM0QjEjLYKATy1JYGWgXuHwg Nyh4ecjlzi4gkWHbAZS1Tw== X-Received: by 10.55.156.11 with SMTP id f11mr27488016qke.8.1494257220751; Mon, 08 May 2017 08:27:00 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 2/8] Consolidate Linux open implementation Date: Mon, 8 May 2017 12:26:46 -0300 Message-Id: <1494257212-524-2-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1494257212-524-1-git-send-email-adhemerval.zanella@linaro.org> References: <1494257212-524-1-git-send-email-adhemerval.zanella@linaro.org> This patch consolidates the open Linux syscall implementation on sysdeps/unix/sysv/linux/open{64}.c. The changes are: 1. Remove open{64} from auto-generation syscalls.list. 2. Add a new open{64}.c implementation. For architectures that define __OFF_T_MATCHES_OFF64_T the default open64 will create alias to required open symbols. 3. Use __NR_open where possible, otherwise use __NR_openat. Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32, arch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu. * sysdeps/unix/sysv/linux/generic/open.c: Remove file. * sysdeps/unix/sysv/linux/generic/open64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/open64.c: Likewise. * sysdeps/unix/sysv/linux/open.c: New file. * sysdeps/unix/sysv/linux/open64.c (__libc_open64): Use O_LARGEFILE only for __OFF_T_MATCHES_OFF64_T and add alias to open if the case. * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Remove open from auto-generated list. --- ChangeLog | 9 +++++ sysdeps/unix/sysv/linux/generic/open64.c | 44 ----------------------- sysdeps/unix/sysv/linux/{generic => }/open.c | 29 ++++++--------- sysdeps/unix/sysv/linux/open64.c | 28 ++++++++++++--- sysdeps/unix/sysv/linux/wordsize-64/open64.c | 1 - sysdeps/unix/sysv/linux/wordsize-64/syscalls.list | 1 - 6 files changed, 44 insertions(+), 68 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/generic/open64.c rename sysdeps/unix/sysv/linux/{generic => }/open.c (78%) delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/open64.c diff --git a/sysdeps/unix/sysv/linux/generic/open64.c b/sysdeps/unix/sysv/linux/generic/open64.c deleted file mode 100644 index 88312a1..0000000 --- a/sysdeps/unix/sysv/linux/generic/open64.c +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright (C) 2011-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. - - 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, see - . */ - -#include -#include -#include -#include -#include - -/* Open FILE with access OFLAG. If O_CREAT or O_TMPFILE is in OFLAG, - a third argument is the file protection. */ -int -__libc_open64 (const char *file, int oflag, ...) -{ - int mode = 0; - - if (__OPEN_NEEDS_MODE (oflag)) - { - va_list arg; - va_start (arg, oflag); - mode = va_arg (arg, int); - va_end (arg); - } - - return SYSCALL_CANCEL (openat, AT_FDCWD, file, oflag | O_LARGEFILE, mode); -} -weak_alias (__libc_open64, __open64) -libc_hidden_weak (__open64) -weak_alias (__libc_open64, open64) diff --git a/sysdeps/unix/sysv/linux/generic/open.c b/sysdeps/unix/sysv/linux/open.c similarity index 78% rename from sysdeps/unix/sysv/linux/generic/open.c rename to sysdeps/unix/sysv/linux/open.c index 10cdbe0..9321bd4 100644 --- a/sysdeps/unix/sysv/linux/generic/open.c +++ b/sysdeps/unix/sysv/linux/open.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2017 Free Software Foundation, Inc. +/* Copyright (C) 2017 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Chris Metcalf , 2011. @@ -16,12 +16,15 @@ License along with the GNU C Library. If not, see . */ -#include +#include +#include #include #include -#include + #include +#ifndef __OFF_T_MATCHES_OFF64_T + /* Open FILE with access OFLAG. If O_CREAT or O_TMPFILE is in OFLAG, a third argument is the file protection. */ int @@ -37,7 +40,11 @@ __libc_open (const char *file, int oflag, ...) va_end (arg); } +# ifdef __NR_open + return SYSCALL_CANCEL (open, file, oflag, mode); +# else return SYSCALL_CANCEL (openat, AT_FDCWD, file, oflag, mode); +# endif } libc_hidden_def (__libc_open) @@ -45,18 +52,4 @@ weak_alias (__libc_open, __open) libc_hidden_weak (__open) weak_alias (__libc_open, open) -int -__open_nocancel (const char *file, int oflag, ...) -{ - int mode = 0; - - if (__OPEN_NEEDS_MODE (oflag)) - { - va_list arg; - va_start (arg, oflag); - mode = va_arg (arg, int); - va_end (arg); - } - - return INLINE_SYSCALL (openat, 4, AT_FDCWD, file, oflag, mode); -} +#endif diff --git a/sysdeps/unix/sysv/linux/open64.c b/sysdeps/unix/sysv/linux/open64.c index 5e209ee..6ad8f77 100644 --- a/sysdeps/unix/sysv/linux/open64.c +++ b/sysdeps/unix/sysv/linux/open64.c @@ -15,10 +15,11 @@ License along with the GNU C Library; if not, see . */ -#include +#include +#include #include #include -#include + #include /* Open FILE with access OFLAG. If O_CREAT or O_TMPFILE is in OFLAG, @@ -36,8 +37,27 @@ __libc_open64 (const char *file, int oflag, ...) va_end (arg); } - return SYSCALL_CANCEL (open, file, oflag | O_LARGEFILE, mode); +#ifdef __OFF_T_MATCHES_OFF64_T +# define EXTRA_OPEN_FLAGS 0 +#else +# define EXTRA_OPEN_FLAGS O_LARGEFILE +#endif + +#ifdef __NR_open + return SYSCALL_CANCEL (open, file, oflag | EXTRA_OPEN_FLAGS, mode); +#else + return SYSCALL_CANCEL (openat, AT_FDCWD, file, oflag | EXTRA_OPEN_FLAGS, + mode); +#endif } -weak_alias (__libc_open64, __open64) + +strong_alias (__libc_open64, __open64) libc_hidden_weak (__open64) weak_alias (__libc_open64, open64) + +#ifdef __OFF_T_MATCHES_OFF64_T +strong_alias (__libc_open64, __libc_open) +strong_alias (__libc_open64, __open) +libc_hidden_weak (__open) +weak_alias (__libc_open64, open) +#endif diff --git a/sysdeps/unix/sysv/linux/wordsize-64/open64.c b/sysdeps/unix/sysv/linux/wordsize-64/open64.c deleted file mode 100644 index 0abe30e..0000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/open64.c +++ /dev/null @@ -1 +0,0 @@ -/* Defined in open syscall. */ diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list index 0c60647..6549ed8 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list @@ -6,7 +6,6 @@ readahead - readahead i:iii __readahead readahead sendfile - sendfile i:iipi sendfile sendfile64 sync_file_range - sync_file_range Ci:iiii sync_file_range creat - creat Ci:si creat creat64 -open - open Ci:siv __libc_open __open open __open64 open64 prlimit EXTRA prlimit64 i:iipp prlimit prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark