Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner: "The timer departement delivers: - a regression fix for the NTP code along with a proper selftest - prevent a spurious timer interrupt in the NOHZ lowres code - a fix for user space interfaces returning the remaining time on architectures with CONFIG_TIME_LOW_RES=y - a few patches to fix COMPILE_TEST fallout" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tick/nohz: Set the correct expiry when switching to nohz/lowres mode clocksource: Fix dependencies for archs w/o HAS_IOMEM clocksource: Select CLKSRC_MMIO where needed tick/sched: Hide unused oneshot timer code kselftests: timers: Add adjtimex SETOFFSET validity tests ntp: Fix ADJ_SETOFFSET being used w/ ADJ_NANO itimers: Handle relative timers with CONFIG_TIME_LOW_RES proper posix-timers: Handle relative timers with CONFIG_TIME_LOW_RES proper timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper hrtimer: Handle remaining time proper for TIME_LOW_RES clockevents/tcb_clksrc: Prevent disabling an already disabled clock

Linus Torvalds committed 10 years ago

Commit dc799d02 parents 7ab85d4 1ca8ec511 files · +245 −36Browse files

Unified · Split

11 files

drivers/clocksource/Kconfig +12 −0
drivers/clocksource/tcb_clksrc.c +2 −1
fs/timerfd.c +1 −1
include/linux/hrtimer.h +31 −3
kernel/time/hrtimer.c +37 −18
kernel/time/itimer.c +1 −1
kernel/time/ntp.c +12 −2
kernel/time/posix-timers.c +1 −1
kernel/time/tick-sched.c +9 −7
kernel/time/timer_list.c +1 −1
tools/testing/selftests/timers/valid-adjtimex.c +138 −1

drivers/clocksource/Kconfig+12−0

@@ -30,6 +30,8 @@ config CLKSRC_MMIO · 29 unmodified lines
30	30	config DIGICOLOR_TIMER
31	31	bool "Digicolor timer driver" if COMPILE_TEST
32	32	depends on GENERIC_CLOCKEVENTS
	33	+ select CLKSRC_MMIO
	34	+ depends on HAS_IOMEM
33	35	help
34	36	Enables the support for the digicolor timer driver.
35	37
@@ -55,6 +57,7 @@ config ARMADA_370_XP_TIMER · 19 unmodified lines
55	57	bool "Armada 370 and XP timer driver" if COMPILE_TEST
56	58	depends on ARM
57	59	select CLKSRC_OF
	60	+ select CLKSRC_MMIO
58	61	help
59	62	Enables the support for the Armada 370 and XP timer driver.
60	63
@@ -76,6 +79,7 @@ config ORION_TIMER · 15 unmodified lines
76	79	config SUN4I_TIMER
77	80	bool "Sun4i timer driver" if COMPILE_TEST
78	81	depends on GENERIC_CLOCKEVENTS
	82	+ depends on HAS_IOMEM
79	83	select CLKSRC_MMIO
80	84	help
81	85	Enables support for the Sun4i timer.
@@ -89,6 +93,7 @@ config SUN5I_HSTIMER · 7 unmodified lines
89	93
90	94	config TEGRA_TIMER
91	95	bool "Tegra timer driver" if COMPILE_TEST
	96	+ select CLKSRC_MMIO
92	97	depends on ARM
93	98	help
94	99	Enables support for the Tegra driver.
@@ -96,6 +101,7 @@ config TEGRA_TIMER · 1 unmodified line
96	101	config VT8500_TIMER
97	102	bool "VT8500 timer driver" if COMPILE_TEST
98	103	depends on GENERIC_CLOCKEVENTS
	104	+ depends on HAS_IOMEM
99	105	help
100	106	Enables support for the VT8500 driver.
101	107
@@ -131,6 +137,7 @@ config CLKSRC_NOMADIK_MTU_SCHED_CLOCK · 29 unmodified lines
131	137	config CLKSRC_DBX500_PRCMU
132	138	bool "Clocksource PRCMU Timer" if COMPILE_TEST
133	139	depends on GENERIC_CLOCKEVENTS
	140	+ depends on HAS_IOMEM
134	141	help
135	142	Use the always on PRCMU Timer as clocksource
136	143
@@ -248,6 +255,7 @@ config CLKSRC_EXYNOS_MCT · 111 unmodified lines
248	255	config CLKSRC_SAMSUNG_PWM
249	256	bool "PWM timer drvier for Samsung S3C, S5P" if COMPILE_TEST
250	257	depends on GENERIC_CLOCKEVENTS
	258	+ depends on HAS_IOMEM
