Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

asm-generic/stat.h: support 64-bit file time_t for stat()

The existing asm-generic/stat.h specifies st_mtime, etc., as a 32-value,
and works well for 32-bit architectures (currently microblaze, score,
and 32-bit tile). However, for 64-bit architectures it isn't sufficient
to return 32 bits of time_t; this isn't good insurance against the 2037
rollover. (It also makes glibc support less convenient, since we can't
use glibc's handy STAT_IS_KERNEL_STAT mode.)

This change extends the two "timespec" fields for each of the three atime,
mtime, and ctime fields from "int" to "long". As a result, on 32-bit
platforms nothing changes, and 64-bit platforms will now work as expected.

The only wrinkle is 32-bit userspace under 64-bit kernels taking advantage
of COMPAT mode. For these, we leave the "struct stat64" definitions with
the "int" versions of the time_t and nsec fields, so that architectures
can implement compat_sys_stat64() and friends with sys_stat64(), etc.,
and get the expected 32-bit structure layout. This requires a
field-by-field copy in the kernel, implemented by the code guarded
under __ARCH_WANT_STAT64.

This does mean that the shape of the "struct stat" and "struct stat64"
structures is different on a 64-bit kernel, but only one of the two
structures should ever be used by any given process: "struct stat"
is meant for 64-bit userspace only, and "struct stat64" for 32-bit
userspace only. (On a 32-bit kernel the two structures continue to have
the same shape, since "long" is 32 bits.)

The alternative is keeping the two structures the same shape on 64-bit
kernels, which means a 64-bit time_t in "struct stat64" for 32-bit
processes. This is a little unnatural since 32-bit userspace can't
do anything with 64 bits of time_t information, since time_t is just
"long", not "int64_t"; and in any case 32-bit userspace might expect
to be running under a 32-bit kernel, which can't provide the high 32
bits anyway. In the case of a 32-bit kernel we'd then be extending the
kernel's 32-bit time_t to 64 bits, then truncating it back to 32 bits
again in userspace, for no particular reason. And, as mentioned above,
if we have 64-bit time_t for 32-bit processes we can't easily use glibc's
STAT_IS_KERNEL_STAT, since glibc's stat structure requires an embedded
"struct timespec", which is a pair of "long" (32-bit) values in a 32-bit
userspace. "Inventive" solutions are possible, but are pretty hacky.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>

+16 -12
+3
arch/tile/include/asm/stat.h
··· 1 + #ifdef CONFIG_COMPAT 2 + #define __ARCH_WANT_STAT64 /* Used for compat_sys_stat64() etc. */ 3 + #endif 1 4 #include <asm-generic/stat.h>
+1
arch/tile/include/asm/unistd.h
··· 41 41 #ifdef CONFIG_COMPAT 42 42 #define __ARCH_WANT_SYS_LLSEEK 43 43 #endif 44 + #define __ARCH_WANT_SYS_NEWFSTATAT 44 45 #endif 45 46 46 47 #endif /* _ASM_TILE_UNISTD_H */
+5 -5
arch/tile/kernel/compat.c
··· 148 148 #define compat_sys_readahead sys32_readahead 149 149 #define compat_sys_sync_file_range compat_sys_sync_file_range2 150 150 151 - /* The native 64-bit "struct stat" matches the 32-bit "struct stat64". */ 152 - #define compat_sys_stat64 sys_newstat 153 - #define compat_sys_lstat64 sys_newlstat 154 - #define compat_sys_fstat64 sys_newfstat 155 - #define compat_sys_fstatat64 sys_newfstatat 151 + /* We leverage the "struct stat64" type for 32-bit time_t/nsec. */ 152 + #define compat_sys_stat64 sys_stat64 153 + #define compat_sys_lstat64 sys_lstat64 154 + #define compat_sys_fstat64 sys_fstat64 155 + #define compat_sys_fstatat64 sys_fstatat64 156 156 157 157 /* The native sys_ptrace dynamically handles compat binaries. */ 158 158 #define compat_sys_ptrace sys_ptrace
+7 -7
include/asm-generic/stat.h
··· 33 33 int st_blksize; /* Optimal block size for I/O. */ 34 34 int __pad2; 35 35 long st_blocks; /* Number 512-byte blocks allocated. */ 36 - int st_atime; /* Time of last access. */ 37 - unsigned int st_atime_nsec; 38 - int st_mtime; /* Time of last modification. */ 39 - unsigned int st_mtime_nsec; 40 - int st_ctime; /* Time of last status change. */ 41 - unsigned int st_ctime_nsec; 36 + long st_atime; /* Time of last access. */ 37 + unsigned long st_atime_nsec; 38 + long st_mtime; /* Time of last modification. */ 39 + unsigned long st_mtime_nsec; 40 + long st_ctime; /* Time of last status change. */ 41 + unsigned long st_ctime_nsec; 42 42 unsigned int __unused4; 43 43 unsigned int __unused5; 44 44 }; 45 45 46 - #if __BITS_PER_LONG != 64 47 46 /* This matches struct stat64 in glibc2.1. Only used for 32 bit. */ 47 + #if __BITS_PER_LONG != 64 || defined(__ARCH_WANT_STAT64) 48 48 struct stat64 { 49 49 unsigned long long st_dev; /* Device. */ 50 50 unsigned long long st_ino; /* File serial number. */