Y2038

y2038@lists.linaro.org

1 participants
1127 discussions

[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, 7 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, 7 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, 7 months

y2038 kernel status update

by Arnd Bergmann

Hi everyone, A lot of things have happened in the move to make the kernel y2038 ready in recent times. I've sent out new patches recently but will be on vacation for the next few weeks, so here's a quick update on where we are today with recent changes and work in progress: - A large number of small driver fixes got merged into linux-4.16. Many of these were old patches I had done a while ago but that had not made it in yet. There are a few dozen more of these coming, but those have some dependency. - Deepa Dinamani has done a lot of the groundwork for the system call conversion. Her latest patch series that got merged now finally adds new system call entry points for timekeeping related syscalls. They are not wired up yet, but now we have a template for the remaining ones, and we have sorted out the header file dependencies. - I just sent a pull request for a second chunk of system calls: The sysvipc semtimedop, semctl/shmctl/msgctl and mq_timedsend/mq_timedreceive calls. I have more patches for most of the remaining calls, and they should be simpler (this one was rather tricky). A full list can be found in a spreadsheet I made[2]. - Baolin Wang has worked on RTC related issues and most recently posted a series to convert the user space ABI for ALSA. This is currently under discussion. - The most complicated remaining part is the conversion of the VFS layer. Deepa is getting a new series for this ready after having done some groundwork over the past years. The current idea is to have a flag-day patch using coccinelle to change the inode, iattr and kstat structures over at the same time. Many file systems will require further changes after that, but those can be done individually through their respective maintainers. - Firoz Khan has started looking at the system call entry points in the architectures. We want to add the new system calls to all 32-bit architectures at once, in order to have a baseline release that C libraries can rely on for implementing 64-bit time_t on all architectures. Even after the architecture removal series, we still have over a dozen different syscall tables and each one is laid out slightly differently, which makes it hard to change. To improve this, Firoz is preparing a series that changes all architectures to use a common table format as used by x86, arm and s390 today. - I have collected all those patches in a git tree [1] for testing. This currently has updated system call entry points for 32-bit ARM and x86, but no others so far. The system call numbers *will* change before it gets merged, so be careful when building user space based on this, but it should be a starting point for testing. I definitely expect this to contain bugs still, especially to the end of the series, but the start of it should be fairly solid. Some patches are marked as work-in-progress or don't contain a proper changelog text. Those will still get reworked before a first version is posted to the mainling lists. - There are two notable areas not included in that tree today: v4l and socket timestamps. I've had patches for both in the past but they need to be reworked. Arnd [1] https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/log/?h=… [2] https://docs.google.com/spreadsheets/d/1HCYwHXxs48TsTb6IGUduNjQnmfRvMPzCN6T…

6 years, 7 months

[PATCH] m68k: use read_persistent_clock64 consistently

by Arnd Bergmann

We have two ways of getting the current time from a platform at boot or during suspend: either using read_persistent_clock() or the rtc class operation. We never need both, so I'm hiding the read_persistent_clock variant when the generic RTC is enabled. Since read_persistent_clock() and mktime() are deprecated because of the y2038 overflow of time_t, we should use the time64_t based replacements here. Finally, the dependency on CONFIG_ARCH_USES_GETTIMEOFFSET looks completely bogus in this case, so let's remove that. It was added in commit b13b3f51ff7b ("m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types") to deal with arch_gettimeoffset(), which has since been removed from this file and is unrelated to the RTC functions. The rtc accessors are only used by classic machines, while coldfire uses proper RTC drivers, so we can put the old ifdef back around both functions. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/m68k/kernel/time.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 6b4389a6e8ea..3a8b47f8f97b 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -71,7 +71,9 @@ static irqreturn_t timer_interrupt(int irq, void *dummy) return IRQ_HANDLED; } -void read_persistent_clock(struct timespec *ts) +#ifdef CONFIG_M68KCLASSIC +#if !IS_BUILTIN(CONFIG_RTC_DRV_GENERIC) +void read_persistent_clock64(struct timespec64 *ts) { struct rtc_time time; @@ -83,11 +85,12 @@ void read_persistent_clock(struct timespec *ts) mach_hwclk(0, &time); - ts->tv_sec = mktime(time.tm_year + 1900, time.tm_mon + 1, time.tm_mday, - time.tm_hour, time.tm_min, time.tm_sec); + ts->tv_sec = mktime64(time.tm_year + 1900, time.tm_mon + 1, time.tm_mday, + time.tm_hour, time.tm_min, time.tm_sec); } +#endif -#if defined(CONFIG_ARCH_USES_GETTIMEOFFSET) && IS_ENABLED(CONFIG_RTC_DRV_GENERIC) +#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC) static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm) { mach_hwclk(0, tm); @@ -145,8 +148,8 @@ static int __init rtc_init(void) } module_init(rtc_init); - -#endif /* CONFIG_ARCH_USES_GETTIMEOFFSET */ +#endif /* CONFIG_RTC_DRV_GENERIC */ +#endif /* CONFIG M68KCLASSIC */ void __init time_init(void) { -- 2.9.0

