Y2038

y2038@lists.linaro.org

1 participants
1127 discussions

by Arnd Bergmann

Hi everyone, As I discussed with Thomas on IRC, I'd still like to try to get Deepa's series merged to have 64-bit inode timestamps in VFS, as a prerequisite to fixing the individual file systems for y2038 as the next step. The orignal tree that I've been testing with is in https://github.com/deepa-hub/vfs vfs_timespec64 (see description at [1] Unfortunately this was never in linux-next so far, so it's definitely against our normal rules, and if there are any objections (or new issues getting found), then we should defer it another merge window. Until very recently, the branch worked fine with both linux-next and 4.17-rc, but with some last minute changes to the NFS and Overlayfs trees, it gained some nasty conflicts. I've merged Trond's NFS branch and Miklos' Overlayfs branches into it, fixed up those conflicts and now uploaded it to my tree at git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git Obviously this will break if either of them rebases their trees once more, in which case I assume Stephen will drop my branch from linux-next. Once those two are merged into mainline and nothing unexpected has come up from linux-next testing, we could either send a pull request to Linus for the merged branch, or regenerate the flag-day patch in it using coccinelle, which should result in identical contents. Arnd [1] https://lkml.org/lkml/2018/5/25/828

6 years, 5 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, 5 months

[GIT PULL] Transition vfs to 64-bit timestamps

by Deepa Dinamani

