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

Commit f09cb9a1 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

time: Introduce tk_fast_raw 



Add the NMI safe CLOCK_MONOTONIC_RAW accessor..

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150319093400.562746929@infradead.org


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

include/linux/timekeeping.h

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ static inline u64 ktime_get_raw_ns(void) 
}



extern u64 ktime_get_mono_fast_ns(void);

extern u64 ktime_get_raw_fast_ns(void);



/*

 * Timespec interfaces utilizing the ktime based ones

kernel/time/timekeeping.c

+13 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct tk_fast { 
};



static struct tk_fast tk_fast_mono ____cacheline_aligned;

static struct tk_fast tk_fast_raw  ____cacheline_aligned;



/* flag for if timekeeping is suspended */

int __read_mostly timekeeping_suspended;
@@ -434,6 +435,12 @@ u64 ktime_get_mono_fast_ns(void) 
}

EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns);



u64 ktime_get_raw_fast_ns(void)

{

	return __ktime_get_fast_ns(&tk_fast_raw);

}

EXPORT_SYMBOL_GPL(ktime_get_raw_fast_ns);



/* Suspend-time cycles value for halted fast timekeeper. */

static cycle_t cycles_at_suspend;
@@ -461,6 +468,11 @@ static void halt_fast_timekeeper(struct timekeeper *tk) 
	cycles_at_suspend = tkr->read(tkr->clock);

	tkr_dummy.read = dummy_clock_read;

	update_fast_timekeeper(&tkr_dummy, &tk_fast_mono);



	tkr = &tk->tkr_raw;

	memcpy(&tkr_dummy, tkr, sizeof(tkr_dummy));

	tkr_dummy.read = dummy_clock_read;

	update_fast_timekeeper(&tkr_dummy, &tk_fast_raw);

}



#ifdef CONFIG_GENERIC_TIME_VSYSCALL_OLD
@@ -592,6 +604,7 @@ static void timekeeping_update(struct timekeeper *tk, unsigned int action) 
		       sizeof(tk_core.timekeeper));



	update_fast_timekeeper(&tk->tkr_mono, &tk_fast_mono);

	update_fast_timekeeper(&tk->tkr_raw,  &tk_fast_raw);

}



/**