6 years, 7 months

[PATCH v3 00/17] y2038: Convert IPC syscalls

by Arnd Bergmann

This is an update of a series I posted a long time ago [1], updating the IPC subsystem to pass down 64-bit time stamps to user space. In particular, 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 v2 [2]: - 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. I haven't seen any objections to v1 and will send a pull request to Thomas Gleixner after Deepa's first patches are all merged there. There are a few more patches in my tree [3] now, I'm still testing those and should be able to send the next batch next week. Arnd [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 (17): y2038: asm-generic: 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: x86: 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 y2038: compat: Move common compat types to asm-generic/compat.h 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 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 | 52 +++++++------------- 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 | 58 +++++++++-------------- 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 | 50 +++++++------------- 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 | 50 +++++++------------- 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 | 50 +++++++------------- 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 | 51 +++++++------------- 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 | 51 +++++++------------- arch/x86/include/uapi/asm/Kbuild | 5 +- arch/x86/include/uapi/asm/msgbuf.h | 1 - arch/x86/include/uapi/asm/sembuf.h | 11 ++++- arch/x86/include/uapi/asm/shmbuf.h | 1 - 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/asm-generic/compat.h | 24 +++++++++- include/linux/compat.h | 2 - include/linux/syscalls.h | 6 +-- include/uapi/asm-generic/msgbuf.h | 17 ++++--- include/uapi/asm-generic/sembuf.h | 26 ++++++---- include/uapi/asm-generic/shmbuf.h | 17 ++++--- ipc/mqueue.c | 86 +++++++++++++++++----------------- ipc/msg.c | 20 +++++--- ipc/sem.c | 27 +++++++---- ipc/shm.c | 14 ++++-- ipc/syscall.c | 13 +++-- ipc/util.h | 4 +- 52 files changed, 493 insertions(+), 807 deletions(-) delete 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 delete mode 100644 arch/x86/include/uapi/asm/msgbuf.h delete mode 100644 arch/x86/include/uapi/asm/shmbuf.h -- 2.9.0

6 years, 7 months

[tip GIT PULL] y2038: timekeeping syscall changes

by Arnd Bergmann

