From patchwork Tue Sep 20 15:01:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 76617 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1534091qgf; Tue, 20 Sep 2016 08:03:32 -0700 (PDT) X-Received: by 10.107.10.229 with SMTP id 98mr22302224iok.165.1474383812511; Tue, 20 Sep 2016 08:03:32 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id s15si25191141ots.154.2016.09.20.08.03.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 08:03:32 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-73360-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of libc-alpha-return-73360-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-73360-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=uKkaNlHFojKmqNgvmogcWTeYpCHNorr NiehPjxu3Ker8lbGCfJ85Zqh0vn5tyasU1iLQNLwKBA72ZSJ5toE+6M3UGasPpa4 kwPqOdCWARxiC4RAk25JoY5/3gk97SideGCwpWOX4euzKWc1rPoAzTgcHXfluQfc LtB+qf2elRu8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=gl2L0yVEmiXQFWF6r9DhGrWn01k=; b=iwYbe 86a2TOo7aSs3CF3faNHjoHe14Cgi7bpUQucQvn/SYty2MA286Gi0/YsDmj80Kc6C mdjmRDku/2xYV2ECm9iOvzIkN5eKVWwM7UBXNDkTOdXrNkbKbAtkgWJ5AKWE35d4 7oOOtmoR7M7M8GCYay5+C8cx7cmF38WoOeM3as= Received: (qmail 10945 invoked by alias); 20 Sep 2016 15:02:19 -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 10696 invoked by uid 89); 20 Sep 2016 15:02:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=powerpc32 X-HELO: mail-yw0-f174.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=4YvM8k0XfHHTs7R81UaXjI2ZbFoVzlqZcQ/MQOZn5ns=; b=QYhanOeSsINpW4OmghoDVyZGXkMtNfij/EwHu0L04zb918+Gr7473jqmGCGLNp0cAV C8cTCvuZkufiiNYE/euaKrfhbYVwyL1S1cnTTnvuLWAlPd9FRxXi3iCaZmqRUJXMspwd 6QuZnuyEwvIc8asubc+VfaEpKLZIenCqPZGT0jy5VgjgHJO+VVC2C8fxEpSo5M2vpAHq gsWcy25b3vY0FZ8RmJWWHvK32ELUJDytWSWZ2vhQLOvvSAcMY8xYmD4JJEK0VGlLCb+q 7085nXs6Ank6G87Fv3n+GsWY67fH5POyVeCol1d8NjJZHEK6kbziCNk7zMBTXiyd0H4e 14Lw== X-Gm-Message-State: AE9vXwP68f5WS67dDAAo2TcGqJlPzNdNmXW7XmqfdXPJhKTO2OAfSRG3zFOLQgLYsLvn5ewV X-Received: by 10.129.152.210 with SMTP id p201mr24163040ywg.281.1474383727654; Tue, 20 Sep 2016 08:02:07 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 4/4] Consolidate Linux truncate implementations Date: Tue, 20 Sep 2016 12:01:54 -0300 Message-Id: <1474383714-15187-5-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1474383714-15187-1-git-send-email-adhemerval.zanella@linaro.org> References: <1474383714-15187-1-git-send-email-adhemerval.zanella@linaro.org> Changes from previous version: - Using __NR_truncate64 for truncate in case of __NR_truncate is not defined. This will still use 32-bit off_t offsets (similar to pread). -- This patch consolidates all Linux truncate implementation on sysdeps/unix/sysv/linux/truncate{64}.c. It is based on {INTERNAL,INLINE}_SYSCALL patch [1] to simplify the syscall construction. General idea is to build ftruncate iff __OFF_T_MATCHES_OFF64_T is not defined, otherwise ftruncate64 will be build and ftruncate will be an alias. The fallocate will use old compat syscall and pass 32-bit off_t argument, while fallocate64 will handle the correct off64_t passing using __ALIGNMENT_ARG and SYSCALL_LL64 macros. Tested on x86_64, i386, aarch64, and armhf. * sysdeps/unix/sysv/linux/arm/truncate64.c: Remove file. * sysdeps/unix/sysv/linux/generic/wordsize-32/truncate.c: Likewise. * sysdeps/sysv/linux/generic/wordsize-32/truncate64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/truncate64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/truncate64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/truncate64.c: Likewise. * sysdeps/unix/sysv/linux/truncate.c: New file. * sysdeps/unix/sysv/linux/truncate64.c (truncate64): Use INLINE_SYSCALL_CALL, __ALIGNMENT_ARG and SYSCALL_LL64 macros. [1] https://sourceware.org/ml/libc-alpha/2016-08/msg00646.html --- sysdeps/unix/sysv/linux/arm/truncate64.c | 35 ---------------------- .../unix/sysv/linux/generic/wordsize-32/truncate.c | 31 ------------------- .../sysv/linux/generic/wordsize-32/truncate64.c | 31 ------------------- sysdeps/unix/sysv/linux/mips/mips32/truncate64.c | 35 ---------------------- sysdeps/unix/sysv/linux/mips/mips64/truncate64.c | 1 - .../unix/sysv/linux/powerpc/powerpc32/truncate64.c | 34 --------------------- sysdeps/unix/sysv/linux/truncate.c | 35 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/truncate64.c | 26 ++++++++-------- sysdeps/unix/sysv/linux/wordsize-64/truncate64.c | 1 - 9 files changed, 49 insertions(+), 180 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/arm/truncate64.c delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/truncate.c delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/truncate64.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/truncate64.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/truncate64.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c create mode 100644 sysdeps/unix/sysv/linux/truncate.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/truncate64.c -- 2.7.4 diff --git a/sysdeps/unix/sysv/linux/arm/truncate64.c b/sysdeps/unix/sysv/linux/arm/truncate64.c deleted file mode 100644 index 28563af..0000000 --- a/sysdeps/unix/sysv/linux/arm/truncate64.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 1997-2016 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, see - . */ - -#include -#include -#include -#include - -#include -#include - -/* Truncate the file FD refers to to LENGTH bytes. */ -int -truncate64 (const char *path, off64_t length) -{ - unsigned int low = length & 0xffffffff; - unsigned int high = length >> 32; - int result = INLINE_SYSCALL (truncate64, 4, path, 0, - __LONG_LONG_PAIR (high, low)); - return result; -} diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate.c deleted file mode 100644 index 2579951..0000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 2011-2016 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 - -/* Truncate PATH to LENGTH bytes. */ -int -__truncate (const char *path, off_t length) -{ - return INLINE_SYSCALL (truncate64, __ALIGNMENT_COUNT (3, 4), path, - __ALIGNMENT_ARG - __LONG_LONG_PAIR (length >> 31, length)); -} -weak_alias (__truncate, truncate) diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate64.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate64.c deleted file mode 100644 index f2927ea..0000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate64.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 2011-2016 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 - -/* Truncate the file PATH to LENGTH bytes. */ -int -truncate64 (const char *path, off64_t length) -{ - unsigned int low = length & 0xffffffff; - unsigned int high = length >> 32; - return INLINE_SYSCALL (truncate64, __ALIGNMENT_COUNT (3, 4), path, - __ALIGNMENT_ARG __LONG_LONG_PAIR (high, low)); -} diff --git a/sysdeps/unix/sysv/linux/mips/mips32/truncate64.c b/sysdeps/unix/sysv/linux/mips/mips32/truncate64.c deleted file mode 100644 index 28563af..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips32/truncate64.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 1997-2016 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, see - . */ - -#include -#include -#include -#include - -#include -#include - -/* Truncate the file FD refers to to LENGTH bytes. */ -int -truncate64 (const char *path, off64_t length) -{ - unsigned int low = length & 0xffffffff; - unsigned int high = length >> 32; - int result = INLINE_SYSCALL (truncate64, 4, path, 0, - __LONG_LONG_PAIR (high, low)); - return result; -} diff --git a/sysdeps/unix/sysv/linux/mips/mips64/truncate64.c b/sysdeps/unix/sysv/linux/mips/mips64/truncate64.c deleted file mode 100644 index 6e25b02..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/truncate64.c +++ /dev/null @@ -1 +0,0 @@ -/* Empty. */ diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c deleted file mode 100644 index ccfdafa..0000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 1997-2016 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, see - . */ - -#include -#include -#include - -#include -#include - -/* Truncate the file referenced by FD to LENGTH bytes. */ -int -truncate64 (const char *path, off64_t length) -{ - /* On PPC32 64bit values are aligned in odd/even register pairs. */ - int result = INLINE_SYSCALL (truncate64, 4, path, 0, - (long) (length >> 32), - (long) length); - return result; -} diff --git a/sysdeps/unix/sysv/linux/truncate.c b/sysdeps/unix/sysv/linux/truncate.c new file mode 100644 index 0000000..9e71288 --- /dev/null +++ b/sysdeps/unix/sysv/linux/truncate.c @@ -0,0 +1,35 @@ +/* Copyright (C) 2016 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, see + . */ + +#include +#include +#include + +#ifndef __OFF_T_MATCHES_OFF64_T +/* Truncate PATH to LENGTH bytes. */ +int +__truncate (const char *path, off_t length) +{ +# ifndef __NR_truncate + return INLINE_SYSCALL_CALL (truncate64, path, + __ALIGNMENT_ARG SYSCALL_LL (length)); +# else + return INLINE_SYSCALL_CALL (truncate, path, length); +# endif +} +weak_alias (__truncate, truncate) +#endif diff --git a/sysdeps/unix/sysv/linux/truncate64.c b/sysdeps/unix/sysv/linux/truncate64.c index 92a6bc4..0d70da7 100644 --- a/sysdeps/unix/sysv/linux/truncate64.c +++ b/sysdeps/unix/sysv/linux/truncate64.c @@ -15,21 +15,23 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include #include - #include -#include +#include -/* Truncate the file referenced by FD to LENGTH bytes. */ +#ifndef __NR_truncate64 +# define __NR_truncate64 __NR_truncate +#endif + +/* Truncate PATH to LENGTH bytes. */ int -truncate64 (const char *path, off64_t length) +__truncate64 (const char *path, off64_t length) { - unsigned int low = length & 0xffffffff; - unsigned int high = length >> 32; - int result = INLINE_SYSCALL (truncate64, 3, path, - __LONG_LONG_PAIR (high, low)); - return result; + return INLINE_SYSCALL_CALL (truncate64, path, + __ALIGNMENT_ARG SYSCALL_LL64 (length)); } +weak_alias (__truncate64, truncate64) + +#ifdef __OFF_T_MATCHES_OFF64_T +weak_alias (__truncate64, truncate); +#endif diff --git a/sysdeps/unix/sysv/linux/wordsize-64/truncate64.c b/sysdeps/unix/sysv/linux/wordsize-64/truncate64.c deleted file mode 100644 index 8999768..0000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/truncate64.c +++ /dev/null @@ -1 +0,0 @@ -/* truncate64 is the same as truncate. */