Merge tag 'timers-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2fbc23c7) · Commits · 戴 / test

Pull timer fixes from Thomas Gleixner: "Two small fixes for the time(r) subsystem: - Handle a subtle race between the clocksource watchdog and a concurrent clocksource watchdog stop/start sequence correctly to prevent a timer double add bug. - Fix the file path for the core time namespace file" * tag 'timers-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource: Prevent double add_timer_on() for watchdog_timer MAINTAINERS: Correct path to time namespace source file

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -13360,7 +13360,7 @@ S: Maintained
		F: fs/timerfd.c
		F: include/linux/timer*
		F: include/linux/time_namespace.h
		F: kernel/time_namespace.c
		F: kernel/time/namespace.c
		F: kernel/time/timer

		POWER MANAGEMENT CORE

kernel/time/clocksource.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -293,8 +293,15 @@ static void clocksource_watchdog(struct timer_list *unused)
		next_cpu = cpumask_next(raw_smp_processor_id(), cpu_online_mask);
		if (next_cpu >= nr_cpu_ids)
		next_cpu = cpumask_first(cpu_online_mask);

		/*
		* Arm timer if not already pending: could race with concurrent
		* pair clocksource_stop_watchdog() clocksource_start_watchdog().
		*/
		if (!timer_pending(&watchdog_timer)) {
		watchdog_timer.expires += WATCHDOG_INTERVAL;
		add_timer_on(&watchdog_timer, next_cpu);
		}
		out:
		spin_unlock(&watchdog_lock);
		}

Admin message