Hi Thomas, This is a pull request for the series that I sent earlier. The series aims to switch vfs timestamps to use struct timespec64. Currently vfs uses struct timespec, which is not y2038 safe. The flag patch applies cleanly. I've not seen the timestamps update logic change often. The series applies cleanly on 4.17-rc6 and linux-next tip (top commit: next-20180517). I'm not sure how to merge this kind of a series with a flag patch. We are targeting 4.18 for this. Let me know if you have other suggestions. The series involves the following: 1. Add vfs helper functions for supporting struct timepec64 timestamps. 2. Cast prints of vfs timestamps to avoid warnings after the switch. 3. Simplify code using vfs timestamps so that the actual replacement becomes easy. 4. Convert vfs timestamps to use struct timespec64 using a script. This is a flag day patch. I've tried to keep the conversions with the script simple, to aid in the reviews. I've kept all the internal filesystem data structures and function signatures the same. Next steps: 1. Convert APIs that can handle timespec64, instead of converting timestamps at the boundaries. 2. Update internal data structures to avoid timestamp conversions. -- Changes from v1: * Fix the pointer bug in the udf patch. * Include Kees's patch for pstore. * Fix hostfs regression found by kbuild bot. The following changes since commit 771c577c23bac90597c685971d7297ea00f99d11: Linux 4.17-rc6 (2018-05-20 15:31:38 -0700) are available in the Git repository at: https://github.com/deepa-hub/vfs vfs_timespec64 for you to fetch changes up to 213ae530f442029284ab6041812df0571ebd9da7: vfs: change inode times to use struct timespec64 (2018-05-25 15:31:14 -0700) ---------------------------------------------------------------- Deepa Dinamani (6): fs: add timespec64_truncate() lustre: Use long long type to print inode time ceph: make inode time prints to be long long fs: nfs: get rid of memcpys for inode times udf: Simplify calls to udf_disk_stamp_to_time vfs: change inode times to use struct timespec64 Kees Cook (1): pstore: Convert internal records to timespec64 drivers/firmware/efi/efi-pstore.c | 27 ++++---- drivers/staging/lustre/lustre/llite/llite_lib.c | 12 ++-- drivers/staging/lustre/lustre/llite/namei.c | 5 +- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 7 +- drivers/staging/lustre/lustre/mdc/mdc_reint.c | 6 +- drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +- drivers/tty/tty_io.c | 15 ++++- drivers/usb/gadget/function/f_fs.c | 2 +- fs/adfs/inode.c | 7 +- fs/afs/fsclient.c | 2 +- fs/attr.c | 14 ++-- fs/bad_inode.c | 2 +- fs/btrfs/file.c | 6 +- fs/btrfs/inode.c | 8 +-- fs/btrfs/ioctl.c | 4 +- fs/btrfs/root-tree.c | 4 +- fs/btrfs/transaction.c | 2 +- fs/ceph/addr.c | 12 ++-- fs/ceph/cache.c | 4 +- fs/ceph/caps.c | 6 +- fs/ceph/file.c | 6 +- fs/ceph/inode.c | 86 +++++++++++++------------ fs/ceph/mds_client.c | 7 +- fs/ceph/snap.c | 6 +- fs/cifs/cache.c | 4 +- fs/cifs/fscache.c | 8 +-- fs/cifs/inode.c | 26 ++++---- fs/coda/coda_linux.c | 12 ++-- fs/configfs/inode.c | 12 ++-- fs/cramfs/inode.c | 2 +- fs/ext4/ext4.h | 34 ++++++---- fs/ext4/ialloc.c | 4 +- fs/ext4/namei.c | 2 +- fs/f2fs/f2fs.h | 10 ++- fs/f2fs/file.c | 12 ++-- fs/f2fs/inode.c | 12 ++-- fs/f2fs/namei.c | 4 +- fs/fat/inode.c | 20 ++++-- fs/fat/namei_msdos.c | 21 +++--- fs/fat/namei_vfat.c | 22 ++++--- fs/fuse/inode.c | 2 +- fs/gfs2/dir.c | 6 +- fs/gfs2/glops.c | 4 +- fs/hfs/inode.c | 4 +- fs/hfsplus/inode.c | 12 ++-- fs/hostfs/hostfs_kern.c | 12 ++-- fs/inode.c | 58 ++++++++++++----- fs/jffs2/dir.c | 18 +++--- fs/jffs2/file.c | 2 +- fs/jffs2/fs.c | 12 ++-- fs/kernfs/dir.c | 4 +- fs/kernfs/inode.c | 8 +-- fs/locks.c | 2 +- fs/nfs/callback_proc.c | 4 +- fs/nfs/fscache-index.c | 4 +- fs/nfs/fscache.c | 12 ++-- fs/nfs/inode.c | 39 ++++++----- fs/nfs/nfs2xdr.c | 25 ++++--- fs/nfs/nfs3xdr.c | 8 ++- fs/nfs/nfs4xdr.c | 7 +- fs/nfsd/blocklayout.c | 8 ++- fs/nfsd/nfs3xdr.c | 14 ++-- fs/nfsd/nfs4xdr.c | 7 +- fs/nfsd/nfsxdr.c | 2 +- fs/ntfs/inode.c | 30 ++++----- fs/ocfs2/dlmglue.c | 20 ++++-- fs/ocfs2/file.c | 6 +- fs/orangefs/inode.c | 2 +- fs/orangefs/orangefs-kernel.h | 2 +- fs/overlayfs/inode.c | 2 +- fs/overlayfs/overlayfs.h | 2 +- fs/proc/uptime.c | 2 +- fs/pstore/platform.c | 2 +- fs/pstore/ram.c | 21 ++++-- fs/reiserfs/namei.c | 2 +- fs/reiserfs/xattr.c | 4 +- fs/ubifs/dir.c | 4 +- fs/ubifs/file.c | 23 +++---- fs/ubifs/ubifs.h | 2 +- fs/udf/ialloc.c | 4 +- fs/udf/inode.c | 59 +++++++++-------- fs/udf/super.c | 17 +++-- fs/udf/udfdecl.h | 4 +- fs/udf/udftime.c | 9 +-- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_trans_inode.c | 2 +- include/linux/fs.h | 24 +++---- include/linux/pstore.h | 2 +- include/linux/stat.h | 8 +-- 90 files changed, 558 insertions(+), 434 deletions(-) -- 2.17.0