251	259	help
252	260	This is a new clocksource driver for the PWM timer found in
253	261	Samsung S3C, S5P and Exynos SoCs, replacing an earlier driver
@@ -257,12 +265,14 @@ config CLKSRC_SAMSUNG_PWM · 3 unmodified lines
257	265	config FSL_FTM_TIMER
258	266	bool "Freescale FlexTimer Module driver" if COMPILE_TEST
259	267	depends on GENERIC_CLOCKEVENTS
	268	+ depends on HAS_IOMEM
260	269	select CLKSRC_MMIO
261	270	help
262	271	Support for Freescale FlexTimer Module (FTM) timer.
263	272
264	273	config VF_PIT_TIMER
265	274	bool
	275	+ select CLKSRC_MMIO
266	276	help
267	277	Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.
268	278
@@ -360,6 +370,7 @@ config CLKSRC_TANGO_XTAL · 91 unmodified lines
360	370	config CLKSRC_PXA
361	371	bool "Clocksource for PXA or SA-11x0 platform" if COMPILE_TEST
362	372	depends on GENERIC_CLOCKEVENTS
	373	+ depends on HAS_IOMEM
363	374	select CLKSRC_MMIO
364	375	help
365	376	This enables OST0 support available on PXA and SA-11x0
@@ -394,6 +405,7 @@ config CLKSRC_ST_LPC · 28 unmodified lines
394	405	bool "Low power clocksource found in the LPC" if COMPILE_TEST
395	406	select CLKSRC_OF if OF
396	407	depends on HAS_IOMEM
	408	+ select CLKSRC_MMIO
397	409	help
398	410	Enable this option to use the Low Power controller timer
399	411	as clocksource.

drivers/clocksource/tcb_clksrc.c+2−1

@@ -98,7 +98,8 @@ static int tc_shutdown(struct clock_event_device *d) · 97 unmodified lines
98	98
99	99	__raw_writel(0xff, regs + ATMEL_TC_REG(2, IDR));
100	100	__raw_writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR));
101		− clk_disable(tcd->clk);
	101	+ if (!clockevent_state_detached(d))
	102	+ clk_disable(tcd->clk);
102	103
103	104	return 0;
104	105	}

fs/timerfd.c+1−1

@@ -153,7 +153,7 @@ static ktime_t timerfd_get_remaining(struct timerfd_ctx *ctx) · 152 unmodified lines
153	153	if (isalarm(ctx))
154	154	remaining = alarm_expires_remaining(&ctx->t.alarm);
155	155	else
156		− remaining = hrtimer_expires_remaining(&ctx->t.tmr);
	156	+ remaining = hrtimer_expires_remaining_adjusted(&ctx->t.tmr);
157	157
158	158	return remaining.tv64 < 0 ? ktime_set(0, 0): remaining;
159	159	}

include/linux/hrtimer.h+31−3

@@ -87,7 +87,8 @@ enum hrtimer_restart { · 86 unmodified lines
87	87	* @function: timer expiry callback function
88	88	* @base: pointer to the timer base (per cpu and per clock)
89	89	* @state: state information (See bit values above)
90		− * @start_pid: timer statistics field to store the pid of the task which
	90	+ * @is_rel: Set if the timer was armed relative
	91	+ * @start_pid: timer statistics field to store the pid of the task which
91	92	* started the timer
92	93	* @start_site: timer statistics field to store the site where the timer
93	94	* was started
@@ -101,7 +102,8 @@ struct hrtimer { · 7 unmodified lines
101	102	ktime_t _softexpires;
102	103	enum hrtimer_restart (function)(struct hrtimer );
103	104	struct hrtimer_clock_base *base;
104		− unsigned long state;
	105	+ u8 state;
	106	+ u8 is_rel;
105	107	#ifdef CONFIG_TIMER_STATS
106	108	int start_pid;
107	109	void *start_site;
@@ -321,6 +323,27 @@ static inline void clock_was_set_delayed(void) { } · 213 unmodified lines
321	323
322	324	#endif
323	325
	326	+static inline ktime_t
	327	+__hrtimer_expires_remaining_adjusted(const struct hrtimer *timer, ktime_t now)
	328	+{
	329	+ ktime_t rem = ktime_sub(timer->node.expires, now);
	330	+
	331	+ /*
	332	+ * Adjust relative timers for the extra we added in
	333	+ * hrtimer_start_range_ns() to prevent short timeouts.
	334	+ */
	335	+ if (IS_ENABLED(CONFIG_TIME_LOW_RES) && timer->is_rel)
	336	+ rem.tv64 -= hrtimer_resolution;
	337	+ return rem;
	338	+}
	339	+
	340	+static inline ktime_t
	341	+hrtimer_expires_remaining_adjusted(const struct hrtimer *timer)
	342	+{
	343	+ return __hrtimer_expires_remaining_adjusted(timer,
	344	+ timer->base->get_time());
	345	+}
	346	+
324	347	extern void clock_was_set(void);
325	348	#ifdef CONFIG_TIMERFD
326	349	extern void timerfd_clock_was_set(void);
@@ -390,7 +413,12 @@ static inline void hrtimer_restart(struct hrtimer *timer) · 63 unmodified lines
390	413	}
391	414
392	415	/* Query timers: */
393		−extern ktime_t hrtimer_get_remaining(const struct hrtimer *timer);
	416	+extern ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust);
	417	+
	418	+static inline ktime_t hrtimer_get_remaining(const struct hrtimer *timer)
	419	+{
	420	+ return __hrtimer_get_remaining(timer, false);
	421	+}
