Y2038 April 2018

y2038@lists.linaro.org

14 participants
18 discussions

[PATCH v3] generic/390: Add tests for inode timestamp policy

by Deepa Dinamani

The test helps to validate clamping and mount behaviors according to supported file system timestamp ranges. Note that the test can fail on 32-bit systems for a few file systems. This will be corrected when vfs is transitioned to use 64-bit timestamps. Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> --- The branch of the kernel tree can be located at https://github.com/deepa-hub/vfs refs/heads/vfs_timestamp_policy The xfs_io patch to add utimes is at https://www.spinics.net/lists/linux-xfs/msg02952.html Changes since v2: * Refactored notrun handling * Updated comments Changes since v1: * Use xfs_io utimes command * Updated error handling * Reorganized code according to review comments common/rc | 48 +++++++++++++ tests/generic/390 | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/390.out | 2 + tests/generic/group | 1 + 4 files changed, 243 insertions(+) create mode 100755 tests/generic/390 create mode 100644 tests/generic/390.out diff --git a/common/rc b/common/rc index e3b54ec..17f025e 100644 --- a/common/rc +++ b/common/rc @@ -1960,6 +1960,51 @@ _run_aiodio() return $status } +# this test requires y2038 sysfs switch and filesystem +# timestamp ranges support. +_require_y2038() +{ + 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) + if [ $tsmin -eq -1 -a $tsmax -eq -1 ]; then + _notrun "filesystem $FSTYP timestamp bounds are unknown" + fi +} + +_filesystem_timestamp_range() +{ + device=${1:-$TEST_DEV} + case $FSTYP in + ext4) + if [ $(dumpe2fs -h $device 2>/dev/null | grep "Inode size:" | cut -d: -f2) -gt 128 ]; then + echo "-2147483648 15032385535" + else + echo "-2147483648 2147483647" + fi + ;; + + xfs) + echo "-2147483648 2147483647" + ;; + jfs) + echo "0 4294967295" + ;; + f2fs) + echo "-2147483648 2147483647" + ;; + *) + echo "-1 -1" + ;; + esac +} + # indicate whether YP/NIS is active or not # _yp_active() @@ -2070,6 +2115,9 @@ _require_xfs_io_command() echo $testio | egrep -q "Inappropriate ioctl" && \ _notrun "xfs_io $command support is missing" ;; + "utimes" ) + testio=`$XFS_IO_PROG -f -c "utimes" 0 0 0 0 $testfile 2>&1` + ;; *) testio=`$XFS_IO_PROG -c "$command help" 2>&1` esac diff --git a/tests/generic/390 b/tests/generic/390 new file mode 100755 index 0000000..f68b931 --- /dev/null +++ b/tests/generic/390 @@ -0,0 +1,192 @@ +#! /bin/bash +# FS QA Test 390 +# +# 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. +# +# Exit status 1: either or both tests above fail. +# Exit status 0: both the above tests pass. +# +#----------------------------------------------------------------------- +# Copyright (c) 2016 Deepa Dinamani. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "exit \$status" 0 1 2 3 15 + +# Get standard environment, filters and checks. +. ./common/rc +. ./common/filter +. ./common/attr + +# remove previous $seqres.full before test +rm -f $seqres.full + +# Prerequisites for the test run. +_supported_fs generic +_supported_os Linux +_require_scratch +_require_xfs_io_command utimes + +# Compare file timestamps obtained from stat +# with a given timestamp. +check_stat() +{ + file=$1 + timestamp=$2 + + stat_timestamp=`stat -c"%X;%Y" $file` + + prev_timestamp="$timestamp;$timestamp" + if [ $prev_timestamp != $stat_timestamp ]; then + echo "$prev_timestamp != $stat_timestamp" | tee -a $seqres.full + fi +} + +run_test_individual() +{ + 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 + $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 + fi + fi + + tsclamp=$(($timestamp>$tsmax?$tsmax:$timestamp)) + echo "Checking file: $file Updated timestamp is `date -d @$tsclamp`" >> $seqres.full + check_stat $file $tsclamp +} + +run_test() +{ + update_time=$1 + + n=1 + + for TIME in "${TIMESTAMPS[@]}" + do + #Run the test + run_test_individual ${SCRATCH_MNT}/test_$n $TIME $update_time + + #update iterator + ((n++)) + done +} + +_scratch_mkfs &>> $seqres.full 2>&1 || _fail "mkfs failed" +_require_y2038 $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 + +# Test timestamps array + +declare -a TIMESTAMPS=( + $tsmin + 0 + $tsmax + $((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 + +# Begin test case 1 +echo "In memory timestamps update test start" >> $seqres.full + +# update time on the file +update_time=1 + +run_test $update_time + +echo "In memory timestamps update complete" >> $seqres.full + +echo "Unmounting and mounting scratch $SCRATCH_MNT" >> $seqres.full + +# unmount and remount $SCRATCH_DEV +_scratch_cycle_mount + +# Begin test case 2 + +n=1 + +# Do not update time on the file this time, just read from disk +update_time=0 + +echo "On disk timestamps update test start" >> $seqres.full + +# Re-run test +run_test $update_time + +echo "On disk timestamps update test complete" >> $seqres.full + +echo "y2038 inode timestamp tests completed successfully" + +# success, all done +status=0 +exit diff --git a/tests/generic/390.out b/tests/generic/390.out new file mode 100644 index 0000000..82bd4eb --- /dev/null +++ b/tests/generic/390.out @@ -0,0 +1,2 @@ +QA output created by 390 +y2038 inode timestamp tests completed successfully diff --git a/tests/generic/group b/tests/generic/group index 08007d7..d137d01 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -392,3 +392,4 @@ 387 auto clone 388 auto log metadata 389 auto quick acl +390 auto quick rw -- 2.7.4

5 years, 8 months

[PATCH v2 1/2] y2038: rusage: Use __kernel_old_timeval for process times

by Arnd Bergmann

