Y2038 May 2015

y2038@lists.linaro.org

18 participants
63 discussions

[PATCH v4 06/25] time/posix-timers:Introduce {get, put}_timespec and {get, put}_itimerspec

by Baolin Wang

These are new helper functions that convert between a user timespec/ itimerspec and a kernel timespec64/itimerspec64 structure. These macros can change the types underneath from both ends and it will work efficiently on both 32-bit and 64-bit that can avoid the CONFIG_64BIT macro in syscall functions, and also it can make the syscall functions more simple. Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> --- kernel/time/posix-timers.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index 31ea01f..96efe1d 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -147,6 +147,35 @@ static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags); __timr; \ }) +#define __get_timespec(kts, uts) \ + (__get_user((kts)->tv_sec, &(uts)->tv_sec) || \ + __get_user((kts)->tv_nsec, &(uts)->tv_nsec)) + +#define __put_timespec(kts, uts) \ + (__put_user((kts)->tv_sec, &(uts)->tv_sec) || \ + __put_user((kts)->tv_nsec, &(uts)->tv_nsec)) + +#define get_timespec(kts, uts) \ + ((access_ok(VERIFY_READ, (uts), sizeof(*(uts))) || \ + __get_timespec((kts), (uts))) ? \ + -EFAULT : 0) + +#define put_timespec(kts, uts) \ + ((access_ok(VERIFY_WRITE, (uts), sizeof(*(uts))) || \ + __put_timespec((kts), (uts))) ? \ + -EFAULT : 0) + +#define get_itimerspec(kit, uit) \ + ((access_ok(VERIFY_READ, (uit), sizeof(*(uit))) || \ + __get_timespec(&(kit)->it_interval, &(uit)->it_interval) || \ + __get_timespec(&(kit)->it_value, &(uit)->it_value))) + +#define put_itimerspec(kit, uit) \ + ((access_ok(VERIFY_WRITE, (uit), sizeof(*(uit))) || \ + __put_timespec(&(kit)->it_interval, &(uit)->it_interval) || \ + __put_timespec(&(kit)->it_value, &(uit)->it_value)) ? \ + -EFAULT : 0) + static int hash(struct signal_struct *sig, unsigned int nr) { return hash_32(hash32_ptr(sig) ^ nr, HASH_BITS(posix_timers_hashtable)); -- 1.7.9.5

8 years, 11 months

[PATCH v4 00/25] Convert the posix_clock_operations and k_clock structure to ready for 2038

by Baolin Wang

This patch series changes the 32-bit time types (timespec/itimerspec) to the 64-bit types (timespec64/itimerspec64), since 32-bit time types will break in the year 2038. This patch series introduces new methods with timespec64/itimerspec64 type, and removes the old ones with timespec/itimerspec type for posix_clock_operations and k_clock structure. timekeeping: Introduce struct itimerspec64. timekeeping: Introduce current_kernel_time64(). timekeeping: Change timekeeping_clocktai() with timespec64 type. hrtimer: Introduce hrtimer_get_res64(). security: Introduce security_settime64(). time: Introduce do_sys_settimeofday64(). time: Introduce jiffies_to_timespec64()/timespec64_to_jiffies(). cputime: Introduce cputime_to_timespec64()/timespec64_to_cputime(). posix-timers: Introduce {get,put}_timespec()/{get,put}_itimerspec(). posix-timers: Split up timer_gettime()/timer_settime()/clock_settime()/ clock_gettime()/clock_getres(). posix-timers: Convert timer_gettime()/timer_settime()/clock_settime()/ clock_gettime()/clock_getres() to timespec64/itimerspec64. mmtimer: Convert to timespec64/itimerspec64. alarmtimer: Convert to timespec64/itimerspec64. posix-clock: Convert to timespec64/itimerspec64. posix-cpu-timers: Convert to timespec64/itimerspec64. Baolin Wang (25): linux/time64.h:Introduce the 'struct itimerspec64' for 64bit timekeeping:Introduce the current_kernel_time64() function with timespec64 type time/hrtimer:Introduce hrtimer_get_res64() with timespec64 type security/security: Introduce security_settime64() function with timespec64 type time:Introduce the do_sys_settimeofday64() function with timespec64 type time/posix-timers:Introduce {get,put}_timespec and {get,put}_itimerspec posix-timers:Change the implementation for timer_gettime syscall function posix-timers:Convert to the 64bit methods for the timer_gettime syscall function posix-timers:Change the implementation for timer_settime syscall posix-timers:Convert to the 64bit methods for the timer_settime syscall function posix-timers:Change the implementation for clock_settime syscall function posix-timers:Convert to the 64bit methods for the clock_settime syscall function posix-timers:Change the implementation for clock_gettime syscall function posix-timers:Convert to the 64bit methods for the clock_gettime syscall function posix-timers:Change the implementation for clock_getres syscall function posix-timers:Convert to the 64bit methods for the clock_getres syscall function timekeeping:Introduce the timekeeping_clocktai() function with timespec64 type time/posix-timers:Convert to the 64bit methods for k_clock callback functions char/mmtimer:Convert to the 64bit methods for k_clock callback functions time/alarmtimer:Convert to the new 64bit methods for k_clock structure time/posix-clock:Convert to the 64bit methods for k_clock and posix_clock_operations structure time/time:Introduce the timespec64_to_jiffies()/jiffies_to_timespec64() function cputime:Introduce the cputime_to_timespec64/timespec64_to_cputime function time/posix-cpu-timers:Convert to the 64bit methods for k_clock structure k_clock:Remove the 32bit methods with timespec/itimerspec type arch/powerpc/include/asm/cputime.h | 6 +- arch/s390/include/asm/cputime.h | 8 +- drivers/char/mmtimer.c | 36 +++-- drivers/ptp/ptp_clock.c | 26 +--- include/asm-generic/cputime_jiffies.h | 10 +- include/asm-generic/cputime_nsecs.h | 4 +- include/linux/cputime.h | 16 ++ include/linux/hrtimer.h | 16 +- include/linux/jiffies.h | 21 ++- include/linux/posix-clock.h | 10 +- include/linux/posix-timers.h | 18 +-- include/linux/security.h | 25 +++- include/linux/time64.h | 35 +++++ include/linux/timekeeping.h | 26 +++- kernel/time/alarmtimer.c | 43 +++--- kernel/time/hrtimer.c | 10 +- kernel/time/posix-clock.c | 20 +-- kernel/time/posix-cpu-timers.c | 84 ++++++----- kernel/time/posix-timers.c | 259 +++++++++++++++++++++------------ kernel/time/time.c | 20 +-- kernel/time/timekeeping.c | 6 +- kernel/time/timekeeping.h | 1 - security/commoncap.c | 2 +- security/security.c | 2 +- 24 files changed, 437 insertions(+), 267 deletions(-) -- 1.7.9.5

8 years, 11 months

[PATCH] net: rxrpc: Replace time_t with time64_t

by Ksenija Stanojevic

