Y2038

y2038@lists.linaro.org

1132 discussions

[PATCH v3 01/22] linux/time64.h:Introduce the 'struct itimerspec64' for 64bit

by Baolin Wang

This patch introduces the 'struct itimerspec64' for 64bit to replace itimerspec, and also introduces the conversion methods: itimerspec64_to_itimerspec() and itimerspec_to_itimerspec64(), that makes itimerspec ready for 2038 year. Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> --- include/linux/time64.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/linux/time64.h b/include/linux/time64.h index a383147..61dc4cb 100644 --- a/include/linux/time64.h +++ b/include/linux/time64.h @@ -11,11 +11,18 @@ typedef __s64 time64_t; */ #if __BITS_PER_LONG == 64 # define timespec64 timespec +#define itimerspec64 itimerspec #else struct timespec64 { time64_t tv_sec; /* seconds */ long tv_nsec; /* nanoseconds */ }; + +struct itimerspec64 { + struct timespec64 it_interval; /* timer period */ + struct timespec64 it_value; /* timer expiration */ +}; + #endif /* Parameters used to convert the timespec values: */ @@ -43,6 +50,16 @@ static inline struct timespec64 timespec_to_timespec64(const struct timespec ts) return ts; } +static inline struct itimerspec itimerspec64_to_itimerspec(struct itimerspec64 *its64) +{ + return *its64; +} + +static inline struct itimerspec64 itimerspec_to_itimerspec64(struct itimerspec *its) +{ + return *its; +} + # define timespec64_equal timespec_equal # define timespec64_compare timespec_compare # define set_normalized_timespec64 set_normalized_timespec @@ -75,6 +92,24 @@ static inline struct timespec64 timespec_to_timespec64(const struct timespec ts) return ret; } +static inline struct itimerspec itimerspec64_to_itimerspec(struct itimerspec64 *its64) +{ + struct itimerspec ret; + + ret.it_interval = timespec64_to_timespec(its64->it_interval); + ret.it_value = timespec64_to_timespec(its64->it_value); + return ret; +} + +static inline struct itimerspec64 itimerspec_to_itimerspec64(struct itimerspec *its) +{ + struct itimerspec64 ret; + + ret.it_interval = timespec_to_timespec64(its->it_interval); + ret.it_value = timespec_to_timespec64(its->it_value); + return ret; +} + static inline int timespec64_equal(const struct timespec64 *a, const struct timespec64 *b) { -- 1.7.9.5

9 years, 11 months

[PATCH v3 00/22] Convert the posix_clock_operations and k_clock structure to ready for 2038

by Baolin Wang

