[PATCH v2 1/2] fstatat64: use statx on kernel using uint32 for time

[PATCH v2 1/2] fstatat64: use statx on kernel using uint32 for time

[YunQiang Su]

MIPS N64's lagacy stat-syscalls use uint32 as its time.
Glibc converts it to int64 then. Timestamp -1 as an example:
   syscall(newfstatat) gets 0xffffffff,
   Glibc converts it to 0x00000000ffffffff
Then, -1 becomes a time in y2106.

We define a macro STAT_KERNEL64_TIME32_T for this behaviour.
fstatat also uses fstatat64_time64 internal for this case.
---
 sysdeps/unix/sysv/linux/fstatat.c          | 9 +++++++--
 sysdeps/unix/sysv/linux/fstatat64.c        | 5 ++++-
 sysdeps/unix/sysv/linux/mips/kernel_stat.h | 5 +++++
 sysdeps/unix/sysv/linux/statx_cp.h         | 4 ++++
 sysdeps/unix/sysv/linux/tst-futimens.c     | 4 ++++
 sysdeps/unix/sysv/linux/tst-utime.c        | 4 ++++
 sysdeps/unix/sysv/linux/tst-utimes.c       | 5 +++++
 7 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/fstatat.c b/sysdeps/unix/sysv/linux/fstatat.c
index 59efff615f..ccb6027b64 100644
--- a/sysdeps/unix/sysv/linux/fstatat.c
+++ b/sysdeps/unix/sysv/linux/fstatat.c
@@ -37,7 +37,12 @@ __fstatat (int fd, const char *file, struct stat *buf, int flag)
 		 || buf->__st_blocks_pad != 0))
     return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW);
 # else
-#  ifdef __NR_fstatat64
+#  if defined(STAT_KERNEL64_TIME32_T)
+   /* Some architecture, like MIPS N64, is 64bit, while its kernel_stat has 32bit timespec.
+      Since they are 64bit, and time_t is also 64bit, it is safe for this cast */
+  return __fstatat64_time64(fd, file, (struct __stat64_t64 *)buf, flag);
+#  endif
+#  if defined(__NR_fstatat64)
   /* Old KABIs with old non-LFS support, e.g. arm, i386, hppa, m68k, mips32,
      microblaze, s390, sh, powerpc, and sparc.  */
   struct stat64 st64;
@@ -72,7 +77,7 @@ __fstatat (int fd, const char *file, struct stat *buf, int flag)
       return 0;
     }
 #  else
-  /* 64-bit kabi outlier, e.g. mips64 and mips64-n32.  */
+  /* 64-bit kabi outlier, e.g. mips64-n32.  */
   struct kernel_stat kst;
   r = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag);
   if (r == 0)
diff --git a/sysdeps/unix/sysv/linux/fstatat64.c b/sysdeps/unix/sysv/linux/fstatat64.c
index 490226a8ec..be19165f49 100644
--- a/sysdeps/unix/sysv/linux/fstatat64.c
+++ b/sysdeps/unix/sysv/linux/fstatat64.c
@@ -47,9 +47,12 @@ __fstatat64_time64 (int fd, const char *file, struct __stat64_t64 *buf,
   int r;
 
 #if (__WORDSIZE == 32 \
-     && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE == 32))
+     && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE == 32)) \
+    || defined(STAT_KERNEL64_TIME32_T)
   /* 32-bit kABI with default 64-bit time_t, e.g. arc, riscv32.   Also
      64-bit time_t support is done through statx syscall.  */
+  /* the time_sec members of kernel_stat struct on some architecture
+     is unsigned 32bit, which has Y2106 problem. MIPS N64 is an example. */
   struct statx tmp;
   r = INTERNAL_SYSCALL_CALL (statx, fd, file, AT_NO_AUTOMOUNT | flag,
 			     STATX_BASIC_STATS, &tmp);
diff --git a/sysdeps/unix/sysv/linux/mips/kernel_stat.h b/sysdeps/unix/sysv/linux/mips/kernel_stat.h
index e4b0f211ca..ce2e1c01ac 100644
--- a/sysdeps/unix/sysv/linux/mips/kernel_stat.h
+++ b/sysdeps/unix/sysv/linux/mips/kernel_stat.h
@@ -68,4 +68,9 @@ struct kernel_stat
 # define STATFS_IS_STATFS64 0
 #endif
 
