x86/tsc: Disable clocksource watchdog for TSC on recent UV
Subsystems (2)
PATCH v3 1/1 x86/tsc: Disable clocksource watchdog for TSC on recent UV
Disable clocksource watchdog checking on recent and future UV platforms to avoid false positives.
Commits 'b50db7095fe0 ("x86/tsc: Disable clocksource watchdog for TSC on qualified platforms")' and '233756a640be ("Extend watchdog check exemption to 4-Sockets platform")' were introduced to avoid an issue where the TSC is falsely declared unstable by exempting qualified platforms of up to 4-sockets from TSC clocksource watchdog checking. Extend that exemption to include recent and future UV platforms.
---
Version 3: Fixes a build error in the X86 32-bit build.
Version 2: Fixes a build error that occurs when UV is not configured.
arch/x86/include/asm/uv/uv.h | 3 +++ arch/x86/include/asm/uv/uv_hub.h | 2 ++ arch/x86/kernel/tsc.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-)
arch/x86/include/asm/uv/uv.h +3 -0
@@ -38,6 +38,9 @@ static inline int is_uv_system(void) { return 0; }static inline int is_uv_hubbed (int uv) {return 0 ; }static inline void uv_cpu_init (void ) { }static inline void uv_system_init (void ) { } +static inline int is_uvx_hub (void ) {return 0 ; } +static inline int is_uvy_hub (void ) {return 0 ; } +static inline int is_uv_hub (void ) {return 0 ; }#endif /* X86_UV */
arch/x86/include/asm/uv/uv_hub.h +2 -0
@@ -246,6 +246,7 @@ static inline int is_uv5_hub(void) { return is_uv(UV5); }* then test if is UV4. */ +#ifdef CONFIG_X86_UV /* UVX class: UV2,3,4 */ static inline int is_uvx_hub (void ) {return is_uv (UVX ); }
@@ -254,6 +255,7 @@ static inline int is_uvy_hub(void) { return is_uv(UVY); }/* Any UV Hubbed System */ static inline int is_uv_hub (void ) {return is_uv (UV_ANY ); } +#endif union uvh_apicid {unsigned long v;
arch/x86/kernel/tsc.c +2 -1
@@ -32,6 +32,7 @@#include <asm/msr.h> #include <asm/topology.h> #include <asm/uv/uv.h> +#include <asm/uv/uv_hub.h> #include <asm/sev.h> unsigned int __read_mostly cpu_khz;/* TSC clocks / usec, not used here */
@@ -1261,7 +1262,7 @@ static void __init check_system_tsc_reliable(void)if (boot_cpu_has (X86_FEATURE_CONSTANT_TSC ) &&boot_cpu_has (X86_FEATURE_NONSTOP_TSC ) &&boot_cpu_has (X86_FEATURE_TSC_ADJUST ) && -topology_max_packages () <=4 ) + (topology_max_packages () <=4 ||is_uvy_hub ()))tsc_disable_clocksource_watchdog (); }
Signature · 1 line
2.43.0
Quoted 79 lines · Dimitri Sivanich
Disable clocksource watchdog checking on recent and future UV platforms to avoid false positives.
Commits '
b50db7095fe0("x86/tsc: Disable clocksource watchdog for TSC on qualified platforms")' and '233756a640be("Extend watchdog check exemption to 4-Sockets platform")' were introduced to avoid an issue where the TSC is falsely declared unstable by exempting qualified platforms of up to 4-sockets from TSC clocksource watchdog checking. Extend that exemption to include recent and future UV platforms.Signed-off-by Dimitri Sivanich <[email protected]>---
Version 3: Fixes a build error in the X86 32-bit build.
Version 2: Fixes a build error that occurs when UV is not configured.
arch/x86/include/asm/uv/uv.h | 3 +++ arch/x86/include/asm/uv/uv_hub.h | 2 ++ arch/x86/kernel/tsc.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-)arch/x86/include/asm/uv/uv.h +3
-0@@ -38,6 +38,9 @@ static inline int is_uv_system(void) { return 0; }static inline int is_uv_hubbed (int uv) {return 0 ; }static inline void uv_cpu_init (void ) { }static inline void uv_system_init (void ) { } +static inline int is_uvx_hub (void ) {return 0 ; } +static inline int is_uvy_hub (void ) {return 0 ; } +static inline int is_uv_hub (void ) {return 0 ; }#endif /* X86_UV */ arch/x86/include/asm/uv/uv_hub.h +2
-0@@ -246,6 +246,7 @@ static inline int is_uv5_hub(void) { return is_uv(UV5); }* then test if is UV4. */ +#ifdef CONFIG_X86_UV /* UVX class: UV2,3,4 */ static inline int is_uvx_hub (void ) {return is_uv (UVX ); }@@ -254,6 +255,7 @@ static inline int is_uvy_hub(void) { return is_uv(UVY); }/* Any UV Hubbed System */ static inline int is_uv_hub (void ) {return is_uv (UV_ANY ); } +#endif union uvh_apicid {unsigned long v;arch/x86/kernel/tsc.c +2
-1@@ -32,6 +32,7 @@#include <asm/msr.h> #include <asm/topology.h> #include <asm/uv/uv.h> +#include <asm/uv/uv_hub.h> #include <asm/sev.h> unsigned int __read_mostly cpu_khz;/* TSC clocks / usec, not used here */ @@ -1261,7 +1262,7 @@ static void __init check_system_tsc_reliable(void)if (boot_cpu_has (X86_FEATURE_CONSTANT_TSC ) &&boot_cpu_has (X86_FEATURE_NONSTOP_TSC ) &&boot_cpu_has (X86_FEATURE_TSC_ADJUST ) && -topology_max_packages () <=4 ) + (topology_max_packages () <=4 ||is_uvy_hub ()))tsc_disable_clocksource_watchdog (); }Signature · 1 line
2.43.0
Just a friendly reminder about this patch.