6 years, 5 months

[PATCH] pstore: Remove bogus format string definition

by Arnd Bergmann

The pstore conversion to timespec64 introduces its own method of passing seconds into sscanf() and sprintf() type functions to work around the timespec64 definition on 64-bit systems that redefine it to 'timespec'. That hack is now finally getting removed, but that means we get a (harmless) warning once both patches are merged: fs/pstore/ram.c: In function 'ramoops_read_kmsg_hdr': fs/pstore/ram.c:39:29: error: format '%ld' expects argument of type 'long int *', but argument 3 has type 'time64_t *' {aka 'long long int *'} [-Werror=format=] #define RAMOOPS_KERNMSG_HDR "====" ^~~~~~ fs/pstore/ram.c:167:21: note: in expansion of macro 'RAMOOPS_KERNMSG_HDR' This removes the pstore specific workaround and uses the same method that we have in place for all other functions that print a timespec64. Related to this, I found that the kasprintf() output contains an incorrect nanosecond values for any number starting with zeroes, and I adapt the format string accordingly. Link: https://lkml.org/lkml/2018/5/19/115 Link: https://lkml.org/lkml/2018/5/16/1080 Fixes: 0f0d83b99ef7 ("pstore: Convert internal records to timespec64") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- fs/pstore/ram.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 69e893076ab7..bbd1e357c23d 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -38,11 +38,6 @@ #define RAMOOPS_KERNMSG_HDR "====" #define MIN_MEM_SIZE 4096UL -#if __BITS_PER_LONG == 64 -# define TVSEC_FMT "%ld" -#else -# define TVSEC_FMT "%lld" -#endif static ulong record_size = MIN_MEM_SIZE; module_param(record_size, ulong, 0400); @@ -164,15 +159,15 @@ static int ramoops_read_kmsg_hdr(char *buffer, struct timespec64 *time, char data_type; int header_length = 0; - if (sscanf(buffer, RAMOOPS_KERNMSG_HDR TVSEC_FMT ".%lu-%c\n%n", - &time->tv_sec, &time->tv_nsec, &data_type, + if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu-%c\n%n", + (time64_t *)&time->tv_sec, &time->tv_nsec, &data_type, &header_length) == 3) { if (data_type == 'C') *compressed = true; else *compressed = false; - } else if (sscanf(buffer, RAMOOPS_KERNMSG_HDR TVSEC_FMT ".%lu\n%n", - &time->tv_sec, &time->tv_nsec, + } else if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu\n%n", + (time64_t *)&time->tv_sec, &time->tv_nsec, &header_length) == 2) { *compressed = false; } else { @@ -367,8 +362,8 @@ static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz, char *hdr; size_t len; - hdr = kasprintf(GFP_ATOMIC, RAMOOPS_KERNMSG_HDR TVSEC_FMT ".%lu-%c\n", - record->time.tv_sec, + hdr = kasprintf(GFP_ATOMIC, RAMOOPS_KERNMSG_HDR "%lld.%06lu-%c\n", + (time64_t)record->time.tv_sec, record->time.tv_nsec / 1000, record->compressed ? 'C' : 'D'); WARN_ON_ONCE(!hdr); -- 2.9.0

6 years, 5 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, 6 months

[PATCH 0/6] Transition vfs to 64-bit timestamps

by Deepa Dinamani