+/* the time_sec members of kernel_stat struct is uint32_t, which has Y2106 problem */
+#if _MIPS_SIM == _ABI64
+#define STAT_KERNEL64_TIME32_T 1
+#endif
+
 #endif
diff --git a/sysdeps/unix/sysv/linux/statx_cp.h b/sysdeps/unix/sysv/linux/statx_cp.h
index 634330aaa6..cc1ae4698d 100644
--- a/sysdeps/unix/sysv/linux/statx_cp.h
+++ b/sysdeps/unix/sysv/linux/statx_cp.h
@@ -18,6 +18,10 @@
 
 extern void __cp_stat64_statx (struct stat64 *to, struct statx *from)
   attribute_hidden;
+#if defined(STAT_KERNEL64_TIME32_T)
+# define __cp_stat64_t64_statx __cp_stat64_statx
+#else
 extern void __cp_stat64_t64_statx (struct __stat64_t64 *to,
 				   const struct statx *from)
   attribute_hidden;
+#endif
diff --git a/sysdeps/unix/sysv/linux/tst-futimens.c b/sysdeps/unix/sysv/linux/tst-futimens.c
index 785cd87557..67a411db74 100644
--- a/sysdeps/unix/sysv/linux/tst-futimens.c
+++ b/sysdeps/unix/sysv/linux/tst-futimens.c
@@ -37,6 +37,9 @@ const struct timespec t2[2] = { { 0x80000001ULL, 0 },  { 0x80000002ULL, 0 } };
 /* struct timespec array around Y2038 threshold.  */
 const struct timespec t3[2] = { { 0x7FFFFFFE, 0 },  { 0x80000002ULL, 0 } };
 
+/* struct timespec array around -1: may trigger Y2106 problem */
+const struct timespec t4[2] = { { -1, 0 },  { -2, 0 } };
+
 #define PREPARE do_prepare
 static void
 do_prepare (int argc, char *argv[])
@@ -83,6 +86,7 @@ do_test (void)
   test_futimens_helper (&t1[0]);
   test_futimens_helper (&t2[0]);
   test_futimens_helper (&t3[0]);
+  test_futimens_helper (&t4[0]);
 
   return 0;
 }
diff --git a/sysdeps/unix/sysv/linux/tst-utime.c b/sysdeps/unix/sysv/linux/tst-utime.c
index 21e4e41dea..c39927fc68 100644
--- a/sysdeps/unix/sysv/linux/tst-utime.c
+++ b/sysdeps/unix/sysv/linux/tst-utime.c
@@ -39,6 +39,9 @@ const static struct utimbuf t2 = { 0x80000001ULL, 0x80000002ULL };
 /* struct utimbuf around Y2038 threshold.  */
 const static struct utimbuf t3 = { 0x7FFFFFFE, 0x80000002ULL };
 
+/* struct timespec array around -1: may trigger Y2106 problem */
+const static struct utimbuf t4 = { -1, -2 };
+
 #define PREPARE do_prepare
 static void
 do_prepare (int argc, char *argv[])
@@ -85,6 +88,7 @@ do_test (void)
   test_utime_helper (&t1);
   test_utime_helper (&t2);
   test_utime_helper (&t3);
+  test_utime_helper (&t4);
 
   return 0;
 }
diff --git a/sysdeps/unix/sysv/linux/tst-utimes.c b/sysdeps/unix/sysv/linux/tst-utimes.c
index 0f23e44897..1395aa1764 100644
--- a/sysdeps/unix/sysv/linux/tst-utimes.c
+++ b/sysdeps/unix/sysv/linux/tst-utimes.c
@@ -40,6 +40,10 @@ struct timeval t2[2] = { { 0x80000001ULL, 0 },  { 0x80000002ULL, 0 } };
 const static
 struct timeval t3[2] = { { 0x7FFFFFFE, 0 },  { 0x80000002ULL, 0 } };
 