394	422
395	423	extern u64 hrtimer_get_next_event(void);
396	424

kernel/time/hrtimer.c+37−18

@@ -897,10 +897,10 @@ static int enqueue_hrtimer(struct hrtimer *timer, · 896 unmodified lines
897	897	*/
898	898	static void __remove_hrtimer(struct hrtimer *timer,
899	899	struct hrtimer_clock_base *base,
900		− unsigned long newstate, int reprogram)
	900	+ u8 newstate, int reprogram)
901	901	{
902	902	struct hrtimer_cpu_base *cpu_base = base->cpu_base;
903		− unsigned int state = timer->state;
	903	+ u8 state = timer->state;
904	904
905	905	timer->state = newstate;
906	906	if (!(state & HRTIMER_STATE_ENQUEUED))
@@ -930,7 +930,7 @@ static inline int · 23 unmodified lines
930	930	remove_hrtimer(struct hrtimer timer, struct hrtimer_clock_base base, bool restart)
931	931	{
932	932	if (hrtimer_is_queued(timer)) {
933		− unsigned long state = timer->state;
	933	+ u8 state = timer->state;
934	934	int reprogram;
935	935
936	936	/*
@@ -954,6 +954,22 @@ remove_hrtimer(struct hrtimer timer, struct hrtimer_clock_base base, bool rest · 17 unmodified lines
954	954	return 0;
955	955	}
956	956
	957	+static inline ktime_t hrtimer_update_lowres(struct hrtimer *timer, ktime_t tim,
	958	+ const enum hrtimer_mode mode)
	959	+{
	960	+#ifdef CONFIG_TIME_LOW_RES
	961	+ /*
	962	+ * CONFIG_TIME_LOW_RES indicates that the system has no way to return
	963	+ * granular time values. For relative timers we add hrtimer_resolution
	964	+ * (i.e. one jiffie) to prevent short timeouts.
	965	+ */
	966	+ timer->is_rel = mode & HRTIMER_MODE_REL;
	967	+ if (timer->is_rel)
	968	+ tim = ktime_add_safe(tim, ktime_set(0, hrtimer_resolution));
	969	+#endif
	970	+ return tim;
	971	+}
	972	+
957	973	/**
958	974	* hrtimer_start_range_ns - (re)start an hrtimer on the current CPU
959	975	* @timer: the timer to be added
@@ -974,19 +990,10 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, · 14 unmodified lines
974	990	/* Remove an active timer from the queue: */
975	991	remove_hrtimer(timer, base, true);
976	992
977		− if (mode & HRTIMER_MODE_REL) {
	993	+ if (mode & HRTIMER_MODE_REL)
978	994	tim = ktime_add_safe(tim, base->get_time());
979		− /*
980		− * CONFIG_TIME_LOW_RES is a temporary way for architectures
981		− * to signal that they simply return xtime in
982		− * do_gettimeoffset(). In this case we want to round up by
983		− * resolution when starting a relative timer, to avoid short
984		− * timeouts. This will go away with the GTOD framework.
985		− */
986		−#ifdef CONFIG_TIME_LOW_RES
987		− tim = ktime_add_safe(tim, ktime_set(0, hrtimer_resolution));
988		−#endif
989		− }
	995	+
	996	+ tim = hrtimer_update_lowres(timer, tim, mode);
990	997
991	998	hrtimer_set_expires_range_ns(timer, tim, delta_ns);
992	999
@@ -1074,19 +1081,23 @@ EXPORT_SYMBOL_GPL(hrtimer_cancel); · 81 unmodified lines
1074	1081	/**
1075	1082	* hrtimer_get_remaining - get remaining time for the timer
1076	1083	* @timer: the timer to read
	1084	+ * @adjust: adjust relative timers when CONFIG_TIME_LOW_RES=y
1077	1085	*/
1078		−ktime_t hrtimer_get_remaining(const struct hrtimer *timer)
	1086	+ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust)
1079	1087	{
1080	1088	unsigned long flags;
1081	1089	ktime_t rem;
1082	1090
1083	1091	lock_hrtimer_base(timer, &flags);
1084		− rem = hrtimer_expires_remaining(timer);
	1092	+ if (IS_ENABLED(CONFIG_TIME_LOW_RES) && adjust)
	1093	+ rem = hrtimer_expires_remaining_adjusted(timer);
	1094	+ else
	1095	+ rem = hrtimer_expires_remaining(timer);
1085	1096	unlock_hrtimer_base(timer, &flags);
1086	1097
1087	1098	return rem;
1088	1099	}
1089		−EXPORT_SYMBOL_GPL(hrtimer_get_remaining);
	1100	+EXPORT_SYMBOL_GPL(__hrtimer_get_remaining);
1090	1101
1091	1102	#ifdef CONFIG_NO_HZ_COMMON
1092	1103	/**
@@ -1219,6 +1230,14 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base, · 126 unmodified lines
1219	1230	timer_stats_account_hrtimer(timer);
1220	1231	fn = timer->function;
1221	1232
	1233	+ /*
	1234	+ * Clear the 'is relative' flag for the TIME_LOW_RES case. If the
	1235	+ * timer is restarted with a period then it becomes an absolute
	1236	+ * timer. If its not restarted it does not matter.
	1237	+ */
	1238	+ if (IS_ENABLED(CONFIG_TIME_LOW_RES))
	1239	+ timer->is_rel = false;
	1240	+
1222	1241	/*
1223	1242	* Because we run timers from hardirq context, there is no chance
1224	1243	* they get migrated to another cpu, therefore its safe to unlock

kernel/time/itimer.c+1−1

@@ -26,7 +26,7 @@ · 25 unmodified lines
26	26	*/
27	27	static struct timeval itimer_get_remtime(struct hrtimer *timer)
28	28	{
29		− ktime_t rem = hrtimer_get_remaining(timer);
	29	+ ktime_t rem = __hrtimer_get_remaining(timer, true);
30	30
31	31	/*
32	32	* Racy but safe: if the itimer expires after the above

kernel/time/ntp.c+12−2

@@ -685,8 +685,18 @@ int ntp_validate_timex(struct timex *txc) · 684 unmodified lines
685	685	if (!capable(CAP_SYS_TIME))
686	686	return -EPERM;
687	687
688		− if (!timeval_inject_offset_valid(&txc->time))
689		− return -EINVAL;
	688	+ if (txc->modes & ADJ_NANO) {
	689	+ struct timespec ts;
	690	+
	691	+ ts.tv_sec = txc->time.tv_sec;
	692	+ ts.tv_nsec = txc->time.tv_usec;
	693	+ if (!timespec_inject_offset_valid(&ts))
	694	+ return -EINVAL;
	695	+
	696	+ } else {
	697	+ if (!timeval_inject_offset_valid(&txc->time))
	698	+ return -EINVAL;
	699	+ }
690	700	}
691	701
692	702	/*

kernel/time/posix-timers.c+1−1

@@ -760,7 +760,7 @@ common_timer_get(struct k_itimer timr, struct itimerspec cur_setting) · 759 unmodified lines
760	760	(timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE))
761	761	timr->it_overrun += (unsigned int) hrtimer_forward(timer, now, iv);
762	762
763		− remaining = ktime_sub(hrtimer_get_expires(timer), now);
	763	+ remaining = __hrtimer_expires_remaining_adjusted(timer, now);
764	764	/* Return 0 only, when the timer is expired and not pending */
765	765	if (remaining.tv64 <= 0) {
766	766	/*

kernel/time/tick-sched.c+9−7

@@ -36,16 +36,17 @@ · 35 unmodified lines
36	36	*/
37	37	static DEFINE_PER_CPU(struct tick_sched, tick_cpu_sched);
38	38
39		−/*
40		− * The time, when the last jiffy update happened. Protected by jiffies_lock.
41		− */
42		−static ktime_t last_jiffies_update;
43		−
44	39	struct tick_sched *tick_get_tick_sched(int cpu)
45	40	{
46	41	return &per_cpu(tick_cpu_sched, cpu);
47	42	}
48	43
	44	+#if defined(CONFIG_NO_HZ_COMMON) \|\| defined(CONFIG_HIGH_RES_TIMERS)
	45	+/*
	46	+ * The time, when the last jiffy update happened. Protected by jiffies_lock.
	47	+ */
	48	+static ktime_t last_jiffies_update;
	49	+
49	50	/*
50	51	* Must be called with interrupts disabled !
51	52	*/
@@ -151,6 +152,7 @@ static void tick_sched_handle(struct tick_sched ts, struct pt_regs regs) · 99 unmodified lines
151	152	update_process_times(user_mode(regs));
152	153	profile_tick(CPU_PROFILING);
153	154	}
	155	+#endif
154	156
155	157	#ifdef CONFIG_NO_HZ_FULL
156	158	cpumask_var_t tick_nohz_full_mask;
@@ -993,9 +995,9 @@ static void tick_nohz_switch_to_nohz(void) · 836 unmodified lines
993	995	/* Get the next period */
994	996	next = tick_init_jiffy_update();
995	997
996		− hrtimer_forward_now(&ts->sched_timer, tick_period);
997	998	hrtimer_set_expires(&ts->sched_timer, next);
998		− tick_program_event(next, 1);
	999	+ hrtimer_forward_now(&ts->sched_timer, tick_period);
	1000	+ tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1);
999	1001	tick_nohz_activate(ts, NOHZ_MODE_LOWRES);
1000	1002	}
1001	1003

