x86/tsc: Fix mark_tsc_unstable() (e3b4f790) · Commits · 戴 / test

mark_tsc_unstable() also needs to affect tsc_early, Now that clocksource_mark_unstable() can be used on a clocksource irrespective of its registration state, use it on both tsc_early and tsc. This does however require cs->list to be initialized empty, otherwise it cannot tell the registation state before registation. Fixes: ("x86/tsc: Introduce early tsc clocksource") Signed-off-by:

Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Tested-by:

Diego Viola <diego.viola@gmail.com> Reviewed-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: len.brown@intel.com Cc: rjw@rjwysocki.net Cc: rui.zhang@intel.com Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20180430100344.533326547@infradead.org

arch/x86/kernel/tsc.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -1067,6 +1067,7 @@ static struct clocksource clocksource_tsc_early = {
		.resume = tsc_resume,
		.mark_unstable = tsc_cs_mark_unstable,
		.tick_stable = tsc_cs_tick_stable,
		.list = LIST_HEAD_INIT(clocksource_tsc_early.list),
		};

		/*
		@@ -1086,6 +1087,7 @@ static struct clocksource clocksource_tsc = {
		.resume = tsc_resume,
		.mark_unstable = tsc_cs_mark_unstable,
		.tick_stable = tsc_cs_tick_stable,
		.list = LIST_HEAD_INIT(clocksource_tsc.list),
		};

		void mark_tsc_unstable(char *reason)
		@@ -1098,13 +1100,9 @@ void mark_tsc_unstable(char *reason)
		clear_sched_clock_stable();
		disable_sched_clock_irqtime();
		pr_info("Marking TSC unstable due to %s\n", reason);
		/* Change only the rating, when not registered */
		if (clocksource_tsc.mult) {

		clocksource_mark_unstable(&clocksource_tsc_early);
		clocksource_mark_unstable(&clocksource_tsc);
		} else {
		clocksource_tsc.flags \|= CLOCK_SOURCE_UNSTABLE;
		clocksource_tsc.rating = 0;
		}
		}

		EXPORT_SYMBOL_GPL(mark_tsc_unstable);

Admin message