The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) are available in the git repository at: git+ssh://gitolite@ra.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git tags/y2038-timekeeping for you to fetch changes up to 2e294d2c97d6683fcdf1134d87be1c461dff8ffd: nanosleep: change time types to safe __kernel_* types (2018-04-19 10:07:58 +0200) ---------------------------------------------------------------- y2038: timekeeping syscall changes This is the first set of system call entry point changes to enable 32-bit architectures to have variants on both 32-bit and 64-bit time_t. Typically these system calls take a 'struct timespec' argument, but that structure is defined in user space by the C library and its layout will change. The kernel already supports handling the 32-bit time_t on 64-bit architectures through the CONFIG_COMPAT mechanism. As there are a total of 51 system calls suffering from this problem, reusing that mechanism on 32-bit architectures. We already have patches for most of the remaining system calls, but this set contains most of the complexity and is best tested. There was one last-minute regression that prevented it from going into 4.17, but that is fixed now. More details from Deepa's patch series description: Big picture is as per the lwn article: https://lwn.net/Articles/643234/ [2] The series is directed at converting posix clock syscalls: clock_gettime, clock_settime, clock_getres and clock_nanosleep to use a new data structure __kernel_timespec at syscall boundaries. __kernel_timespec maintains 64 bit time_t across all execution modes. vdso will be handled as part of each architecture when they enable support for 64 bit time_t. The compat syscalls are repurposed to provide backward compatibility by using them as native syscalls as well for 32 bit architectures. They will continue to use timespec at syscall boundaries. CONFIG_64_BIT_TIME controls whether the syscalls use __kernel_timespec or timespec at syscall boundaries. The series does the following: 1. Enable compat syscalls on 32 bit architectures. 2. Add a new __kernel_timespec type to be used as the data structure for all the new syscalls. 3. Add new config CONFIG_64BIT_TIME(intead of the CONFIG_COMPAT_TIME in [1] and [2] to switch to new definition of __kernel_timespec. It is the same as struct timespec otherwise. 4. Add new CONFIG_32BIT_TIME to conditionally compile compat syscalls. ---------------------------------------------------------------- Arnd Bergmann (2): compat: add an asm-generic/compat.h file sparc: compat: allow including asm/compat.h for 32-bit Deepa Dinamani (10): compat: Make compat helpers independent of CONFIG_COMPAT include: Move compat_timespec/ timeval to compat_time.h compat: enable compat_get/put_timespec64 always arch: introduce CONFIG_64BIT_TIME arch: Introduce CONFIG_COMPAT_32BIT_TIME posix-clocks: Make compat syscalls depend on CONFIG_COMPAT_32BIT_TIME include: Add new y2038 safe __kernel_timespec fix get_timespec64() for y2038 safe compat interfaces change time types to new y2038 safe __kernel_* types nanosleep: change time types to safe __kernel_* types arch/Kconfig | 15 +++++++++ arch/alpha/include/asm/Kbuild | 1 + arch/arc/include/asm/Kbuild | 1 + arch/arm/include/asm/Kbuild | 1 + arch/arm64/include/asm/compat.h | 11 ------- arch/arm64/include/asm/stat.h | 1 + arch/arm64/kernel/hw_breakpoint.c | 1 - arch/arm64/kernel/perf_regs.c | 2 +- arch/c6x/include/asm/Kbuild | 1 + arch/h8300/include/asm/Kbuild | 1 + arch/hexagon/include/asm/Kbuild | 1 + arch/ia64/include/asm/Kbuild | 1 + arch/m68k/include/asm/Kbuild | 1 + arch/microblaze/include/asm/Kbuild | 1 + arch/mips/include/asm/compat.h | 11 ------- arch/mips/kernel/signal32.c | 2 +- arch/nds32/include/asm/Kbuild | 1 + arch/nios2/include/asm/Kbuild | 1 + arch/openrisc/include/asm/Kbuild | 1 + arch/parisc/include/asm/compat.h | 11 ------- arch/powerpc/include/asm/compat.h | 11 ------- arch/powerpc/kernel/asm-offsets.c | 2 +- arch/powerpc/oprofile/backtrace.c | 1 + arch/s390/hypfs/hypfs_sprp.c | 1 - arch/s390/include/asm/compat.h | 11 ------- arch/s390/include/asm/elf.h | 4 +-- arch/s390/kvm/priv.c | 1 - arch/s390/pci/pci_clp.c | 1 - arch/sh/include/asm/Kbuild | 1 + arch/sparc/include/asm/compat.h | 15 +++------ arch/um/include/asm/Kbuild | 1 + arch/unicore32/include/asm/Kbuild | 1 + arch/x86/events/core.c | 2 +- arch/x86/include/asm/compat.h | 11 ------- arch/x86/include/asm/ftrace.h | 2 +- arch/x86/kernel/sys_x86_64.c | 2 +- arch/xtensa/include/asm/Kbuild | 1 + drivers/s390/block/dasd_ioctl.c | 1 - drivers/s390/char/fs3270.c | 1 - drivers/s390/char/sclp_ctl.c | 1 - drivers/s390/char/vmcp.c | 1 - drivers/s390/cio/chsc_sch.c | 1 - drivers/s390/net/qeth_core_main.c | 2 +- include/asm-generic/compat.h | 3 ++ include/linux/compat.h | 12 ++++--- include/linux/compat_time.h | 23 ++++++++++++++ include/linux/restart_block.h | 7 ++-- include/linux/syscalls.h | 13 ++++---- include/linux/time.h | 4 +-- include/linux/time64.h | 10 +++++- include/uapi/asm-generic/posix_types.h | 1 + include/uapi/linux/time.h | 7 ++++ kernel/compat.c | 52 +++++------------------------- kernel/time/hrtimer.c | 10 ++++-- kernel/time/posix-stubs.c | 12 ++++--- kernel/time/posix-timers.c | 24 ++++++++++---- kernel/time/time.c | 58 +++++++++++++++++++++++++++++++--- 57 files changed, 201 insertions(+), 176 deletions(-) create mode 100644 include/asm-generic/compat.h create mode 100644 include/linux/compat_time.h