kernel/time/timer_list.c+1−1

@@ -69,7 +69,7 @@ print_timer(struct seq_file m, struct hrtimer taddr, struct hrtimer *timer, · 68 unmodified lines
69	69	print_name_offset(m, taddr);
70	70	SEQ_printf(m, ", ");
71	71	print_name_offset(m, timer->function);
72		− SEQ_printf(m, ", S:%02lx", timer->state);
	72	+ SEQ_printf(m, ", S:%02x", timer->state);
73	73	#ifdef CONFIG_TIMER_STATS
74	74	SEQ_printf(m, ", ");
75	75	print_name_offset(m, timer->start_site);

tools/testing/selftests/timers/valid-adjtimex.c+138−1

@@ -45,7 +45,17 @@ static inline int ksft_exit_fail(void) · 44 unmodified lines
45	45	}
46	46	#endif
47	47
48		−#define NSEC_PER_SEC 1000000000L
	48	+#define NSEC_PER_SEC 1000000000LL
	49	+#define USEC_PER_SEC 1000000LL
	50	+
	51	+#define ADJ_SETOFFSET 0x0100
	52	+
	53	+#include <sys/syscall.h>
	54	+static int clock_adjtime(clockid_t id, struct timex *tx)
	55	+{
	56	+ return syscall(__NR_clock_adjtime, id, tx);
	57	+}
	58	+