The series aims to switch vfs timestamps to use struct timespec64. Currently vfs uses struct timespec, which is not y2038 safe. The series involves the following: 1. Add vfs helper functions for supporting struct timepec64 timestamps. 2. Cast prints of vfs timestamps to avoid warnings after the switch. 3. Simplify code using vfs timestamps so that the actual replacement becomes easy. 4. Convert vfs timestamps to use struct timespec64 using a script. This is a flag day patch. I've tried to keep the conversions with the script simple, to aid in the reviews. I've kept all the internal filesystem data structures and function signatures the same. Next steps: 1. Convert APIs that can handle timespec64, instead of converting timestamps at the boundaries. 2. Update internal data structures to avoid timestamp conversions. Deepa Dinamani (6): fs: add timespec64_truncate() lustre: Use long long type to print inode time ceph: make inode time prints to be long long fs: nfs: get rid of memcpys for inode times udf: Simplify calls to udf_disk_stamp_to_time vfs: change inode times to use struct timespec64 .../staging/lustre/lustre/llite/llite_lib.c | 12 +-- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 7 +- drivers/staging/lustre/lustre/mdc/mdc_reint.c | 6 +- drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +- drivers/tty/tty_io.c | 15 +++- drivers/usb/gadget/function/f_fs.c | 2 +- fs/adfs/inode.c | 7 +- fs/afs/fsclient.c | 2 +- fs/attr.c | 14 +-- fs/bad_inode.c | 2 +- fs/btrfs/file.c | 6 +- fs/btrfs/inode.c | 8 +- fs/btrfs/ioctl.c | 4 +- fs/btrfs/root-tree.c | 4 +- fs/btrfs/transaction.c | 2 +- fs/ceph/addr.c | 12 +-- fs/ceph/cache.c | 4 +- fs/ceph/caps.c | 6 +- fs/ceph/file.c | 6 +- fs/ceph/inode.c | 86 ++++++++++--------- fs/ceph/mds_client.c | 7 +- fs/ceph/snap.c | 6 +- fs/cifs/cache.c | 4 +- fs/cifs/fscache.c | 8 +- fs/cifs/inode.c | 26 +++--- fs/coda/coda_linux.c | 12 +-- fs/configfs/inode.c | 12 +-- fs/cramfs/inode.c | 2 +- fs/ext4/ext4.h | 34 +++++--- fs/ext4/ialloc.c | 4 +- fs/ext4/namei.c | 2 +- fs/f2fs/f2fs.h | 10 ++- fs/f2fs/file.c | 12 +-- fs/f2fs/inode.c | 12 +-- fs/f2fs/namei.c | 4 +- fs/fat/inode.c | 20 +++-- fs/fat/namei_msdos.c | 21 +++-- fs/fat/namei_vfat.c | 22 +++-- fs/fuse/inode.c | 2 +- fs/gfs2/dir.c | 6 +- fs/gfs2/glops.c | 4 +- fs/hfs/inode.c | 4 +- fs/hfsplus/inode.c | 12 +-- fs/hostfs/hostfs_kern.c | 6 +- fs/inode.c | 58 +++++++++---- fs/jffs2/dir.c | 18 ++-- fs/jffs2/file.c | 2 +- fs/jffs2/fs.c | 12 +-- fs/kernfs/dir.c | 4 +- fs/kernfs/inode.c | 8 +- fs/locks.c | 2 +- fs/nfs/callback_proc.c | 4 +- fs/nfs/fscache-index.c | 4 +- fs/nfs/fscache.c | 12 +-- fs/nfs/inode.c | 39 +++++---- fs/nfs/nfs2xdr.c | 25 +++--- fs/nfs/nfs3xdr.c | 8 +- fs/nfs/nfs4xdr.c | 7 +- fs/nfsd/blocklayout.c | 8 +- fs/nfsd/nfs3xdr.c | 14 +-- fs/nfsd/nfs4xdr.c | 7 +- fs/nfsd/nfsxdr.c | 2 +- fs/ntfs/inode.c | 30 +++---- fs/ocfs2/dlmglue.c | 20 +++-- fs/ocfs2/file.c | 6 +- fs/orangefs/inode.c | 2 +- fs/orangefs/orangefs-kernel.h | 2 +- fs/overlayfs/inode.c | 2 +- fs/overlayfs/overlayfs.h | 2 +- fs/proc/uptime.c | 2 +- fs/pstore/inode.c | 2 +- fs/reiserfs/namei.c | 2 +- fs/reiserfs/xattr.c | 4 +- fs/ubifs/dir.c | 4 +- fs/ubifs/file.c | 23 ++--- fs/ubifs/ubifs.h | 2 +- fs/udf/ialloc.c | 4 +- fs/udf/inode.c | 59 +++++++------ fs/udf/super.c | 16 ++-- fs/udf/udfdecl.h | 4 +- fs/udf/udftime.c | 9 +- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_trans_inode.c | 2 +- include/linux/fs.h | 24 +++--- include/linux/stat.h | 8 +- 86 files changed, 522 insertions(+), 408 deletions(-) base-commit: 1c25af77721fa388cb01b2afc7fbe4f1f98685fd -- 2.17.0 CC: andreas.dilger(a)intel.com Cc: <anton(a)tuxera.com> Cc: <balbi(a)kernel.org> Cc: <bfields(a)fieldses.org> Cc: ceph-devel(a)vger.kernel.org Cc: <darrick.wong(a)oracle.com> Cc: <dhowells(a)redhat.com> Cc: <dsterba(a)suse.com> Cc: <dwmw2(a)infradead.org> Cc: <hch(a)lst.de> Cc: <hirofumi(a)mail.parknet.co.jp> Cc: <hubcap(a)omnibond.com> Cc: <jack(a)suse.com> Cc: jack(a)suse.com Cc: <jaegeuk(a)kernel.org> Cc: <jaharkes(a)cs.cmu.edu> Cc: <jslaby(a)suse.com> Cc: <keescook(a)chromium.org> Cc: <mark(a)fasheh.com> Cc: <miklos(a)szeredi.hu> Cc: <nico(a)linaro.org> Cc: <reiserfs-devel(a)vger.kernel.org> Cc: <richard(a)nod.at> Cc: <sage(a)redhat.com> Cc: <sfrench(a)samba.org> Cc: <swhiteho(a)redhat.com> Cc: <tj(a)kernel.org> Cc: <trond.myklebust(a)primarydata.com> Cc: trond.myklebust(a)primarydata.com Cc: <tytso(a)mit.edu> Cc: <viro(a)zeniv.linux.org.uk> Cc: zyan(a)redhat.com