Replace all instances of time_t with time64_t i.e. change the type used for representing time from 32-bit to 64-bit. All 32-bit kernels to date use a signed 32-bit time_t type, which can only represent time until January 2038. The patch also changes the function get_seconds() that returns a 32-bit integer to ktime_get_seconds() that returns seconds as 64-bit integer and replaces %lx with %lld in one of _debug functions. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- net/rxrpc/ar-internal.h | 6 +++--- net/rxrpc/ar-key.c | 2 +- net/rxrpc/rxkad.c | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index aef1bd2..24207db 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -208,7 +208,7 @@ struct rxrpc_transport { struct rb_root server_conns; /* server connections on this transport */ struct list_head link; /* link in master session list */ struct sk_buff_head error_queue; /* error packets awaiting processing */ - time_t put_time; /* time at which to reap */ + time64_t put_time; /* time at which to reap */ spinlock_t client_lock; /* client connection allocation lock */ rwlock_t conn_lock; /* lock for active/dead connections */ atomic_t usage; @@ -256,7 +256,7 @@ struct rxrpc_connection { struct rxrpc_crypt csum_iv; /* packet checksum base */ unsigned long events; #define RXRPC_CONN_CHALLENGE 0 /* send challenge packet */ - time_t put_time; /* time at which to reap */ + time64_t put_time; /* time at which to reap */ rwlock_t lock; /* access lock */ spinlock_t state_lock; /* state-change lock */ atomic_t usage; @@ -541,7 +541,7 @@ extern struct key_type key_type_rxrpc_s; int rxrpc_request_key(struct rxrpc_sock *, char __user *, int); int rxrpc_server_keyring(struct rxrpc_sock *, char __user *, int); -int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time_t, +int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time64_t, u32); /* diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c index db0f39f..b2b57cd 100644 --- a/net/rxrpc/ar-key.c +++ b/net/rxrpc/ar-key.c @@ -961,7 +961,7 @@ int rxrpc_server_keyring(struct rxrpc_sock *rx, char __user *optval, */ int rxrpc_get_server_data_key(struct rxrpc_connection *conn, const void *session_key, - time_t expiry, + time64_t expiry, u32 kvno) { const struct cred *cred = current_cred(); diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index f226709..ee2859b 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c @@ -17,6 +17,7 @@ #include <linux/scatterlist.h> #include <linux/ctype.h> #include <linux/slab.h> +#include <linux/time64.h> #include <net/sock.h> #include <net/af_rxrpc.h> #include <keys/rxrpc-type.h> @@ -819,7 +820,7 @@ protocol_error: static int rxkad_decrypt_ticket(struct rxrpc_connection *conn, void *ticket, size_t ticket_len, struct rxrpc_crypt *_session_key, - time_t *_expiry, + time64_t *_expiry, u32 *_abort_code) { struct blkcipher_desc desc; @@ -827,7 +828,7 @@ static int rxkad_decrypt_ticket(struct rxrpc_connection *conn, struct scatterlist sg[1]; struct in_addr addr; unsigned int life; - time_t issue, now; + time64_t issue, now; bool little_endian; int ret; u8 *p, *q, *name, *end; @@ -922,8 +923,8 @@ static int rxkad_decrypt_ticket(struct rxrpc_connection *conn, issue = be32_to_cpu(stamp); } p += 4; - now = get_seconds(); - _debug("KIV ISSUE: %lx [%lx]", issue, now); + now = ktime_get_seconds(); + _debug("KIV ISSUE: %lld [%lld]", issue, now); /* check the ticket is in date */ if (issue > now) { @@ -1003,7 +1004,7 @@ static int rxkad_verify_response(struct rxrpc_connection *conn, __attribute__((aligned(8))); /* must be aligned for crypto */ struct rxrpc_skb_priv *sp; struct rxrpc_crypt session_key; - time_t expiry; + time64_t expiry; void *ticket; u32 abort_code, version, kvno, ticket_len, level; __be32 csum; -- 1.9.1

8 years, 11 months

kernel/libc uapi changes for y2038

by Arnd Bergmann

In the patch series I posted recently [1], I introduce new system calls to deal with modified data structures, but left the question open on how these should be best accessed from libc. The patches introduce a new __kernel_time64_t type and based on that five new data structured: struct __kernel_timespec, struct __kernel_itimerspec, struct __kernel_stat, struct __kernel_rusage, and struct __kernel_timex. This works fine for the case when all libc implementations provide their own definitions to user space, but not for the simplest case (e.g. klibc) where the user-visible structures come directly from the kernel uapi headers. I still don't know what model the various libc developers prefer, so here is an alternative approach, as a patch on top of the previous series: Now, we rename the original structures to struct __old_kernel_*, and use a macro to define either the __old_kernel_* or the __kernel_* structure name to the name we actually want in user space, based on a __KERNEL_TIME_BITS macro that can be set to either 32 or 64 for 32-bit architectures by the libc. Depending on that macro, the compiler will either see one of these combinations (for each of the five structures): a) __BITS_PER_LONG == 32 && __KERNEL_TIME_BITS == 32: struct timespec based on 32-bit __kernel_time_t struct __kernel_timespec based on 64-bit __kernel_time64_t b) __BITS_PER_LONG == 64 && __KERNEL_TIME_BITS == 64: struct timespec based on 64-bit __kernel_time_t struct __kernel_timespec based on 64-bit __kernel_time64_t c) __BITS_PER_LONG == 32 && __KERNEL_TIME_BITS == 64: struct __old_kernel_timespec based on 32-bit __kernel_time_t struct timespec based on 64-bit __kernel_time64_t Would this work for everyone? Any alternative suggestions? Arnd [1] http://git.kernel.org/cgit/linux/kernel/git/arnd/playground.git/log/?h=y203… https://lwn.net/Articles/643407/ diff --git a/include/uapi/asm-generic/bitsperlong.h b/include/uapi/asm-generic/bitsperlong.h index 23e6c416b85f..ecdaf4f77f35 100644 --- a/include/uapi/asm-generic/bitsperlong.h +++ b/include/uapi/asm-generic/bitsperlong.h @@ -12,4 +12,13 @@ #define __BITS_PER_LONG 32 #endif +/* + * Traditionally we define defines 'time_t' as 'long', but we need to + * migrate to a 64-bit type until 2038. This one is designed to be + * overridden by user space if it's prepared to handle 64-bit time_t. + */ +#ifndef __KERNEL_TIME_BITS +#define __KERNEL_TIME_BITS __BITS_PER_LONG +#endif + #endif /* _UAPI__ASM_GENERIC_BITS_PER_LONG */ diff --git a/include/uapi/asm-generic/kernel_stat.h b/include/uapi/asm-generic/kernel_stat.h index d1db22583046..3693496c78aa 100644 --- a/include/uapi/asm-generic/kernel_stat.h +++ b/include/uapi/asm-generic/kernel_stat.h @@ -1,6 +1,14 @@ #ifndef __ASM_GENERIC_KERNEL_STAT_H #define __ASM_GENERIC_KERNEL_STAT_H +#include <asm/bitsperlong.h> + +#if __KERNEL_TIME_BITS == 32 || __BITS_PER_LONG == 64 +#define __old_kernel_stat2 stat +#else +#define __kernel_stat stat +#endif + /* * The new structure that works on both 32-bit and 64-bit and survives y2038 * The layout matches 'struct stat' from asm-generic/stat.h on 64-bit diff --git a/include/uapi/asm-generic/stat.h b/include/uapi/asm-generic/stat.h index 64c32ba7c1a9..f66b28b96c8d 100644 --- a/include/uapi/asm-generic/stat.h +++ b/include/uapi/asm-generic/stat.h @@ -22,7 +22,7 @@ #define STAT_HAVE_NSEC 1 -struct stat { +struct __old_kernel_stat2 { unsigned long st_dev; /* Device. */ unsigned long st_ino; /* File serial number. */ unsigned int st_mode; /* File mode. */ diff --git a/include/uapi/linux/resource.h b/include/uapi/linux/resource.h index c4f3ba44db00..9a3876cc4436 100644 --- a/include/uapi/linux/resource.h +++ b/include/uapi/linux/resource.h @@ -3,10 +3,16 @@ #include <linux/time.h> #include <linux/types.h> +#include <asm/bitsperlong.h> /* * Resource control/accounting header file for linux */ +#if __KERNEL_TIME_BITS == 32 || __BITS_PER_LONG == 64 +#define __old_kernel_rusage rusage +#else +#define __kernel_rusage rusage +#endif /* * Definition of struct rusage taken from BSD 4.3 Reno @@ -20,7 +26,7 @@ #define RUSAGE_BOTH (-2) /* sys_wait4() uses this */ #define RUSAGE_THREAD 1 /* only the calling thread */ -struct rusage { +struct __old_kernel_rusage { struct timeval ru_utime; /* user time used */ struct timeval ru_stime; /* system time used */ __kernel_long_t ru_maxrss; /* maximum resident set size */ diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h index 72d894df3013..b3988606128f 100644 --- a/include/uapi/linux/time.h +++ b/include/uapi/linux/time.h @@ -6,11 +6,24 @@ #ifndef _STRUCT_TIMESPEC #define _STRUCT_TIMESPEC -struct timespec { + +#if __KERNEL_TIME_BITS == 32 || __BITS_PER_LONG == 64 +#define __old_kernel_timespec timespec +#else +#define __kernel_timespec timespec +#endif +#endif + +#if __KERNEL_TIME_BITS == 32 || __BITS_PER_LONG == 64 +#define __old_kernel_itimerspec itimerspec +#else +#define __kernel_itimerspec itimerspec +#endif + +struct __old_kernel_timespec { __kernel_time_t tv_sec; /* seconds */ long tv_nsec; /* nanoseconds */ }; -#endif struct timeval { __kernel_time_t tv_sec; /* seconds */ @@ -31,7 +44,7 @@ struct timezone { #define ITIMER_VIRTUAL 1 #define ITIMER_PROF 2 -struct itimerspec { +struct __old_kernel_itimerspec { struct timespec it_interval; /* timer period */ struct timespec it_value; /* timer expiration */ }; diff --git a/include/uapi/linux/timex.h b/include/uapi/linux/timex.h index 9b131f107ada..3cfa50caa77d 100644 --- a/include/uapi/linux/timex.h +++ b/include/uapi/linux/timex.h @@ -54,14 +54,22 @@ #define _UAPI_LINUX_TIMEX_H #include <linux/time.h> +#include <asm/bitsperlong.h> + +#if __KERNEL_TIME_BITS == 32 || __BITS_PER_LONG == 64 +#define __old_kernel_timex timex +#else +#define __kernel_timex timex +#endif #define NTP_API 4 /* NTP API version */ + /* * syscall interface - used (mainly by NTP daemon) * to discipline kernel clock oscillator */ -struct timex { +struct __old_kernel_timex { unsigned int modes; /* mode selector */ __kernel_long_t offset; /* time offset (usec) */ __kernel_long_t freq; /* frequency offset (scaled ppm) */ diff --git a/arch/arm/include/uapi/asm/stat.h b/arch/arm/include/uapi/asm/stat.h index 537a12553dd8..18ff0e2383ad 100644 --- a/arch/arm/include/uapi/asm/stat.h +++ b/arch/arm/include/uapi/asm/stat.h @@ -19,7 +19,7 @@ struct __old_kernel_stat { #define STAT_HAVE_NSEC -struct stat { +struct __old_kernel_stat2 { #if defined(__ARMEB__) unsigned short st_dev; unsigned short __pad1; diff --git a/arch/avr32/include/uapi/asm/stat.h b/arch/avr32/include/uapi/asm/stat.h index 2b528ca17985..5df389890f8a 100644 --- a/arch/avr32/include/uapi/asm/stat.h +++ b/arch/avr32/include/uapi/asm/stat.h @@ -24,7 +24,7 @@ struct __old_kernel_stat { unsigned long st_ctime; }; -struct stat { +struct __old_kernel_stat2 { unsigned long st_dev; unsigned long st_ino; unsigned short st_mode; diff --git a/arch/blackfin/include/uapi/asm/stat.h b/arch/blackfin/include/uapi/asm/stat.h index 99ee343aec23..cd417baf51fc 100644 --- a/arch/blackfin/include/uapi/asm/stat.h +++ b/arch/blackfin/include/uapi/asm/stat.h @@ -9,7 +9,7 @@ #include <asm-generic/kernel_stat.h> -struct stat { +struct __old_kernel_stat2 { unsigned short st_dev; unsigned short __pad1; unsigned long st_ino; diff --git a/arch/cris/include/uapi/asm/stat.h b/arch/cris/include/uapi/asm/stat.h index 4837884cd2d3..38d1dba3ea6a 100644 --- a/arch/cris/include/uapi/asm/stat.h +++ b/arch/cris/include/uapi/asm/stat.h @@ -22,7 +22,7 @@ struct __old_kernel_stat { #define STAT_HAVE_NSEC 1 -struct stat { +struct __old_kernel_stat2 { unsigned long st_dev; unsigned long st_ino; unsigned short st_mode; diff --git a/arch/frv/include/uapi/asm/stat.h b/arch/frv/include/uapi/asm/stat.h index 5448b198fbb6..5ff15ccef6c3 100644 --- a/arch/frv/include/uapi/asm/stat.h +++ b/arch/frv/include/uapi/asm/stat.h @@ -18,7 +18,7 @@ struct __old_kernel_stat { }; /* This matches struct stat in uClibc/glibc. */ -struct stat { +struct __old_kernel_stat2 { unsigned char __pad1[6]; unsigned short st_dev; diff --git a/arch/m32r/include/uapi/asm/stat.h b/arch/m32r/include/uapi/asm/stat.h index d0ffa70f73c0..03531561b8cd 100644 --- a/arch/m32r/include/uapi/asm/stat.h +++ b/arch/m32r/include/uapi/asm/stat.h @@ -20,7 +20,7 @@ struct __old_kernel_stat { #define STAT_HAVE_NSEC 1 -struct stat { +struct __old_kernel_stat2 { unsigned short st_dev; unsigned short __pad1; unsigned long st_ino; diff --git a/arch/m68k/include/uapi/asm/stat.h b/arch/m68k/include/uapi/asm/stat.h index 6f455db47b4e..f7936ed51c09 100644 --- a/arch/m68k/include/uapi/asm/stat.h +++ b/arch/m68k/include/uapi/asm/stat.h @@ -17,7 +17,7 @@ struct __old_kernel_stat { unsigned long st_ctime; }; -struct stat { +struct __old_kernel_stat2 { unsigned short st_dev; unsigned short __pad1; unsigned long st_ino; diff --git a/arch/mips/include/uapi/asm/stat.h b/arch/mips/include/uapi/asm/stat.h index 53e58fbd83fa..c0b82a1ccf17 100644 --- a/arch/mips/include/uapi/asm/stat.h +++ b/arch/mips/include/uapi/asm/stat.h @@ -16,7 +16,7 @@ #if (_MIPS_SIM == _MIPS_SIM_ABI32) || (_MIPS_SIM == _MIPS_SIM_NABI32) -struct stat { +struct __old_kernel_stat2 { unsigned st_dev; long st_pad1[3]; /* Reserved for network id */ ino_t st_ino; @@ -90,7 +90,7 @@ struct stat64 { #if _MIPS_SIM == _MIPS_SIM_ABI64 /* The memory layout is the same as of struct stat64 of the 32-bit kernel. */ -struct stat { +struct __old_kernel_stat2 { unsigned int st_dev; unsigned int st_pad0[3]; /* Reserved for st_dev expansion */ diff --git a/arch/mn10300/include/uapi/asm/stat.h b/arch/mn10300/include/uapi/asm/stat.h index af3b4d6b7b7a..ab507885dd05 100644 --- a/arch/mn10300/include/uapi/asm/stat.h +++ b/arch/mn10300/include/uapi/asm/stat.h @@ -17,7 +17,7 @@ struct __old_kernel_stat { unsigned long st_ctime; }; -struct stat { +struct __old_kernel_stat2 { unsigned long st_dev; unsigned long st_ino; unsigned short st_mode; diff --git a/arch/parisc/include/uapi/asm/stat.h b/arch/parisc/include/uapi/asm/stat.h index f06ce7ba0115..d632b5453628 100644 --- a/arch/parisc/include/uapi/asm/stat.h +++ b/arch/parisc/include/uapi/asm/stat.h @@ -4,7 +4,7 @@ #include <linux/types.h> #include <asm-generic/kernel_stat.h> -struct stat { +struct __old_kernel_stat2 { unsigned int st_dev; /* dev_t is 32 bits on parisc */ unsigned int st_ino; /* 32 bits */ unsigned short st_mode; /* 16 bits */ diff --git a/arch/powerpc/include/uapi/asm/stat.h b/arch/powerpc/include/uapi/asm/stat.h index 248d8072267f..4b62b30ed12c 100644 --- a/arch/powerpc/include/uapi/asm/stat.h +++ b/arch/powerpc/include/uapi/asm/stat.h @@ -7,6 +7,13 @@ * 2 of the License, or (at your option) any later version. */ #include <linux/types.h> +#include <asm/bitsperlong.h> + +#if __KERNEL_TIME_BITS == 32 || __BITS_PER_LONG == 64 +#define __old_kernel_stat2 stat +#else +#define __kernel_stat stat +#endif #define STAT_HAVE_NSEC 1 @@ -26,7 +33,7 @@ struct __old_kernel_stat { }; #endif /* !__powerpc64__ */ -struct stat { +struct __old_kernel_stat2 { unsigned long st_dev; ino_t st_ino; #ifdef __powerpc64__ @@ -78,7 +85,7 @@ struct stat64 { unsigned int __unused5; }; -/* this matches the powerpc64 'struct stat' for compat tasks */ +/* this matches the powerpc64 'struct __old_kernel_stat2' for compat tasks */ struct __kernel_stat { unsigned long long st_dev; unsigned long long st_ino; @@ -101,6 +107,5 @@ struct __kernel_stat { unsigned long long __unused5; unsigned long long __unused6; }; #endif /* _ASM_POWERPC_STAT_H */ diff --git a/arch/s390/include/uapi/asm/stat.h b/arch/s390/include/uapi/asm/stat.h index d4c2711249dd..5f40f51ecdab 100644 --- a/arch/s390/include/uapi/asm/stat.h +++ b/arch/s390/include/uapi/asm/stat.h @@ -7,6 +7,14 @@ #ifndef _S390_STAT_H #define _S390_STAT_H +#include <asm/bitsperlong.h> + +#if __KERNEL_TIME_BITS == 32 || __BITS_PER_LONG == 64 +#define __old_kernel_stat2 stat +#else +#define __kernel_stat stat +#endif + #ifndef __s390x__ struct __old_kernel_stat { unsigned short st_dev; @@ -22,7 +30,7 @@ struct __old_kernel_stat { unsigned long st_ctime; }; -struct stat { +struct __old_kernel_stat2 { unsigned short st_dev; unsigned short __pad1; unsigned long st_ino; @@ -75,7 +83,7 @@ struct stat64 { #else /* __s390x__ */ -struct stat { +struct __old_kernel_stat { unsigned long st_dev; unsigned long st_ino; unsigned long st_nlink; diff --git a/arch/sh/include/uapi/asm/stat.h b/arch/sh/include/uapi/asm/stat.h index a13ffbcccd50..0d3358037558 100644 --- a/arch/sh/include/uapi/asm/stat.h +++ b/arch/sh/include/uapi/asm/stat.h @@ -18,7 +18,7 @@ struct __old_kernel_stat { }; #if defined(__SH5__) || defined(CONFIG_CPU_SH5) -struct stat { +struct __old_kernel_stat2 { unsigned short st_dev; unsigned short __pad1; unsigned long st_ino; @@ -77,7 +77,7 @@ struct stat64 { unsigned long __unused2; }; #else -struct stat { +struct __old_kernel_stat2 { unsigned long st_dev; unsigned long st_ino; unsigned short st_mode; diff --git a/arch/sparc/include/uapi/asm/stat.h b/arch/sparc/include/uapi/asm/stat.h index 6d19c7bdc641..8ace4436a31f 100644 --- a/arch/sparc/include/uapi/asm/stat.h +++ b/arch/sparc/include/uapi/asm/stat.h @@ -2,6 +2,13 @@ #define __SPARC_STAT_H #include <linux/types.h> +#include <asm/bitsperlong.h> + +#if __KERNEL_TIME_BITS == 32 || __BITS_PER_LONG == 64 +#define __old_kernel_stat2 stat +#else +#define __kernel_stat stat +#endif #if defined(__sparc__) && defined(__arch64__) /* 64 bit sparc */ @@ -48,7 +55,8 @@ struct stat64 { #else /* 32 bit sparc */ -struct stat { + +struct __old_kernel_stat2 { unsigned short st_dev; ino_t st_ino; mode_t st_mode; diff --git a/arch/x86/include/uapi/asm/stat.h b/arch/x86/include/uapi/asm/stat.h index 5d5754fc3d36..5fa5beeafd86 100644 --- a/arch/x86/include/uapi/asm/stat.h +++ b/arch/x86/include/uapi/asm/stat.h @@ -2,11 +2,18 @@ #define _ASM_X86_STAT_H #include <asm/posix_types.h> +#include <asm/bitsperlong.h> #define STAT_HAVE_NSEC 1 +#if __KERNEL_TIME_BITS == 32 || __BITS_PER_LONG == 64 +#define __old_kernel_stat2 stat +#else +#define __kernel_stat stat +#endif + #ifdef __i386__ -struct stat { +struct __old_kernel_stat2 { unsigned long st_dev; unsigned long st_ino; unsigned short st_mode; @@ -73,7 +80,7 @@ struct stat64 { #else /* __i386__ */ -struct stat { +struct __old_kernel_stat2 { __kernel_ulong_t st_dev; __kernel_ulong_t st_ino; __kernel_ulong_t st_nlink; diff --git a/arch/xtensa/include/uapi/asm/stat.h b/arch/xtensa/include/uapi/asm/stat.h index 8d9c1d9d82d0..94e40d22eb88 100644 --- a/arch/xtensa/include/uapi/asm/stat.h +++ b/arch/xtensa/include/uapi/asm/stat.h @@ -15,7 +15,7 @@ #define STAT_HAVE_NSEC 1 -struct stat { +struct __old_kernel_stat2 { unsigned long st_dev; unsigned long st_ino; unsigned int st_mode;

8 years, 11 months

[PATCH v3] isdn: Use ktime_t instead of 'struct timeval'

by Tina Ruchandani

'struct timeval' uses 32-bit representation for seconds which will overflow in year 2038 and beyond. mISDN/clock.c needs to compute and store elapsed time in intervals of 125 microseconds. This patch replaces the usage of 'struct timeval' with 64-bit ktime_t which is y2038 safe. The patch also replaces do_gettimeofday() (wall-clock time) with ktime_get() (monotonic time) since we only care about elapsed time here. Signed-off-by: Tina Ruchandani <ruchandani.tina(a)gmail.com> Suggested-by: Arnd Bergmnann <arnd(a)arndb.de> -- Changes in v3: - Use division scheme suggested by Arnd Bergmann to avoid a (64-bit variable) / (32-bit variable) expression. Changes in v2: - Avoid possible truncation bug caused by assigning ktime_us_delta output to a 16-bit number. - Use ktime_us_delta, more concise than a combination of ktime_sub and ktime_to_us. --- drivers/isdn/mISDN/clock.c | 56 ++++++++++++++++++---------------------------- include/linux/mISDNif.h | 2 +- 2 files changed, 23 insertions(+), 35 deletions(-) diff --git a/drivers/isdn/mISDN/clock.c b/drivers/isdn/mISDN/clock.c index 693fb7c..0ea7e2f 100644 --- a/drivers/isdn/mISDN/clock.c +++ b/drivers/isdn/mISDN/clock.c @@ -37,6 +37,7 @@ #include <linux/types.h> #include <linux/stddef.h> #include <linux/spinlock.h> +#include <linux/ktime.h> #include <linux/mISDNif.h> #include <linux/export.h> #include "core.h" @@ -45,7 +46,7 @@ static u_int *debug; static LIST_HEAD(iclock_list); static DEFINE_RWLOCK(iclock_lock); static u16 iclock_count; /* counter of last clock */ -static struct timeval iclock_tv; /* time stamp of last clock */ +static ktime_t iclock_tv; /* time stamp of last clock */ static int iclock_tv_valid; /* already received one timestamp */ static struct mISDNclock *iclock_current; @@ -53,7 +54,7 @@ void mISDN_init_clock(u_int *dp) { debug = dp; - do_gettimeofday(&iclock_tv); + iclock_tv = ktime_get(); } static void @@ -139,12 +140,11 @@ mISDN_unregister_clock(struct mISDNclock *iclock) EXPORT_SYMBOL(mISDN_unregister_clock); void -mISDN_clock_update(struct mISDNclock *iclock, int samples, struct timeval *tv) +mISDN_clock_update(struct mISDNclock *iclock, int samples, ktime_t *tv) { u_long flags; - struct timeval tv_now; - time_t elapsed_sec; - int elapsed_8000th; + ktime_t tv_now; + u16 delta; write_lock_irqsave(&iclock_lock, flags); if (iclock_current != iclock) { @@ -160,28 +160,22 @@ mISDN_clock_update(struct mISDNclock *iclock, int samples, struct timeval *tv) /* increment sample counter by given samples */ iclock_count += samples; if (tv) { /* tv must be set, if function call is delayed */ - iclock_tv.tv_sec = tv->tv_sec; - iclock_tv.tv_usec = tv->tv_usec; - } else - do_gettimeofday(&iclock_tv); + iclock_tv = *tv; + } else { + iclock_tv = ktime_get(); + } } else { /* calc elapsed time by system clock */ if (tv) { /* tv must be set, if function call is delayed */ - tv_now.tv_sec = tv->tv_sec; - tv_now.tv_usec = tv->tv_usec; - } else - do_gettimeofday(&tv_now); - elapsed_sec = tv_now.tv_sec - iclock_tv.tv_sec; - elapsed_8000th = (tv_now.tv_usec / 125) - - (iclock_tv.tv_usec / 125); - if (elapsed_8000th < 0) { - elapsed_sec -= 1; - elapsed_8000th += 8000; + tv_now = *tv; + } else { + tv_now = ktime_get(); } + delta = ktime_divns(ktime_sub(tv_now, iclock_tv), + (NS_PER_SEC / 8000)); /* add elapsed time to counter and set new timestamp */ - iclock_count += elapsed_sec * 8000 + elapsed_8000th; - iclock_tv.tv_sec = tv_now.tv_sec; - iclock_tv.tv_usec = tv_now.tv_usec; + iclock_count += delta; + iclock_tv = tv_now; iclock_tv_valid = 1; if (*debug & DEBUG_CLOCK) printk("Received first clock from source '%s'.\n", @@ -195,22 +189,16 @@ unsigned short mISDN_clock_get(void) { u_long flags; - struct timeval tv_now; - time_t elapsed_sec; - int elapsed_8000th; + ktime_t tv_now; + u16 delta; u16 count; read_lock_irqsave(&iclock_lock, flags); /* calc elapsed time by system clock */ - do_gettimeofday(&tv_now); - elapsed_sec = tv_now.tv_sec - iclock_tv.tv_sec; - elapsed_8000th = (tv_now.tv_usec / 125) - (iclock_tv.tv_usec / 125); - if (elapsed_8000th < 0) { - elapsed_sec -= 1; - elapsed_8000th += 8000; - } + tv_now = ktime_get(); + delta = ktime_divns(ktime_sub(tv_now, iclock_tv), (NS_PER_SEC / 8000)); /* add elapsed time to counter */ - count = iclock_count + elapsed_sec * 8000 + elapsed_8000th; + count = iclock_count + delta; read_unlock_irqrestore(&iclock_lock, flags); return count; } diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index 246a352..ac02c54 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h @@ -596,7 +596,7 @@ static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) } extern void set_channel_address(struct mISDNchannel *, u_int, u_int); -extern void mISDN_clock_update(struct mISDNclock *, int, struct timeval *); +extern void mISDN_clock_update(struct mISDNclock *, int, ktime_t *); extern unsigned short mISDN_clock_get(void); extern const char *mISDNDevName4ch(struct mISDNchannel *); -- 2.2.0.rc0.207.ga3a616c

8 years, 11 months

[PATCH] fbdev: radeon: Remove 'struct timeval' usage

by Tina Ruchandani

'struct timeval' uses a 32-bit representation for the seconds field which will overflow in the year 2038 and beyond. This patch replaces the usage of 'struct timeval' with ktime_t which uses a 64-bit time representation and does not suffer from the y2038 problem. This patch is part of a larger effort to remove all instances of 'struct timeval', 'struct timespec', time_t and other 32-bit timekeeping variables from the kernel. The patch also replaces the use of real time (do_gettimeofday) with monotonic time (ktime_get). Signed-off-by: Tina Ruchandani <ruchandani.tina(a)gmail.com> --- drivers/video/fbdev/aty/radeon_base.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c index 01237c8..9747e9e 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c @@ -64,6 +64,7 @@ #include <linux/slab.h> #include <linux/delay.h> #include <linux/time.h> +#include <linux/ktime.h> #include <linux/fb.h> #include <linux/ioport.h> #include <linux/init.h> @@ -461,8 +462,8 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) int hTotal, vTotal, num, denom, m, n; unsigned long long hz, vclk; long xtal; - struct timeval start_tv, stop_tv; - long total_secs, total_usecs; + ktime_t start, stop; + s64 delta; int i; /* Ugh, we cut interrupts, bad bad bad, but we want some precision @@ -478,7 +479,7 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) == 0) break; - do_gettimeofday(&start_tv); + start = ktime_get(); for(i=0; i<1000000; i++) if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) != 0) @@ -487,20 +488,18 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) for(i=0; i<1000000; i++) if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) == 0) break; - - do_gettimeofday(&stop_tv); - + + stop = ktime_get(); + local_irq_enable(); - total_secs = stop_tv.tv_sec - start_tv.tv_sec; - if (total_secs > 10) + delta = ktime_us_delta(stop, start); + + /* Return -1 if more than 10 seconds have elapsed */ + if (delta > (10*1000000)) return -1; - total_usecs = stop_tv.tv_usec - start_tv.tv_usec; - total_usecs += total_secs * 1000000; - if (total_usecs < 0) - total_usecs = -total_usecs; - hz = 1000000/total_usecs; - + hz = 1000000/delta; + hTotal = ((INREG(CRTC_H_TOTAL_DISP) & 0x1ff) + 1) * 8; vTotal = ((INREG(CRTC_V_TOTAL_DISP) & 0x3ff) + 1); vclk = (long long)hTotal * (long long)vTotal * hz; @@ -548,7 +547,7 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) denom *= 3; break; case 6: - denom *= 6; + denom *= 6; break; case 7: denom *= 12; -- 2.2.0.rc0.207.ga3a616c

8 years, 11 months

[PATCH v4 00/24] Convert the posix_clock_operations and k_clock structure to ready for 2038

by Baolin Wang

This patch series changes the 32-bit time types (timespec/itimerspec) to the 64-bit types (timespec64/itimerspec64), since 32-bit time types will break in the year 2038. This patch series introduces new methods with timespec64/itimerspec64 type, and removes the old ones with timespec/itimerspec type for posix_clock_operations and k_clock structure. timekeeping: Introduce struct itimerspec64. timekeeping: Introduce current_kernel_time64(). timekeeping: Change timekeeping_clocktai() with timespec64 type. hrtimer: Introduce hrtimer_get_res64(). security: Introduce security_settime64(). time: Introduce do_sys_settimeofday64(). time: Introduce jiffies_to_timespec64()/timespec64_to_jiffies(). cputime: Introduce cputime_to_timespec64()/timespec64_to_cputime(). posix-timers: Split up timer_gettime()/timer_settime()/clock_settime()/ clock_gettime()/clock_getres(). posix-timers: Convert timer_gettime()/timer_settime()/clock_settime()/ clock_gettime()/clock_getres() to timespec64/itimerspec64. mmtimer: Convert to timespec64/itimerspec64. alarmtimer: Convert to timespec64/itimerspec64. posix-clock: Convert to timespec64/itimerspec64. posix-cpu-timers: Convert to timespec64/itimerspec64. Baolin Wang (24): linux/time64.h:Introduce the 'struct itimerspec64' for 64bit timekeeping:Introduce the current_kernel_time64() function with timespec64 type time/hrtimer:Introduce hrtimer_get_res64() with timespec64 type for getting the timer resolution security/security: Introduce security_settime64() function with timespec64 type time:Introduce the do_sys_settimeofday64() function with timespec64 type posix-timers:Change the implementation for timer_gettime syscall function posix-timers:Convert to the 64bit methods for the timer_gettime syscall function posix-timers:Change the implementation for timer_settime syscall posix-timers:Convert to the 64bit methods for the timer_settime syscall function posix-timers:Change the implementation for clock_settime syscall function posix-timers:Convert to the 64bit methods for the clock_settime syscall function posix-timers:Change the implementation for clock_gettime syscall function posix-timers:Convert to the 64bit methods for the clock_gettime syscall function posix-timers:Change the implementation for clock_getres syscall function posix-timers:Convert to the 64bit methods for the clock_getres syscall function timekeeping:Introduce the timekeeping_clocktai() function with timespec64 type time/posix-timers:Convert to the 64bit methods for k_clock callback functions char/mmtimer:Convert to the 64bit methods for k_clock callback functions time/alarmtimer:Convert to the new 64bit methods for k_clock structure time/posix-clock:Convert to the 64bit methods for k_clock and posix_clock_operations structure time/time:Introduce the timespec64_to_jiffies()/jiffies_to_timespec64() function cputime:Introduce the cputime_to_timespec64/timespec64_to_cputime function time/posix-cpu-timers:Convert to the 64bit methods for k_clock structure k_clock:Remove the 32bit methods with timespec/itimerspec type arch/powerpc/include/asm/cputime.h | 6 +- arch/s390/include/asm/cputime.h | 8 +- drivers/char/mmtimer.c | 36 +++-- drivers/ptp/ptp_clock.c | 26 +--- include/asm-generic/cputime_jiffies.h | 10 +- include/asm-generic/cputime_nsecs.h | 4 +- include/linux/cputime.h | 15 ++ include/linux/hrtimer.h | 12 +- include/linux/jiffies.h | 21 ++- include/linux/posix-clock.h | 10 +- include/linux/posix-timers.h | 18 +-- include/linux/security.h | 25 ++- include/linux/time64.h | 35 +++++ include/linux/timekeeping.h | 26 +++- kernel/time/alarmtimer.c | 43 +++--- kernel/time/hrtimer.c | 10 +- kernel/time/posix-clock.c | 20 +-- kernel/time/posix-cpu-timers.c | 83 +++++----- kernel/time/posix-timers.c | 270 ++++++++++++++++++++++----------- kernel/time/time.c | 20 +-- kernel/time/timekeeping.c | 6 +- kernel/time/timekeeping.h | 1 - security/commoncap.c | 2 +- security/security.c | 2 +- 24 files changed, 447 insertions(+), 262 deletions(-) -- 1.7.9.5

8 years, 11 months

[PATCH 0/9] converting system calls to 64-bit time_t, part 2

by Arnd Bergmann

This is a follow-up to the series posted at [1]. To make review a little easier, I'm focusing on just one class of system calls here, and this is one that is handled differently from all the others. 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. Please review. Arnd [1] http://lwn.net/Articles/643407/ Arnd Bergmann (8): y2038: asm-generic: extend sysvipc 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: report long times to user space arch/arm64/include/asm/compat.h | 32 +++++++++---------- arch/mips/include/asm/compat.h | 38 +++++++++++----------- arch/mips/include/uapi/asm/msgbuf.h | 56 +++++++++++++++++++++----------- 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 | 32 +++++++++---------- arch/parisc/include/uapi/asm/sembuf.h | 13 ++++---- arch/parisc/include/uapi/asm/shmbuf.h | 18 +++++------ 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 | 18 +++++------ arch/sparc/include/asm/compat.h | 32 +++++++++---------- arch/sparc/include/uapi/asm/msgbuf.h | 21 ++++++------ arch/sparc/include/uapi/asm/sembuf.h | 15 ++++----- arch/sparc/include/uapi/asm/shmbuf.h | 20 ++++++------ arch/tile/include/asm/compat.h | 32 +++++++++---------- arch/x86/include/asm/compat.h | 32 +++++++++---------- arch/x86/include/uapi/asm/msgbuf.h | 41 +++++++++++++++++++++++- arch/x86/include/uapi/asm/sembuf.h | 10 ++++++ arch/x86/include/uapi/asm/shmbuf.h | 58 +++++++++++++++++++++++++++++++++- arch/xtensa/include/uapi/asm/msgbuf.h | 24 +++++++------- arch/xtensa/include/uapi/asm/sembuf.h | 16 +++++----- arch/xtensa/include/uapi/asm/shmbuf.h | 36 +++++---------------- include/linux/msg.h | 7 ++-- include/linux/sem.h | 3 +- include/linux/shm.h | 7 ++-- include/uapi/asm-generic/msgbuf.h | 16 +++++----- include/uapi/asm-generic/sembuf.h | 26 +++++++++------ include/uapi/asm-generic/shmbuf.h | 16 +++++----- ipc/compat.c | 8 +++++ ipc/msg.c | 23 ++++++++------ ipc/sem.c | 32 +++++++++++-------- ipc/shm.c | 21 +++++++----- 35 files changed, 499 insertions(+), 338 deletions(-) -- 2.1.0.rc2

8 years, 11 months

[PATCH v2] [media] dvb-frontend: Replace timeval with ktime_t

by Tina Ruchandani

struct timeval uses a 32-bit seconds representation which will overflow in the year 2038 and beyond. This patch replaces the usage of struct timeval with ktime_t which is a 64-bit timestamp and is year 2038 safe. This patch is part of a larger attempt to remove all instances of 32-bit timekeeping variables (timeval, timespec, time_t) which are not year 2038 safe, from the kernel. The patch is a work-in-progress - correctness of the following changes is unclear: (a) Usage of timeval_usec_diff - The function seems to subtract usec values without caring about the difference of the seconds field. There may be an implicit assumption in the original code that the time delta is always of the order of microseconds. The patch replaces the usage of timeval_usec_diff with ktime_to_us(ktime_sub()) which computes the real timestamp difference, not just the difference in the usec field. (b) printk diffing the tv[i] and tv[i-1] values. The original printk statement seems to get the order wrong. This patch preserves that order. Signed-off-by: Tina Ruchandani <ruchandani.tina(a)gmail.com> Suggested-by: Arnd Bergmann <arnd(a)arndb.de> -- Changes in v2: - Use the more concise ktime_us_delta - Preserve the waketime argument in dvb_frontend_sleep_until as a pointer, fixes bug introduced in v1 of the patch where the caller doesn't get its timestamp modified. --- drivers/media/dvb-core/dvb_frontend.c | 40 +++++++++-------------------------- drivers/media/dvb-core/dvb_frontend.h | 3 +-- drivers/media/dvb-frontends/stv0299.c | 11 +++++----- 3 files changed, 17 insertions(+), 37 deletions(-) diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c index 882ca41..c110e37 100644 --- a/drivers/media/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb-core/dvb_frontend.c @@ -40,6 +40,7 @@ #include <linux/freezer.h> #include <linux/jiffies.h> #include <linux/kthread.h> +#include <linux/ktime.h> #include <asm/processor.h> #include "dvb_frontend.h" @@ -889,42 +890,21 @@ static void dvb_frontend_stop(struct dvb_frontend *fe) fepriv->thread); } -s32 timeval_usec_diff(struct timeval lasttime, struct timeval curtime) -{ - return ((curtime.tv_usec < lasttime.tv_usec) ? - 1000000 - lasttime.tv_usec + curtime.tv_usec : - curtime.tv_usec - lasttime.tv_usec); -} -EXPORT_SYMBOL(timeval_usec_diff); - -static inline void timeval_usec_add(struct timeval *curtime, u32 add_usec) -{ - curtime->tv_usec += add_usec; - if (curtime->tv_usec >= 1000000) { - curtime->tv_usec -= 1000000; - curtime->tv_sec++; - } -} - /* * Sleep until gettimeofday() > waketime + add_usec * This needs to be as precise as possible, but as the delay is * usually between 2ms and 32ms, it is done using a scheduled msleep * followed by usleep (normally a busy-wait loop) for the remainder */ -void dvb_frontend_sleep_until(struct timeval *waketime, u32 add_usec) +void dvb_frontend_sleep_until(ktime_t *waketime, u32 add_usec) { - struct timeval lasttime; s32 delta, newdelta; - timeval_usec_add(waketime, add_usec); - - do_gettimeofday(&lasttime); - delta = timeval_usec_diff(lasttime, *waketime); + ktime_add_us(*waketime, add_usec); + delta = ktime_us_delta(ktime_get_real(), *waketime); if (delta > 2500) { msleep((delta - 1500) / 1000); - do_gettimeofday(&lasttime); - newdelta = timeval_usec_diff(lasttime, *waketime); + newdelta = ktime_us_delta(ktime_get_real(), *waketime); delta = (newdelta > delta) ? 0 : newdelta; } if (delta > 0) @@ -2458,13 +2438,13 @@ static int dvb_frontend_ioctl_legacy(struct file *file, * include the initialization or start bit */ unsigned long swcmd = ((unsigned long) parg) << 1; - struct timeval nexttime; - struct timeval tv[10]; + ktime_t nexttime; + ktime_t tv[10]; int i; u8 last = 1; if (dvb_frontend_debug) printk("%s switch command: 0x%04lx\n", __func__, swcmd); - do_gettimeofday(&nexttime); + nexttime = ktime_get_real(); if (dvb_frontend_debug) tv[0] = nexttime; /* before sending a command, initialize by sending @@ -2475,7 +2455,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file, for (i = 0; i < 9; i++) { if (dvb_frontend_debug) - do_gettimeofday(&tv[i + 1]); + tv[i+1] = ktime_get_real(); if ((swcmd & 0x01) != last) { /* set voltage to (last ? 13V : 18V) */ fe->ops.set_voltage(fe, (last) ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18); @@ -2489,7 +2469,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file, printk("%s(%d): switch delay (should be 32k followed by all 8k\n", __func__, fe->dvb->num); for (i = 1; i < 10; i++) - printk("%d: %d\n", i, timeval_usec_diff(tv[i-1] , tv[i])); + printk("%d: %d\n", i, (int) ktime_to_us(ktime_sub(tv[i-1], tv[i]))); } err = 0; fepriv->state = FESTATE_DISEQC; diff --git a/drivers/media/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h index 816269e..5b64686 100644 --- a/drivers/media/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb-core/dvb_frontend.h @@ -439,7 +439,6 @@ extern void dvb_frontend_reinitialise(struct dvb_frontend *fe); extern int dvb_frontend_suspend(struct dvb_frontend *fe); extern int dvb_frontend_resume(struct dvb_frontend *fe); -extern void dvb_frontend_sleep_until(struct timeval *waketime, u32 add_usec); -extern s32 timeval_usec_diff(struct timeval lasttime, struct timeval curtime); +extern void dvb_frontend_sleep_until(ktime_t *waketime, u32 add_usec); #endif diff --git a/drivers/media/dvb-frontends/stv0299.c b/drivers/media/dvb-frontends/stv0299.c index b57ecf4..70c8065 100644 --- a/drivers/media/dvb-frontends/stv0299.c +++ b/drivers/media/dvb-frontends/stv0299.c @@ -44,6 +44,7 @@ #include <linux/init.h> #include <linux/kernel.h> +#include <linux/ktime.h> #include <linux/module.h> #include <linux/string.h> #include <linux/slab.h> @@ -404,8 +405,8 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long u8 lv_mask = 0x40; u8 last = 1; int i; - struct timeval nexttime; - struct timeval tv[10]; + ktime_t nexttime; + ktime_t tv[10]; reg0x08 = stv0299_readreg (state, 0x08); reg0x0c = stv0299_readreg (state, 0x0c); @@ -418,7 +419,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long if (debug_legacy_dish_switch) printk ("%s switch command: 0x%04lx\n",__func__, cmd); - do_gettimeofday (&nexttime); + nexttime = ktime_get_real(); if (debug_legacy_dish_switch) tv[0] = nexttime; stv0299_writeregI (state, 0x0c, reg0x0c | 0x50); /* set LNB to 18V */ @@ -427,7 +428,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long for (i=0; i<9; i++) { if (debug_legacy_dish_switch) - do_gettimeofday (&tv[i+1]); + tv[i+1] = ktime_get_real(); if((cmd & 0x01) != last) { /* set voltage to (last ? 13V : 18V) */ stv0299_writeregI (state, 0x0c, reg0x0c | (last ? lv_mask : 0x50)); @@ -443,7 +444,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long printk ("%s(%d): switch delay (should be 32k followed by all 8k\n", __func__, fe->dvb->num); for (i = 1; i < 10; i++) - printk ("%d: %d\n", i, timeval_usec_diff(tv[i-1] , tv[i])); + printk("%d: %d\n", i, (int) ktime_to_us(ktime_sub(tv[i-1], tv[i]))); } return 0; -- 2.2.0.rc0.207.ga3a616c

8 years, 11 months

[PATCH v4] Staging: media: lirc: Replace timeval with ktime_t

by Ksenija Stanojevic

'struct timeval last_tv' is used to get the time of last signal change and 'struct timeval last_intr_tv' is used to get the time of last UART interrupt. 32-bit systems using 'struct timeval' will break in the year 2038, so we have to replace that code with more appropriate types. Here struct timeval is replaced with ktime_t. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> --- Changes in v4: - add lirc in subject line. - remove delta function. - change variable names. Changes in v3: - delta function is changed to inline function. - change variable names. Changes in v2: - change subject line drivers/staging/media/lirc/lirc_sir.c | 75 ++++++++++++++--------------------- 1 file changed, 30 insertions(+), 45 deletions(-) diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c index 29087f6..4f326e9 100644 --- a/drivers/staging/media/lirc/lirc_sir.c +++ b/drivers/staging/media/lirc/lirc_sir.c @@ -44,7 +44,7 @@ #include <linux/ioport.h> #include <linux/kernel.h> #include <linux/serial_reg.h> -#include <linux/time.h> +#include <linux/ktime.h> #include <linux/string.h> #include <linux/types.h> #include <linux/wait.h> @@ -127,9 +127,9 @@ static int threshold = 3; static DEFINE_SPINLOCK(timer_lock); static struct timer_list timerlist; /* time of last signal change detected */ -static struct timeval last_tv = {0, 0}; +static ktime_t last; /* time of last UART data ready interrupt */ -static struct timeval last_intr_tv = {0, 0}; +static ktime_t last_intr_time; static int last_value; static DECLARE_WAIT_QUEUE_HEAD(lirc_read_queue); @@ -400,20 +400,6 @@ static void drop_chrdev(void) } /* SECTION: Hardware */ -static long delta(struct timeval *tv1, struct timeval *tv2) -{ - unsigned long deltv; - - deltv = tv2->tv_sec - tv1->tv_sec; - if (deltv > 15) - deltv = 0xFFFFFF; - else - deltv = deltv*1000000 + - tv2->tv_usec - - tv1->tv_usec; - return deltv; -} - static void sir_timeout(unsigned long data) { /* @@ -432,12 +418,14 @@ static void sir_timeout(unsigned long data) /* clear unread bits in UART and restart */ outb(UART_FCR_CLEAR_RCVR, io + UART_FCR); /* determine 'virtual' pulse end: */ - pulse_end = delta(&last_tv, &last_intr_tv); + pulse_end = min_t(unsigned long, + ktime_us_delta(last, last_intr_time), + PULSE_MASK); dev_dbg(driver.dev, "timeout add %d for %lu usec\n", last_value, pulse_end); add_read_queue(last_value, pulse_end); last_value = 0; - last_tv = last_intr_tv; + last = last_intr_time; } spin_unlock_irqrestore(&timer_lock, flags); } @@ -445,9 +433,9 @@ static void sir_timeout(unsigned long data) static irqreturn_t sir_interrupt(int irq, void *dev_id) { unsigned char data; - struct timeval curr_tv; - static unsigned long deltv; - unsigned long deltintrtv; + ktime_t curr_time; + static unsigned long delt; + unsigned long deltintr; unsigned long flags; int iir, lsr; @@ -471,49 +459,46 @@ static irqreturn_t sir_interrupt(int irq, void *dev_id) do { del_timer(&timerlist); data = inb(io + UART_RX); - do_gettimeofday(&curr_tv); - deltv = delta(&last_tv, &curr_tv); - deltintrtv = delta(&last_intr_tv, &curr_tv); + curr_time = ktime_get(); + delt = min_t(unsigned long, + ktime_us_delta(last, curr_time), + PULSE_MASK); + deltintr = min_t(unsigned long, + ktime_us_delta(last_intr_time, + curr_time), + PULSE_MASK); dev_dbg(driver.dev, "t %lu, d %d\n", - deltintrtv, (int)data); + deltintr, (int)data); /* * if nothing came in last X cycles, * it was gap */ - if (deltintrtv > TIME_CONST * threshold) { + if (deltintr > TIME_CONST * threshold) { if (last_value) { dev_dbg(driver.dev, "GAP\n"); /* simulate signal change */ add_read_queue(last_value, - deltv - - deltintrtv); + delt - + deltintr); last_value = 0; - last_tv.tv_sec = - last_intr_tv.tv_sec; - last_tv.tv_usec = - last_intr_tv.tv_usec; - deltv = deltintrtv; + last = last_intr_time; + delt = deltintr; } } data = 1; if (data ^ last_value) { /* - * deltintrtv > 2*TIME_CONST, remember? + * deltintr > 2*TIME_CONST, remember? * the other case is timeout */ add_read_queue(last_value, - deltv-TIME_CONST); + delt-TIME_CONST); last_value = data; - last_tv = curr_tv; - if (last_tv.tv_usec >= TIME_CONST) { - last_tv.tv_usec -= TIME_CONST; - } else { - last_tv.tv_sec--; - last_tv.tv_usec += 1000000 - - TIME_CONST; - } + last = curr_time; + last = ktime_sub_us(last, + TIME_CONST); } - last_intr_tv = curr_tv; + last_intr_time = curr_time; if (data) { /* * start timer for end of -- 1.9.1

8 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038 May 2015