From patchwork Fri Feb 7 13:00:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1234919 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-109250-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=b7eiH16G; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Db5z1HvPz9sSK for ; Sat, 8 Feb 2020 00:01:26 +1100 (AEDT) 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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=e643Cxw09DgoYfPn99zp5jXuvG77q2yGkxvTKNRRZxyfVAq/E/05N c2R8u+j2AeuPudSATISOVrxn39W6NBYSigED4Z+09XDPGTxuaT01hRmOdA5PhPvW e8RfUHgg3XcgTOuAFnYU+/iChI2ns2BPWARHOJTnXLpVwKAq9z67Mk= 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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=VsJow+Rxhw3HqgAWPip24cLpExM=; b=b7eiH16G1UgOm5uwTCamTbnTH+Wc NyMNiQujOYZs1ax17xwtbBayahMFcXxRAVWzZitZ70GWGR4RC9ghXPIgvhfE4G8e Xrq6sCOrzwuAb414yqm5XOjlSklzvdGXlDqAszi72v9bG57BzMWtGJyqJkYQxtbt OvTx9Tz+x3lEgCo= Received: (qmail 118381 invoked by alias); 7 Feb 2020 13:01:04 -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 118148 invoked by uid 89); 7 Feb 2020 13:00:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy=modification, HContent-Transfer-Encoding:8bit X-HELO: mail-out.m-online.net From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Cc: Alistair Francis , Alistair Francis , GNU C Library , Siddhesh Poyarekar , Florian Weimer , Florian Weimer , Zack Weinberg , Carlos O'Donell , Andreas Schwab , Lukasz Majewski Subject: [PATCH 1/3] y2038: Introduce struct __utimbuf64 - new internal glibc type Date: Fri, 7 Feb 2020 14:00:07 +0100 Message-Id: <20200207130009.19396-2-lukma@denx.de> In-Reply-To: <20200207130009.19396-1-lukma@denx.de> References: <20200207130009.19396-1-lukma@denx.de> MIME-Version: 1.0 This type is a glibc's "internal" type to store file's access and modification times in __time64_t rather than __time_t, which makes it Y2038-proof. Build tests: ./src/scripts/build-many-glibcs.py glibcs Reviewed-by: Alistair Francis Reviewed-by: Adhemerval Zanella --- include/time.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/time.h b/include/time.h index 389355a5a5..e38f5e32e6 100644 --- a/include/time.h +++ b/include/time.h @@ -109,6 +109,18 @@ struct __timeval64 }; #endif +#if __TIMESIZE == 64 +# define __utimbuf64 utimbuf +#else +/* The glibc Y2038-proof struct __utimbuf64 structure for file's access + and modification time values. */ +struct __utimbuf64 +{ + __time64_t actime; /* Access time. */ + __time64_t modtime; /* Modification time. */ +}; +#endif + #if __TIMESIZE == 64 # define __itimerval64 itimerval #else From patchwork Fri Feb 7 13:00:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1234921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-109252-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=X6DdUaDS; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Db6K3JJbz9sRK for ; Sat, 8 Feb 2020 00:01:45 +1100 (AEDT) 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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=sewIWMLneR0AUgvULSfntxPk571asMgA6m9cx2QlNY1HUIaxBa2fb jCGvNzP6IbPYtST+3+w+5DoWjDalgZ7XJXcV1tVpfgtH3UY4Zs1/V2SXWeuGrO6h srZuP5cQvnVzZ9ngqv9Dn41EK0KV8q62iM/CM/7s85R2FOQM5Gap/g= 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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=3eQqarBJ30146snqyrrPSUH9Gvg=; b=X6DdUaDS67kGgoHv7N1/9ynt6zui DScpuWba+koSmZAopYW0krJBPwO6WdeOSjr0GotFyO2RiEtpJ3aaczq8enU0UJQB jNlTpUQfQPV2jiScLZ4W5R7hJgEMTOEI1pK1H5cKgGR50RLREn5wr+AXjjHwrU49 03l+3YYVDkKlW5Q= Received: (qmail 118571 invoked by alias); 7 Feb 2020 13:01:07 -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 118388 invoked by uid 89); 7 Feb 2020 13:01:04 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy= X-HELO: mail-out.m-online.net From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Cc: Alistair Francis , Alistair Francis , GNU C Library , Siddhesh Poyarekar , Florian Weimer , Florian Weimer , Zack Weinberg , Carlos O'Donell , Andreas Schwab , Lukasz Majewski Subject: [PATCH 2/3] y2038: linux: Provide __utimes64 implementation Date: Fri, 7 Feb 2020 14:00:08 +0100 Message-Id: <20200207130009.19396-3-lukma@denx.de> In-Reply-To: <20200207130009.19396-1-lukma@denx.de> References: <20200207130009.19396-1-lukma@denx.de> MIME-Version: 1.0 This patch provides new __utimes64 explicit 64 bit function for setting file's 64 bit attributes for access and modification time. Internally, the __utimensat64_helper function is used. This patch is necessary for having architectures with __WORDSIZE == 32 Y2038 safe. Moreover, a 32 bit version - __utimes has been refactored to internally use __utimes64. The __utimes is now supposed to be used on systems still supporting 32 bit time (__TIMESIZE != 64) - hence the necessary conversion of struct timeval to 64 bit struct __timeval64. Build tests: ./src/scripts/build-many-glibcs.py glibcs Run-time tests: - Run specific tests on ARM/x86 32bit systems (qemu): https://github.com/lmajewski/meta-y2038 and run tests: https://github.com/lmajewski/y2038-tests/commits/master Above tests were performed with Y2038 redirection applied as well as without to test proper usage of both __utimes64 and __utimes. Reviewed-by: Adhemerval Zanella --- include/time.h | 3 +++ sysdeps/unix/sysv/linux/utimes.c | 37 ++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/include/time.h b/include/time.h index e38f5e32e6..b04747889a 100644 --- a/include/time.h +++ b/include/time.h @@ -211,8 +211,11 @@ libc_hidden_proto (__clock_getres64); #endif #if __TIMESIZE == 64 +# define __utimes64 __utimes # define __utimensat64 __utimensat #else +extern int __utimes64 (const char *file, const struct __timeval64 tvp[2]); +libc_hidden_proto (__utimes64) extern int __utimensat64 (int fd, const char *file, const struct __timespec64 tsp[2], int flags); libc_hidden_proto (__utimensat64); diff --git a/sysdeps/unix/sysv/linux/utimes.c b/sysdeps/unix/sysv/linux/utimes.c index 121d883469..09c4e56f18 100644 --- a/sysdeps/unix/sysv/linux/utimes.c +++ b/sysdeps/unix/sysv/linux/utimes.c @@ -16,22 +16,37 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include -#include -#include +#include +int +__utimes64 (const char *file, const struct __timeval64 tvp[2]) +{ + struct __timespec64 ts64[2]; + + if (tvp) + { + ts64[0] = timeval64_to_timespec64 (tvp[0]); + ts64[1] = timeval64_to_timespec64 (tvp[1]); + } + + return __utimensat64_helper (0, file, tvp ? ts64 : NULL, 0); +} -/* Consider moving to syscalls.list. */ +#if __TIMESIZE != 64 +libc_hidden_def (__utimes64) -/* Change the access time of FILE to TVP[0] and - the modification time of FILE to TVP[1]. */ int __utimes (const char *file, const struct timeval tvp[2]) { - /* Avoid implicit array coercion in syscall macros. */ - return INLINE_SYSCALL (utimes, 2, file, &tvp[0]); -} + struct __timeval64 tv64[2]; + if (tvp) + { + tv64[0] = valid_timeval_to_timeval64 (tvp[0]); + tv64[1] = valid_timeval_to_timeval64 (tvp[1]); + } + + return __utimes64 (file, tvp ? tv64 : NULL); +} +#endif weak_alias (__utimes, utimes) From patchwork Fri Feb 7 13:00:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1234920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-109251-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=No+LkDlp; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Db6843wvz9sRK for ; Sat, 8 Feb 2020 00:01:36 +1100 (AEDT) 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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=BxN6tM9wTlo/BK0sYIMMHjfSIndZRlaJ3/HlhW72sg4GF68b8bttq 1VjFnSrrd+biJXnAfJwh+tqMfLeDkrbGTYIzb25wiLH0qVwwiQbTRxQ5Yyz1KMPf w9OwFIyrzHLjp+rnf0BNtispM0ke7J9qXq4hQoioOz1+/sLXAPzFys= 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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=RuDFMrUwQj8klSz9HUr/i7oJIrA=; b=No+LkDlp+RsrGbnkcxgsVYbMFRfx VA7IYQcZbR/D151xavm8xp/wtRpC9yn4q4dS5pW9pstuBnpaTCgVkn98+Pqxx4v4 qq/5beTIljSHGpN53ZOwGfTv3RlzkF/+eLzDBT+9frKyQjZgXYi+HGd/5SWE1L8J FPW2IQRlj32zmoc= Received: (qmail 118415 invoked by alias); 7 Feb 2020 13:01:05 -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 118155 invoked by uid 89); 7 Feb 2020 13:00:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy=replaces, moreover, modification X-HELO: mail-out.m-online.net From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Cc: Alistair Francis , Alistair Francis , GNU C Library , Siddhesh Poyarekar , Florian Weimer , Florian Weimer , Zack Weinberg , Carlos O'Donell , Andreas Schwab , Lukasz Majewski Subject: [PATCH 3/3] y2038: linux: Provide __utime64 implementation Date: Fri, 7 Feb 2020 14:00:09 +0100 Message-Id: <20200207130009.19396-4-lukma@denx.de> In-Reply-To: <20200207130009.19396-1-lukma@denx.de> References: <20200207130009.19396-1-lukma@denx.de> MIME-Version: 1.0 This patch replaces auto generated wrapper (as described in sysdeps/unix/sysv/linux/syscalls.list) for utime with one which adds extra support for setting file's access and modification 64 bit time on machines with __TIMESIZE != 64. Internally, the __utimensat_time64 helper function is used. This patch is necessary for having architectures with __WORDSIZE == 32 && __TIMESIZE != 64 Y2038 safe. Moreover, a 32 bit version - __utime has been refactored to internally use __utime64. The __utime is now supposed to be used on systems still supporting 32 bit time (__TIMESIZE != 64) - hence the necessary conversion between struct utimbuf and struct __utimbuf64. Build tests: ./src/scripts/build-many-glibcs.py glibcs Run-time tests: - Run specific tests on ARM/x86 32bit systems (qemu): https://github.com/lmajewski/meta-y2038 and run tests: https://github.com/lmajewski/y2038-tests/commits/master Above tests were performed with Y2038 redirection applied as well as without to test proper usage of both __utime64 and __utime. Reviewed-by: Adhemerval Zanella --- include/time.h | 3 ++ sysdeps/unix/sysv/linux/syscalls.list | 1 - sysdeps/unix/sysv/linux/utime.c | 56 +++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/sysv/linux/utime.c diff --git a/include/time.h b/include/time.h index b04747889a..c0d1ea3315 100644 --- a/include/time.h +++ b/include/time.h @@ -211,9 +211,12 @@ libc_hidden_proto (__clock_getres64); #endif #if __TIMESIZE == 64 +# define __utime64 __utime # define __utimes64 __utimes # define __utimensat64 __utimensat #else +extern int __utime64 (const char *file, const struct __utimbuf64 *times); +libc_hidden_proto (__utime64) extern int __utimes64 (const char *file, const struct __timeval64 tvp[2]); libc_hidden_proto (__utimes64) extern int __utimensat64 (int fd, const char *file, diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 5d65ed23e0..e40f993495 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -65,7 +65,6 @@ swapon - swapon i:si __swapon swapon swapoff - swapoff i:s __swapoff swapoff unshare EXTRA unshare i:i unshare uselib EXTRA uselib i:s __compat_uselib uselib@GLIBC_2.0:GLIBC_2.23 -utime - utime i:sP utime chown - chown i:sii __libc_chown __chown chown diff --git a/sysdeps/unix/sysv/linux/utime.c b/sysdeps/unix/sysv/linux/utime.c new file mode 100644 index 0000000000..75ee0745ec --- /dev/null +++ b/sysdeps/unix/sysv/linux/utime.c @@ -0,0 +1,56 @@ +/* utime -- Change access and modification times of file. Linux version. + Copyright (C) 1991-2020 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 + +int +__utime64 (const char *file, const struct __utimbuf64 *times) +{ + struct __timespec64 ts64[2]; + + if (times) + { + ts64[0].tv_sec = times->actime; + ts64[0].tv_nsec = 0LL; + ts64[1].tv_sec = times->modtime; + ts64[1].tv_nsec = 0LL; + } + + return __utimensat64_helper (0, file, times ? ts64 : NULL, 0); +} + +#if __TIMESIZE != 64 +libc_hidden_def (__utime64) + +int +__utime (const char *file, const struct utimbuf *times) +{ + struct __utimbuf64 utb64; + + if (times) + { + utb64.actime = (__time64_t) times->actime; + utb64.modtime = (__time64_t) times->modtime; + } + + return __utime64 (file, times ? &utb64 : NULL); +} +#endif +strong_alias (__utime, utime) +libc_hidden_def (utime)