6 years, 7 months

[tip GIT PULL v2] y2038: timekeeping syscall changes

by Arnd Bergmann

The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) are available in the git repository at: git+ssh://gitolite@ra.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git tags/y2038-timekeeping for you to fetch changes up to 01909974b41036a6a8d3907c66cc7b41c9a73da9: time: Change nanosleep to safe __kernel_* types (2018-04-19 13:32:03 +0200) ---------------------------------------------------------------- y2038: timekeeping syscall changes This is the first set of system call entry point changes to enable 32-bit architectures to have variants on both 32-bit and 64-bit time_t. Typically these system calls take a 'struct timespec' argument, but that structure is defined in user space by the C library and its layout will change. The kernel already supports handling the 32-bit time_t on 64-bit architectures through the CONFIG_COMPAT mechanism. As there are a total of 51 system calls suffering from this problem, reusing that mechanism on 32-bit architectures. We already have patches for most of the remaining system calls, but this set contains most of the complexity and is best tested. There was one last-minute regression that prevented it from going into 4.17, but that is fixed now. More details from Deepa's patch series description: Big picture is as per the lwn article: https://lwn.net/Articles/643234/ [2] The series is directed at converting posix clock syscalls: clock_gettime, clock_settime, clock_getres and clock_nanosleep to use a new data structure __kernel_timespec at syscall boundaries. __kernel_timespec maintains 64 bit time_t across all execution modes. vdso will be handled as part of each architecture when they enable support for 64 bit time_t. The compat syscalls are repurposed to provide backward compatibility by using them as native syscalls as well for 32 bit architectures. They will continue to use timespec at syscall boundaries. CONFIG_64_BIT_TIME controls whether the syscalls use __kernel_timespec or timespec at syscall boundaries. The series does the following: 1. Enable compat syscalls on 32 bit architectures. 2. Add a new __kernel_timespec type to be used as the data structure for all the new syscalls. 3. Add new config CONFIG_64BIT_TIME(intead of the CONFIG_COMPAT_TIME in [1] and [2] to switch to new definition of __kernel_timespec. It is the same as struct timespec otherwise. 4. Add new CONFIG_32BIT_TIME to conditionally compile compat syscalls. ---------------------------------------------------------------- v2: rewrote subject lines as suggested by Thomas, the contents are unchanged. I Hope I understood all the requests right. Arnd Bergmann (2): time: Add an asm-generic/compat.h file sparc: compat: Allow including asm/compat.h for 32-bit Deepa Dinamani (10): compat: Make compat helpers independent of CONFIG_COMPAT compat: Move compat_timespec/ timeval to compat_time.h compat: Enable compat_get/put_timespec64 always time: Introduce CONFIG_64BIT_TIME in architectures time: Introduce CONFIG_COMPAT_32BIT_TIME posix-timers: Make compat syscalls depend on CONFIG_COMPAT_32BIT_TIME time: Add new y2038 safe __kernel_timespec time: Fix get_timespec64() for y2038 safe compat interfaces time: Change types to new y2038 safe __kernel_* types time: Change nanosleep to safe __kernel_* types arch/Kconfig | 15 +++++++++ arch/alpha/include/asm/Kbuild | 1 + arch/arc/include/asm/Kbuild | 1 + arch/arm/include/asm/Kbuild | 1 + arch/arm64/include/asm/compat.h | 11 ------- arch/arm64/include/asm/stat.h | 1 + arch/arm64/kernel/hw_breakpoint.c | 1 - arch/arm64/kernel/perf_regs.c | 2 +- arch/c6x/include/asm/Kbuild | 1 + arch/h8300/include/asm/Kbuild | 1 + arch/hexagon/include/asm/Kbuild | 1 + arch/ia64/include/asm/Kbuild | 1 + arch/m68k/include/asm/Kbuild | 1 + arch/microblaze/include/asm/Kbuild | 1 + arch/mips/include/asm/compat.h | 11 ------- arch/mips/kernel/signal32.c | 2 +- arch/nds32/include/asm/Kbuild | 1 + arch/nios2/include/asm/Kbuild | 1 + arch/openrisc/include/asm/Kbuild | 1 + arch/parisc/include/asm/compat.h | 11 ------- arch/powerpc/include/asm/compat.h | 11 ------- arch/powerpc/kernel/asm-offsets.c | 2 +- arch/powerpc/oprofile/backtrace.c | 1 + arch/s390/hypfs/hypfs_sprp.c | 1 - arch/s390/include/asm/compat.h | 11 ------- arch/s390/include/asm/elf.h | 4 +-- arch/s390/kvm/priv.c | 1 - arch/s390/pci/pci_clp.c | 1 - arch/sh/include/asm/Kbuild | 1 + arch/sparc/include/asm/compat.h | 15 +++------ arch/um/include/asm/Kbuild | 1 + arch/unicore32/include/asm/Kbuild | 1 + arch/x86/events/core.c | 2 +- arch/x86/include/asm/compat.h | 11 ------- arch/x86/include/asm/ftrace.h | 2 +- arch/x86/kernel/sys_x86_64.c | 2 +- arch/xtensa/include/asm/Kbuild | 1 + drivers/s390/block/dasd_ioctl.c | 1 - drivers/s390/char/fs3270.c | 1 - drivers/s390/char/sclp_ctl.c | 1 - drivers/s390/char/vmcp.c | 1 - drivers/s390/cio/chsc_sch.c | 1 - drivers/s390/net/qeth_core_main.c | 2 +- include/asm-generic/compat.h | 3 ++ include/linux/compat.h | 12 ++++--- include/linux/compat_time.h | 23 ++++++++++++++ include/linux/restart_block.h | 7 ++-- include/linux/syscalls.h | 13 ++++---- include/linux/time.h | 4 +-- include/linux/time64.h | 10 +++++- include/uapi/asm-generic/posix_types.h | 1 + include/uapi/linux/time.h | 7 ++++ kernel/compat.c | 52 +++++------------------------- kernel/time/hrtimer.c | 10 ++++-- kernel/time/posix-stubs.c | 12 ++++--- kernel/time/posix-timers.c | 24 ++++++++++---- kernel/time/time.c | 58 +++++++++++++++++++++++++++++++--- 57 files changed, 201 insertions(+), 176 deletions(-) create mode 100644 include/asm-generic/compat.h create mode 100644 include/linux/compat_time.h

