x86/tsc: Fix ART for TSC_KNOWN_FREQ
Subhransu reported that convert_art_to_tsc() isn't working for him.
It turns out that because of commit:
57779dc2b3b7 ("x86, tsc: Skip refined tsc calibration on systems with reliable TSC")
Systems with TSC_KNOWN_FREQ (due to having CPUID.15h) will not run the refined calibration thing, and then forget to set the ART clocksource relation.
We cannot set the ART relation prior to running the refined calibration; therefore duplicate the lines.
XXX: should we clear this in mark_tsc_unstable() ?
--- arch/x86/kernel/tsc.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/tsc.c +2 -0
@@ -1333,6 +1333,8 @@ static int __init init_tsc_clocksource(void)* the refined calibration and directly register it as a clocksource. */ if (boot_cpu_has (X86_FEATURE_TSC_KNOWN_FREQ )) { +if (boot_cpu_has (X86_FEATURE_ART )) + art_related_clocksource = &clocksource_tsc;clocksource_register_khz (&clocksource_tsc, tsc_khz);return 0 ; }
tip-bot for Peter Zijlstra
merge botx86/tsc: Fix ART for TSC_KNOWN_FREQ
Commit-ID: 44fee88cea43d3c2cac962e0439cb10a3cabff6d Gitweb: http://git.kernel.org/tip/44fee88cea43d3c2cac962e0439cb10a3cabff6d Author: Peter Zijlstra <[email protected]> AuthorDate: Mon, 13 Mar 2017 15:57:12 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 13 Mar 2017 19:50:23 +0100
x86/tsc: Fix ART for TSC_KNOWN_FREQ
Subhransu reported that convert_art_to_tsc() isn't working for him.
The ART to TSC relation is only set up for systems which use the refined TSC calibration. Systems with known TSC frequency (available via CPUID 15) are not using the refined calibration and therefor the ART to TSC relation is never established.
Add the setup to the known frequency init path which skips ART calibration. The init code needs to be duplicated as for systems which use refined calibration the ART setup must be delayed until calibration has been done.
The problem has been there since the ART support was introdduced, but only detected now because Subhransu tested the first time on hardware which has TSC frequency enumerated via CPUID 15.
Note for stable: The conditional has changed from TSC_RELIABLE to
TSC_KNOWN_FREQUENCY.
[ tglx: Rewrote changelog and identified the proper 'Fixes' commit ]
--- arch/x86/kernel/tsc.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/tsc.c +2 -0
@@ -1333,6 +1333,8 @@ static int __init init_tsc_clocksource(void)* the refined calibration and directly register it as a clocksource. */ if (boot_cpu_has (X86_FEATURE_TSC_KNOWN_FREQ )) { +if (boot_cpu_has (X86_FEATURE_ART )) + art_related_clocksource = &clocksource_tsc;clocksource_register_khz (&clocksource_tsc, tsc_khz);return 0 ; }
Quoted 6 lines · Peter Zijlstra
Subhransu reported that
convert_art_to_tsc()isn't working for him.It turns out that because of commit:
57779dc2b3b7("x86, tsc: Skip refined tsc calibration on systems with reliable TSC")
That's the wrong culprit. The problem was introduced with the ART support patches. I fixed the changelog up.
Quoted 8 lines
Systems with
TSC_KNOWN_FREQ(due to having CPUID.15h) will not run the refined calibration thing, and then forget to set the ART clocksource relation.We cannot set the ART relation prior to running the refined calibration; therefore duplicate the lines.
XXX: should we clear this in
mark_tsc_unstable()?
It's already handled. get_device_system_timestamp() which convert ART to clock monotonic checks whether the timekeeper clocksource is the same as the correlated ART clocksource, i.e. TSC. So when timekeeping switches away from TSC get_device_system_timestamp() returns -ENODEV.
Thanks,
tglx
Quoted 11 lines · Thomas Gleixner
Quoted 6 lines · Peter Zijlstra
Subhransu reported that
convert_art_to_tsc()isn't working for him.It turns out that because of commit:
57779dc2b3b7("x86, tsc: Skip refined tsc calibration on systems with reliable TSC")That's the wrong culprit. The problem was introduced with the ART support patches. I fixed the changelog up.
Right; thanks for untangling that history.
Quoted 7 lines
Quoted 7 lines
Systems with
TSC_KNOWN_FREQ(due to having CPUID.15h) will not run the refined calibration thing, and then forget to set the ART clocksource relation.We cannot set the ART relation prior to running the refined calibration; therefore duplicate the lines.
Quoted 6 lines
Quoted 1 line
XXX: should we clear this in
mark_tsc_unstable()?It's already handled.
get_device_system_timestamp()which convert ART to clock monotonic checks whether the timekeeper clocksource is the same as the correlated ART clocksource, i.e. TSC. So when timekeeping switches away from TSCget_device_system_timestamp()returns-ENODEV.
Ah right. Couldn't find that in a hurry.