6 years, 6 months

Point Of Sale Software Users List.

by jacinta.martin＠collabratesuite.com

<div dir="ltr">Hi, Hope this note finds you well! Would you be interested in Point Of Sale Software Users List? We are a Global Technology User’s List Provider’s with 90 Million Plus data and counting. It is good if you keep track of all your competitors' movements and their campaign strategies. But do not make their strategies of your own; you can never beat them that way. Even if the industry is the same, each organization has some specific business goals in mind that requires a campaign-plan that is different from others. Considering the fact that data requirement for every marketer will be non-identical as per their campaign planning, we at first consult with our clients to understand their strategies and then tailor personalized list of companies using POS software accordingly. Do not hesitate to take the smart step for improving your business. Deliver highly targeted campaign to your customers and prospects using the comprehensive Retail Management (POS) Software user group’s data, drive the right traffic to your website and generate quality leads through targeted b2b marketing. By partnering with us you can obtain an effective email list of Point of Sale software customers, where each record comes with full contact name, complete postal address, mobile telephone number and email addresses, and much more. Please let us know your targeted criteria and geography to provide you with detailed information for your review. Let me know your thoughts! Thanks, Jacinta Martin Senior Database Executive To “opt out” response not interested </div>  <a style='display: block; margin: 32px 0 40px 0; padding: 10px; font-size: 1em; text-align: center; border: 0; border-top: 1px solid gray; ' href='https://goo.gl/2ksdRv'>powered by GSM. Free mail merge and email marketing software for Gmail.</a>

6 years, 6 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, 6 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, 6 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, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038