'struct rusage' contains the run times of a process in 'timeval' format and is accessed through the wait4() and getrusage() system calls. This is not a problem for y2038 safety by itself, but causes an issue when the C library starts using 64-bit time_t on 32-bit architectures because the structure layout becomes incompatible. There are three possible ways of dealing with this: a) deprecate the wait4() and getrusage() system calls, and create a set of kernel interfaces based around a newly defined structure that could solve multiple problems at once, e.g. provide more fine-grained timestamps. The C library could then implement the posix interfaces on top of the new system calls. b) Extend the approach taken by the x32 ABI, and use the 64-bit native structure layout for rusage on all architectures with new system calls that is otherwise compatible. A downside of this is that it requires a number of ugly hacks to deal with all the other fields of the structure also becoming 64 bit wide. Especially on big-endian architectures, we can't easily use the union trick from glibc. c) Change the definition of struct rusage to be independent of time_t. This is the easiest change, as it does not involve new system call entry points, but it requires the C library to convert between the kernel format of the structure and the user space definition. d) Add a new ABI variant of 'struct rusage' that corresponds to the current layout with 32-bit counters but 64-bit time_t. This would minimize the libc changes but require additional kernel code to handle a third binary layout on 64-bit kernels. I'm picking approach c) for its simplicity. As pointed out by reviewers, simply using the kernel structure in user space would not be POSIX compliant, but I have verified that none of the usual C libraries (glibc, musl, uclibc-ng, newlib) do that. Instead, they all provide their own definition of 'struct rusage' to applications in sys/resource.h. To be on the safe side, I'm only changing the definition inside of the kernel and for user space with an updated 'time_t'. All existing users will see the traditional layout that is compatible with what the C libraries export. A 32-bit application that includes linux/resource.h but uses an update C library with 64-bit time_t will now see the low-level kernel structure that corresponds to the getrusage() system call interface but that will be different from one defined in sys/resource.h for the getrusage library interface. Link: https://patchwork.kernel.org/patch/10077527/ Cc: Paul Eggert <eggert(a)cs.ucla.edu> Cc: Eric W. Biederman <ebiederm(a)xmission.com> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/alpha/kernel/osf_sys.c | 15 +++++++++------ include/uapi/linux/resource.h | 14 ++++++++++++-- kernel/sys.c | 4 ++-- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 89faa6f4de47..cad03ee445b3 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1184,6 +1184,7 @@ SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options, struct rusage32 __user *, ur) { unsigned int status = 0; + struct rusage32 r32; struct rusage r; long err = kernel_wait4(pid, &status, options, &r); if (err <= 0) @@ -1192,12 +1193,14 @@ SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options, return -EFAULT; if (!ur) return err; - if (put_tv_to_tv32(&ur->ru_utime, &r.ru_utime)) - return -EFAULT; - if (put_tv_to_tv32(&ur->ru_stime, &r.ru_stime)) - return -EFAULT; - if (copy_to_user(&ur->ru_maxrss, &r.ru_maxrss, - sizeof(struct rusage32) - offsetof(struct rusage32, ru_maxrss))) + r32.ru_utime.tv_sec = r.ru_utime.tv_sec; + r32.ru_utime.tv_usec = r.ru_utime.tv_usec; + r32.ru_stime.tv_sec = r.ru_stime.tv_sec; + r32.ru_stime.tv_usec = r.ru_stime.tv_usec; + memcpy(&r32.ru_maxrss, &r.ru_maxrss, + sizeof(struct rusage32) - offsetof(struct rusage32, ru_maxrss)); + + if (copy_to_user(ur, &r32, sizeof(r32))) return -EFAULT; return err; } diff --git a/include/uapi/linux/resource.h b/include/uapi/linux/resource.h index cc00fd079631..611d3745c70a 100644 --- a/include/uapi/linux/resource.h +++ b/include/uapi/linux/resource.h @@ -22,8 +22,18 @@ #define RUSAGE_THREAD 1 /* only the calling thread */ struct rusage { - struct timeval ru_utime; /* user time used */ - struct timeval ru_stime; /* system time used */ +#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL__) + struct timeval ru_utime; /* user time used */ + struct timeval ru_stime; /* system time used */ +#else + /* + * For 32-bit user space with 64-bit time_t, the binary layout + * in these fields is incompatible with 'struct timeval', so the + * C library has to translate this into the POSIX compatible layout. + */ + struct __kernel_old_timeval ru_utime; + struct __kernel_old_timeval ru_stime; +#endif __kernel_long_t ru_maxrss; /* maximum resident set size */ __kernel_long_t ru_ixrss; /* integral shared memory size */ __kernel_long_t ru_idrss; /* integral unshared data size */ diff --git a/kernel/sys.c b/kernel/sys.c index ad692183dfe9..1de538f622e8 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1769,8 +1769,8 @@ void getrusage(struct task_struct *p, int who, struct rusage *r) unlock_task_sighand(p, &flags); out: - r->ru_utime = ns_to_timeval(utime); - r->ru_stime = ns_to_timeval(stime); + r->ru_utime = ns_to_kernel_old_timeval(utime); + r->ru_stime = ns_to_kernel_old_timeval(stime); if (who != RUSAGE_CHILDREN) { struct mm_struct *mm = get_task_mm(p); -- 2.9.0

6 years, 6 months

[PATCH 1/5] powerpc: always enable RTC_LIB

by Arnd Bergmann

In order to use the rtc_tm_to_time64() and rtc_time64_to_tm() helper functions in later patches, we have to ensure that CONFIG_RTC_LIB is always built-in. Note that this symbol only controls a couple of helper functions, not the actual RTC subsystem, which remains optional and is enabled with CONFIG_RTC_CLASS. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/powerpc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index c32a181a7cbb..de2cda320fdd 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -232,6 +232,7 @@ config PPC select OF_RESERVED_MEM select OLD_SIGACTION if PPC32 select OLD_SIGSUSPEND + select RTC_LIB select SPARSE_IRQ select SYSCTL_EXCEPTION_TRACE select VIRT_TO_BUS if !PPC64 -- 2.9.0

6 years, 6 months

[PATCH 1/3] rtc: vr41xx: remove mktime usage

by Arnd Bergmann

