Y2038

y2038@lists.linaro.org

1132 discussions

Re: [Y2038] Trying Debian/armhf rebootstrap with time64

by Arnd Bergmann

On Mon, Mar 16, 2020 at 11:12 PM Lukasz Majewski <lukma(a)denx.de> wrote: > > On Fri, Mar 13, 2020 at 9:22 PM Rich Felker <dalias(a)libc.org> wrote: > > > > - Removing the time32 symbols from the glibc shared object did > > > > not work as they are still used (a lot) internally, and by the > > > > testsuite. > > > > > > That they're used internally sounds like a major problem; anywhere > > > they're being used internally potentially has hidden Y2038 bugs. > > > This is also why I'm concerned about glibc's approach of not > > > building itself with _TIME_BITS=64, and just undefining it or doing > > > something else in the wrapper files for the legacy time32 symbols. > > > > I thought this was the long-term plan. Working on the ABI first and > > then changing the implementation may help speed up the timeline > > before distro-level work can start, but OTOH removing all the 32-bit > > codepaths from the implementation first makes it more likely to find > > all relevant bits. > > If I understood the question correctly - the problem is with having > glibc ABI consistent. This requires having 64 bit types for relevant > functions. For example the __clock_settime64 accepts struct > __timespec64 parameter which: > > - Is aliased to "normal" struct timespec on machines with > __WORDSIZE==64 (x32 is a special case) > > - The struct __timespec64 is used on 32 bit machines > > As a result the glibc is ready to handle 64 bit time always (with > clock_settime on __WORDSIZE==64 or clock_settime64 otherwise), as > exported struct timespec fields size vary depending on the machine for > which glibc is built. I think we all understand the need to duplicate each interface that passes a data type derived from time_t, and how the aliasing works, The point above is purely for the internal implementation. The approach that I have picked for the kernel and Rich did for musl was that internal code never sees the old __time_t definition for any data structure or function call, those are only used to define the wrappers for 32-bit architectures that provide the legacy interfaces. Arnd

5 years, 1 month

Re: [Y2038] Trying Debian/armhf rebootstrap with time64

by Arnd Bergmann