49	59
50	60	/* clear NTP time_status & time_state */
51	61	int clear_time_state(void)
@@ -193,10 +203,137 @@ out: · 141 unmodified lines
193	203	}
194	204
195	205
	206	+int set_offset(long long offset, int use_nano)
	207	+{
	208	+ struct timex tmx = {};
	209	+ int ret;
	210	+
	211	+ tmx.modes = ADJ_SETOFFSET;
	212	+ if (use_nano) {
	213	+ tmx.modes \|= ADJ_NANO;
	214	+
	215	+ tmx.time.tv_sec = offset / NSEC_PER_SEC;
	216	+ tmx.time.tv_usec = offset % NSEC_PER_SEC;
	217	+
	218	+ if (offset < 0 && tmx.time.tv_usec) {
	219	+ tmx.time.tv_sec -= 1;
	220	+ tmx.time.tv_usec += NSEC_PER_SEC;
	221	+ }
	222	+ } else {
	223	+ tmx.time.tv_sec = offset / USEC_PER_SEC;
	224	+ tmx.time.tv_usec = offset % USEC_PER_SEC;
	225	+
	226	+ if (offset < 0 && tmx.time.tv_usec) {
	227	+ tmx.time.tv_sec -= 1;
	228	+ tmx.time.tv_usec += USEC_PER_SEC;
	229	+ }
	230	+ }
	231	+
	232	+ ret = clock_adjtime(CLOCK_REALTIME, &tmx);
	233	+ if (ret < 0) {
	234	+ printf("(sec: %ld usec: %ld) ", tmx.time.tv_sec, tmx.time.tv_usec);
	235	+ printf("[FAIL]\n");
	236	+ return -1;
	237	+ }
	238	+ return 0;
	239	+}
	240	+
	241	+int set_bad_offset(long sec, long usec, int use_nano)
	242	+{
	243	+ struct timex tmx = {};
	244	+ int ret;
	245	+
	246	+ tmx.modes = ADJ_SETOFFSET;
	247	+ if (use_nano)
	248	+ tmx.modes \|= ADJ_NANO;
	249	+
	250	+ tmx.time.tv_sec = sec;
	251	+ tmx.time.tv_usec = usec;
	252	+ ret = clock_adjtime(CLOCK_REALTIME, &tmx);
	253	+ if (ret >= 0) {
	254	+ printf("Invalid (sec: %ld usec: %ld) did not fail! ", tmx.time.tv_sec, tmx.time.tv_usec);
	255	+ printf("[FAIL]\n");
	256	+ return -1;
	257	+ }
	258	+ return 0;
	259	+}
	260	+
	261	+int validate_set_offset(void)
	262	+{
	263	+ printf("Testing ADJ_SETOFFSET... ");
	264	+
	265	+ /* Test valid values */
	266	+ if (set_offset(NSEC_PER_SEC - 1, 1))
	267	+ return -1;
	268	+
	269	+ if (set_offset(-NSEC_PER_SEC + 1, 1))
	270	+ return -1;
	271	+
	272	+ if (set_offset(-NSEC_PER_SEC - 1, 1))
	273	+ return -1;
	274	+
	275	+ if (set_offset(5 * NSEC_PER_SEC, 1))
	276	+ return -1;
	277	+
	278	+ if (set_offset(-5 * NSEC_PER_SEC, 1))
	279	+ return -1;
	280	+
	281	+ if (set_offset(5 * NSEC_PER_SEC + NSEC_PER_SEC / 2, 1))
	282	+ return -1;
	283	+
	284	+ if (set_offset(-5 * NSEC_PER_SEC - NSEC_PER_SEC / 2, 1))
	285	+ return -1;
	286	+
	287	+ if (set_offset(USEC_PER_SEC - 1, 0))
	288	+ return -1;
	289	+
	290	+ if (set_offset(-USEC_PER_SEC + 1, 0))
	291	+ return -1;
	292	+
	293	+ if (set_offset(-USEC_PER_SEC - 1, 0))
	294	+ return -1;
	295	+
	296	+ if (set_offset(5 * USEC_PER_SEC, 0))
	297	+ return -1;
	298	+
	299	+ if (set_offset(-5 * USEC_PER_SEC, 0))
	300	+ return -1;
	301	+
	302	+ if (set_offset(5 * USEC_PER_SEC + USEC_PER_SEC / 2, 0))
	303	+ return -1;
	304	+
	305	+ if (set_offset(-5 * USEC_PER_SEC - USEC_PER_SEC / 2, 0))
	306	+ return -1;
	307	+
	308	+ /* Test invalid values */
	309	+ if (set_bad_offset(0, -1, 1))
	310	+ return -1;
	311	+ if (set_bad_offset(0, -1, 0))
	312	+ return -1;
	313	+ if (set_bad_offset(0, 2 * NSEC_PER_SEC, 1))
	314	+ return -1;
	315	+ if (set_bad_offset(0, 2 * USEC_PER_SEC, 0))
	316	+ return -1;
	317	+ if (set_bad_offset(0, NSEC_PER_SEC, 1))
	318	+ return -1;
	319	+ if (set_bad_offset(0, USEC_PER_SEC, 0))
	320	+ return -1;
	321	+ if (set_bad_offset(0, -NSEC_PER_SEC, 1))
	322	+ return -1;
	323	+ if (set_bad_offset(0, -USEC_PER_SEC, 0))
	324	+ return -1;
	325	+
	326	+ printf("[OK]\n");
	327	+ return 0;
	328	+}
	329	+
196	330	int main(int argc, char **argv)
197	331	{
198	332	if (validate_freq())
199	333	return ksft_exit_fail();
200	334
	335	+ if (validate_set_offset())
	336	+ return ksft_exit_fail();
	337	+
201	338	return ksft_exit_pass();
202	339	}

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code