This driver uses mktime() and rtc_time_to_tm() to convert between time values. This works fine on 64-bit kernels over the whole supported range, and the vr41xx chip is a 64-bit MIPS implementation, but it is inconsistent because it doesn't do the same thing on 32-bit kernels that overflow in 2106 or 2038. Changing it to use mktime64/rtc_time64_to_tm() should have no visible impact on vr41xx but gets us closer to removing the 32-bit interfaces. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/rtc/rtc-vr41xx.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index 7ce22967fd16..480cffe8d321 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c @@ -88,7 +88,7 @@ static unsigned int alarm_enabled; static int aie_irq; static int pie_irq; -static inline unsigned long read_elapsed_second(void) +static inline time64_t read_elapsed_second(void) { unsigned long first_low, first_mid, first_high; @@ -105,10 +105,10 @@ static inline unsigned long read_elapsed_second(void) } while (first_low != second_low || first_mid != second_mid || first_high != second_high); - return (first_high << 17) | (first_mid << 1) | (first_low >> 15); + return ((u64)first_high << 17) | (first_mid << 1) | (first_low >> 15); } -static inline void write_elapsed_second(unsigned long sec) +static inline void write_elapsed_second(time64_t sec) { spin_lock_irq(&rtc_lock); @@ -121,22 +121,22 @@ static inline void write_elapsed_second(unsigned long sec) static int vr41xx_rtc_read_time(struct device *dev, struct rtc_time *time) { - unsigned long epoch_sec, elapsed_sec; + time64_t epoch_sec, elapsed_sec; - epoch_sec = mktime(epoch, 1, 1, 0, 0, 0); + epoch_sec = mktime64(epoch, 1, 1, 0, 0, 0); elapsed_sec = read_elapsed_second(); - rtc_time_to_tm(epoch_sec + elapsed_sec, time); + rtc_time64_to_tm(epoch_sec + elapsed_sec, time); return 0; } static int vr41xx_rtc_set_time(struct device *dev, struct rtc_time *time) { - unsigned long epoch_sec, current_sec; + time64_t epoch_sec, current_sec; - epoch_sec = mktime(epoch, 1, 1, 0, 0, 0); - current_sec = mktime(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday, + epoch_sec = mktime64(epoch, 1, 1, 0, 0, 0); + current_sec = mktime64(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec); write_elapsed_second(current_sec - epoch_sec); @@ -165,11 +165,11 @@ static int vr41xx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) static int vr41xx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) { - unsigned long alarm_sec; + time64_t alarm_sec; struct rtc_time *time = &wkalrm->time; - alarm_sec = mktime(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday, - time->tm_hour, time->tm_min, time->tm_sec); + alarm_sec = mktime64(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday, + time->tm_hour, time->tm_min, time->tm_sec); spin_lock_irq(&rtc_lock); -- 2.9.0

6 years, 7 months

[PATCH] Update struct input_event

by Deepa Dinamani

The struct input_event is not y2038 safe. Update the struct according to the kernel patch: https://lkml.org/lkml/2018/1/6/324 Signed-off-by: Deepa Dinamani <deepa.kernel(a)gmail.com> --- include/linux/input.h | 14 +++++++++++++- src/evdev-mt-touchpad.c | 11 +++++++++-- src/evdev-tablet.c | 12 ++++++++---- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/include/linux/input.h b/include/linux/input.h index 06316b27..8274c292 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (c) 1999-2002 Vojtech Pavlik * @@ -8,6 +9,7 @@ #ifndef _INPUT_H #define _INPUT_H + #include <sys/time.h> #include <sys/ioctl.h> #include <sys/types.h> @@ -17,10 +19,20 @@ /* * The event structure itself + * Note that __USE_TIME_BITS64 is defined by libc based on + * application's request to use 64 bit time_t. */ - struct input_event { +#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL) struct timeval time; +#define input_event_sec time.tv_sec +#define input_event_usec time.tv_usec +#else + __kernel_ulong_t __sec; + __kernel_ulong_t __usec; +#define input_event_sec __sec +#define input_event_usec __usec +#endif __u16 type; __u16 code; __s32 value; diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index 52df8fd2..7190df1c 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -522,7 +522,13 @@ tp_process_trackpoint_button(struct tp_dispatch *tp, { struct evdev_dispatch *dispatch; struct input_event event; - struct input_event syn_report = {{ 0, 0 }, EV_SYN, SYN_REPORT, 0 }; + struct input_event syn_report = { + .input_event_sec = 0, + .input_event_usec = 0, + .type = EV_SYN, + .code = SYN_REPORT, + .value = 0 }; + if (!tp->buttons.trackpoint) return; @@ -530,7 +536,8 @@ tp_process_trackpoint_button(struct tp_dispatch *tp, dispatch = tp->buttons.trackpoint->dispatch; event = *e; - syn_report.time = e->time; + syn_report.input_event_sec = e->input_event_sec; + syn_report.input_event_usec = e->input_event_usec; switch (event.code) { case BTN_0: diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c index 8188686c..f81ad862 100644 --- a/src/evdev-tablet.c +++ b/src/evdev-tablet.c @@ -1650,12 +1650,15 @@ static void tablet_proximity_out_quirk_timer_func(uint64_t now, void *data) { struct tablet_dispatch *tablet = data; + struct timeval tv = us2tv(now); struct input_event events[2] = { - { .time = us2tv(now), + { .input_event_sec = tv.tv_sec, + .input_event_usec = tv.tv_usec, .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 0 }, - { .time = us2tv(now), + { .input_event_sec = tv.tv_sec, + .input_event_usec = tv.tv_usec, .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, @@ -1708,9 +1711,10 @@ tablet_proximity_out_quirk_update(struct tablet_dispatch *tablet, /* If the timer function forced prox out before, fake a BTN_TOOL_PEN event */ if (tablet->quirks.proximity_out_forced) { - + struct timeval tv = us2tv(time); struct input_event fake_event = { - .time = us2tv(time), + .input_event_sec = tv.tv_sec, + .input_event_usec = tv.tv_usec, .type = EV_KEY, .code = BTN_TOOL_PEN, .value = 1, -- 2.14.1

6 years, 8 months

[PATCH] [v3] x86: Convert x86_platform_ops to timespec64