+/* struct timespec array around -1: may trigger Y2106 problem */
+const static
+struct timeval t4[2] = { { -1, 0 },  { -2, 0 } };
+
 #define PREPARE do_prepare
 static void
 do_prepare (int argc, char *argv[])
@@ -86,6 +90,7 @@ do_test (void)
   test_utime_helper (&t1[0]);
   test_utime_helper (&t2[0]);
   test_utime_helper (&t3[0]);
+  test_utime_helper (&t4[0]);
 
   return 0;
 }
-- 
2.31.0

[PATCH v2 2/2] MIPS: N64, make xstat as wrapper of generic fstatat

[YunQiang Su]

fxstatat as wrapper of fstatat
fxstatat64 as wrapper of fstatat64

fxstat, lxstat, xstat as wrapper of fxstatat
fxstat64, lxstat64, xstat64 as wrapper of fxstatat64
---
 .../unix/sysv/linux/mips/mips64/n64/fxstat.c  | 27 +++++++++++++
 .../sysv/linux/mips/mips64/n64/fxstat64.c     | 28 ++++++++++++++
 .../sysv/linux/mips/mips64/n64/fxstatat.c     | 38 +++++++++++++++++++
 .../sysv/linux/mips/mips64/n64/fxstatat64.c   | 34 +++++++++++++++++
 .../unix/sysv/linux/mips/mips64/n64/lxstat.c  | 27 +++++++++++++
 .../sysv/linux/mips/mips64/n64/lxstat64.c     | 27 +++++++++++++
 .../unix/sysv/linux/mips/mips64/n64/xstat.c   | 27 +++++++++++++
 .../unix/sysv/linux/mips/mips64/n64/xstat64.c | 28 ++++++++++++++
 8 files changed, 236 insertions(+)
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat.c
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat64.c
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fxstatat.c
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fxstatat64.c
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/lxstat.c
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/lxstat64.c
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/xstat.c
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/xstat64.c

diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat.c
new file mode 100644
index 0000000000..037b2bb080
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat.c
@@ -0,0 +1,27 @@
+/* fxstat using old-style Unix stat system call.
+   Copyright (C) 1991-2021 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/* Get information about the file NAME in BUF.  */
+int
+__fxstat (int vers, int fd, struct stat *buf)
+{
+   return __fxstatat(vers, fd, "", buf, AT_EMPTY_PATH);
+}
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat64.c
new file mode 100644
index 0000000000..4c2d461667
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat64.c
@@ -0,0 +1,28 @@
+/* fxstat64 using 64-bit MIPS fstat system call.
+   Copyright (C) 1997-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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/* Get information about the file FD in BUF.  */
+
+int
+__fxstat64 (int vers, int fd, struct stat64 *buf)
+{
+    return __fxstatat64(vers, fd, "", buf, AT_EMPTY_PATH);
+}
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstatat.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstatat.c
new file mode 100644
index 0000000000..6d94f12bce
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstatat.c
@@ -0,0 +1,38 @@
+/* Copyright (C) 2005-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
+   <https://www.gnu.org/licenses/>.  */
+
+/* Ho hum, since fxstatat == fxstatat64 we must get rid of the
+   prototype or gcc will complain since they don't strictly match.  */
+
+#include <sys/syscall.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* Get information about the file NAME relative to FD in ST.  */
+int
+__fxstatat (int vers, int fd, const char *file, struct stat *st, int flag)
+{
+  if (__builtin_expect (vers != _STAT_VER_LINUX, 0))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  return __fstatat(fd, file, st, flag);
+
+}
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstatat64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstatat64.c
new file mode 100644
index 0000000000..b5b0eac92f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstatat64.c
@@ -0,0 +1,34 @@
+/* Copyright (C) 2005-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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* Get information about the file NAME in BUF.  */
+
+int
+__fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag)
+{
+  if (__builtin_expect (vers != _STAT_VER_LINUX, 0))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  return __fstatat64_time64(fd, file, st, flag);
+}
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/lxstat.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/lxstat.c
new file mode 100644
index 0000000000..43dd4e76b7
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/lxstat.c
@@ -0,0 +1,27 @@
+/* lxstat using old-style Unix stat system call.
+   Copyright (C) 1991-2021 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/* Get information about the file NAME in BUF.  */
+int
+__lxstat (int vers, const char *name, struct stat *buf)
+{
+   return __fxstatat(vers, AT_FDCWD, name, buf, AT_SYMLINK_NOFOLLOW);
+}
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/lxstat64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/lxstat64.c
new file mode 100644
index 0000000000..232878a74a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/lxstat64.c
@@ -0,0 +1,27 @@
+/* lxstat64 using 64-bit MIPS lstat system call.
+   Copyright (C) 1997-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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/* Get information about the file NAME in BUF.  */
+int
+__lxstat64 (int vers, const char *name, struct stat64 *buf)
+{
+    return __fxstatat64(vers, AT_FDCWD, name, buf, AT_SYMLINK_NOFOLLOW);
+}
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/xstat.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/xstat.c
new file mode 100644
index 0000000000..68e62fc3b3
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/xstat.c
@@ -0,0 +1,27 @@
+/* xstat using old-style Unix stat system call.
+   Copyright (C) 1991-2021 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/* Get information about the file NAME in BUF.  */
+int
+__xstat (int vers, const char *name, struct stat *buf)
+{
+   return __fxstatat(vers, AT_FDCWD, name, buf, 0);
+}
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/xstat64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/xstat64.c
new file mode 100644
index 0000000000..06f9738a65
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/xstat64.c
@@ -0,0 +1,28 @@
+/* xstat64 using 64-bit MIPS stat system call.
+   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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/* Get information about the file NAME in BUF.  */
+
+int
+__xstat64 (int vers, const char *name, struct stat64 *buf)
+{
+    return __fxstatat64(vers, AT_FDCWD, name, buf, 0);
+}
-- 
2.31.0

