From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 8436F1F5AE for ; Thu, 30 Jul 2020 12:42:59 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5AE893870842; Thu, 30 Jul 2020 12:42:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AE893870842 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1596112978; bh=D0AMiruXrDgF1wC1/5Qd9gDZzVeSPl6uyOwpsWkigxQ=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=sPyi3ur/Yn4hqhXfAK8VrG7VFnq9i3HSABss5QFDiVXJotc8D90cGerFY9sif3tJ4 TLYUuC4XO1LiCTgtDD6IuI72DxA/ag4vEJgmDzndVwsKhG2z6rOJfURKjAQ/NTqxTh SxCvXVIQzwvXLpHzAf5UNZuBk0UrC45MJZ2dAe/U= Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by sourceware.org (Postfix) with ESMTPS id 71FB93857C61 for ; Thu, 30 Jul 2020 12:42:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 71FB93857C61 Received: by mail-qk1-x742.google.com with SMTP id l23so25430033qkk.0 for ; Thu, 30 Jul 2020 05:42:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to; bh=D0AMiruXrDgF1wC1/5Qd9gDZzVeSPl6uyOwpsWkigxQ=; b=QbeU4XVqSmY/LNJsxyzEBDCrtykW+/2qJLSs8K+tcitNuoLLhiz7f+HcueEBFuYemG LlGuRIf4ruM8enUgyZ5LA1fJFKXYBiZCqSoq2cYiHwDr2+wA3OG5vYWx1OSfn1bo0jwg B75cz/RP0Y7i2UG4/PhyIbVJX9y1BAhrMzaqUg6Uj3hXkjwpNKBx+mBN7hfkTap3wWE7 gnYZEpX/Y6H7Gbyb4x6KqMcDXyy2DC3vvg+3N3YO45iOkpffc3ahO38SGruNtWlPY5NV ZKwYsWExiho8ueqW2mDmvTttJPx5wfNlohybp8VcX5MBmtVkjxkMIF5n/Lu8QmENHkFL WO2g== X-Gm-Message-State: AOAM530YxpftrKGEPe2L7MEX+KoCUveQJlvXcsacfwmo0SwiLq/dhHbK kHEMKObCMD7f4l11wctuR66ERmkkkCE= X-Google-Smtp-Source: ABdhPJxpl8dfqH28MzNSJaFPTTfUFu1R44q4D5lcwp1i8GXPzfTykWz6rm5ZVtCbrsM3COnzdf4ekA== X-Received: by 2002:a37:9f94:: with SMTP id i142mr19146027qke.310.1596112974975; Thu, 30 Jul 2020 05:42:54 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id g4sm3862420qka.25.2020.07.30.05.42.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Jul 2020 05:42:54 -0700 (PDT) Subject: Re: [PATCH 15/16] linux: Add {f}stat{at} y2038 support To: Lukasz Majewski References: <20200723194641.1949404-1-adhemerval.zanella@linaro.org> <20200723194641.1949404-16-adhemerval.zanella@linaro.org> <20200724125350.7bbbd20a@jawa> Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <9555e199-4dcc-22c0-0d06-85144d1f1156@linaro.org> Date: Thu, 30 Jul 2020 09:42:51 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200724125350.7bbbd20a@jawa> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hJ5kpgC0WncKwAb15vrnYTrHpJjlS9mUa" X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Adhemerval Zanella via Libc-alpha Reply-To: Adhemerval Zanella Cc: Alistair Francis , libc-alpha@sourceware.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --hJ5kpgC0WncKwAb15vrnYTrHpJjlS9mUa Content-Type: multipart/mixed; boundary="Oh0K2D2xRmWZ16VnBwBrqM8Y6IYDsd9k5"; protected-headers="v1" From: Adhemerval Zanella To: Lukasz Majewski Cc: libc-alpha@sourceware.org, Alistair Francis Message-ID: <9555e199-4dcc-22c0-0d06-85144d1f1156@linaro.org> Subject: Re: [PATCH 15/16] linux: Add {f}stat{at} y2038 support References: <20200723194641.1949404-1-adhemerval.zanella@linaro.org> <20200723194641.1949404-16-adhemerval.zanella@linaro.org> <20200724125350.7bbbd20a@jawa> In-Reply-To: <20200724125350.7bbbd20a@jawa> --Oh0K2D2xRmWZ16VnBwBrqM8Y6IYDsd9k5 Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 24/07/2020 07:53, Lukasz Majewski wrote: >> =20 >> diff --git a/sysdeps/unix/sysv/linux/fstatat.c >> b/sysdeps/unix/sysv/linux/fstatat.c index 03ddb3f493..f65d3b74a6 >> 100644 --- a/sysdeps/unix/sysv/linux/fstatat.c >> +++ b/sysdeps/unix/sysv/linux/fstatat.c >> -# ifdef __NR_fstatat64 >> - /* Old KABIs with old non-LFS support, e.g. arm, i386, hppa, m68k, >> mips32, >> - microblaze, s390, sh, powerpc, and sparc. */ >> + struct statx stx; >> + int r =3D INLINE_SYSCALL_CALL (statx, fd, file, flag, >> STATX_BASIC_STATS, >> + &stx); >=20 > I'm wondering about the indentation here - I do see 3*TAB and some > spaces. Shouldn't we only use spaces? Afaik the GNU code guidelines requires to use TAB indentations instead of space in this case. =20 >=20 > And one more question what is the correct alignment: > (statx, fd, file, flag > &stx); >=20 > or > (statx, fd, file, flag > &stx); My understanding the latter. >=20 >> + if (r =3D=3D 0 || errno !=3D ENOSYS) >> + { >> + if (r =3D=3D 0) >> + __cp_stat_t64_statx (st, &stx); >> + return r; >> + } >=20 > Great that the statx is used here. >=20 >> + >> +# ifdef __NR_fstatat64 >> + /* Both new kABI which uses generic pre 64-bit time Linux ABI >> (e.g. csky >> + and nios) and old kABI with non-LFS support (e.g. arm, i386, >> hppa, m68k, >> + mips32, microblaze, s390, sh, powerpc, and sparc32). */ >> struct stat64 st64; >> - int r =3D INLINE_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); >> + r =3D INLINE_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); >> if (r =3D=3D 0) >> { >> if (! in_ino_t_range (st64.st_ino) >> @@ -48,7 +51,7 @@ __fstatat (int fd, const char *file, struct stat >> *st, int flag) || ! in_blkcnt_t_range (st64.st_blocks)) >> return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW); >> =20 >> - /* Clear internal pad and reserved fields. */ >> + /* Clear both pad and reserved fields. */ >> memset (st, 0, sizeof (*st)); >> =20 >> st->st_dev =3D st64.st_dev, >> @@ -61,22 +64,29 @@ __fstatat (int fd, const char *file, struct stat >> *st, int flag) st->st_size =3D st64.st_size; >> st->st_blksize =3D st64.st_blksize; >> st->st_blocks =3D st64.st_blocks; >> - st->st_atim.tv_sec =3D st64.st_atim.tv_sec; >> - st->st_atim.tv_nsec =3D st64.st_atim.tv_nsec; >> - st->st_mtim.tv_sec =3D st64.st_mtim.tv_sec; >> - st->st_mtim.tv_nsec =3D st64.st_mtim.tv_nsec; >> - st->st_ctim.tv_sec =3D st64.st_ctim.tv_sec; >> - st->st_ctim.tv_nsec =3D st64.st_ctim.tv_nsec; >> + st->st_atim =3D valid_timespec_to_timespec64 (st64.st_atim); >> + st->st_mtim =3D valid_timespec_to_timespec64 (st64.st_mtim); >> + st->st_ctim =3D valid_timespec_to_timespec64 (st64.st_ctim); >> } >> return r; >> -# else >> +# else >> /* 64-bit kabi outlier, e.g. mips64 and mips64-n32. */ >> struct kernel_stat kst; >> - int r =3D INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag);= >> - return r ?: __cp_kstat_stat (&kst, st); >> -# endif /* __nr_fstatat64 */ >> -# endif /* STAT_IS_KERNEL_STAT */ >> + r =3D INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); >> + return r ?: __cp_kstat_stat_t64 (&kst, st); >> +# endif /* __NR_fstatat64 */ >> +} >> +# if __TIMESIZE !=3D 64 >> +libc_hidden_def (__fstatat_time64) >> + >> +int >> +__fstatat (int fd, const char *file, struct stat *buf, int flags) >> +{ >> + struct __stat_t64 st_t64; >> + return __fstatat_time64 (fd, file, &st_t64, flags) >> + ?: __cp_stat_t64_stat (&st_t64, buf); >> } >> +# endif >> =20 >> weak_alias (__fstatat, fstatat) >> #endif >> diff --git a/sysdeps/unix/sysv/linux/fstatat64.c >> b/sysdeps/unix/sysv/linux/fstatat64.c index 82fab107a5..b3940f0d20 >> 100644 --- a/sysdeps/unix/sysv/linux/fstatat64.c >> +++ b/sysdeps/unix/sysv/linux/fstatat64.c >> @@ -19,56 +19,102 @@ >> #define __fstatat __redirect___fstatat >> #define fstatat __redirect_fstatat >> #include >> -#undef __fstatat >> -#undef fstatat >> #include >> - >> +#include >> #include >> #include >> - >> +#include >> #include >> #include >> +#include >> =20 >> int >> -__fstatat64 (int fd, const char *file, struct stat64 *st, int flag) >> +__fstatat64_time64 (int fd, const char *file, struct __stat64_t64 >> *st, >> + int flag) >> { >> + int r; >> + >> +#if (__WORDSIZE =3D=3D 32 \ >> + && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE =3D=3D 32)= ) >=20 > I do guess that the above condition is to ensure that 32 bit archs > (excluding x86_64-x32 - e.g. arm, riscv, etc) use statx? Yes, this is similar for what is done by SysVIPC fixes.=20 --Oh0K2D2xRmWZ16VnBwBrqM8Y6IYDsd9k5-- --hJ5kpgC0WncKwAb15vrnYTrHpJjlS9mUa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEUMEGt8/rO2QSpplaqrHsFKeUiO8FAl8iwEsACgkQqrHsFKeU iO+vrxAAs26X99jXwr6kIDLZYLYWCO3Pt+oenzcg2c1xDsn2li02JKfGbbrnYYaZ ZHp0QivVuHB7p0GDdq0Bv4DZY3uNV7gYza14fw5szO+Pk6cDxfhkl9nrmygcHbKu 9aBWol14QpjhEb9hFDXPmn6zZtyjsDnaIMAx7gEzU4Q7cX3Weu/R0UBxviIjg2mx EOI/+8Ov5oub1ajYljO59rEM8idCtHFMuNIIGxg87tZ1OcWfLIYCtJX2pleTQzeC u/ktZIaFYtfIv571jV63RwOCxN92X84IGuVtW4vvj3Ers5ZgcqVdkptm6XU2vdmv U+dT9LBLSdMmbEFXnOYmvHBr4FoGG+/8B0Ka898b+mxO3T5lZ2u+ubuuPj8X4yv5 EHLsJNi7IWNTMu7PTL0+NKffY/AbGKdzIEZK4Db3+rqReExPX/I4F5MMTuViCpJ1 13DXB882uByjEA+VhtAA7yS4DfoWEoUrjKmi66oSTk2OEzCjrIV4WPY7iNPfvQQi xq3m2qaCPOG/B/XnA4Fv03unDTaq5oSig8Tu61cIU+6kWvC4Y5Fc5tTptbW89Qjy +KH5Nda7HEDVZLhO7+XFhdHAJuUbRHjyA8hwnJ7bxoKTSfgQtsRcJrYr+ct0x28j P/hsi8dUrc//2W5wqd8DfLRDjxMhEC9Zi2V8RqC26uz2H3Se7/M= =NuC1 -----END PGP SIGNATURE----- --hJ5kpgC0WncKwAb15vrnYTrHpJjlS9mUa--