by Arnd Bergmann

The x86 platform operations are fairly isolated, so we can change them from using timespec to timespec64. I checked that All the users and callers are safe, and there is only one critical function that is broken beyond 2106: pvclock_read_wallclock() uses a 32-bit number of seconds since the epoch to communicate the boot time between host and guest in a virtual environment. This will work until 2106, but we should ideally find a replacement anyway. I've added a comment about it there. Reviewed-by: Boris Ostrovsky <boris.ostrovsky(a)oracle.com> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- v2 changes: - move comment block (Boris) - remove unnecessary type cast (Boris) - fix format string (0day bot) - fix include order (0day bot) v3 changes: - add jailhouse specific change - avoid include file header by relying on another patch ("timekeeping: Remove timespec64 hack") Not sure how we want to merge this (assuming the last modification worked, this has seen little testing). The "timekeeping: Remove timespec64 hack" patch should go through the timekeeping branch in tip, while this one is for x86. I assume the linux-tip maintainers can come up with a plan. --- arch/x86/include/asm/intel_mid_vrtc.h | 4 ++-- arch/x86/include/asm/mc146818rtc.h | 4 ++-- arch/x86/include/asm/pvclock.h | 2 +- arch/x86/include/asm/x86_init.h | 6 +++--- arch/x86/kernel/jailhouse.c | 2 +- arch/x86/kernel/kvmclock.c | 4 ++-- arch/x86/kernel/pvclock.c | 15 +++++++++++---- arch/x86/kernel/rtc.c | 10 +++++----- arch/x86/platform/intel-mid/intel_mid_vrtc.c | 12 ++++++------ arch/x86/xen/time.c | 10 +++++----- 10 files changed, 38 insertions(+), 31 deletions(-) diff --git a/arch/x86/include/asm/intel_mid_vrtc.h b/arch/x86/include/asm/intel_mid_vrtc.h index 35555016b1be..0b44b1abe4d9 100644 --- a/arch/x86/include/asm/intel_mid_vrtc.h +++ b/arch/x86/include/asm/intel_mid_vrtc.h @@ -4,7 +4,7 @@ extern unsigned char vrtc_cmos_read(unsigned char reg); extern void vrtc_cmos_write(unsigned char val, unsigned char reg); -extern void vrtc_get_time(struct timespec *now); -extern int vrtc_set_mmss(const struct timespec *now); +extern void vrtc_get_time(struct timespec64 *now); +extern int vrtc_set_mmss(const struct timespec64 *now); #endif diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h index 1775a32f7ea6..97198001e567 100644 --- a/arch/x86/include/asm/mc146818rtc.h +++ b/arch/x86/include/asm/mc146818rtc.h @@ -95,8 +95,8 @@ static inline unsigned char current_lock_cmos_reg(void) unsigned char rtc_cmos_read(unsigned char addr); void rtc_cmos_write(unsigned char val, unsigned char addr); -extern int mach_set_rtc_mmss(const struct timespec *now); -extern void mach_get_cmos_time(struct timespec *now); +extern int mach_set_rtc_mmss(const struct timespec64 *now); +extern void mach_get_cmos_time(struct timespec64 *now); #define RTC_IRQ 8 diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h index a7471dcd2205..b6033680d458 100644 --- a/arch/x86/include/asm/pvclock.h +++ b/arch/x86/include/asm/pvclock.h @@ -12,7 +12,7 @@ void pvclock_set_flags(u8 flags); unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src); void pvclock_read_wallclock(struct pvclock_wall_clock *wall, struct pvclock_vcpu_time_info *vcpu, - struct timespec *ts); + struct timespec64 *ts); void pvclock_resume(void); void pvclock_touch_watchdogs(void); diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index ce8b4da07e35..2d27236c16a3 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -170,7 +170,7 @@ struct x86_cpuinit_ops { void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node); }; -struct timespec; +struct timespec64; /** * struct x86_legacy_devices - legacy x86 devices @@ -264,8 +264,8 @@ struct x86_hyper_runtime { struct x86_platform_ops { unsigned long (*calibrate_cpu)(void); unsigned long (*calibrate_tsc)(void); - void (*get_wallclock)(struct timespec *ts); - int (*set_wallclock)(const struct timespec *ts); + void (*get_wallclock)(struct timespec64 *ts); + int (*set_wallclock)(const struct timespec64 *ts); void (*iommu_shutdown)(void); bool (*is_untracked_pat_range)(u64 start, u64 end); void (*nmi_init)(void); diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c index fa183a131edc..a0b05bf185ac 100644 --- a/arch/x86/kernel/jailhouse.c +++ b/arch/x86/kernel/jailhouse.c @@ -37,7 +37,7 @@ static uint32_t __init jailhouse_detect(void) return jailhouse_cpuid_base(); } -static void jailhouse_get_wallclock(struct timespec *now) +static void jailhouse_get_wallclock(struct timespec64 *now) { memset(now, 0, sizeof(*now)); } diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 8b26c9e01cc4..bf8d1eb7fca3 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -53,7 +53,7 @@ static struct pvclock_wall_clock *wall_clock; * have elapsed since the hypervisor wrote the data. So we try to account for * that with system time */ -static void kvm_get_wallclock(struct timespec *now) +static void kvm_get_wallclock(struct timespec64 *now) { struct pvclock_vcpu_time_info *vcpu_time; int low, high; @@ -72,7 +72,7 @@ static void kvm_get_wallclock(struct timespec *now) put_cpu(); } -static int kvm_set_wallclock(const struct timespec *now) +static int kvm_set_wallclock(const struct timespec64 *now) { return -ENODEV; } diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c index 761f6af6efa5..637982efecd8 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -123,28 +123,35 @@ u64 pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) void pvclock_read_wallclock(struct pvclock_wall_clock *wall_clock, struct pvclock_vcpu_time_info *vcpu_time, - struct timespec *ts) + struct timespec64 *ts) { u32 version; u64 delta; - struct timespec now; + struct timespec64 now; /* get wallclock at system boot */ do { version = wall_clock->version; rmb(); /* fetch version before time */ + /* + * Note: wall_clock->sec is a u32 value, so it can + * only store dates between 1970 and 2106. To allow + * times beyond that, we need to create a new hypercall + * interface with an extended pvclock_wall_clock structure + * like ARM has. + */ now.tv_sec = wall_clock->sec; now.tv_nsec = wall_clock->nsec; rmb(); /* fetch time before checking version */ } while ((wall_clock->version & 1) || (version != wall_clock->version)); delta = pvclock_clocksource_read(vcpu_time); /* time since system boot */ - delta += now.tv_sec * (u64)NSEC_PER_SEC + now.tv_nsec; + delta += now.tv_sec * NSEC_PER_SEC + now.tv_nsec; now.tv_nsec = do_div(delta, NSEC_PER_SEC); now.tv_sec = delta; - set_normalized_timespec(ts, now.tv_sec, now.tv_nsec); + set_normalized_timespec64(ts, now.tv_sec, now.tv_nsec); } void pvclock_set_pvti_cpu0_va(struct pvclock_vsyscall_time_info *pvti) diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index f7b82ed7b5b5..586f718b8e95 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -39,7 +39,7 @@ EXPORT_SYMBOL(rtc_lock); * jump to the next second precisely 500 ms later. Check the Motorola * MC146818A or Dallas DS12887 data sheet for details. */ -int mach_set_rtc_mmss(const struct timespec *now) +int mach_set_rtc_mmss(const struct timespec64 *now) { unsigned long long nowtime = now->tv_sec; struct rtc_time tm; @@ -60,7 +60,7 @@ int mach_set_rtc_mmss(const struct timespec *now) return retval; } -void mach_get_cmos_time(struct timespec *now) +void mach_get_cmos_time(struct timespec64 *now) { unsigned int status, year, mon, day, hour, min, sec, century = 0; unsigned long flags; @@ -118,7 +118,7 @@ void mach_get_cmos_time(struct timespec *now) } else year += CMOS_YEARS_OFFS; - now->tv_sec = mktime(year, mon, day, hour, min, sec); + now->tv_sec = mktime64(year, mon, day, hour, min, sec); now->tv_nsec = 0; } @@ -145,13 +145,13 @@ void rtc_cmos_write(unsigned char val, unsigned char addr) } EXPORT_SYMBOL(rtc_cmos_write); -int update_persistent_clock(struct timespec now) +int update_persistent_clock64(struct timespec64 now) { return x86_platform.set_wallclock(&now); } /* not static: needed by APM */ -void read_persistent_clock(struct timespec *ts) +void read_persistent_clock64(struct timespec64 *ts) { x86_platform.get_wallclock(ts); } diff --git a/arch/x86/platform/intel-mid/intel_mid_vrtc.c b/arch/x86/platform/intel-mid/intel_mid_vrtc.c index 58024862a7eb..a52914aa3b6c 100644 --- a/arch/x86/platform/intel-mid/intel_mid_vrtc.c +++ b/arch/x86/platform/intel-mid/intel_mid_vrtc.c @@ -57,7 +57,7 @@ void vrtc_cmos_write(unsigned char val, unsigned char reg) } EXPORT_SYMBOL_GPL(vrtc_cmos_write); -void vrtc_get_time(struct timespec *now) +void vrtc_get_time(struct timespec64 *now) { u8 sec, min, hour, mday, mon; unsigned long flags; @@ -83,18 +83,18 @@ void vrtc_get_time(struct timespec *now) pr_info("vRTC: sec: %d min: %d hour: %d day: %d " "mon: %d year: %d\n", sec, min, hour, mday, mon, year); - now->tv_sec = mktime(year, mon, mday, hour, min, sec); + now->tv_sec = mktime64(year, mon, mday, hour, min, sec); now->tv_nsec = 0; } -int vrtc_set_mmss(const struct timespec *now) +int vrtc_set_mmss(const struct timespec64 *now) { unsigned long flags; struct rtc_time tm; int year; int retval = 0; - rtc_time_to_tm(now->tv_sec, &tm); + rtc_time64_to_tm(now->tv_sec, &tm); if (!rtc_valid_tm(&tm) && tm.tm_year >= 72) { /* * tm.year is the number of years since 1900, and the @@ -110,8 +110,8 @@ int vrtc_set_mmss(const struct timespec *now) vrtc_cmos_write(tm.tm_sec, RTC_SECONDS); spin_unlock_irqrestore(&rtc_lock, flags); } else { - pr_err("%s: Invalid vRTC value: write of %lx to vRTC failed\n", - __func__, now->tv_sec); + pr_err("%s: Invalid vRTC value: write of %llx to vRTC failed\n", + __func__, (s64)now->tv_sec); retval = -EINVAL; } return retval; diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 29163c43ebbd..e0f1bcf01d63 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -57,7 +57,7 @@ static u64 xen_clocksource_get_cycles(struct clocksource *cs) return xen_clocksource_read(); } -static void xen_read_wallclock(struct timespec *ts) +static void xen_read_wallclock(struct timespec64 *ts) { struct shared_info *s = HYPERVISOR_shared_info; struct pvclock_wall_clock *wall_clock = &(s->wc); @@ -68,12 +68,12 @@ static void xen_read_wallclock(struct timespec *ts) put_cpu_var(xen_vcpu); } -static void xen_get_wallclock(struct timespec *now) +static void xen_get_wallclock(struct timespec64 *now) { xen_read_wallclock(now); } -static int xen_set_wallclock(const struct timespec *now) +static int xen_set_wallclock(const struct timespec64 *now) { return -ENODEV; } @@ -461,7 +461,7 @@ static void __init xen_time_init(void) { struct pvclock_vcpu_time_info *pvti; int cpu = smp_processor_id(); - struct timespec tp; + struct timespec64 tp; /* As Dom0 is never moved, no penalty on using TSC there */ if (xen_initial_domain()) @@ -479,7 +479,7 @@ static void __init xen_time_init(void) /* Set initial system time with full resolution */ xen_read_wallclock(&tp); - do_settimeofday(&tp); + do_settimeofday64(&tp); setup_force_cpu_cap(X86_FEATURE_TSC); -- 2.9.0

