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

Commit 7615856e authored by John Stultz's avatar John Stultz Committed by Thomas Gleixner
Browse files

timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset 



update_vsyscall() did not provide the wall_to_monotoinc offset,
so arch specific implementations tend to reference wall_to_monotonic
directly. This limits future cleanups in the timekeeping core, so
this patch fixes the update_vsyscall interface to provide
wall_to_monotonic, allowing wall_to_monotonic to be made static
as planned in Documentation/feature-removal-schedule.txt

Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Tony Luck <tony.luck@intel.com>
LKML-Reference: <1279068988-21864-7-git-send-email-johnstul@us.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 06d518e3

arch/ia64/kernel/time.c

+4 −3
Original line number Diff line number Diff line
@@ -471,7 +471,8 @@ void update_vsyscall_tz(void) 
{

}



void update_vsyscall(struct timespec *wall, struct clocksource *c, u32 mult)

void update_vsyscall(struct timespec *wall, struct timespec *wtm,

			struct clocksource *c, u32 mult)

{

        unsigned long flags;
@@ -487,9 +488,9 @@ void update_vsyscall(struct timespec *wall, struct clocksource *c, u32 mult) 
	/* copy kernel time structures */

        fsyscall_gtod_data.wall_time.tv_sec = wall->tv_sec;

        fsyscall_gtod_data.wall_time.tv_nsec = wall->tv_nsec;

        fsyscall_gtod_data.monotonic_time.tv_sec = wall_to_monotonic.tv_sec

	fsyscall_gtod_data.monotonic_time.tv_sec = wtm->tv_sec

							+ wall->tv_sec;

        fsyscall_gtod_data.monotonic_time.tv_nsec = wall_to_monotonic.tv_nsec

	fsyscall_gtod_data.monotonic_time.tv_nsec = wtm->tv_nsec

							+ wall->tv_nsec;



	/* normalize */

arch/powerpc/kernel/time.c

+4 −4
Original line number Diff line number Diff line
@@ -849,8 +849,8 @@ static cycle_t timebase_read(struct clocksource *cs) 
	return (cycle_t)get_tb();

}



void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,

		     u32 mult)

void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,

			struct clocksource *clock, u32 mult)

{

	u64 new_tb_to_xs, new_stamp_xsec;
@@ -882,8 +882,8 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, 
	vdso_data->tb_orig_stamp = clock->cycle_last;

	vdso_data->stamp_xsec = new_stamp_xsec;

	vdso_data->tb_to_xs = new_tb_to_xs;

	vdso_data->wtom_clock_sec = wall_to_monotonic.tv_sec;

	vdso_data->wtom_clock_nsec = wall_to_monotonic.tv_nsec;

	vdso_data->wtom_clock_sec = wtm->tv_sec;

	vdso_data->wtom_clock_nsec = wtm->tv_nsec;

	vdso_data->stamp_xtime = *wall_time;

	smp_wmb();

	++(vdso_data->tb_update_count);

arch/s390/kernel/time.c

+4 −4
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ struct clocksource * __init clocksource_default_clock(void) 
	return &clocksource_tod;

}



void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,

		     u32 mult)

void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,

			struct clocksource *clock, u32 mult)

{

	if (clock != &clocksource_tod)

		return;
@@ -219,8 +219,8 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, 
	vdso_data->xtime_tod_stamp = clock->cycle_last;

	vdso_data->xtime_clock_sec = wall_time->tv_sec;

	vdso_data->xtime_clock_nsec = wall_time->tv_nsec;

	vdso_data->wtom_clock_sec = wall_to_monotonic.tv_sec;

	vdso_data->wtom_clock_nsec = wall_to_monotonic.tv_nsec;

	vdso_data->wtom_clock_sec = wtm->tv_sec;

	vdso_data->wtom_clock_nsec = wtm->tv_nsec;

	vdso_data->ntp_mult = mult;

	smp_wmb();

	++vdso_data->tb_update_count;

arch/x86/kernel/vsyscall_64.c

+3 −3
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ void update_vsyscall_tz(void) 
	write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);

}



void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,

		     u32 mult)

void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,

			struct clocksource *clock, u32 mult)

{

	unsigned long flags;
@@ -87,7 +87,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, 
	vsyscall_gtod_data.clock.shift = clock->shift;

	vsyscall_gtod_data.wall_time_sec = wall_time->tv_sec;

	vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec;

	vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic;

	vsyscall_gtod_data.wall_to_monotonic = *wtm;

	vsyscall_gtod_data.wall_time_coarse = __current_kernel_time();

	write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);

}

include/linux/clocksource.h

+4 −2
Original line number Diff line number Diff line
@@ -313,11 +313,13 @@ clocksource_calc_mult_shift(struct clocksource *cs, u32 freq, u32 minsec) 


#ifdef CONFIG_GENERIC_TIME_VSYSCALL

extern void

update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult);

update_vsyscall(struct timespec *ts, struct timespec *wtm,

			struct clocksource *c, u32 mult);

extern void update_vsyscall_tz(void);

#else

static inline void

update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult)

update_vsyscall(struct timespec *ts, struct timespec *wtm,

			struct clocksource *c, u32 mult)

{

}