6 years, 7 months

[PATCH v2 00/13] y2038: convert IPC syscalls

by Arnd Bergmann

This is an update of a series I posted a long time ago [1], updating the IPC subsystem to pass down 64-bit time stamps to user space. In particular, 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. 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 the previous version include - 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. If everyone agrees with the series, I'd like to have it merged through the tip tree once Deepa's earlier syscall series in there (I have both in my y2038 tree [2]). Arnd [1] https://lkml.org/lkml/2015/5/20/605 [2] git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git y2038-next Arnd Bergmann (13): y2038: asm-generic: 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: x86: 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 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 arch/alpha/include/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/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 | 38 ++++++++++++----------- 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/Kbuild | 3 ++ arch/s390/include/asm/compat.h | 32 +++++++++---------- 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/Kbuild | 5 ++- arch/x86/include/uapi/asm/msgbuf.h | 1 - arch/x86/include/uapi/asm/sembuf.h | 11 ++++++- arch/x86/include/uapi/asm/shmbuf.h | 1 - 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/uapi/asm-generic/msgbuf.h | 17 +++++----- include/uapi/asm-generic/sembuf.h | 26 ++++++++++------ include/uapi/asm-generic/shmbuf.h | 17 +++++----- ipc/msg.c | 20 ++++++++---- ipc/sem.c | 20 ++++++++---- ipc/shm.c | 14 +++++++-- 46 files changed, 393 insertions(+), 633 deletions(-) delete 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 delete mode 100644 arch/x86/include/uapi/asm/msgbuf.h delete mode 100644 arch/x86/include/uapi/asm/shmbuf.h -- 2.9.0

6 years, 7 months