6 years, 8 months

[PATCH 0/5] timekeeping: API cleanup and extensions

by Arnd Bergmann

Hi Thomas, I've had these patches for a while but never got around to submitting them. I recently rebased them after the boot time removal and now again after the revert. I'd like to see these go into v4.18 as a preparation for a last set of driver conversions to y2038-safe interfaces that I've held off for now since the interfaces were suboptimal. The problems solved by this series are: - aliasing timespec to timespec64 is a little erorr-prone, and in particular requires ugly casts to print a tv_sec field using the same format string across architectures - naming is inconsistent, and while converting from the deprecated time_t to something else, I'd like to also convert to a ktime_get_*() API for consistency - drivers that use current_kernel_time() today often care about the call being fast but don't care about it being CLOCK_REALTIME based, so they are better off being changed to a CLOCK_MONOTONIC or CLOCK_BOOTTIME based accessor to avoid issues with time going backwards. Arnd Arnd Bergmann (5): timekeeping: Remove timespec64 hack timekeeping: Clean up ktime_get_real_ts64 timekeeping: Standardize on ktime_get_*() naming timekeeping: Add ktime_get_coarse_with_offset timekeeping: Add more coarse clocktai/boottime interfaces include/linux/time32.h | 18 ++------- include/linux/time64.h | 7 ---- include/linux/timekeeping.h | 91 ++++++++++++++++++++++++++++++++++++------- include/linux/timekeeping32.h | 70 ++++++--------------------------- kernel/time/time.c | 2 - kernel/time/timekeeping.c | 73 ++++++++++++++++------------------ 6 files changed, 124 insertions(+), 137 deletions(-) -- 2.9.0