Re: [PATCH v2 2/2] MIPS: N64, make xstat as wrapper of generic fstatat

[Andreas Schwab]

On Mär 19 2021, YunQiang Su wrote:

> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat.c
> new file mode 100644
> index 0000000000..037b2bb080
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/fxstat.c
> @@ -0,0 +1,27 @@
> +/* fxstat using old-style Unix stat system call.
> +   Copyright (C) 1991-2021 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
> +   <https://www.gnu.org/licenses/>.  */
> +
> +#include <sys/stat.h>
> +#include <fcntl.h>
> +
> +/* Get information about the file NAME in BUF.  */
> +int
> +__fxstat (int vers, int fd, struct stat *buf)
> +{
> +   return __fxstatat(vers, fd, "", buf, AT_EMPTY_PATH);

That needs to reject fd < 0.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."

Re: [PATCH v2 1/2] fstatat64: use statx on kernel using uint32 for time

[Adhemerval Zanella]

On 18/03/2021 22:18, YunQiang Su wrote:
> diff --git a/sysdeps/unix/sysv/linux/fstatat.c b/sysdeps/unix/sysv/linux/fstatat.c
> index 59efff615f..ccb6027b64 100644
> --- a/sysdeps/unix/sysv/linux/fstatat.c
> +++ b/sysdeps/unix/sysv/linux/fstatat.c
> @@ -37,7 +37,12 @@ __fstatat (int fd, const char *file, struct stat *buf, int flag)
>  		 || buf->__st_blocks_pad != 0))
>      return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW);
>  # else
> -#  ifdef __NR_fstatat64
> +#  if defined(STAT_KERNEL64_TIME32_T)
> +   /* Some architecture, like MIPS N64, is 64bit, while its kernel_stat has 32bit timespec.
> +      Since they are 64bit, and time_t is also 64bit, it is safe for this cast */
> +  return __fstatat64_time64(fd, file, (struct __stat64_t64 *)buf, flag);
> +#  endif

I am not very found of this aliasing violation, specially because my
refactor tried exactly to avoid it on the newer implementations
(only the old xstat does require them because of the way the compat
is implemented).