[some mailing lists appear to have classified the earlier mail as spam, it was quite long and contained a lot of links. See https://lists.debian.org/debian-arm/2020/03/msg00032.html for the start of the thread if you did not get that] On Wed, Mar 11, 2020 at 3:37 PM Lukasz Majewski <lukma(a)denx.de> wrote: > > - stat()/fstat()/lstat(), nanosleep(), wait3()/wait4(), ppoll_chk() > > are some of the other interfaces that take a time_t based > > argument and need to grow a time64 version to avoid an ABI > > mismatch. > > The stat() and friends will use statx internally, which supports 64 bit > time from the outset. > Unfortunately, it hasn't been yet converted. > > As statx was added in 4.1 (IIRC) - after the minimal supported Linux > kernel version is bumped to this version (from 3.2 as now) it all will > be fixed. The problem I had with these was not on the kernel API side (I still have CONFIG_COMPAT_32BIT_TIME enabled for now) but on the application side. In particular, the 'struct stat' definition (when __USE_XOPEN2K8 is defined) contains struct timespec st_atim; and similar fields that are interpreted using 64-bit time_t in the application including the header, but with 32-bit time_t inside of the ___fxstat64() implementation in glibc. The problem is caused by the mismatched ABI, not by the time_t overflow, in the same way that happens in the nptl library callers and in the other interfaces I mentioned. This is also what seems to cause most of the testcase failures when the tests are built with __TIME_BITS=64. > > - The timeval prototype appears to be broken, as it's missing > > padding on architectures without native alignment of __time64 > > (e.g. i386) and on all big-endian architectures. > > > > You mean the one "exported" to the system or one, which is internal to > glibc (from ./include/time.h)? I mean in the installed headers, where I get (after preprocessing) typedef long long __time64_t; typedef long __suseconds_t; struct timeval { __time64_t tv_sec; __suseconds_t tv_usec; }; On i386 and m68k, this leads to a 12 byte structure when the kernel interfaces expect a 16 byte structure. All other 32-bit architectures add four byte padding at the end, so the size is correct, but on big-endian systems, kernel also expects padding *before* tv_usec, in the same way as the timespec definition does. IIRC the best way to handle this is with a 64-bit suseconds_t, e.g. by adding a __suseconds64_t defined the same way as __time64_t. > > I have spent more time on this now than I had planned, and don't > > expect to do further work on it anytime soon, but I hope my summary > > is useful to others that are going to need this later. I can > > obviously share my patches and build artifacts if anyone needs them. > > Could you upload them to any server? (kernel.org or github)? I have uploaded the modified debian-glibc and rebootstrap sources to https://git.linaro.org/people/arnd/ now, this should be all that's needed to recreate the build, using these steps: - build an x86-64 debian glibc-2.31 package (binary plus source) based on the glibc package data - create a pbuilder instance with that available as a source to apt - log into the pbuilder and run the modified bootstrap.sh according to information on the pbuilder web page. The binary packages I created are not as useful, as they would not work with any build of glibc, neither the version I built, nor any fixed one. I could find a way to send that to you in private, but it's hundreds of megabytes. Unfortunately I lost the build logs during a crash yesterday. > > There are two additional approaches that would likely get a Debian > > bootstrap further, but that I have not tried as they were previously > > dismissed: > > > > * Adding a time64 armhf as a separate (incompatible) target in glibc > > that defines __TIMESIZE==64 and a 64-bit __time_t would avoid > > most of the remaining ABI issues and put armhf-time64 in the same > > category as riscv32 and arc, but this idea was so far rejected by > > the glibc maintainers. > > As fair as I know riscv32 and arc will use generic syscall interface. > The arm32 bit doesn't support it - so the code from those two > aforementioned ports will not be used. The differences between the generic syscall interface and the arm version are much smaller than ABI differences between the ABIs for 32-bit __time_t and the __time_t == __time64_t version. In particular, as such a new port could mandate a minimum kernel of v5.1, it could just use all the time64 syscalls, the split sysvipc and statx as a baseline. Arnd

5 years, 1 month

[GIT PULL] compat-ioctl fix for v5.6

by Arnd Bergmann

The following changes since commit 77b9040195dea3fcddf19e136c9e99a501351778: compat_ioctl: simplify the implementation (2020-01-03 09:42:52 +0100) are available in the Git repository at: git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git tags/compat-ioctl-fix for you to fetch changes up to 0a061743af93f472687b8c69b0d539d1f12f3fd2: compat_ioctl: fix FIONREAD on devices (2020-02-08 18:02:54 +0100) ---------------------------------------------------------------- compat-ioctl fix for v5.6 One patch in the compat-ioctl series broke 32-bit rootfs for multiple people testing on 64-bit kernels. Let's fix it in -rc1 before others run into the same issue. ---------------------------------------------------------------- Arnd Bergmann (1): compat_ioctl: fix FIONREAD on devices fs/ioctl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

5 years, 2 months

[PATCH] generic/402: fix for updated behavior of timestamp limits

by Deepa Dinamani

The mount behavior will not be altered because of the unsupported timestamps on the filesystems. Adjust the test accordingly. An updated series to be posted after the merge window is hosted at <https://github.com/deepa-hub/vfs/tree/limits> Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> --- common/rc | 36 +++++++++--------- tests/generic/402 | 87 ++++++++++++++++--------------------------- tests/generic/402.out | 2 +- 3 files changed, 53 insertions(+), 72 deletions(-) diff --git a/common/rc b/common/rc index 25203bb4..39a2deb0 100644 --- a/common/rc +++ b/common/rc @@ -1959,16 +1959,9 @@ _run_aiodio() return $status } -# this test requires y2038 sysfs switch and filesystem -# timestamp ranges support. -_require_y2038() +_require_timestamp_range() { local device=${1:-$TEST_DEV} - local sysfsdir=/proc/sys/fs/fs-timestamp-check-on - - if [ ! -e $sysfsdir ]; then - _notrun "no kernel support for y2038 sysfs switch" - fi local tsmin tsmax read tsmin tsmax <<<$(_filesystem_timestamp_range $device) @@ -1980,23 +1973,32 @@ _require_y2038() _filesystem_timestamp_range() { local device=${1:-$TEST_DEV} + u32max=$(((1<<32)-1)) + s32min=-$((1<<31)) + s32max=$(((1<<31)-1)) + s64max=$(((1<<63)-1)) + s64min=$((1<<63)) + case $FSTYP in - ext4) + ext2) + echo "$s32min $s32max" + ;; + ext3|ext4) if [ $(dumpe2fs -h $device 2>/dev/null | grep "Inode size:" | cut -d: -f2) -gt 128 ]; then - echo "-2147483648 15032385535" + printf "%d %d\n" $s32min 0x37fffffff else - echo "-2147483648 2147483647" + echo "$s32min $s32max" fi ;; - xfs) - echo "-2147483648 2147483647" - ;; jfs) - echo "0 4294967295" + echo "0 $u32max" ;; - f2fs) - echo "-2147483648 2147483647" + xfs) + echo "$s32min $s32max" + ;; + btrfs) + echo "$s64min $s64max" ;; *) echo "-1 -1" diff --git a/tests/generic/402 b/tests/generic/402 index f742fedd..dd136ec2 100755 --- a/tests/generic/402 +++ b/tests/generic/402 @@ -4,15 +4,10 @@ # # FS QA Test 402 # -# Tests to verify policy for filesystem timestamps for -# supported ranges: -# 1. Verify filesystem rw mount according to sysctl -# timestamp_supported. -# 2. Verify timestamp clamping for timestamps beyond max -# timestamp supported. +# Test to verify filesystem timestamps for supported ranges. # -# Exit status 1: either or both tests above fail. -# Exit status 0: both the above tests pass. +# Exit status 1: test failed. +# Exit status 0: test passed. # seq=`basename $0` seqres=$RESULT_DIR/$seq @@ -49,47 +44,59 @@ check_stat() prev_timestamp="$timestamp;$timestamp" if [ $prev_timestamp != $stat_timestamp ]; then echo "$prev_timestamp != $stat_timestamp" | tee -a $seqres.full + return 1 fi + return 0 } run_test_individual() { + fail=0 file=$1 timestamp=$2 update_time=$3 # check if the time needs update if [ $update_time -eq 1 ]; then - echo "Updating file: $file to timestamp `date -d @$timestamp`" >> $seqres.full + echo "Updating file: $file to timestamp $timestamp" >> $seqres.full $XFS_IO_PROG -f -c "utimes $timestamp 0 $timestamp 0" $file if [ $? -ne 0 ]; then echo "Failed to update times on $file" | tee -a $seqres.full + fail=1 fi fi - tsclamp=$(($timestamp>$tsmax?$tsmax:$timestamp)) - echo "Checking file: $file Updated timestamp is `date -d @$tsclamp`" >> $seqres.full - check_stat $file $tsclamp + tsclamp=$((timestamp<tsmin?tsmin:timestamp>tsmax?tsmax:timestamp)) + echo "Checking file: $file Updated timestamp is $tsclamp" >> $seqres.full + if ! check_stat $file $tsclamp; then + fail=1 + fi + return $fail } run_test() { + fail=0 update_time=$1 n=1 for TIME in "${TIMESTAMPS[@]}"; do - run_test_individual ${SCRATCH_MNT}/test_$n $TIME $update_time + if ! run_test_individual ${SCRATCH_MNT}/test_$n $TIME $update_time; then + fail=1 + fi ((n++)) done + + return $fail } _scratch_mkfs &>> $seqres.full 2>&1 || _fail "mkfs failed" -_require_y2038 $SCRATCH_DEV +_require_timestamp_range $SCRATCH_DEV read tsmin tsmax <<<$(_filesystem_timestamp_range $SCRATCH_DEV) -echo min supported timestamp $tsmin $(date --date=@$tsmin) >> $seqres.full -echo max supported timestamp $tsmax $(date --date=@$tsmax) >> $seqres.full +echo min supported timestamp $tsmin >> $seqres.full +echo max supported timestamp $tsmax >> $seqres.full # Test timestamps array @@ -97,45 +104,14 @@ declare -a TIMESTAMPS=( $tsmin 0 $tsmax + $((tsmax/2)) $((tsmax+1)) - 4294967295 - 8589934591 - 34359738367 ) -# Max timestamp is hardcoded to Mon Jan 18 19:14:07 PST 2038 -sys_tsmax=2147483647 -echo "max timestamp that needs to be supported by fs for rw mount is" \ - "$((sys_tsmax+1)) $(date --date=@$((sys_tsmax+1)))" >> $seqres.full - -read ts_check <<<$(cat /proc/sys/fs/fs-timestamp-check-on) - _scratch_mount result=$? -if [ $ts_check -ne 0 ]; then - echo "sysctl filesystem timestamp check is on" >> $seqres.full - # check for mount failure if the minimum requirement for max timestamp - # supported is not met. - if [ $sys_tsmax -ge $tsmax ]; then - if [ $result -eq 0 ]; then - echo "mount test failed" | tee -a $seqres.full - exit - fi - else - if [ $result -ne 0 ]; then - echo "failed to mount $SCRATCH_DEV" | tee -a $seqres.full - exit - fi - fi -else - # if sysctl switch is off then mount should succeed always. - echo "sysctl filesystem timestamp check is off" >> $seqres.full - if [ $result -ne 0 ]; then - echo "failed to mount $SCRATCH_DEV and timestamp check is off" >> $seqres.full - exit - fi -fi +status=0 # Begin test case 1 echo "In memory timestamps update test start" >> $seqres.full @@ -143,7 +119,9 @@ echo "In memory timestamps update test start" >> $seqres.full # update time on the file update_time=1 -run_test $update_time +if ! run_test $update_time; then + status=1 +fi echo "In memory timestamps update complete" >> $seqres.full @@ -162,12 +140,13 @@ update_time=0 echo "On disk timestamps update test start" >> $seqres.full # Re-run test -run_test $update_time +if ! run_test $update_time; then + status=1 +fi echo "On disk timestamps update test complete" >> $seqres.full -echo "y2038 inode timestamp tests completed successfully" +echo "inode timestamp tests completed status $status" # success, all done -status=0 -exit +exit $status diff --git a/tests/generic/402.out b/tests/generic/402.out index 6c5b9308..4500e6c7 100644 --- a/tests/generic/402.out +++ b/tests/generic/402.out @@ -1,2 +1,2 @@ QA output created by 402 -y2038 inode timestamp tests completed successfully +inode timestamp tests completed status 0 -- 2.17.1

5 years, 2 months

[GIT PULL] y2038: core, driver and file system changes

by Arnd Bergmann

The following changes since commit e42617b825f8073569da76dc4510bfa019b1c35a: Linux 5.5-rc1 (2019-12-08 14:57:55 -0800) are available in the Git repository at: git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git tags/y2038-drivers-for-v5.6-signed for you to fetch changes up to c4e71212a245017d2ab05f322f7722f0b87a55da: Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC" (2020-01-28 23:24:23 +0100) ---------------------------------------------------------------- y2038: core, driver and file system changes These are updates to device drivers and file systems that for some reason or another were not included in the kernel in the previous y2038 series. I've gone through all users of time_t again to make sure the kernel is in a long-term maintainable state, replacing all remaining references to time_t with safe alternatives. Some related parts of the series were picked up into the nfsd, xfs, alsa and v4l2 trees. A final set of patches in linux-mm removes the now unused time_t/timeval/timespec types and helper functions after all five branches are merged for linux-5.6, ensuring that no new users get merged. As a result, linux-5.6, or my backport of the patches to 5.4 [1], should be the first release that can serve as a base for a 32-bit system designed to run beyond year 2038, with a few remaining caveats: - All user space must be compiled with a 64-bit time_t, which will be supported in the coming musl-1.2 and glibc-2.32 releases, along with installed kernel headers from linux-5.6 or higher. - Applications that use the system call interfaces directly need to be ported to use the time64 syscalls added in linux-5.1 in place of the existing system calls. This impacts most users of futex() and seccomp() as well as programming languages that have their own runtime environment not based on libc. - Applications that use a private copy of kernel uapi header files or their contents may need to update to the linux-5.6 version, in particular for sound/asound.h, xfs/xfs_fs.h, linux/input.h, linux/elfcore.h, linux/sockios.h, linux/timex.h and linux/can/bcm.h. - A few remaining interfaces cannot be changed to pass a 64-bit time_t in a compatible way, so they must be configured to use CLOCK_MONOTONIC times or (with a y2106 problem) unsigned 32-bit timestamps. Most importantly this impacts all users of 'struct input_event'. - All y2038 problems that are present on 64-bit machines also apply to 32-bit machines. In particular this affects file systems with on-disk timestamps using signed 32-bit seconds: ext4 with ext3-style small inodes, ext2, xfs (to be fixed soon) and ufs. Changes since v1 [2]: - Add Acks I received - Rebase to v5.5-rc1, dropping patches that got merged already - Add NFS, XFS and the final three patches from another series - Rewrite etnaviv patches - Add one late revert to avoid an etnaviv regression [1] https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/log/?h=… [2] https://lore.kernel.org/lkml/20191108213257.3097633-1-arnd@arndb.de/ ---------------------------------------------------------------- Arnd Bergmann (21): fat: use prandom_u32() for i_generation dlm: use SO_SNDTIMEO_NEW instead of SO_SNDTIMEO_OLD xtensa: ISS: avoid struct timeval um: ubd: use 64-bit time_t where possible acct: stop using get_seconds() tsacct: add 64-bit btime field packet: clarify timestamp overflow hostfs: pass 64-bit timestamps to/from user space hfs/hfsplus: use 64-bit inode timestamps drm/msm: avoid using 'timespec' drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC drm/etnaviv: avoid deprecated timespec sunrpc: convert to time64_t for expiry nfs: use time64_t internally nfs: fix timstamp debug prints nfs: fscache: use timespec64 in inode auxdata y2038: remove obsolete jiffies conversion functions y2038: rename itimerval to __kernel_old_itimerval y2038: sparc: remove use of struct timex y2038: sh: remove timeval/timespec usage from headers Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC" arch/sh/include/uapi/asm/sockios.h | 4 +- arch/sparc/kernel/sys_sparc_64.c | 33 ++++++------ arch/um/drivers/cow.h | 2 +- arch/um/drivers/cow_user.c | 7 +-- arch/um/drivers/ubd_kern.c | 10 ++-- arch/um/include/shared/os.h | 2 +- arch/um/os-Linux/file.c | 2 +- .../platforms/iss/include/platform/simcall.h | 4 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 11 ++-- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 11 ++-- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 +- drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 5 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 5 +- drivers/gpu/drm/msm/msm_drv.h | 3 +- fs/dlm/lowcomms.c | 6 +-- fs/fat/inode.c | 3 +- fs/hfs/hfs_fs.h | 28 ++++++++--- fs/hfs/inode.c | 4 +- fs/hfsplus/hfsplus_fs.h | 28 +++++++++-- fs/hfsplus/inode.c | 12 ++--- fs/hostfs/hostfs.h | 22 ++++---- fs/hostfs/hostfs_kern.c | 15 +++--- fs/nfs/fscache-index.c | 6 ++- fs/nfs/fscache.c | 18 ++++--- fs/nfs/fscache.h | 8 +-- fs/nfs/nfs4xdr.c | 10 ++-- include/linux/jiffies.h | 20 -------- include/linux/sunrpc/cache.h | 42 +++++++++------- include/linux/sunrpc/gss_api.h | 4 +- include/linux/sunrpc/gss_krb5.h | 2 +- include/linux/syscalls.h | 9 ++-- include/uapi/linux/acct.h | 2 + include/uapi/linux/taskstats.h | 6 ++- include/uapi/linux/time_types.h | 5 ++ include/uapi/linux/timex.h | 2 + kernel/acct.c | 4 +- kernel/time/itimer.c | 18 +++---- kernel/time/time.c | 58 ++-------------------- kernel/tsacct.c | 9 ++-- net/packet/af_packet.c | 27 ++++++---- net/sunrpc/auth_gss/gss_krb5_mech.c | 12 +++-- net/sunrpc/auth_gss/gss_krb5_seal.c | 8 +-- net/sunrpc/auth_gss/gss_krb5_unseal.c | 6 +-- net/sunrpc/auth_gss/gss_krb5_wrap.c | 16 +++--- net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 6 +-- net/sunrpc/cache.c | 16 +++--- net/sunrpc/svcauth_unix.c | 10 ++-- 49 files changed, 283 insertions(+), 266 deletions(-)

5 years, 3 months

[PATCH v2 00/24] drivers, fs: y2038 updates

by Arnd Bergmann

These are updates to devidce drivers and file systems that for some reason or another were not included in the kernel in the previous y2038 series. I've gone through all users of time_t again to make sure the kernel is in a long-term maintainable state. Posting these as a series for better organization, but each change here is applicable standalone. Please merge, review, ack/nack etc as you see fit. I will add these to my y2038 branch [1] for linux-next, but can keep rebasing for feedback and to remove any patches that get picked up by a maintainer. Changes since v1 [2]: - Add Acks I received - Rebase to v5.5-rc1, droping patches that got merged already - Add NFS, XFS and the final three patches from another series - Rewrite etnaviv patches Arnd [1] https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/log/?h=… [2] https://lore.kernel.org/lkml/20191108213257.3097633-1-arnd@arndb.de/ Arnd Bergmann (24): Input: input_event: fix struct padding on sparc64 fat: use prandom_u32() for i_generation dlm: use SO_SNDTIMEO_NEW instead of SO_SNDTIMEO_OLD xtensa: ISS: avoid struct timeval um: ubd: use 64-bit time_t where possible acct: stop using get_seconds() tsacct: add 64-bit btime field packet: clarify timestamp overflow quota: avoid time_t in v1_disk_dqblk definition hostfs: pass 64-bit timestamps to/from user space hfs/hfsplus: use 64-bit inode timestamps drm/msm: avoid using 'timespec' drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC drm/etnaviv: avoid deprecated timespec sunrpc: convert to time64_t for expiry nfs: use time64_t internally nfs: fix timstamp debug prints nfs: fscache: use timespec64 in inode auxdata xfs: rename compat_time_t to old_time32_t xfs: disallow broken ioctls without compat-32-bit-time xfs: quota: move to time64_t interfaces y2038: remove obsolete jiffies conversion functions y2038: rename itimerval to __kernel_old_itimerval y2038: sparc: remove use of struct timex arch/sparc/kernel/sys_sparc_64.c | 29 +++++----- arch/um/drivers/cow.h | 2 +- arch/um/drivers/cow_user.c | 7 ++- arch/um/drivers/ubd_kern.c | 10 ++-- arch/um/include/shared/os.h | 2 +- arch/um/os-Linux/file.c | 2 +- .../platforms/iss/include/platform/simcall.h | 4 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 20 ++++--- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 11 ++-- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 +- drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 5 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 5 +- drivers/gpu/drm/msm/msm_drv.h | 3 +- drivers/input/evdev.c | 14 ++--- drivers/input/misc/uinput.c | 14 +++-- fs/dlm/lowcomms.c | 6 +- fs/fat/inode.c | 3 +- fs/hfs/hfs_fs.h | 28 +++++++-- fs/hfs/inode.c | 4 +- fs/hfsplus/hfsplus_fs.h | 28 +++++++-- fs/hfsplus/inode.c | 12 ++-- fs/hostfs/hostfs.h | 22 ++++--- fs/hostfs/hostfs_kern.c | 15 +++-- fs/nfs/fscache-index.c | 6 +- fs/nfs/fscache.c | 18 ++++-- fs/nfs/fscache.h | 8 ++- fs/nfs/nfs4xdr.c | 10 ++-- fs/quota/quotaio_v1.h | 6 +- fs/xfs/xfs_dquot.c | 6 +- fs/xfs/xfs_ioctl.c | 26 +++++++++ fs/xfs/xfs_ioctl32.c | 2 +- fs/xfs/xfs_ioctl32.h | 2 +- fs/xfs/xfs_qm.h | 6 +- fs/xfs/xfs_quotaops.c | 6 +- fs/xfs/xfs_trans_dquot.c | 8 ++- include/linux/jiffies.h | 20 ------- include/linux/sunrpc/cache.h | 42 ++++++++------ include/linux/sunrpc/gss_api.h | 4 +- include/linux/sunrpc/gss_krb5.h | 2 +- include/linux/syscalls.h | 9 ++- include/uapi/linux/acct.h | 2 + include/uapi/linux/input.h | 1 + include/uapi/linux/taskstats.h | 6 +- include/uapi/linux/time_types.h | 5 ++ include/uapi/linux/timex.h | 2 + kernel/acct.c | 4 +- kernel/time/itimer.c | 18 +++--- kernel/time/time.c | 58 ++----------------- kernel/tsacct.c | 9 ++- net/packet/af_packet.c | 27 +++++---- net/sunrpc/auth_gss/gss_krb5_mech.c | 12 +++- net/sunrpc/auth_gss/gss_krb5_seal.c | 8 +-- net/sunrpc/auth_gss/gss_krb5_unseal.c | 6 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 16 ++--- net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 6 +- net/sunrpc/cache.c | 16 ++--- net/sunrpc/svcauth_unix.c | 10 ++-- 59 files changed, 351 insertions(+), 290 deletions(-) -- 2.20.0 Cc: jdike(a)addtoit.com Cc: richard(a)nod.at Cc: jcmvbkbc(a)gmail.com Cc: stefanr(a)s5r6.in-berlin.de Cc: l.stach(a)pengutronix.de Cc: linux+etnaviv(a)armlinux.org.uk Cc: christian.gmeiner(a)gmail.com Cc: airlied(a)linux.ie Cc: daniel(a)ffwll.ch Cc: robdclark(a)gmail.com Cc: sean(a)poorly.run Cc: valdis.kletnieks(a)vt.edu Cc: gregkh(a)linuxfoundation.org Cc: ccaulfie(a)redhat.com Cc: teigland(a)redhat.com Cc: hirofumi(a)mail.parknet.co.jp Cc: jack(a)suse.com Cc: davem(a)davemloft.net Cc: fw(a)strlen.de Cc: viro(a)zeniv.linux.org.uk Cc: rfontana(a)redhat.com Cc: tglx(a)linutronix.de Cc: linux-um(a)lists.infradead.org Cc: linux1394-devel(a)lists.sourceforge.net Cc: etnaviv(a)lists.freedesktop.org Cc: dri-devel(a)lists.freedesktop.org Cc: linux-arm-msm(a)vger.kernel.org Cc: freedreno(a)lists.freedesktop.org Cc: devel(a)driverdev.osuosl.org Cc: cluster-devel(a)redhat.com Cc: linux-fsdevel(a)vger.kernel.org Cc: netdev(a)vger.kernel.org Cc: trond.myklebust(a)hammerspace.com Cc: anna.schumaker(a)netapp.com Cc: linux-nfs(a)vger.kernel.org Cc: linux-xfs(a)vger.kernel.org Cc: darrick.wong(a)oracle.com Cc: sparclinux(a)vger.kernel.org

5 years, 3 months

[PATCH] hcidump: add support for time64 based libc

by Arnd Bergmann

musl is moving to a default of 64-bit time_t on all architectures, glibc will follow later. This breaks reading timestamps through cmsg data with the HCI_TIME_STAMP socket option. Change both copies of hcidump to work on all architectures. This also fixes x32, which has never worked, and carefully avoids breaking sparc64, which is another special case. I have only compiled this on one architecture, please at least test it to ensure there are no regressions. The toolchain binaries from http://musl.cc/ should allow testing with a 64-bit time_t, but it may be hard to build all the dependencies first. libpcap has the same bug and needs a similar fix to work on future 32-bit Linux systems. Everything else apparently uses the generic SO_TIMESTAMP timestamps, which work correctly when using new enough kernels with a time64 libc. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- monitor/hcidump.c | 32 +++++++++++++++++++++++++++++++- tools/hcidump.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/monitor/hcidump.c b/monitor/hcidump.c index 8b6f846d3..6d2330287 100644 --- a/monitor/hcidump.c +++ b/monitor/hcidump.c @@ -107,6 +107,36 @@ static int open_hci_dev(uint16_t index) return fd; } +static struct timeval hci_tstamp_read(void *data) +{ + struct timeval tv; + + /* + * On 64-bit architectures, the data matches the timeval + * format. Note that on sparc64 this is different from + * all others. + */ + if (sizeof(long) == 8) { + memcpy(&tv, data, sizeof(tv)); + } + + /* + * On 32-bit architectures, the timeval definition may + * use 32-bit or 64-bit members depending on the C + * library and architecture. + * The cmsg data however always contains a pair of + * 32-bit values. Interpret as unsigned to make it work + * past y2038. + */ + if (sizeof(long) == 4) { + unsigned int *stamp = data; + tv.tv_sec = stamp[0]; + tv.tv_usec = stamp[1]; + } + + return tv; +} + static void device_callback(int fd, uint32_t events, void *user_data) { struct hcidump_data *data = user_data; @@ -150,7 +180,7 @@ static void device_callback(int fd, uint32_t events, void *user_data) memcpy(&dir, CMSG_DATA(cmsg), sizeof(dir)); break; case HCI_CMSG_TSTAMP: - memcpy(&ctv, CMSG_DATA(cmsg), sizeof(ctv)); + ctv = hci_tstamp_read(CMSG_DATA(cmsg)); tv = &ctv; break; } diff --git a/tools/hcidump.c b/tools/hcidump.c index 33d429b6c..be14d0930 100644 --- a/tools/hcidump.c +++ b/tools/hcidump.c @@ -136,6 +136,36 @@ static inline int write_n(int fd, char *buf, int len) return t; } +static struct timeval hci_tstamp_read(void *data) +{ + struct timeval tv; + + /* + * On 64-bit architectures, the data matches the timeval + * format. Note that on sparc64 this is different from + * all others. + */ + if (sizeof(long) == 8) { + memcpy(&tv, data, sizeof(tv)); + } + + /* + * On 32-bit architectures, the timeval definition may + * use 32-bit or 64-bit members depending on the C + * library and architecture. + * The cmsg data however always contains a pair of + * 32-bit values. Interpret as unsigned to make it work + * past y2038. + */ + if (sizeof(long) == 4) { + unsigned int *stamp = data; + tv.tv_sec = stamp[0]; + tv.tv_usec = stamp[1]; + } + + return tv; +} + static int process_frames(int dev, int sock, int fd, unsigned long flags) { struct cmsghdr *cmsg; @@ -230,8 +260,7 @@ static int process_frames(int dev, int sock, int fd, unsigned long flags) frm.in = (uint8_t) dir; break; case HCI_CMSG_TSTAMP: - memcpy(&frm.ts, CMSG_DATA(cmsg), - sizeof(struct timeval)); + frm.ts = hci_tstamp_read(CMSG_DATA(cmsg)); break; } cmsg = CMSG_NXTHDR(&msg, cmsg); -- 2.20.0

5 years, 3 months

[RFC] y2038: HCI_TIME_STAMP with time64

by Arnd Bergmann

I noticed earlier this week that the HCI_CMSG_TSTAMP/HCI_TIME_STAMP interface has no time64 equivalent, as we apparently missed that when converting the normal socket timestamps to support both time32 and time64 variants of the sockopt and cmsg data. The interface was originally added back in 2002 by Maksim Krasnyanskiy when bluetooth support first became non-experimental. When using HCI_TIME_STAMP on a 32-bit system with a time64 libc, users will interpret the { s32 tv_sec; s32 tv_usec } layout of the kernel as { s64 tv_sec; ... }, which puts complete garbage into the timestamp regardless of whether this code runs before or after y2038. From looking at codesearch.debian.org, I found two users of this: libpcap and hcidump. There are probably others that are not part of Debian. Fixing this the same was as normal socket timestamps is not possible because include/net/bluetooth/hci.h is not an exported UAPI header. This means any changes to it for defining HCI_TIME_STAMP conditionally would be ignored by applications that use a different copy of the header. I can see three possible ways forward: 1. move include/net/bluetooth/hci.h to include/uapi/, add a conditional definition of HCI_TIME_STAMP and make the kernel code support both formats. Then change applications to rely on that version of header file to get the correct definition but not change application code. 2. Leave the kernel completely unchanged and modify only the users to not expect the output to be a 'struct timeval' but interpret as as { uint32_t tv_sec; int32_t tv_usec; } structure on 32-bit architectures, which will work until the unsigned time overflows 86 years from now in 2106 (same as the libpcap on-disk format). 3. Add support for the normal SO_TIMESTAMPNS_NEW sockopt in HCI, providing timestamps in the unambiguous { long long tv_sec; long long tv_nsec; } format to user space, and change applications to use that if supported by the kernel. Arnd

5 years, 3 months

[PATCH 0/3] y2038: remove unused interfaces

by Arnd Bergmann

Hi Andrew, Can you add these to your patches for linux-5.6? I have y2038 cleanups for sound, v4l, nfsd, scsi and xfs that are merged in the respective subsystem trees, as well as another series of individual patches queued up in my own y2038 tree. With all that work merged, most of include/linux/time32.h and some other related code can be removed from the kernel, so it would be good to send these at the end of the coming merge window, and to give them some more testing in linux-next to make sure we don't gain any new users. Arnd Arnd Bergmann (3): y2038: remove ktime to/from timespec/timeval conversion y2038: remove unused time32 interfaces y2038: hide timeval/timespec/itimerval/itimerspec types include/linux/compat.h | 29 ----- include/linux/ktime.h | 37 ------ include/linux/time32.h | 154 +------------------------ include/linux/timekeeping32.h | 32 ----- include/linux/types.h | 5 - include/uapi/asm-generic/posix_types.h | 2 + include/uapi/linux/time.h | 22 ++-- kernel/compat.c | 64 ---------- kernel/time/time.c | 43 ------- 9 files changed, 15 insertions(+), 373 deletions(-) -- Cc: y2038(a)lists.linaro.org Cc: linux-kernel(a)vger.kernel.org Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Deepa Dinamani <deepa.kernel(a)gmail.com> 2.20.0

5 years, 3 months

[PATCH 1/3] xfs: rename compat_time_t to old_time32_t

by Arnd Bergmann

The compat_time_t type has been removed everywhere else, as most users rely on old_time32_t for both native and compat mode handling of 32-bit time_t. Remove the last one in xfs. Reviewed-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- fs/xfs/xfs_ioctl32.c | 2 +- fs/xfs/xfs_ioctl32.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c index c4c4f09113d3..a49bd80b2c3b 100644 --- a/fs/xfs/xfs_ioctl32.c +++ b/fs/xfs/xfs_ioctl32.c @@ -107,7 +107,7 @@ xfs_ioctl32_bstime_copyin( xfs_bstime_t *bstime, compat_xfs_bstime_t __user *bstime32) { - compat_time_t sec32; /* tv_sec differs on 64 vs. 32 */ + old_time32_t sec32; /* tv_sec differs on 64 vs. 32 */ if (get_user(sec32, &bstime32->tv_sec) || get_user(bstime->tv_nsec, &bstime32->tv_nsec)) diff --git a/fs/xfs/xfs_ioctl32.h b/fs/xfs/xfs_ioctl32.h index 8c7743cd490e..053de7d894cd 100644 --- a/fs/xfs/xfs_ioctl32.h +++ b/fs/xfs/xfs_ioctl32.h @@ -32,7 +32,7 @@ #endif typedef struct compat_xfs_bstime { - compat_time_t tv_sec; /* seconds */ + old_time32_t tv_sec; /* seconds */ __s32 tv_nsec; /* and nanoseconds */ } compat_xfs_bstime_t; -- 2.20.0

5 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038