6 years, 8 months

[PATCH 0/4] ALSA: Fix year 2038 issue for sound subsystem, alternative

by Arnd Bergmann

I've tried the suggestion from Jaroslaw, doing a minimal change to the UAPI headers to keep the existing binary interface. As he predicted, this is a much simpler set of kernel changes, but we will pay for that with added complexity in alsa-lib. The first two patches in this series are taken from Baolin's patch set, with a small bugfix folded in to avoid a compile-time regression. The other two patches are to redefine the UAPI and to deprecate the support for CLOCK_REALTIME time stamps, which we can no longer allow with user space that we expect to survive beyond 2038. Overall, I'd still be happier with Baolin's approach since it allows us to keep compatiblity with CLOCK_REALTIME users and requires fewer changes in user space, but this would work as well. Arnd Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: tiwai(a)suse.com Cc: lgirdwood(a)gmail.com Cc: broonie(a)kernel.org Cc: o-takashi(a)sakamocchi.jp Cc: y2038(a)lists.linaro.org Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: Baolin Wang <baolin.wang(a)linaro.org> Arnd Bergmann (2): ALSA: replace timespec types in uapi headers ALSA: Deprecate CLOCK_REALTIME timestamps Baolin Wang (2): ALSA: Replace timespec with timespec64 ALSA: Avoid using timespec for struct snd_ctl_elem_value include/sound/asound.h | 8 +++++ include/sound/pcm.h | 22 +++++++----- include/sound/timer.h | 4 +-- include/uapi/sound/asound.h | 53 +++++++++++++++++++++-------- sound/core/Kconfig | 11 ++++++ sound/core/compat.h | 11 ++++++ sound/core/pcm.c | 3 ++ sound/core/pcm_compat.c | 70 ++++++++++++++++++++++----------------- sound/core/pcm_lib.c | 36 ++++++++++++-------- sound/core/pcm_native.c | 25 ++++++++++---- sound/core/rawmidi_compat.c | 12 +++---- sound/core/timer.c | 28 ++++++++-------- sound/core/timer_compat.c | 4 ++- sound/pci/hda/hda_controller.c | 14 +++++--- sound/soc/intel/skylake/skl-pcm.c | 4 +-- 15 files changed, 203 insertions(+), 102 deletions(-) create mode 100644 sound/core/compat.h -- 2.9.0

6 years, 8 months

[PATCH 00/17] y2038: system calls, part 3

by Arnd Bergmann