> diff --git a/sysdeps/unix/sysv/linux/statx_cp.h b/sysdeps/unix/sysv/linux/statx_cp.h
> index 634330aaa6..cc1ae4698d 100644
> --- a/sysdeps/unix/sysv/linux/statx_cp.h
> +++ b/sysdeps/unix/sysv/linux/statx_cp.h
> @@ -18,6 +18,10 @@
>  
>  extern void __cp_stat64_statx (struct stat64 *to, struct statx *from)
>    attribute_hidden;
> +#if defined(STAT_KERNEL64_TIME32_T)
> +# define __cp_stat64_t64_statx __cp_stat64_statx
> +#else
>  extern void __cp_stat64_t64_statx (struct __stat64_t64 *to,
>  				   const struct statx *from)
>    attribute_hidden;
> +#endif

Instead of adding this hack, it is better to just open code the
__cp_stat64_t64_statx (it is used solely on fstatat64).

> diff --git a/sysdeps/unix/sysv/linux/tst-futimens.c b/sysdeps/unix/sysv/linux/tst-futimens.c
> index 785cd87557..67a411db74 100644
> --- a/sysdeps/unix/sysv/linux/tst-futimens.c
> +++ b/sysdeps/unix/sysv/linux/tst-futimens.c
> @@ -37,6 +37,9 @@ const struct timespec t2[2] = { { 0x80000001ULL, 0 },  { 0x80000002ULL, 0 } };
>  /* struct timespec array around Y2038 threshold.  */
>  const struct timespec t3[2] = { { 0x7FFFFFFE, 0 },  { 0x80000002ULL, 0 } };
>  
> +/* struct timespec array around -1: may trigger Y2106 problem */
> +const struct timespec t4[2] = { { -1, 0 },  { -2, 0 } };
> +
>  #define PREPARE do_prepare
>  static void
>  do_prepare (int argc, char *argv[])
> @@ -83,6 +86,7 @@ do_test (void)
>    test_futimens_helper (&t1[0]);
>    test_futimens_helper (&t2[0]);
>    test_futimens_helper (&t3[0]);
> +  test_futimens_helper (&t4[0]);
>  
>    return 0;
>  }

This test will fail on MIPSn64 kernels older than 4.11.

I have sent a more complete fix, that also fixes the s390 issue regarding
missing nanoseconds and improves the tests to handle the y2106 issue as
well [1].

[1] https://patchwork.sourceware.org/project/glibc/list/?series=1878

Re: [PATCH v2 2/2] MIPS: N64, make xstat as wrapper of generic fstatat

[Adhemerval Zanella]

On 18/03/2021 22:18, YunQiang Su wrote:
> fxstatat as wrapper of fstatat
> fxstatat64 as wrapper of fstatat64
> 
> fxstat, lxstat, xstat as wrapper of fxstatat
> fxstat64, lxstat64, xstat64 as wrapper of fxstatat64

Sorry I am still unconvinced that compat symbols worth the maintainability 
burden and these implementations takes a complete opposite turn of the
recent consolidation and simplification we are doing on the glibc
codebase.

If user does want a y2106 ready binary it should build against a newer
glibc, I just send a fix [1] that handle on both the non-LFS and the
LFS symbol.

[1] https://patchwork.sourceware.org/project/glibc/list/?series=1878

回复: [PATCH v2 2/2] MIPS: N64, make xstat as wrapper of generic fstatat

[yunqiang.su]

> 
> On 18/03/2021 22:18, YunQiang Su wrote:
> > fxstatat as wrapper of fstatat
> > fxstatat64 as wrapper of fstatat64
> >
> > fxstat, lxstat, xstat as wrapper of fxstatat fxstat64, lxstat64,
> > xstat64 as wrapper of fxstatat64
> 
> Sorry I am still unconvinced that compat symbols worth the maintainability
> burden and these implementations takes a complete opposite turn of the
> recent consolidation and simplification we are doing on the glibc codebase.
> 
> If user does want a y2106 ready binary it should build against a newer glibc, I
> just send a fix [1] that handle on both the non-LFS and the LFS symbol.
> 

Thank you. The major problem has been resolved. And anyway, Y2106 is far enough.

> [1] https://patchwork.sourceware.org/project/glibc/list/?series=1878