[PATCH libevdev] 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 | 13 ++++++++++++- libevdev/libevdev.c | 6 ++++-- test/test-libevdev-init.c | 20 ++++++++++---------- tools/libevdev-events.c | 8 ++++---- tools/mouse-dpi-tool.c | 8 +------- 5 files changed, 31 insertions(+), 24 deletions(-) diff --git a/include/linux/input.h b/include/linux/input.h index c5c8bc4..8274c29 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 * @@ -18,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/libevdev/libevdev.c b/libevdev/libevdev.c index 41bfd25..a48974f 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -524,7 +524,8 @@ libevdev_get_fd(const struct libevdev* dev) static inline void init_event(struct libevdev *dev, struct input_event *ev, int type, int code, int value) { - ev->time = dev->last_event_time; + ev->input_event_sec = dev->last_event_time.tv_sec; + ev->input_event_usec = dev->last_event_time.tv_usec; ev->type = type; ev->code = code; ev->value = value; @@ -966,7 +967,8 @@ update_state(struct libevdev *dev, const struct input_event *e) break; } - dev->last_event_time = e->time; + dev->last_event_time.tv_sec = e->input_event_sec; + dev->last_event_time.tv_usec = e->input_event_usec; return rc; } diff --git a/test/test-libevdev-init.c b/test/test-libevdev-init.c index f673a58..feba27f 100644 --- a/test/test-libevdev-init.c +++ b/test/test-libevdev-init.c @@ -575,19 +575,19 @@ START_TEST(test_clock_id_events) ck_assert_int_eq(ev1.code, ev2.code); ck_assert_int_eq(ev1.value, ev2.value); - t1 = ev1.time.tv_sec * 1000000LL + ev1.time.tv_usec; - t2 = ev2.time.tv_sec * 1000000LL + ev2.time.tv_usec; + t1 = ev1.input_event_sec * 1000000LL + ev1.input_event_usec; + t2 = ev2.input_event_sec * 1000000LL + ev2.input_event_usec; ck_assert_int_ne(t1, t2); - ck_assert_int_ge(ev1.time.tv_sec, t1_real.tv_sec); - ck_assert_int_ge(ev1.time.tv_usec, t1_real.tv_nsec/1000); - ck_assert_int_le(ev1.time.tv_sec, t2_real.tv_sec); - ck_assert_int_le(ev1.time.tv_usec, t2_real.tv_nsec/1000); + ck_assert_int_ge(ev1.input_event_sec, t1_real.tv_sec); + ck_assert_int_ge(ev1.input_event_usec, t1_real.tv_nsec/1000); + ck_assert_int_le(ev1.input_event_sec, t2_real.tv_sec); + ck_assert_int_le(ev1.input_event_usec, t2_real.tv_nsec/1000); - ck_assert_int_ge(ev2.time.tv_sec, t1_mono.tv_sec); - ck_assert_int_ge(ev2.time.tv_usec, t1_mono.tv_nsec/1000); - ck_assert_int_le(ev2.time.tv_sec, t2_mono.tv_sec); - ck_assert_int_le(ev2.time.tv_usec, t2_mono.tv_nsec/1000); + ck_assert_int_ge(ev2.input_event_sec, t1_mono.tv_sec); + ck_assert_int_ge(ev2.input_event_usec, t1_mono.tv_nsec/1000); + ck_assert_int_le(ev2.input_event_sec, t2_mono.tv_sec); + ck_assert_int_le(ev2.input_event_usec, t2_mono.tv_nsec/1000); uinput_device_free(uidev); libevdev_free(dev); diff --git a/tools/libevdev-events.c b/tools/libevdev-events.c index 3ce23f1..dfd841f 100644 --- a/tools/libevdev-events.c +++ b/tools/libevdev-events.c @@ -112,13 +112,13 @@ print_event(struct input_event *ev) { if (ev->type == EV_SYN) printf("Event: time %ld.%06ld, ++++++++++++++++++++ %s +++++++++++++++\n", - ev->time.tv_sec, - ev->time.tv_usec, + ev->input_event_sec, + ev->input_event_usec, libevdev_event_type_get_name(ev->type)); else printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %d\n", - ev->time.tv_sec, - ev->time.tv_usec, + ev->input_event_sec, + ev->input_event_usec, ev->type, libevdev_event_type_get_name(ev->type), ev->code, diff --git a/tools/mouse-dpi-tool.c b/tools/mouse-dpi-tool.c index b472ad0..da44124 100644 --- a/tools/mouse-dpi-tool.c +++ b/tools/mouse-dpi-tool.c @@ -61,12 +61,6 @@ usage(void) { return 1; } -static inline uint64_t -tv2us(const struct timeval *tv) -{ - return tv->tv_sec * 1000000 + tv->tv_usec; -} - static inline double get_frequency(uint64_t last, uint64_t current) { @@ -119,7 +113,7 @@ handle_event(struct measurements *m, const struct input_event *ev) const int idle_reset = 3000000; /* us */ uint64_t last_us = m->us; - m->us = tv2us(&ev->time); + m->us = ev->input_event_sec * 1000000 + ev->input_event_usec; /* reset after pause */ if (last_us + idle_reset < m->us) { -- 2.14.1

6 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038