Commit ad196384 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Thomas Gleixner
Browse files

time: Change k_clock nsleep() to use timespec64 



struct timespec is not y2038 safe on 32 bit machines.  Replace uses of
struct timespec with struct timespec64 in the kernel.

The syscall interfaces themselves will be changed in a separate series.

Note that the restart_block parameter for nanosleep has also been left
unchanged and will be part of syscall series noted above.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Cc: y2038@lists.linaro.org
Cc: john.stultz@linaro.org
Cc: arnd@arndb.de
Link: http://lkml.kernel.org/r/1490555058-4603-8-git-send-email-deepa.kernel@gmail.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 5f252b32

include/linux/hrtimer.h

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static inline u64 hrtimer_forward_now(struct hrtimer *timer, 
}



/* Precise sleep: */

extern long hrtimer_nanosleep(struct timespec *rqtp,

extern long hrtimer_nanosleep(struct timespec64 *rqtp,

			      struct timespec __user *rmtp,

			      const enum hrtimer_mode mode,

			      const clockid_t clockid);

include/linux/posix-timers.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct k_clock { 
	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 *);

		       struct timespec64 *, struct timespec __user *);

	long (*nsleep_restart) (struct restart_block *restart_block);

	int (*timer_set) (struct k_itimer *timr, int flags,

			  struct itimerspec64 *new_setting,

kernel/compat.c

+4 −2
Original line number Diff line number Diff line
@@ -240,18 +240,20 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp, 
		       struct compat_timespec __user *, rmtp)

{

	struct timespec tu, rmt;

	struct timespec64 tu64;

	mm_segment_t oldfs;

	long ret;



	if (compat_get_timespec(&tu, rqtp))

		return -EFAULT;



	if (!timespec_valid(&tu))

	tu64 = timespec_to_timespec64(tu);

	if (!timespec64_valid(&tu64))

		return -EINVAL;



	oldfs = get_fs();

	set_fs(KERNEL_DS);

	ret = hrtimer_nanosleep(&tu,

	ret = hrtimer_nanosleep(&tu64,

				rmtp ? (struct timespec __user *)&rmt : NULL,

				HRTIMER_MODE_REL, CLOCK_MONOTONIC);

	set_fs(oldfs);

kernel/time/alarmtimer.c

+4 −3
Original line number Diff line number Diff line
@@ -790,13 +790,14 @@ out: 
 * Handles clock_nanosleep calls against _ALARM clockids

 */

static int alarm_timer_nsleep(const clockid_t which_clock, int flags,

		     struct timespec *tsreq, struct timespec __user *rmtp)

			      struct timespec64 *tsreq,

			      struct timespec __user *rmtp)

{

	enum  alarmtimer_type type = clock2alarm(which_clock);

	struct restart_block *restart;

	struct alarm alarm;

	ktime_t exp;

	int ret = 0;

	struct restart_block *restart;



	if (!alarmtimer_get_rtcdev())

		return -ENOTSUPP;
@@ -809,7 +810,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags, 


	alarm_init(&alarm, type, alarmtimer_nsleep_wakeup);



	exp = timespec_to_ktime(*tsreq);

	exp = timespec64_to_ktime(*tsreq);

	/* Convert (if necessary) to absolute time */

	if (flags != TIMER_ABSTIME) {

		ktime_t now = alarm_bases[type].gettime();

kernel/time/hrtimer.c

+6 −4
Original line number Diff line number Diff line
@@ -1503,7 +1503,7 @@ out: 
	return ret;

}



long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,

long hrtimer_nanosleep(struct timespec64 *rqtp, struct timespec __user *rmtp,

		       const enum hrtimer_mode mode, const clockid_t clockid)

{

	struct restart_block *restart;
@@ -1516,7 +1516,7 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp, 
		slack = 0;



	hrtimer_init_on_stack(&t.timer, clockid, mode);

	hrtimer_set_expires_range_ns(&t.timer, timespec_to_ktime(*rqtp), slack);

	hrtimer_set_expires_range_ns(&t.timer, timespec64_to_ktime(*rqtp), slack);

	if (do_nanosleep(&t, mode))

		goto out;
@@ -1547,15 +1547,17 @@ out: 
SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,

		struct timespec __user *, rmtp)

{

	struct timespec64 tu64;

	struct timespec tu;



	if (copy_from_user(&tu, rqtp, sizeof(tu)))

		return -EFAULT;



	if (!timespec_valid(&tu))

	tu64 = timespec_to_timespec64(tu);

	if (!timespec64_valid(&tu64))

		return -EINVAL;



	return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC);

	return hrtimer_nanosleep(&tu64, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE