Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c00a1fe authored by Xunlei Pang's avatar Xunlei Pang Committed by Ingo Molnar
Browse files

time: Add y2038 safe update_persistent_clock64() 



As part of addressing in-kernel y2038 issues, this patch adds
update_persistent_clock64() and replaces all the call sites of
update_persistent_clock() with this function. This is a __weak
implementation, which simply calls the existing y2038 unsafe
update_persistent_clock().

This allows architecture specific implementations to be
converted independently, and eventually y2038-unsafe
update_persistent_clock() can be removed after all its
architecture specific implementations have been converted to
update_persistent_clock64().

Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarXunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1427945681-29972-4-git-send-email-john.stultz@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 2ee96632

drivers/rtc/systohc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ 
 * rtc_set_ntp_time - Save NTP synchronized time to the RTC

 * rtc_set_ntp_time - Save NTP synchronized time to the RTC

 * @now: Current time of day

 * @now: Current time of day

 *

 *

 * Replacement for the NTP platform function update_persistent_clock

 * Replacement for the NTP platform function update_persistent_clock64

 * that stores time for later retrieval by rtc_hctosys.

 * that stores time for later retrieval by rtc_hctosys.

 *

 *

 * Returns 0 on successful RTC update, -ENODEV if a RTC update is not

 * Returns 0 on successful RTC update, -ENODEV if a RTC update is not

include/linux/timekeeping.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -272,6 +272,7 @@ extern void read_persistent_clock64(struct timespec64 *ts); 
extern void read_boot_clock(struct timespec *ts);

extern void read_boot_clock(struct timespec *ts);

extern void read_boot_clock64(struct timespec64 *ts);

extern void read_boot_clock64(struct timespec64 *ts);

extern int update_persistent_clock(struct timespec now);

extern int update_persistent_clock(struct timespec now);

extern int update_persistent_clock64(struct timespec64 now);









#endif
 
#endif

kernel/time/ntp.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -458,6 +458,16 @@ int second_overflow(unsigned long secs) 
	return leap;

	return leap;

}

}





#ifdef CONFIG_GENERIC_CMOS_UPDATE

int __weak update_persistent_clock64(struct timespec64 now64)

{

	struct timespec now;



	now = timespec64_to_timespec(now64);

	return update_persistent_clock(now);

}

#endif



#if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC)

#if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC)

static void sync_cmos_clock(struct work_struct *work);

static void sync_cmos_clock(struct work_struct *work);
@@ -493,8 +503,9 @@ static void sync_cmos_clock(struct work_struct *work) 
		if (persistent_clock_is_local)

		if (persistent_clock_is_local)

			adjust.tv_sec -= (sys_tz.tz_minuteswest * 60);

			adjust.tv_sec -= (sys_tz.tz_minuteswest * 60);

#ifdef CONFIG_GENERIC_CMOS_UPDATE

#ifdef CONFIG_GENERIC_CMOS_UPDATE

		fail = update_persistent_clock(timespec64_to_timespec(adjust));

		fail = update_persistent_clock64(adjust);

#endif

#endif



#ifdef CONFIG_RTC_SYSTOHC

#ifdef CONFIG_RTC_SYSTOHC

		if (fail == -ENODEV)

		if (fail == -ENODEV)

			fail = rtc_set_ntp_time(adjust);

			fail = rtc_set_ntp_time(adjust);