After the first timekeeping series from Deepa (merged into -tip now) and my follow-up for IPC system calls, this is a third set of system call conversions following the same principle. Most of the changes are straightforward, so I'm grouping them into a larger series even though the system calls are mostly unrelated to one another. After this series, the remaining calls that need to be changed are getrusage()/waitid(), pselect6/ppoll(), timer{,fd}_{get,set}time() and getitimer()/setitimer(). Those will be sent separately, once they are matured enough. To put the changes into perspective, a list of all system calls that require changes is available in a spreadsheet[1] and I have made another experimental patch that changes over x86[2] and arm[3] to actually use them. Please review! Arnd [1] https://docs.google.com/spreadsheets/d/1HCYwHXxs48TsTb6IGUduNjQnmfRvMPzCN6T… [2] https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/commit/… [3] https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/commit/… Arnd Bergmann (17): y2038: compat: Move common compat types to asm-generic/compat.h y2038: Remove newstat family from default syscall set y2038: Remove stat64 family from default syscall set asm-generic: Remove unneeded __ARCH_WANT_SYS_LLSEEK macro asm-generic: Remove empty asm/unistd.h y2038: Change sys_utimensat() to use __kernel_timespec y2038: Compile utimes()/futimesat() conditionally y2038: utimes: Rework #ifdef guards for compat syscalls y2038: futex: Move compat implementation into futex.c y2038: futex: Add support for __kernel_timespec y2038: Prepare sched_rr_get_interval for __kernel_timespec y2038: aio: Prepare sys_io_getevents for __kernel_timespec y2038: socket: Convert recvmmsg to __kernel_timespec y2038: socket: Add compat_sys_recvmmsg_time64 y2038: signal: Change rt_sigtimedwait to use __kernel_timespec y2038: Make compat_sys_rt_sigtimedwait usable on 32-bit y2038: signal: Add compat_sys_rt_sigtimedwait_time64 Cc: linux-api(a)vger.kernel.org Cc: linux-arch(a)vger.kernel.org Cc: libc-alpha(a)sourceware.org Cc: tglx(a)linutronix.de Cc: netdev(a)vger.kernel.org Cc: deepa.kernel(a)gmail.com Cc: viro(a)zeniv.linux.org.uk Cc: albert.aribaud(a)3adev.fr Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Darren Hart <dvhart(a)infradead.org> Cc: "Eric W. Biederman" <ebiederm(a)xmission.com> Cc: Dominik Brodowski <linux(a)dominikbrodowski.net> arch/alpha/include/asm/unistd.h | 2 + arch/arc/include/uapi/asm/unistd.h | 1 + arch/arm/include/asm/unistd.h | 4 +- arch/arm64/include/asm/compat.h | 20 +-- arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/uapi/asm/unistd.h | 1 + arch/c6x/include/uapi/asm/unistd.h | 1 + arch/h8300/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/ia64/include/asm/unistd.h | 3 + arch/m68k/include/asm/unistd.h | 2 +- arch/microblaze/include/asm/unistd.h | 2 +- arch/mips/include/asm/compat.h | 22 +--- arch/mips/include/asm/unistd.h | 3 +- arch/nds32/include/uapi/asm/unistd.h | 1 + arch/nios2/include/uapi/asm/unistd.h | 1 + arch/openrisc/include/uapi/asm/unistd.h | 1 + arch/parisc/include/asm/compat.h | 18 +-- arch/parisc/include/asm/unistd.h | 3 +- arch/powerpc/include/asm/compat.h | 18 +-- arch/powerpc/include/asm/unistd.h | 3 +- arch/s390/include/asm/compat.h | 18 +-- arch/s390/include/asm/unistd.h | 3 +- arch/sh/include/asm/unistd.h | 2 +- arch/sparc/include/asm/compat.h | 19 +-- arch/sparc/include/asm/unistd.h | 3 +- arch/unicore32/include/uapi/asm/unistd.h | 1 + arch/x86/include/asm/compat.h | 19 +-- arch/x86/include/asm/unistd.h | 3 +- arch/xtensa/include/asm/unistd.h | 2 +- fs/aio.c | 4 +- fs/read_write.c | 2 +- fs/stat.c | 3 + fs/utimes.c | 59 +++++---- include/asm-generic/compat.h | 24 +++- include/asm-generic/unistd.h | 13 -- include/linux/compat.h | 12 +- include/linux/compat_time.h | 5 + include/linux/futex.h | 8 -- include/linux/socket.h | 19 ++- include/linux/syscalls.h | 23 ++-- include/uapi/asm-generic/unistd.h | 2 + kernel/Makefile | 3 - kernel/futex.c | 207 +++++++++++++++++++++++++++++-- kernel/futex_compat.c | 202 ------------------------------ kernel/sched/core.c | 4 +- kernel/signal.c | 68 ++++++++-- kernel/sys_ni.c | 1 + net/compat.c | 16 +-- net/socket.c | 55 ++++++-- 50 files changed, 456 insertions(+), 454 deletions(-) delete mode 100644 include/asm-generic/unistd.h delete mode 100644 kernel/futex_compat.c -- 2.9.0

6 years, 8 months

[GIT PULL, PATCH v4 00/16] y2038: IPC system call conversion

by Arnd Bergmann

Hi Thomas, This is a small update to last week's patch series, I hope I have worked out all the remaining issues now. If nothing else comes up, please pull into tip for 4.18. The commits are based on top of what you already pulled into timers/core, so you can either add these to the same branch or to a different one. I'll be away for three weeks starting on Sunday, so if new issues get found, I won't be able to address them until I get back home. I'll post another set of simpler syscall patches for review after this, and there is at last a fourth set of those that are not ready yet, but is available for preview at [3], which also contains unrelated y2038 patches for random subsystems. Arnd ---------------------------------------------------------------- The following changes since commit 01909974b41036a6a8d3907c66cc7b41c9a73da9: time: Change nanosleep to safe __kernel_* types (2018-04-19 13:32:03 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git y2038-ipc for you to fetch changes up to 5dc0b1529d21b54aad4098874e334a52027fd16d: y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop (2018-04-20 16:20:30 +0200) ---------------------------------------------------------------- y2038: IPC system call conversion This is a follow-up to Deepa's work on the timekeeping system calls, providing a y2038-safe syscall API for SYSVIPC. It uses a combination of two strategies: For sys_msgctl, sys_semctl and sys_shmctl, I do not introduce a completely new set of replacement system calls, but instead extend the existing ones to return data in the reserved fields of the normal data structure. This should be completely transparent to any existing user space, and only after the 32-bit time_t wraps, it will make a difference in the returned data. libc implementations will consequently have to provide their own data structures when they move to 64-bit time_t, and convert the structures in user space from the ones returned by the kernel. In contrast, mq_timedsend, mq_timedreceive and and semtimedop all do need to change because having a libc redefine the timespec type breaks the ABI, so with this series there will be two separate entry points for 32-bit architectures. There are three cases here: - little-endian architectures (except powerpc and mips) can use the normal layout and just cast the data structure to the user space type that contains 64-bit numbers. - parisc and sparc can do the same thing with big-endian user space - little-endian powerpc and most big-endian architectures have to flip the upper and lower 32-bit halves of the time_t value in memory, but can otherwise keep using the normal layout - mips and big-endian xtensa need to be more careful because they are not consistent in their definitions, and they have to provide custom libc implementations for the system calls to use 64-bit time_t. ---------------------------------------------------------------- Changes to v3: - reworked x86 portion after discovering an old bug, submitted a fix for that separately. - use consistent types in asm-generic based on feedback from Jeffrey Walton Changes to v2: - added patches for mq_timedsend, mq_timedreceive and and semtimedop system calls - add asm-generic/compat.h changes to prepare for actually using those on 32-bit. - fix 'make headers_install' as reported by Heiko Carstens - fix MIPS build as reported by build bot - Cc everyone on all patches as originally intended, not just on the cover letter. Changes to v1 [1]: - Rebased to the latest kernel (4.17-rc) - Dropped changes for removed architectures - Simplified the IPC code changes, based on prior work from both Deepa and Eric - Fixed a few bugs that I found during rebasing, in parcular the sparc version was incorrect. [1] https://lkml.org/lkml/2015/5/20/605 [2] https://lwn.net/Articles/751676/ [3] git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git y2038-next ---------------------------------------------------------------- Arnd Bergmann (16): y2038: asm-generic: Extend sysvipc data structures y2038: x86: Extend sysvipc data structures y2038: alpha: Remove unneeded ipc uapi header files y2038: ia64: Remove unneeded ipc uapi header files y2038: s390: Remove unneeded ipc uapi header files y2038: arm64: Extend sysvipc compat data structures y2038: mips: Extend sysvipc data structures y2038: parisc: Extend sysvipc data structures y2038: sparc: Extend sysvipc data structures y2038: powerpc: Extend sysvipc data structures y2038: xtensa: Extend sysvipc data structures y2038: ipc: Use ktime_get_real_seconds consistently y2038: ipc: Report long times to user space y2038: ipc: Use __kernel_timespec y2038: ipc: Enable COMPAT_32BIT_TIME y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop Cc: linux-api(a)vger.kernel.org Cc: linux-arch(a)vger.kernel.org Cc: libc-alpha(a)sourceware.org Cc: tglx(a)linutronix.de Cc: deepa.kernel(a)gmail.com Cc: viro(a)zeniv.linux.org.uk Cc: ebiederm(a)xmission.com Cc: albert.aribaud(a)3adev.fr Cc: linux-s390(a)vger.kernel.org Cc: schwidefsky(a)de.ibm.com Cc: x86(a)kernel.org Cc: catalin.marinas(a)arm.com Cc: will.deacon(a)arm.com Cc: linux-mips(a)linux-mips.org Cc: jhogan(a)kernel.org Cc: ralf(a)linux-mips.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: sparclinux(a)vger.kernel.org Cc: Zack Weinberg <zackw(a)panix.com> Cc: Jeffrey Walton <noloader(a)gmail.com> arch/alpha/include/uapi/asm/Kbuild | 4 ++ arch/alpha/include/uapi/asm/ipcbuf.h | 2 - arch/alpha/include/uapi/asm/msgbuf.h | 28 ----------- arch/alpha/include/uapi/asm/sembuf.h | 23 --------- arch/alpha/include/uapi/asm/shmbuf.h | 39 --------------- arch/arm64/include/asm/compat.h | 32 ++++++------- arch/ia64/include/uapi/asm/Kbuild | 4 ++ arch/ia64/include/uapi/asm/ipcbuf.h | 2 - arch/ia64/include/uapi/asm/msgbuf.h | 28 ----------- arch/ia64/include/uapi/asm/sembuf.h | 23 --------- arch/ia64/include/uapi/asm/shmbuf.h | 39 --------------- arch/mips/include/asm/compat.h | 40 +++++++++------- arch/mips/include/uapi/asm/msgbuf.h | 57 ++++++++++++++-------- arch/mips/include/uapi/asm/sembuf.h | 15 +++++- arch/mips/include/uapi/asm/shmbuf.h | 23 ++++++++- arch/parisc/include/asm/compat.h | 32 ++++++------- arch/parisc/include/uapi/asm/msgbuf.h | 33 +++++++------ arch/parisc/include/uapi/asm/sembuf.h | 16 +++---- arch/parisc/include/uapi/asm/shmbuf.h | 19 ++++---- arch/powerpc/include/asm/compat.h | 32 ++++++------- arch/powerpc/include/uapi/asm/msgbuf.h | 18 +++---- arch/powerpc/include/uapi/asm/sembuf.h | 14 +++--- arch/powerpc/include/uapi/asm/shmbuf.h | 19 ++++---- arch/s390/include/asm/compat.h | 32 ++++++------- arch/s390/include/uapi/asm/Kbuild | 3 ++ arch/s390/include/uapi/asm/msgbuf.h | 38 --------------- arch/s390/include/uapi/asm/sembuf.h | 30 ------------ arch/s390/include/uapi/asm/shmbuf.h | 49 ------------------- arch/sparc/include/asm/compat.h | 32 ++++++------- arch/sparc/include/uapi/asm/msgbuf.h | 22 ++++----- arch/sparc/include/uapi/asm/sembuf.h | 16 +++---- arch/sparc/include/uapi/asm/shmbuf.h | 21 ++++----- arch/x86/include/asm/compat.h | 32 ++++++------- arch/x86/include/uapi/asm/sembuf.h | 11 ++++- arch/xtensa/include/uapi/asm/msgbuf.h | 25 +++++----- arch/xtensa/include/uapi/asm/sembuf.h | 17 ++++--- arch/xtensa/include/uapi/asm/shmbuf.h | 37 ++++----------- include/linux/syscalls.h | 6 +-- include/uapi/asm-generic/msgbuf.h | 27 +++++------ include/uapi/asm-generic/sembuf.h | 26 ++++++---- include/uapi/asm-generic/shmbuf.h | 41 ++++++++-------- ipc/mqueue.c | 86 +++++++++++++++++----------------- ipc/msg.c | 20 +++++--- ipc/sem.c | 27 +++++++---- ipc/shm.c | 14 ++++-- ipc/syscall.c | 13 +++-- ipc/util.h | 4 +- 47 files changed, 471 insertions(+), 700 deletions(-) elete mode 100644 arch/alpha/include/uapi/asm/ipcbuf.h delete mode 100644 arch/alpha/include/uapi/asm/msgbuf.h delete mode 100644 arch/alpha/include/uapi/asm/sembuf.h delete mode 100644 arch/alpha/include/uapi/asm/shmbuf.h delete mode 100644 arch/ia64/include/uapi/asm/ipcbuf.h delete mode 100644 arch/ia64/include/uapi/asm/msgbuf.h delete mode 100644 arch/ia64/include/uapi/asm/sembuf.h delete mode 100644 arch/ia64/include/uapi/asm/shmbuf.h delete mode 100644 arch/s390/include/uapi/asm/msgbuf.h delete mode 100644 arch/s390/include/uapi/asm/sembuf.h delete mode 100644 arch/s390/include/uapi/asm/shmbuf.h -- 2.9.0

6 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038 April 2018