This patch series changes the 32-bit time type (timespec/itimerspec) to the 64-bit one (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. Also introduces some new functions with timespec64/itimerspec64 type, like current_kernel_time64(), hrtimer_get_res64(), cputime_to_timespec64() and timespec64_to_cputime(). Changes since v2: -Split the syscall conversion patch into small some patches. *** BLURB HERE *** Baolin Wang (22): 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 posix-timers:Split out the guts of the syscall and change the implementation for timer_gettime posix-timers:Convert to the 64bit methods for the timer_gettime syscall function posix-timers:Split out the guts of the syscall and change the implementation for timer_settime posix-timers:Convert to the 64bit methods for the timer_settime syscall function posix-timers:Split out the guts of the syscall and change the implementation for clock_settime posix-timers:Convert to the 64bit methods for the clock_settime syscall function posix-timers:Split out the guts of the syscall and change the implementation for clock_gettime posix-timers:Convert to the 64bit methods for the clock_gettime syscall function posix-timers:Split out the guts of the syscall and change the implementation for clock_getres posix-timers:Convert to the 64bit methods for the clock_getres syscall function time:Introduce the do_sys_settimeofday64() 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 function 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/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 | 269 ++++++++++++++++++++++----------- kernel/time/time.c | 22 +-- kernel/time/timekeeping.c | 6 +- kernel/time/timekeeping.h | 2 +- 21 files changed, 428 insertions(+), 254 deletions(-) -- 1.7.9.5

9 years, 11 months

Re: [Y2038] [PATCH v4 06/10] cec: add HDMI CEC framework: y2038 question

by Hans Verkuil

Added the y2038 mailinglist since I would like to get their input for this API. Y2038 experts, can you take a look at my comments in the code below? Thanks! On 04/23/2015 03:03 PM, Kamil Debski wrote: > From: Hans Verkuil <hansverk(a)cisco.com> > > The added HDMI CEC framework provides a generic kernel interface for > HDMI CEC devices. > > Signed-off-by: Hans Verkuil <hansverk(a)cisco.com> > [k.debski(a)samsung.com: Merged CEC Updates commit by Hans Verkuil] > [k.debski(a)samsung.com: Merged Update author commit by Hans Verkuil] > [k.debski(a)samsung.com: change kthread handling when setting logical > address] > [k.debski(a)samsung.com: code cleanup and fixes] > [k.debski(a)samsung.com: add missing CEC commands to match spec] > [k.debski(a)samsung.com: add RC framework support] > [k.debski(a)samsung.com: move and edit documentation] > [k.debski(a)samsung.com: add vendor id reporting] > [k.debski(a)samsung.com: add possibility to clear assigned logical > addresses] > [k.debski(a)samsung.com: documentation fixes, clenaup and expansion] > [k.debski(a)samsung.com: reorder of API structs and add reserved fields] > [k.debski(a)samsung.com: fix handling of events and fix 32/64bit timespec > problem] > [k.debski(a)samsung.com: add cec.h to include/uapi/linux/Kbuild] > Signed-off-by: Kamil Debski <k.debski(a)samsung.com> > --- > Documentation/cec.txt | 396 ++++++++++++++++ > drivers/media/Kconfig | 6 + > drivers/media/Makefile | 2 + > drivers/media/cec.c | 1161 +++++++++++++++++++++++++++++++++++++++++++++ > include/media/cec.h | 140 ++++++ > include/uapi/linux/Kbuild | 1 + > include/uapi/linux/cec.h | 303 ++++++++++++ > 7 files changed, 2009 insertions(+) > create mode 100644 Documentation/cec.txt > create mode 100644 drivers/media/cec.c > create mode 100644 include/media/cec.h > create mode 100644 include/uapi/linux/cec.h > <snip> > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > index 4842a98..5854cfd 100644 > --- a/include/uapi/linux/Kbuild > +++ b/include/uapi/linux/Kbuild > @@ -81,6 +81,7 @@ header-y += capi.h > header-y += cciss_defs.h > header-y += cciss_ioctl.h > header-y += cdrom.h > +header-y += cec.h > header-y += cgroupstats.h > header-y += chio.h > header-y += cm4000_cs.h > diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h > new file mode 100644 > index 0000000..bb6d66c > --- /dev/null > +++ b/include/uapi/linux/cec.h > @@ -0,0 +1,303 @@ > +#ifndef _CEC_H > +#define _CEC_H > + > +#include <linux/types.h> > + > +struct cec_time { > + __u64 sec; > + __u64 nsec; > +}; I don't like having to introduce a new struct for time here. Basically we are only doing this because there is still no public struct timespec64. When will that struct become available for use in a public API? If it is 4.2, then we can start using it. If it will take longer, then what alternative can we use to prevent having to change the API later? One alternative might be to drop it for now and just reserve space in the structs to add it later. Input from the y2038 experts will be welcome! Regards, Hans > + > +struct cec_msg { > + struct cec_time ts; > + __u32 len; > + __u32 status; > + __u32 timeout; > + /* timeout (in ms) is used to timeout CEC_RECEIVE. > + Set to 0 if you want to wait forever. */ > + __u8 msg[16]; > + __u8 reply; > + /* If non-zero, then wait for a reply with this opcode. > + If there was an error when sending the msg or FeatureAbort > + was returned, then reply is set to 0. > + If reply is non-zero upon return, then len/msg are set to > + the received message. > + If reply is zero upon return and status has the > + CEC_TX_STATUS_FEATURE_ABORT bit set, then len/msg are set to the > + received feature abort message. > + If reply is zero upon return and status has the > + CEC_TX_STATUS_REPLY_TIMEOUT > + bit set, then no reply was seen at all. > + This field is ignored with CEC_RECEIVE. > + If reply is non-zero for CEC_TRANSMIT and the message is a broadcast, > + then -EINVAL is returned. > + if reply is non-zero, then timeout is set to 1000 (the required > + maximum response time). > + */ > + __u8 reserved[31]; > +}; > + > +static inline __u8 cec_msg_initiator(const struct cec_msg *msg) > +{ > + return msg->msg[0] >> 4; > +} > + > +static inline __u8 cec_msg_destination(const struct cec_msg *msg) > +{ > + return msg->msg[0] & 0xf; > +} > + > +static inline bool cec_msg_is_broadcast(const struct cec_msg *msg) > +{ > + return (msg->msg[0] & 0xf) == 0xf; > +} > + > +/* cec status field */ > +#define CEC_TX_STATUS_OK (0) > +#define CEC_TX_STATUS_ARB_LOST (1 << 0) > +#define CEC_TX_STATUS_RETRY_TIMEOUT (1 << 1) > +#define CEC_TX_STATUS_FEATURE_ABORT (1 << 2) > +#define CEC_TX_STATUS_REPLY_TIMEOUT (1 << 3) > +#define CEC_RX_STATUS_READY (0) > + > +#define CEC_LOG_ADDR_INVALID 0xff > + > +/* The maximum number of logical addresses one device can be assigned to. > + * The CEC 2.0 spec allows for only 2 logical addresses at the moment. The > + * Analog Devices CEC hardware supports 3. So let's go wild and go for 4. */ > +#define CEC_MAX_LOG_ADDRS 4 > + > +/* The "Primary Device Type" */ > +#define CEC_PRIM_DEVTYPE_TV 0 > +#define CEC_PRIM_DEVTYPE_RECORD 1 > +#define CEC_PRIM_DEVTYPE_TUNER 3 > +#define CEC_PRIM_DEVTYPE_PLAYBACK 4 > +#define CEC_PRIM_DEVTYPE_AUDIOSYSTEM 5 > +#define CEC_PRIM_DEVTYPE_SWITCH 6 > +#define CEC_PRIM_DEVTYPE_VIDEOPROC 7 > + > +/* The "All Device Types" flags (CEC 2.0) */ > +#define CEC_FL_ALL_DEVTYPE_TV (1 << 7) > +#define CEC_FL_ALL_DEVTYPE_RECORD (1 << 6) > +#define CEC_FL_ALL_DEVTYPE_TUNER (1 << 5) > +#define CEC_FL_ALL_DEVTYPE_PLAYBACK (1 << 4) > +#define CEC_FL_ALL_DEVTYPE_AUDIOSYSTEM (1 << 3) > +#define CEC_FL_ALL_DEVTYPE_SWITCH (1 << 2) > +/* And if you wondering what happened to VIDEOPROC devices: those should > + * be mapped to a SWITCH. */ > + > +/* The logical address types that the CEC device wants to claim */ > +#define CEC_LOG_ADDR_TYPE_TV 0 > +#define CEC_LOG_ADDR_TYPE_RECORD 1 > +#define CEC_LOG_ADDR_TYPE_TUNER 2 > +#define CEC_LOG_ADDR_TYPE_PLAYBACK 3 > +#define CEC_LOG_ADDR_TYPE_AUDIOSYSTEM 4 > +#define CEC_LOG_ADDR_TYPE_SPECIFIC 5 > +#define CEC_LOG_ADDR_TYPE_UNREGISTERED 6 > +/* Switches should use UNREGISTERED. > + * Video processors should use SPECIFIC. */ > + > +/* The CEC version */ > +#define CEC_VERSION_1_4B 5 > +#define CEC_VERSION_2_0 6 > + > +struct cec_event { > + struct cec_time ts; > + __u32 event; > + __u8 reserved[4]; > +}; > + > +/* The CEC state */ > +#define CEC_STATE_DISABLED 0 > +#define CEC_STATE_ENABLED 1 > + > +/* Userspace has to configure the adapter state (enable/disable) */ > +#define CEC_CAP_STATE (1 << 0) > +/* Userspace has to configure the physical address */ > +#define CEC_CAP_PHYS_ADDR (1 << 1) > +/* Userspace has to configure the logical addresses */ > +#define CEC_CAP_LOG_ADDRS (1 << 2) > +/* Userspace can transmit messages */ > +#define CEC_CAP_TRANSMIT (1 << 3) > +/* Userspace can receive messages */ > +#define CEC_CAP_RECEIVE (1 << 4) > +/* Userspace has to configure the vendor id */ > +#define CEC_CAP_VENDOR_ID (1 << 5) > +/* The hardware has the possibility to work in the promiscuous mode */ > +#define CEC_CAP_PROMISCUOUS (1 << 6) > + > +struct cec_caps { > + __u32 available_log_addrs; > + __u32 capabilities; > + __u32 vendor_id; > + __u8 version; > + __u8 reserved[11]; > +}; > + > +struct cec_log_addrs { > + __u8 cec_version; > + __u8 num_log_addrs; > + __u8 primary_device_type[CEC_MAX_LOG_ADDRS]; > + __u8 log_addr_type[CEC_MAX_LOG_ADDRS]; > + __u8 log_addr[CEC_MAX_LOG_ADDRS]; > + > + /* CEC 2.0 */ > + __u8 all_device_types; > + __u8 features[CEC_MAX_LOG_ADDRS][12]; > + > + __u8 reserved[9]; > +}; > + > +/* Commands */ > + > +/* One Touch Play Feature */ > +#define CEC_OP_ACTIVE_SOURCE 0x82 > +#define CEC_OP_IMAGE_VIEW_ON 0x04 > +#define CEC_OP_TEXT_VIEW_ON 0x0d > + > +/* Routing Control Feature */ > +#define CEC_OP_ACTIVE_SOURCE 0x82 > +#define CEC_OP_INACTIVE_SOURCE 0x9d > +#define CEC_OP_REQUEST_ACTIVE_SOURCE 0x85 > +#define CEC_OP_ROUTING_CHANGE 0x80 > +#define CEC_OP_ROUTING_INFORMATION 0x81 > +#define CEC_OP_SET_STREAM_PATH 0x86 > + > +/* Standby Feature */ > +#define CEC_OP_STANDBY 0x36 > + > +/* One Touch Record Feature */ > +#define CEC_OP_RECORD_OFF 0x0b > +#define CEC_OP_RECORD_ON 0x09 > +#define CEC_OP_RECORD_STATUS 0x0a > +#define CEC_OP_RECORD_TV_SCREEN 0x0f > + > +/* Timer Programming Feature */ > +#define CEC_OP_CLEAR_ANALOGUE_TIMER 0x33 > +#define CEC_OP_CLEAR_DIGITAL_TIMER 0x99 > +#define CEC_OP_CLEAR_EXT_TIMER 0xa1 > +#define CEC_OP_SET_ANALOGUE_TIMER 0x34 > +#define CEC_OP_SET_DIGITAL_TIMER 0x97 > +#define CEC_OP_SET_EXT_TIMER 0xa2 > +#define CEC_OP_SET_EXT_PROGRAM_TIMER 0x67 > +#define CEC_OP_TIMER_CLEARED_STATUS 0x43 > +#define CEC_OP_TIMER_STATUS 0x35 > + > +/* System Information Feature */ > +#define CEC_OP_CEC_VERSION 0x9e > +#define CEC_OP_GET_CEC_VERSION 0x9f > +#define CEC_OP_GIVE_PHYSICAL_ADDR 0x83 > +#define CEC_OP_GET_MENU_LANGUAGE 0x91 > +#define CEC_OP_REPORT_PHYSICAL_ADDR 0x84 > +#define CEC_OP_SET_MENU_LANGUAGE 0x32 > + > +/* Deck Control Feature */ > +#define CEC_OP_DECK_CONTROL 0x42 > +#define CEC_OP_DECK_STATUS 0x1b > +#define CEC_OP_GIVE_DECK_STATUS 0x1a > +#define CEC_OP_PLAY 0x41 > + > +/* Tuner Control Feature */ > +#define CEC_OP_GIVE_TUNER_DEVICE_STATUS 0x08 > +#define CEC_OP_SELECT_ANALOGUE_SERVICE 0x92 > +#define CEC_OP_SELECT_DIGITAL_SERVICE 0x93 > +#define CEC_OP_TUNER_DEVICE_STATUS 0x07 > +#define CEC_OP_TUNER_STEP_DECREMENT 0x06 > +#define CEC_OP_TUNER_STEP_INCREMENT 0x05 > + > +/* Vendor Specific Commands Feature */ > +#define CEC_OP_CEC_VERSION 0x9e > +#define CEC_OP_DEVICE_VENDOR_ID 0x87 > +#define CEC_OP_GET_CEC_VERSION 0x9f > +#define CEC_OP_GIVE_DEVICE_VENDOR_ID 0x8c > +#define CEC_OP_VENDOR_COMMAND 0x89 > +#define CEC_OP_VENDOR_COMMAND_WITH_ID 0xa0 > +#define CEC_OP_VENDOR_REMOTE_BUTTON_DOWN 0x8a > +#define CEC_OP_VENDOR_REMOTE_BUTTON_UP 0x8b > + > +/* OSD Display Feature */ > +#define CEC_OP_SET_OSD_STRING 0x64 > + > +/* Device OSD Transfer Feature */ > +#define CEC_OP_GIVE_OSD_NAME 0x46 > +#define CEC_OP_SET_OSD_NAME 0x47 > + > +/* Device Menu Control Feature */ > +#define CEC_OP_MENU_REQUEST 0x8d > +#define CEC_OP_MENU_STATUS 0x8e > +#define CEC_OP_USER_CONTROL_PRESSED 0x44 > +#define CEC_OP_USER_CONTROL_RELEASED 0x45 > + > +/* Power Status Feature */ > +#define CEC_OP_GIVE_DEVICE_POWER_STATUS 0x8f > +#define CEC_OP_REPORT_POWER_STATUS 0x90 > +#define CEC_OP_FEATURE_ABORT 0x00 > +#define CEC_OP_ABORT 0xff > + > +/* System Audio Control Feature */ > +#define CEC_OP_GIVE_AUDIO_STATUS 0x71 > +#define CEC_OP_GIVE_SYSTEM_AUDIO_MODE_STATUS 0x7d > +#define CEC_OP_REPORT_AUDIO_STATUS 0x7a > +#define CEC_OP_SET_SYSTEM_AUDIO_MODE 0x72 > +#define CEC_OP_SYSTEM_AUDIO_MODE_REQUEST 0x70 > +#define CEC_OP_SYSTEM_AUDIO_MODE_STATUS 0x7e > + > +/* Audio Rate Control Feature */ > +#define CEC_OP_SET_AUDIO_RATE 0x9a > + > +/* Events */ > +/* Event that occurs when a cable is connected */ > +#define CEC_EVENT_CONNECT 1 > +/* Event that occurs when all logical addresses were claimed */ > +#define CEC_EVENT_READY 2 > +/* Event that is sent when the cable is disconnected */ > +#define CEC_EVENT_DISCONNECT 3 > + > +/* ioctls */ > + > +/* issue a CEC command */ > +#define CEC_G_CAPS _IOWR('a', 0, struct cec_caps) > +#define CEC_TRANSMIT _IOWR('a', 1, struct cec_msg) > +#define CEC_RECEIVE _IOWR('a', 2, struct cec_msg) > + > +/* > + Configure the CEC adapter. It sets the device type and which > + logical types it will try to claim. It will return which > + logical addresses it could actually claim. > + An error is returned if the adapter is disabled or if there > + is no physical address assigned. > + */ > + > +#define CEC_G_ADAP_LOG_ADDRS _IOR('a', 3, struct cec_log_addrs) > +#define CEC_S_ADAP_LOG_ADDRS _IOWR('a', 4, struct cec_log_addrs) > + > +/* > + Enable/disable the adapter. The Set state ioctl may not > + be available if that is handled internally. > + */ > +#define CEC_G_ADAP_STATE _IOR('a', 5, __u32) > +#define CEC_S_ADAP_STATE _IOW('a', 6, __u32) > + > +/* > + phys_addr is either 0 (if this is the CEC root device) > + or a valid physical address obtained from the sink's EDID > + as read by this CEC device (if this is a source device) > + or a physical address obtained and modified from a sink > + EDID and used for a sink CEC device. > + If nothing is connected, then phys_addr is 0xffff. > + See HDMI 1.4b, section 8.7 (Physical Address). > + > + The Set ioctl may not be available if that is handled > + internally. > + */ > +#define CEC_G_ADAP_PHYS_ADDR _IOR('a', 7, __u16) > +#define CEC_S_ADAP_PHYS_ADDR _IOW('a', 8, __u16) > + > +#define CEC_G_EVENT _IOWR('a', 9, struct cec_event) > +/* > + Read and set the vendor ID of the CEC adapter. > + */ > +#define CEC_G_VENDOR_ID _IOR('a', 9, __u32) > +#define CEC_S_VENDOR_ID _IOW('a', 10, __u32) > + > +#endif >

9 years, 11 months

[PATCH v2 04/15] posix timers:Introduce the 64bit methods with timespec64 type for k_clock structure

by Baolin Wang

This patch introduces the new methods with timespec64/itimerspec64 type for k_clcok structure,converts the timepsec type to timespec64 type in k_clock structure and converts the itimerspec type to itimerspec64 type to ready for 2038 issue. Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> --- include/linux/posix-timers.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index 907f3fd..35786c5 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -98,9 +98,13 @@ struct k_itimer { struct k_clock { int (*clock_getres) (const clockid_t which_clock, struct timespec *tp); + int (*clock_getres64) (const clockid_t which_clock, struct timespec64 *tp); int (*clock_set) (const clockid_t which_clock, const struct timespec *tp); + int (*clock_set64) (const clockid_t which_clock, + const struct timespec64 *tp); int (*clock_get) (const clockid_t which_clock, struct timespec * tp); + int (*clock_get64) (const clockid_t which_clock, struct timespec64 *tp); int (*clock_adj) (const clockid_t which_clock, struct timex *tx); int (*timer_create) (struct k_itimer *timer); int (*nsleep) (const clockid_t which_clock, int flags, @@ -109,10 +113,15 @@ struct k_clock { int (*timer_set) (struct k_itimer * timr, int flags, struct itimerspec * new_setting, struct itimerspec * old_setting); + int (*timer_set64) (struct k_itimer *timr, int flags, + struct itimerspec64 *new_setting, + struct itimerspec64 *old_setting); int (*timer_del) (struct k_itimer * timr); #define TIMER_RETRY 1 void (*timer_get) (struct k_itimer * timr, struct itimerspec * cur_setting); + void (*timer_get64) (struct k_itimer *timr, + struct itimerspec64 *cur_setting); }; extern struct k_clock clock_posix_cpu; -- 1.7.9.5

9 years, 11 months

Re: [Y2038] [PATCH v3] scsi: stex: Remove use of struct timeval

by Arnd Bergmann

On Tuesday 05 May 2015 12:34:27 Tina Ruchandani wrote: > Function stex_gettime uses 'struct timeval' whose tv_sec value > will overflow on 32-bit systems in year 2038 and beyond. This patch > replaces the use of struct timeval and do_gettimeofday with > ktime_get_real_seconds, which returns a 64-bit seconds value. > > Suggested-by: Arnd Bergmann <arnd(a)arndb.de> > Signed-off-by: Tina Ruchandani <ruchandani.tina(a)gmail.com> > -- [+ y2038 list] Looks good, Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> > Changes in v3: > - Remove stex_gettime altogether, directly assign the timestamp. > Changes in v2: > - Change subject line to indicate that the patch is restricted to stex driver. > --- > --- > drivers/scsi/stex.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c > index 98a62bc..84e196e 100644 > --- a/drivers/scsi/stex.c > +++ b/drivers/scsi/stex.c > @@ -25,6 +25,7 @@ > #include <linux/types.h> > #include <linux/module.h> > #include <linux/spinlock.h> > +#include <linux/ktime.h> > #include <asm/io.h> > #include <asm/irq.h> > #include <asm/byteorder.h> > @@ -362,14 +363,6 @@ MODULE_DESCRIPTION("Promise Technology SuperTrak EX Controllers"); > MODULE_LICENSE("GPL"); > MODULE_VERSION(ST_DRIVER_VERSION); > > -static void stex_gettime(__le64 *time) > -{ > - struct timeval tv; > - > - do_gettimeofday(&tv); > - *time = cpu_to_le64(tv.tv_sec); > -} > - > static struct status_msg *stex_get_status(struct st_hba *hba) > { > struct status_msg *status = hba->status_buffer + hba->status_tail; > @@ -1002,7 +995,7 @@ static int stex_common_handshake(struct st_hba *hba) > h->req_cnt = cpu_to_le16(hba->rq_count+1); > h->status_sz = cpu_to_le16(sizeof(struct status_msg)); > h->status_cnt = cpu_to_le16(hba->sts_count+1); > - stex_gettime(&h->hosttime); > + h->hosttime = cpu_to_le64(ktime_get_real_seconds()); > h->partner_type = HMU_PARTNER_TYPE; > if (hba->extra_offset) { > h->extra_offset = cpu_to_le32(hba->extra_offset); > @@ -1076,7 +1069,7 @@ static int stex_ss_handshake(struct st_hba *hba) > h->req_cnt = cpu_to_le16(hba->rq_count+1); > h->status_sz = cpu_to_le16(sizeof(struct status_msg)); > h->status_cnt = cpu_to_le16(hba->sts_count+1); > - stex_gettime(&h->hosttime); > + h->hosttime = cpu_to_le64(ktime_get_real_seconds()); > h->partner_type = HMU_PARTNER_TYPE; > h->extra_offset = h->extra_size = 0; > scratch_size = (hba->sts_count+1)*sizeof(u32); >

9 years, 11 months

[RFC 00/37] converting all system calls to 64-bit time_t

by Arnd Bergmann

Apologies for the overly long patch series, I was hoping this would have been simpler. This is my first draft of how we could modify the system call interface in Linux to support user space with 64-bit time_t in addition to the existing 32-bit time_t based interfaces. For the time being, I'm mainly interested in feedback about the general approach, to see if this is a reasonable concept, or whether we should do this in a completely different way. The current submission is for a relatively small group of people and only for the y2038 mailing list, and if we can agree on the approach, I will post it to a wider group of people and mailing lists next. The overall approach I have taken here is as follows: * Since 64-bit architectures already support two versions of each system call that passes a time value in order to run 32-bit user space, I'm not adding new system calls for the most part, but instead make 32-bit architectures use the same compat handlers that 64-bit architectures already use. * The existing syscall numbers are modified to point to the compat_sys_* functions, and new numbers are assigned to point to the existing handlers that now deal with 64-bit time_t based structures * This series does not touch any ioctl implementation, but should be otherwise complete regarding the system calls. We are still trying to find out exactly which ioctls are affected and have not come up with a complete list at this point. It's probably a good idea though to do at least the essential ioctls before merging the series, so we can have a better understanding of how it will be done in the end. * Each data structure we need to modify gets a new definition with a __kernel_ prefix, e.g. struct __kernel_timespec to replace struct timespec. This keeps the new structures out of the user libc namespace, but still allows the structure to be integrated into other data structures, e.g. for ioctl. * There is no #ifdef in the UAPI headers at this point that would check for the kind of user space that is in use. Unfortunately, I believe we will need to add that in order to do some of the particularly tricky ioctls later. * At first, all system call implementations are modified, but this is done in a way that is not supposed to have any ABI-visible effect on existing architectures. * After all system calls are converted, we can change one architecture at a time to select ARCH_HAS_COMPAT_TIME, and modify its system call table accordingly. In this version, I do it for ARM32, x86-32, and x86-64 for demonstration purposes. * A follow-up series changes over all other architectures. * The last patch in the series changes the CONFIG_COMPAT_TIME Kconfig symbol to be user visible. Disabling this symbol will get you a kernel that intentionally breaks support for old tasks in order to provide an interface that will survive 2038. This is meant mostly as a debugging help for now, to let people build a y2038 safe distro, but at some point in the 2030s, we should remove that option and all the compat handling. Arnd Bergmann (37): initramfs: use vfs_stat/lstat directly y2038: introduce linux/compat_time.h header y2038: introduce CONFIG_COMPAT_TIME y2038: make linux/compat_time.h usable on 32-bit y2038: compile compat time code even when CONFIG_COMPAT is not set y2038: add compat_sys_rt_sigtimedwait variants y2038: introduce struct __kernel_rusage y2038: introduce struct __kernel_timespec y2038: introduce struct __kernel_stat y2038: use timespec64 for poll/select/recvmmsg y2038: add compat_{get,put}_timespec64 y2038: use __kernel_timespec in sys_aio_getevents y2038: factor out compat fd_set and sigset handling y2038: add compat handling for sys_recvmmsg y2038: add compat handling for sys_semtimedop y2038: extend sysvipc data structures for 64-bit time_t y2038: ipc: report long times to user space y2038: introduce {get,put}_itimerspec y2038: use __kernel_itimerspec in timerfd y2038: introduce compat_sys_pselect6_time64 y2038: introduce compat_sys_ppoll_time64 y2038: use __kernel_timespec for sys_mq_timed{send,receive} y2038: make compat_sys_mq_timed{send,receive} usable on 32-bit y2038: use __kernel_timespec in sys_utimensat y2038: introduce timespec64_to_jiffies y2038: use __kernel_timespec in sys_rt_sigtimedwait y2038: use __kernel_timespec in sys_futex y2038: introduce jiffies_to_timespec64 y2038: use __kernel_timespec in sys_sched_rr_get_interval y2038: move compat posix time handling to posix-timers.c y2038: introduce struct __kernel_timex y2038: convert all timex users to use __kernel_timex y2038: convert posix clock syscalls y2038: ignore new syscalls for now ARM: use CONFIG_COMPAT_TIME x86: use COMPAT_SYS_TIME [NOT YET] y2038: make CONFIG_COMPAT_TIME optional arch/Kconfig | 12 ++ arch/alpha/include/asm/Kbuild | 4 + arch/alpha/include/uapi/asm/ipcbuf.h | 1 - arch/alpha/include/uapi/asm/msgbuf.h | 27 --- arch/alpha/include/uapi/asm/sembuf.h | 22 -- arch/alpha/include/uapi/asm/shmbuf.h | 38 ---- arch/alpha/include/uapi/asm/stat.h | 4 + arch/alpha/kernel/osf_sys.c | 8 +- arch/arm/Kconfig | 1 + arch/arm/include/asm/unistd.h | 11 +- arch/arm/include/uapi/asm/stat.h | 2 + arch/arm/include/uapi/asm/unistd.h | 22 ++ arch/arm/kernel/calls.S | 101 ++++++---- arch/arm/kernel/sys_oabi-compat.c | 9 +- arch/arm64/include/asm/compat.h | 43 ++-- arch/avr32/include/asm/Kbuild | 4 + arch/avr32/include/uapi/asm/Kbuild | 1 - arch/avr32/include/uapi/asm/msgbuf.h | 31 --- arch/avr32/include/uapi/asm/sembuf.h | 25 --- arch/avr32/include/uapi/asm/shmbuf.h | 42 ---- arch/avr32/include/uapi/asm/stat.h | 2 + arch/blackfin/include/uapi/asm/stat.h | 2 + arch/cris/include/asm/Kbuild | 6 +- arch/cris/include/uapi/asm/ipcbuf.h | 1 - arch/cris/include/uapi/asm/msgbuf.h | 33 --- arch/cris/include/uapi/asm/sembuf.h | 25 --- arch/cris/include/uapi/asm/shmbuf.h | 42 ---- arch/cris/include/uapi/asm/stat.h | 2 + arch/frv/include/asm/Kbuild | 4 + arch/frv/include/uapi/asm/ipcbuf.h | 1 - arch/frv/include/uapi/asm/msgbuf.h | 32 --- arch/frv/include/uapi/asm/sembuf.h | 26 --- arch/frv/include/uapi/asm/shmbuf.h | 43 ---- arch/frv/include/uapi/asm/stat.h | 2 + arch/ia64/include/asm/Kbuild | 4 + arch/ia64/include/uapi/asm/ipcbuf.h | 1 - arch/ia64/include/uapi/asm/msgbuf.h | 27 --- arch/ia64/include/uapi/asm/sembuf.h | 22 -- arch/ia64/include/uapi/asm/shmbuf.h | 38 ---- arch/ia64/include/uapi/asm/stat.h | 4 + arch/m32r/include/asm/Kbuild | 4 + arch/m32r/include/uapi/asm/ipcbuf.h | 1 - arch/m32r/include/uapi/asm/msgbuf.h | 31 --- arch/m32r/include/uapi/asm/sembuf.h | 25 --- arch/m32r/include/uapi/asm/shmbuf.h | 42 ---- arch/m32r/include/uapi/asm/stat.h | 1 + arch/m68k/include/uapi/asm/stat.h | 2 + arch/mips/include/asm/compat.h | 49 ++--- 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/mips/include/uapi/asm/stat.h | 1 + arch/mn10300/include/asm/Kbuild | 4 + arch/mn10300/include/uapi/asm/ipcbuf.h | 1 - arch/mn10300/include/uapi/asm/msgbuf.h | 31 --- arch/mn10300/include/uapi/asm/sembuf.h | 25 --- arch/mn10300/include/uapi/asm/shmbuf.h | 42 ---- arch/mn10300/include/uapi/asm/stat.h | 2 + arch/parisc/include/asm/compat.h | 43 ++-- 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/parisc/include/uapi/asm/stat.h | 1 + arch/powerpc/include/asm/compat.h | 43 ++-- 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/powerpc/include/uapi/asm/stat.h | 25 +++ arch/s390/include/asm/Kbuild | 4 +- arch/s390/include/asm/compat.h | 43 ++-- arch/s390/include/uapi/asm/msgbuf.h | 37 ---- arch/s390/include/uapi/asm/sembuf.h | 29 --- arch/s390/include/uapi/asm/shmbuf.h | 48 ----- arch/s390/include/uapi/asm/stat.h | 24 +++ arch/s390/kernel/time.c | 2 +- arch/sh/include/uapi/asm/stat.h | 2 + arch/sparc/include/asm/compat.h | 43 ++-- 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/sparc/include/uapi/asm/stat.h | 28 +++ arch/tile/include/asm/compat.h | 43 ++-- arch/x86/Kconfig | 1 + arch/x86/include/asm/compat.h | 44 ++-- arch/x86/include/asm/ftrace.h | 2 +- arch/x86/include/asm/sys_ia32.h | 2 +- arch/x86/include/asm/unistd.h | 21 +- 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/x86/include/uapi/asm/stat.h | 49 +++-- arch/x86/kernel/cpu/perf_event.c | 2 +- arch/x86/syscalls/syscall_32.tbl | 98 +++++---- arch/xtensa/include/uapi/asm/msgbuf.h | 24 +-- arch/xtensa/include/uapi/asm/sembuf.h | 16 +- arch/xtensa/include/uapi/asm/shmbuf.h | 36 +--- arch/xtensa/include/uapi/asm/stat.h | 2 + drivers/ptp/ptp_clock.c | 2 +- fs/Makefile | 1 + fs/aio.c | 54 +++-- fs/compat.c | 198 +++++++++++------- fs/eventpoll.c | 12 +- fs/select.c | 64 +++--- fs/stat.c | 12 +- fs/timerfd.c | 13 +- fs/utimes.c | 19 +- include/linux/audit.h | 4 +- include/linux/compat.h | 261 +++--------------------- include/linux/compat_time.h | 298 +++++++++++++++++++++++++++ include/linux/hrtimer.h | 2 +- include/linux/jiffies.h | 23 ++- include/linux/msg.h | 7 +- include/linux/poll.h | 10 +- include/linux/posix-clock.h | 2 +- include/linux/posix-timers.h | 11 +- include/linux/resource.h | 8 +- include/linux/sem.h | 3 +- include/linux/shm.h | 7 +- include/linux/signal.h | 3 +- include/linux/socket.h | 4 +- include/linux/stat.h | 3 + include/linux/syscalls.h | 73 ++++--- include/linux/thread_info.h | 8 +- include/linux/time.h | 11 +- include/linux/time64.h | 25 ++- include/linux/timex.h | 6 +- include/net/compat.h | 3 + include/uapi/asm-generic/kernel_stat.h | 36 ++++ include/uapi/asm-generic/msgbuf.h | 16 +- include/uapi/asm-generic/sembuf.h | 26 ++- include/uapi/asm-generic/shmbuf.h | 16 +- include/uapi/asm-generic/stat.h | 12 +- include/uapi/linux/net.h | 1 + include/uapi/linux/resource.h | 32 +++ include/uapi/linux/time.h | 17 ++ include/uapi/linux/timex.h | 45 +++++ init/do_mounts.h | 22 +- init/initramfs.c | 14 +- ipc/compat.c | 18 +- ipc/compat_mq.c | 28 --- ipc/mqueue.c | 140 +++++++++---- ipc/msg.c | 23 ++- ipc/sem.c | 92 ++++++--- ipc/shm.c | 21 +- ipc/syscall.c | 9 +- kernel/Makefile | 1 + kernel/audit.h | 2 +- kernel/auditsc.c | 14 +- kernel/compat.c | 340 +++++++++++++------------------ kernel/exit.c | 6 +- kernel/futex.c | 10 +- kernel/sched/core.c | 35 +++- kernel/signal.c | 13 +- kernel/sys.c | 23 ++- kernel/sys_ni.c | 38 ++++ kernel/time/alarmtimer.c | 13 +- kernel/time/hrtimer.c | 20 +- kernel/time/ntp.c | 16 +- kernel/time/ntp_internal.h | 4 +- kernel/time/posix-clock.c | 2 +- kernel/time/posix-cpu-timers.c | 14 +- kernel/time/posix-timers.c | 357 ++++++++++++++++++++++++++++----- kernel/time/time.c | 63 ++++-- kernel/time/timekeeping.c | 2 +- net/compat.c | 18 +- net/socket.c | 52 ++++- scripts/checksyscalls.sh | 25 +++ 167 files changed, 2564 insertions(+), 2289 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/avr32/include/uapi/asm/msgbuf.h delete mode 100644 arch/avr32/include/uapi/asm/sembuf.h delete mode 100644 arch/avr32/include/uapi/asm/shmbuf.h delete mode 100644 arch/cris/include/uapi/asm/ipcbuf.h delete mode 100644 arch/cris/include/uapi/asm/msgbuf.h delete mode 100644 arch/cris/include/uapi/asm/sembuf.h delete mode 100644 arch/cris/include/uapi/asm/shmbuf.h delete mode 100644 arch/frv/include/uapi/asm/ipcbuf.h delete mode 100644 arch/frv/include/uapi/asm/msgbuf.h delete mode 100644 arch/frv/include/uapi/asm/sembuf.h delete mode 100644 arch/frv/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/m32r/include/uapi/asm/ipcbuf.h delete mode 100644 arch/m32r/include/uapi/asm/msgbuf.h delete mode 100644 arch/m32r/include/uapi/asm/sembuf.h delete mode 100644 arch/m32r/include/uapi/asm/shmbuf.h delete mode 100644 arch/mn10300/include/uapi/asm/ipcbuf.h delete mode 100644 arch/mn10300/include/uapi/asm/msgbuf.h delete mode 100644 arch/mn10300/include/uapi/asm/sembuf.h delete mode 100644 arch/mn10300/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 create mode 100644 include/linux/compat_time.h create mode 100644 include/uapi/asm-generic/kernel_stat.h -- 2.1.0.rc2

9 years, 12 months

[PATCH] Staging: rts5208: Replace timeval with timespec64

by Ksenija Stanojevic

struct timeval tv is used to get current time. 32-bit systems using 'struct timeval' will break in the year 2038, so we have to replace that code with more appropriate types. Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic(a)gmail.com> Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/staging/rts5208/rtsx.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rts5208/rtsx.h b/drivers/staging/rts5208/rtsx.h index 9e6ecb7..f768fc0 100644 --- a/drivers/staging/rts5208/rtsx.h +++ b/drivers/staging/rts5208/rtsx.h @@ -37,7 +37,7 @@ #include <linux/cdrom.h> #include <linux/workqueue.h> #include <linux/timer.h> -#include <linux/time.h> +#include <linux/time64.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> @@ -151,21 +151,24 @@ static inline struct rtsx_dev *host_to_rtsx(struct Scsi_Host *host) static inline void get_current_time(u8 *timeval_buf, int buf_len) { - struct timeval tv; + struct timespec64 ts64; + u32 tv_usec; if (!timeval_buf || (buf_len < 8)) return; - do_gettimeofday(&tv); + getnstimeofday64(&ts64); - timeval_buf[0] = (u8)(tv.tv_sec >> 24); - timeval_buf[1] = (u8)(tv.tv_sec >> 16); - timeval_buf[2] = (u8)(tv.tv_sec >> 8); - timeval_buf[3] = (u8)(tv.tv_sec); - timeval_buf[4] = (u8)(tv.tv_usec >> 24); - timeval_buf[5] = (u8)(tv.tv_usec >> 16); - timeval_buf[6] = (u8)(tv.tv_usec >> 8); - timeval_buf[7] = (u8)(tv.tv_usec); + tv_usec = ts64.tv_nsec/NSEC_PER_USEC; + + timeval_buf[0] = (u8)(ts64.tv_sec >> 24); + timeval_buf[1] = (u8)(ts64.tv_sec >> 16); + timeval_buf[2] = (u8)(ts64.tv_sec >> 8); + timeval_buf[3] = (u8)(ts64.tv_sec); + timeval_buf[4] = (u8)(tv_usec >> 24); + timeval_buf[5] = (u8)(tv_usec >> 16); + timeval_buf[6] = (u8)(tv_usec >> 8); + timeval_buf[7] = (u8)(tv_usec); } /* The scsi_lock() and scsi_unlock() macros protect the sm_state and the -- 1.9.1

9 years, 12 months

[PATCH v2 15/15] k_clock:Remove the 32bit methods with timespec/itimerspec type

by Baolin Wang

All of the k_clock users have been converted to the new methods. This patch removes the older methods with timepsec/itimerspec type. As a result, the k_clock structure is ready for the year 2038. Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> --- include/linux/posix-timers.h | 9 ----- kernel/time/posix-timers.c | 74 +++--------------------------------------- 2 files changed, 5 insertions(+), 78 deletions(-) diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index 35786c5..7c3dae2 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -97,29 +97,20 @@ struct k_itimer { }; struct k_clock { - int (*clock_getres) (const clockid_t which_clock, struct timespec *tp); int (*clock_getres64) (const clockid_t which_clock, struct timespec64 *tp); - int (*clock_set) (const clockid_t which_clock, - const struct timespec *tp); int (*clock_set64) (const clockid_t which_clock, const struct timespec64 *tp); - int (*clock_get) (const clockid_t which_clock, struct timespec * tp); int (*clock_get64) (const clockid_t which_clock, struct timespec64 *tp); int (*clock_adj) (const clockid_t which_clock, struct timex *tx); int (*timer_create) (struct k_itimer *timer); int (*nsleep) (const clockid_t which_clock, int flags, struct timespec *, struct timespec __user *); long (*nsleep_restart) (struct restart_block *restart_block); - int (*timer_set) (struct k_itimer * timr, int flags, - struct itimerspec * new_setting, - struct itimerspec * old_setting); int (*timer_set64) (struct k_itimer *timr, int flags, struct itimerspec64 *new_setting, struct itimerspec64 *old_setting); int (*timer_del) (struct k_itimer * timr); #define TIMER_RETRY 1 - void (*timer_get) (struct k_itimer * timr, - struct itimerspec * cur_setting); void (*timer_get64) (struct k_itimer *timr, struct itimerspec64 *cur_setting); }; diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index 8ced634..ba95172 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -140,7 +140,6 @@ static int common_timer_del(struct k_itimer *timer); static enum hrtimer_restart posix_timer_fn(struct hrtimer *data); static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags); -static struct k_clock *clockid_to_kclock(const clockid_t id); #define lock_timer(tid, flags) \ ({ struct k_itimer *__timr; \ @@ -514,57 +513,6 @@ static struct pid *good_sigevent(sigevent_t * event) return task_pid(rtn); } -static int default_timer_get64(struct k_itimer *timr, - struct itimerspec64 *cur_setting64) -{ - struct itimerspec cur_setting; - struct k_clock *kc = clockid_to_kclock(timr->it_clock); - - kc->timer_get(timr, &cur_setting); - return 0; -} - -static int default_timer_set64(struct k_itimer *timr, int flags, - struct itimerspec64 *new_setting64, - struct itimerspec64 *old_setting64) -{ - struct k_clock *kc = clockid_to_kclock(timr->it_clock); - struct itimerspec new_setting, old_setting; - - kc->timer_set(timr, flags, &new_setting, &old_setting); - return 0; -} - -static int default_clock_set64(const clockid_t which_clock, - const struct timespec64 *tp64) -{ - struct k_clock *kc = clockid_to_kclock(which_clock); - struct timespec tp; - - kc->clock_set(which_clock, &tp); - return 0; -} - -static int default_clock_get64(const clockid_t which_clock, - struct timespec64 *tp64) -{ - struct k_clock *kc = clockid_to_kclock(which_clock); - struct timespec tp; - - kc->clock_get(which_clock, &tp); - return 0; -} - -static int default_clock_getres64(const clockid_t which_clock, - struct timespec64 *tp64) -{ - struct k_clock *kc = clockid_to_kclock(which_clock); - struct timespec tp; - - kc->clock_getres(which_clock, &tp); - return 0; -} - void posix_timers_register_clock(const clockid_t clock_id, struct k_clock *new_clock) { @@ -574,28 +522,17 @@ void posix_timers_register_clock(const clockid_t clock_id, return; } - if (!new_clock->clock_get && !new_clock->clock_get64) { - printk(KERN_WARNING "POSIX clock id %d lacks clock_get() and clock_get64()\n", + if (!new_clock->clock_get64) { + printk(KERN_WARNING "POSIX clock id %d lacks clock_get64()\n", clock_id); return; } - if (!new_clock->clock_getres && !new_clock->clock_getres64) { - printk(KERN_WARNING "POSIX clock id %d lacks clock_getres() and clock_getres64()\n", + if (!new_clock->clock_getres64) { + printk(KERN_WARNING "POSIX clock id %d lacks clock_getres64()\n", clock_id); return; } - if (new_clock->timer_get && !new_clock->timer_get64) - new_clock->timer_get64 = default_timer_get64; - if (new_clock->timer_set && !new_clock->timer_set64) - new_clock->timer_set64 = default_timer_set64; - if (new_clock->clock_set && !new_clock->clock_set64) - new_clock->clock_set64 = default_clock_set64; - if (new_clock->clock_get && !new_clock->clock_get64) - new_clock->clock_get64 = default_clock_get64; - if (new_clock->clock_getres && !new_clock->clock_getres64) - new_clock->clock_getres64 = default_clock_getres64; - posix_clocks[clock_id] = *new_clock; } EXPORT_SYMBOL_GPL(posix_timers_register_clock); @@ -642,8 +579,7 @@ static struct k_clock *clockid_to_kclock(const clockid_t id) return (id & CLOCKFD_MASK) == CLOCKFD ? &clock_posix_dynamic : &clock_posix_cpu; - if (id >= MAX_CLOCKS || (!posix_clocks[id].clock_getres - && !posix_clocks[id].clock_getres64)) + if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres64) return NULL; return &posix_clocks[id]; } -- 1.7.9.5

9 years, 12 months

[PATCH v2 14/15] time/posix-cpu-timers:Convert to the 64bit methods for k_clock structure

by Baolin Wang

This patch changes to the new methods of k_clock structure with timespec64 type, converts the timespec/itimerspec type to timespec64/itimerspec64 type for the callback function in posix-cpu-timers.c file. Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> --- kernel/time/posix-cpu-timers.c | 83 +++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index 0075da7..a4651cd 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -52,7 +52,7 @@ static int check_clock(const clockid_t which_clock) } static inline unsigned long long -timespec_to_sample(const clockid_t which_clock, const struct timespec *tp) +timespec64_to_sample(const clockid_t which_clock, const struct timespec64 *tp) { unsigned long long ret; @@ -60,19 +60,19 @@ timespec_to_sample(const clockid_t which_clock, const struct timespec *tp) if (CPUCLOCK_WHICH(which_clock) == CPUCLOCK_SCHED) { ret = (unsigned long long)tp->tv_sec * NSEC_PER_SEC + tp->tv_nsec; } else { - ret = cputime_to_expires(timespec_to_cputime(tp)); + ret = cputime_to_expires(timespec64_to_cputime(tp)); } return ret; } -static void sample_to_timespec(const clockid_t which_clock, +static void sample_to_timespec64(const clockid_t which_clock, unsigned long long expires, - struct timespec *tp) + struct timespec64 *tp) { if (CPUCLOCK_WHICH(which_clock) == CPUCLOCK_SCHED) - *tp = ns_to_timespec(expires); + *tp = ns_to_timespec64(expires); else - cputime_to_timespec((__force cputime_t)expires, tp); + cputime_to_timespec64((__force cputime_t)expires, tp); } /* @@ -141,7 +141,7 @@ static inline unsigned long long virt_ticks(struct task_struct *p) } static int -posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *tp) +posix_cpu_clock_getres(const clockid_t which_clock, struct timespec64 *tp) { int error = check_clock(which_clock); if (!error) { @@ -160,7 +160,7 @@ posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *tp) } static int -posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *tp) +posix_cpu_clock_set(const clockid_t which_clock, const struct timespec64 *tp) { /* * You can never reset a CPU clock, but we check for other errors @@ -263,7 +263,7 @@ static int cpu_clock_sample_group(const clockid_t which_clock, static int posix_cpu_clock_get_task(struct task_struct *tsk, const clockid_t which_clock, - struct timespec *tp) + struct timespec64 *tp) { int err = -EINVAL; unsigned long long rtn; @@ -277,13 +277,14 @@ static int posix_cpu_clock_get_task(struct task_struct *tsk, } if (!err) - sample_to_timespec(which_clock, rtn, tp); + sample_to_timespec64(which_clock, rtn, tp); return err; } -static int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *tp) +static int posix_cpu_clock_get(const clockid_t which_clock, + struct timespec64 *tp) { const pid_t pid = CPUCLOCK_PID(which_clock); int err = -EINVAL; @@ -598,7 +599,7 @@ static inline void posix_cpu_timer_kick_nohz(void) { } * and try again. (This happens when the timer is in the middle of firing.) */ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, - struct itimerspec *new, struct itimerspec *old) + struct itimerspec64 *new, struct itimerspec64 *old) { unsigned long flags; struct sighand_struct *sighand; @@ -608,7 +609,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, WARN_ON_ONCE(p == NULL); - new_expires = timespec_to_sample(timer->it_clock, &new->it_value); + new_expires = timespec64_to_sample(timer->it_clock, &new->it_value); /* * Protect against sighand release/switch in exit/exec and p->cpu_timers @@ -669,7 +670,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, bump_cpu_timer(timer, val); if (val < timer->it.cpu.expires) { old_expires = timer->it.cpu.expires - val; - sample_to_timespec(timer->it_clock, + sample_to_timespec64(timer->it_clock, old_expires, &old->it_value); } else { @@ -709,7 +710,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, * Install the new reload setting, and * set up the signal and overrun bookkeeping. */ - timer->it.cpu.incr = timespec_to_sample(timer->it_clock, + timer->it.cpu.incr = timespec64_to_sample(timer->it_clock, &new->it_interval); /* @@ -734,7 +735,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, ret = 0; out: if (old) { - sample_to_timespec(timer->it_clock, + sample_to_timespec64(timer->it_clock, old_incr, &old->it_interval); } if (!ret) @@ -742,7 +743,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, return ret; } -static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp) +static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec64 *itp) { unsigned long long now; struct task_struct *p = timer->it.cpu.task; @@ -752,7 +753,7 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp) /* * Easy part: convert the reload time. */ - sample_to_timespec(timer->it_clock, + sample_to_timespec64(timer->it_clock, timer->it.cpu.incr, &itp->it_interval); if (timer->it.cpu.expires == 0) { /* Timer not armed at all. */ @@ -782,7 +783,7 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp) * Call the timer disarmed, nothing else to do. */ timer->it.cpu.expires = 0; - sample_to_timespec(timer->it_clock, timer->it.cpu.expires, + sample_to_timespec64(timer->it_clock, timer->it.cpu.expires, &itp->it_value); } else { cpu_timer_sample_group(timer->it_clock, p, &now); @@ -791,7 +792,7 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp) } if (now < timer->it.cpu.expires) { - sample_to_timespec(timer->it_clock, + sample_to_timespec64(timer->it_clock, timer->it.cpu.expires - now, &itp->it_value); } else { @@ -1248,6 +1249,8 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags, struct timespec *rqtp, struct itimerspec *it) { struct k_itimer timer; + struct timespec64 ts64; + struct itimerspec64 *it64; int error; /* @@ -1260,13 +1263,14 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags, error = posix_cpu_timer_create(&timer); timer.it_process = current; if (!error) { - static struct itimerspec zero_it; + static struct itimerspec64 zero_it; memset(it, 0, sizeof *it); it->it_value = *rqtp; spin_lock_irq(&timer.it_lock); - error = posix_cpu_timer_set(&timer, flags, it, NULL); + *it64 = itimerspec_to_itimerspec64(it); + error = posix_cpu_timer_set(&timer, flags, it64, NULL); if (error) { spin_unlock_irq(&timer.it_lock); return error; @@ -1295,8 +1299,9 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags, /* * We were interrupted by a signal. */ - sample_to_timespec(which_clock, timer.it.cpu.expires, rqtp); - error = posix_cpu_timer_set(&timer, 0, &zero_it, it); + sample_to_timespec64(which_clock, timer.it.cpu.expires, &ts64); + *rqtp = timespec64_to_timespec(ts64); + error = posix_cpu_timer_set(&timer, 0, &zero_it, it64); if (!error) { /* * Timer is now unarmed, deletion can not fail. @@ -1395,12 +1400,12 @@ static long posix_cpu_nsleep_restart(struct restart_block *restart_block) #define THREAD_CLOCK MAKE_THREAD_CPUCLOCK(0, CPUCLOCK_SCHED) static int process_cpu_clock_getres(const clockid_t which_clock, - struct timespec *tp) + struct timespec64 *tp) { return posix_cpu_clock_getres(PROCESS_CLOCK, tp); } static int process_cpu_clock_get(const clockid_t which_clock, - struct timespec *tp) + struct timespec64 *tp) { return posix_cpu_clock_get(PROCESS_CLOCK, tp); } @@ -1420,12 +1425,12 @@ static long process_cpu_nsleep_restart(struct restart_block *restart_block) return -EINVAL; } static int thread_cpu_clock_getres(const clockid_t which_clock, - struct timespec *tp) + struct timespec64 *tp) { return posix_cpu_clock_getres(THREAD_CLOCK, tp); } static int thread_cpu_clock_get(const clockid_t which_clock, - struct timespec *tp) + struct timespec64 *tp) { return posix_cpu_clock_get(THREAD_CLOCK, tp); } @@ -1436,37 +1441,37 @@ static int thread_cpu_timer_create(struct k_itimer *timer) } struct k_clock clock_posix_cpu = { - .clock_getres = posix_cpu_clock_getres, - .clock_set = posix_cpu_clock_set, - .clock_get = posix_cpu_clock_get, + .clock_getres64 = posix_cpu_clock_getres, + .clock_set64 = posix_cpu_clock_set, + .clock_get64 = posix_cpu_clock_get, .timer_create = posix_cpu_timer_create, .nsleep = posix_cpu_nsleep, .nsleep_restart = posix_cpu_nsleep_restart, - .timer_set = posix_cpu_timer_set, + .timer_set64 = posix_cpu_timer_set, .timer_del = posix_cpu_timer_del, - .timer_get = posix_cpu_timer_get, + .timer_get64 = posix_cpu_timer_get, }; static __init int init_posix_cpu_timers(void) { struct k_clock process = { - .clock_getres = process_cpu_clock_getres, - .clock_get = process_cpu_clock_get, + .clock_getres64 = process_cpu_clock_getres, + .clock_get64 = process_cpu_clock_get, .timer_create = process_cpu_timer_create, .nsleep = process_cpu_nsleep, .nsleep_restart = process_cpu_nsleep_restart, }; struct k_clock thread = { - .clock_getres = thread_cpu_clock_getres, - .clock_get = thread_cpu_clock_get, + .clock_getres64 = thread_cpu_clock_getres, + .clock_get64 = thread_cpu_clock_get, .timer_create = thread_cpu_timer_create, }; - struct timespec ts; + struct timespec64 ts; posix_timers_register_clock(CLOCK_PROCESS_CPUTIME_ID, &process); posix_timers_register_clock(CLOCK_THREAD_CPUTIME_ID, &thread); - cputime_to_timespec(cputime_one_jiffy, &ts); + cputime_to_timespec64(cputime_one_jiffy, &ts); onecputick = ts.tv_nsec; WARN_ON(ts.tv_sec != 0); -- 1.7.9.5

9 years, 12 months

[PATCH v2 13/15] cputime:Introduce the cputime_to_timespec64/timespec64_to_cputime function

by Baolin Wang

This patch introduces some functions for converting cputime to timespec64 and back, that repalce the timespec type with timespec64 type, as well as for arch/s390 and arch/powerpc architecture. And these new methods will replace the old cputime_to_timespec/timespec_to_cputime function to ready for 2038 issue. The cputime_to_timespec/timespec_to_cputime functions are moved to include/linux/cputime.h file for removing conveniently. Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> --- arch/powerpc/include/asm/cputime.h | 6 +++--- arch/s390/include/asm/cputime.h | 8 ++++---- include/asm-generic/cputime_jiffies.h | 10 +++++----- include/asm-generic/cputime_nsecs.h | 4 ++-- include/linux/cputime.h | 15 +++++++++++++++ 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/arch/powerpc/include/asm/cputime.h b/arch/powerpc/include/asm/cputime.h index e245255..5dda5c0 100644 --- a/arch/powerpc/include/asm/cputime.h +++ b/arch/powerpc/include/asm/cputime.h @@ -154,9 +154,9 @@ static inline cputime_t secs_to_cputime(const unsigned long sec) } /* - * Convert cputime <-> timespec + * Convert cputime <-> timespec64 */ -static inline void cputime_to_timespec(const cputime_t ct, struct timespec *p) +static inline void cputime_to_timespec64(const cputime_t ct, struct timespec64 *p) { u64 x = (__force u64) ct; unsigned int frac; @@ -168,7 +168,7 @@ static inline void cputime_to_timespec(const cputime_t ct, struct timespec *p) p->tv_nsec = x; } -static inline cputime_t timespec_to_cputime(const struct timespec *p) +static inline cputime_t timespec64_to_cputime(const struct timespec64 *p) { u64 ct; diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h index b91e960..1266697 100644 --- a/arch/s390/include/asm/cputime.h +++ b/arch/s390/include/asm/cputime.h @@ -89,16 +89,16 @@ static inline cputime_t secs_to_cputime(const unsigned int s) } /* - * Convert cputime to timespec and back. + * Convert cputime to timespec64 and back. */ -static inline cputime_t timespec_to_cputime(const struct timespec *value) +static inline cputime_t timespec64_to_cputime(const struct timespec64 *value) { unsigned long long ret = value->tv_sec * CPUTIME_PER_SEC; return (__force cputime_t)(ret + __div(value->tv_nsec * CPUTIME_PER_USEC, NSEC_PER_USEC)); } -static inline void cputime_to_timespec(const cputime_t cputime, - struct timespec *value) +static inline void cputime_to_timespec64(const cputime_t cputime, + struct timespec64 *value) { unsigned long long __cputime = (__force unsigned long long) cputime; #ifndef CONFIG_64BIT diff --git a/include/asm-generic/cputime_jiffies.h b/include/asm-generic/cputime_jiffies.h index fe386fc..54e034c 100644 --- a/include/asm-generic/cputime_jiffies.h +++ b/include/asm-generic/cputime_jiffies.h @@ -44,12 +44,12 @@ typedef u64 __nocast cputime64_t; #define secs_to_cputime(sec) jiffies_to_cputime((sec) * HZ) /* - * Convert cputime to timespec and back. + * Convert cputime to timespec64 and back. */ -#define timespec_to_cputime(__val) \ - jiffies_to_cputime(timespec_to_jiffies(__val)) -#define cputime_to_timespec(__ct,__val) \ - jiffies_to_timespec(cputime_to_jiffies(__ct),__val) +#define timespec64_to_cputime(__val) \ + jiffies_to_cputime(timespec64_to_jiffies(__val)) +#define cputime_to_timespec64(__ct,__val) \ + jiffies_to_timespec64(cputime_to_jiffies(__ct),__val) /* * Convert cputime to timeval and back. diff --git a/include/asm-generic/cputime_nsecs.h b/include/asm-generic/cputime_nsecs.h index 0419485..65c875b 100644 --- a/include/asm-generic/cputime_nsecs.h +++ b/include/asm-generic/cputime_nsecs.h @@ -73,12 +73,12 @@ typedef u64 __nocast cputime64_t; /* * Convert cputime <-> timespec (nsec) */ -static inline cputime_t timespec_to_cputime(const struct timespec *val) +static inline cputime_t timespec64_to_cputime(const struct timespec64 *val) { u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_nsec; return (__force cputime_t) ret; } -static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val) +static inline void cputime_to_timespec64(const cputime_t ct, struct timespec64 *val) { u32 rem; diff --git a/include/linux/cputime.h b/include/linux/cputime.h index f2eb2ee..f01896f 100644 --- a/include/linux/cputime.h +++ b/include/linux/cputime.h @@ -13,4 +13,19 @@ usecs_to_cputime((__nsecs) / NSEC_PER_USEC) #endif +static inline cputime_t timespec_to_cputime(const struct timespec *ts) +{ + struct timespec64 ts64 = timespec_to_timespec64(*ts); + return timespec64_to_cputime(&ts64); +} + +static inline void cputime_to_timespec(const cputime_t cputime, + struct timespec *value) +{ + struct timespec64 *ts64; + + *ts64 = timespec_to_timespec64(*value); + cputime_to_timespec64(cputime, ts64); +} + #endif /* __LINUX_CPUTIME_H */ -- 1.7.9.5

9 years, 12 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038