FAILED: patch "[PATCH] x86/hyperv: Fix hv tsc page based sched_clock for hibernation" failed to apply to 6.6-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x bcc80dec91ee745b3d66f3e48f0ec2efdea97149
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024122324-twitter-clustered-891d@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From bcc80dec91ee745b3d66f3e48f0ec2efdea97149 Mon Sep 17 00:00:00 2001
From: Naman Jain <[email protected]>
Date: Tue, 17 Sep 2024 11:09:17 +0530
Subject: [PATCH] x86/hyperv: Fix hv tsc page based sched_clock for hibernation
read_hv_sched_clock_tsc() assumes that the Hyper-V clock counter is bigger than the variable hv_sched_clock_offset, which is cached during early boot, but depending on the timing this assumption may be false when a hibernated VM starts again (the clock counter starts from 0 again) and is resuming back (Note: hv_init_tsc_clocksource() is not called during hibernation/resume); consequently, read_hv_sched_clock_tsc() may return a negative integer (which is interpreted as a huge positive integer since the return type is u64) and new kernel messages are prefixed with huge timestamps before read_hv_sched_clock_tsc() grows big enough (which typically takes several seconds).
Fix the issue by saving the Hyper-V clock counter just before the suspend, and using it to correct the hv_sched_clock_offset in resume. This makes hv tsc page based sched_clock continuous and ensures that post resume, it starts from where it left off during suspend. Override x86_platform.save_sched_clock_state and x86_platform.restore_sched_clock_state routines to correct this as soon as possible.
Note: if Invariant TSC is available, the issue doesn't happen because
1) we don't register read_hv_sched_clock_tsc() for sched clock:
See commit e5313f1c5404 ("clocksource/drivers/hyper-v: Rework clocksource and sched clock setup");
2) the common x86 code adjusts TSC similarly: see __restore_processor_state() -> tsc_verify_tsc_adjust(true) and x86_platform.restore_sched_clock_state().
Message-ID: <[email protected]>
arch/x86/kernel/cpu/mshyperv.c +58 -0
@@ -223,6 +223,63 @@ static void hv_machine_crash_shutdown(struct pt_regs *regs)hyperv_cleanup (); }#endif /* CONFIG_CRASH_DUMP */ + +static u64 hv_ref_counter_at_suspend; +static void (*old_save_sched_clock_state)(void ); +static void (*old_restore_sched_clock_state)(void ); + +/* +* Hyper-V clock counter resets during hibernation. Save and restore clock +* offset during suspend/resume, while also considering the time passed +* before suspend. This is to make sure that sched_clock using hv tsc page +* based clocksource, proceeds from where it left off during suspend and +* it shows correct time for the timestamps of kernel messages after resume. +*/ +static void save_hv_clock_tsc_state (void ) +{ + hv_ref_counter_at_suspend =hv_read_reference_counter (); +} + +static void restore_hv_clock_tsc_state (void ) +{ +/* +* Adjust the offsets used by hv tsc clocksource to +* account for the time spent before hibernation. +* adjusted value = reference counter (time) at suspend +* - reference counter (time) now. +*/ +hv_adj_sched_clock_offset (hv_ref_counter_at_suspend -hv_read_reference_counter ()); +} + +/* +* Functions to override save_sched_clock_state and restore_sched_clock_state +* functions of x86_platform. The Hyper-V clock counter is reset during +* suspend-resume and the offset used to measure time needs to be +* corrected, post resume. +*/ +static void hv_save_sched_clock_state (void ) +{ +old_save_sched_clock_state (); +save_hv_clock_tsc_state (); +} + +static void hv_restore_sched_clock_state (void ) +{ +restore_hv_clock_tsc_state (); +old_restore_sched_clock_state (); +} + +static void __init x86_setup_ops_for_tsc_pg_clock (void ) +{ +if (!(ms_hyperv.features &HV_MSR_REFERENCE_TSC_AVAILABLE )) +return ; + + old_save_sched_clock_state = x86_platform.save_sched_clock_state; + x86_platform.save_sched_clock_state = hv_save_sched_clock_state; + + old_restore_sched_clock_state = x86_platform.restore_sched_clock_state; + x86_platform.restore_sched_clock_state = hv_restore_sched_clock_state; +}#endif /* CONFIG_HYPERV */ static uint32_t __init ms_hyperv_platform (void )
@@ -579,6 +636,7 @@ static void __init ms_hyperv_init_platform(void)/* Register Hyper-V specific clocksource */ hv_init_clocksource (); +x86_setup_ops_for_tsc_pg_clock ();hv_vtl_init_platform ();#endif /*
drivers/clocksource/hyperv_timer.c +13 -1
@@ -27,7 +27,8 @@#include <asm/mshyperv.h> static struct clock_event_device __percpu *hv_clock_event; -static u64 hv_sched_clock_offset__ro_after_init ; +/* Note: offset can hold negative values after hibernation. */ +static u64 hv_sched_clock_offset__read_mostly ;/* * If false, we're using the old mechanism for stimer0 interrupts
@@ -470,6 +471,17 @@ static void resume_hv_clock_tsc(struct clocksource *arg)hv_set_msr (HV_MSR_REFERENCE_TSC , tsc_msr.as_uint64); } +/* +* Called during resume from hibernation, from overridden +* x86_platform.restore_sched_clock_state routine. This is to adjust offsets +* used to calculate time for hv tsc page based sched_clock, to account for +* time spent before hibernation. +*/ +void hv_adj_sched_clock_offset (u64 offset) +{ + hv_sched_clock_offset -= offset; +} +#ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK static int hv_cs_enable (struct clocksource *cs) {
include/clocksource/hyperv_timer.h +2 -0
@@ -38,6 +38,8 @@ extern void hv_remap_tsc_clocksource(void);extern unsigned long hv_get_tsc_pfn (void );extern struct ms_hyperv_tsc_page *hv_get_tsc_page (void ); +extern void hv_adj_sched_clock_offset (u64 offset); + static __always_inline boolhv_read_tsc_page_tsc (const struct ms_hyperv_tsc_page *tsc_pg,u64 *cur_tsc,u64 *time)
PATCH 1/1 x86/hyperv: Fix hv tsc page based sched_clock for hibernation
read_hv_sched_clock_tsc() assumes that the Hyper-V clock counter is bigger than the variable hv_sched_clock_offset, which is cached during early boot, but depending on the timing this assumption may be false when a hibernated VM starts again (the clock counter starts from 0 again) and is resuming back (Note: hv_init_tsc_clocksource() is not called during hibernation/resume); consequently, read_hv_sched_clock_tsc() may return a negative integer (which is interpreted as a huge positive integer since the return type is u64) and new kernel messages are prefixed with huge timestamps before read_hv_sched_clock_tsc() grows big enough (which typically takes several seconds).
Fix the issue by saving the Hyper-V clock counter just before the suspend, and using it to correct the hv_sched_clock_offset in resume. This makes hv tsc page based sched_clock continuous and ensures that post resume, it starts from where it left off during suspend. Override x86_platform.save_sched_clock_state and x86_platform.restore_sched_clock_state routines to correct this as soon as possible.
Note: if Invariant TSC is available, the issue doesn't happen because
1) we don't register read_hv_sched_clock_tsc() for sched clock:
See commit e5313f1c5404 ("clocksource/drivers/hyper-v: Rework clocksource and sched clock setup");
2) the common x86 code adjusts TSC similarly: see __restore_processor_state() -> tsc_verify_tsc_adjust(true) and x86_platform.restore_sched_clock_state().
Message-ID: <[email protected]>
--- arch/x86/kernel/cpu/mshyperv.c | 58 ++++++++++++++++++++++++++++++ drivers/clocksource/hyperv_timer.c | 14 +++++++- include/clocksource/hyperv_timer.h | 2 ++ 3 files changed, 73 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/mshyperv.c +58 -0
@@ -222,6 +222,63 @@ static void hv_machine_crash_shutdown(struct pt_regs *regs)hyperv_cleanup (); }#endif /* CONFIG_KEXEC_CORE */ + +static u64 hv_ref_counter_at_suspend; +static void (*old_save_sched_clock_state)(void ); +static void (*old_restore_sched_clock_state)(void ); + +/* +* Hyper-V clock counter resets during hibernation. Save and restore clock +* offset during suspend/resume, while also considering the time passed +* before suspend. This is to make sure that sched_clock using hv tsc page +* based clocksource, proceeds from where it left off during suspend and +* it shows correct time for the timestamps of kernel messages after resume. +*/ +static void save_hv_clock_tsc_state (void ) +{ + hv_ref_counter_at_suspend =hv_read_reference_counter (); +} + +static void restore_hv_clock_tsc_state (void ) +{ +/* +* Adjust the offsets used by hv tsc clocksource to +* account for the time spent before hibernation. +* adjusted value = reference counter (time) at suspend +* - reference counter (time) now. +*/ +hv_adj_sched_clock_offset (hv_ref_counter_at_suspend -hv_read_reference_counter ()); +} + +/* +* Functions to override save_sched_clock_state and restore_sched_clock_state +* functions of x86_platform. The Hyper-V clock counter is reset during +* suspend-resume and the offset used to measure time needs to be +* corrected, post resume. +*/ +static void hv_save_sched_clock_state (void ) +{ +old_save_sched_clock_state (); +save_hv_clock_tsc_state (); +} + +static void hv_restore_sched_clock_state (void ) +{ +restore_hv_clock_tsc_state (); +old_restore_sched_clock_state (); +} + +static void __init x86_setup_ops_for_tsc_pg_clock (void ) +{ +if (!(ms_hyperv.features &HV_MSR_REFERENCE_TSC_AVAILABLE )) +return ; + + old_save_sched_clock_state = x86_platform.save_sched_clock_state; + x86_platform.save_sched_clock_state = hv_save_sched_clock_state; + + old_restore_sched_clock_state = x86_platform.restore_sched_clock_state; + x86_platform.restore_sched_clock_state = hv_restore_sched_clock_state; +}#endif /* CONFIG_HYPERV */ static uint32_t __init ms_hyperv_platform (void )
@@ -572,6 +629,7 @@ static void __init ms_hyperv_init_platform(void)/* Register Hyper-V specific clocksource */ hv_init_clocksource (); +x86_setup_ops_for_tsc_pg_clock ();hv_vtl_init_platform ();#endif /*
drivers/clocksource/hyperv_timer.c +13 -1
@@ -27,7 +27,8 @@#include <asm/mshyperv.h> static struct clock_event_device __percpu *hv_clock_event; -static u64 hv_sched_clock_offset__ro_after_init ; +/* Note: offset can hold negative values after hibernation. */ +static u64 hv_sched_clock_offset__read_mostly ;/* * If false, we're using the old mechanism for stimer0 interrupts
@@ -456,6 +457,17 @@ static void resume_hv_clock_tsc(struct clocksource *arg)hv_set_register (HV_REGISTER_REFERENCE_TSC , tsc_msr.as_uint64); } +/* +* Called during resume from hibernation, from overridden +* x86_platform.restore_sched_clock_state routine. This is to adjust offsets +* used to calculate time for hv tsc page based sched_clock, to account for +* time spent before hibernation. +*/ +void hv_adj_sched_clock_offset (u64 offset) +{ + hv_sched_clock_offset -= offset; +} +#ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK static int hv_cs_enable (struct clocksource *cs) {
include/clocksource/hyperv_timer.h +2 -0
@@ -38,6 +38,8 @@ extern void hv_remap_tsc_clocksource(void);extern unsigned long hv_get_tsc_pfn (void );extern struct ms_hyperv_tsc_page *hv_get_tsc_page (void ); +extern void hv_adj_sched_clock_offset (u64 offset); + static __always_inline boolhv_read_tsc_page_tsc (const struct ms_hyperv_tsc_page *tsc_pg,u64 *cur_tsc,u64 *time)
Signature · 1 line
2.43.0
Sasha Levin
maintainerRe: [PATCH 6.6.y] x86/hyperv: Fix hv tsc page based sched_clock for hibernation
[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: bcc80dec91ee745b3d66f3e48f0ec2efdea97149
Status in newer kernel trees:
6.12.y | Present (different SHA1: bacd0498dea0)
6.6.y | Present (different SHA1: 4c8d45af23c2)
Note: The patch differs from the upstream commit:
---
1: bcc80dec91ee ! 1: cc5a1702c099 x86/hyperv: Fix hv tsc page based sched_clock for hibernation
@@ Commit message
Message-ID: <[email protected]>
+ (cherry picked from commit bcc80dec91ee745b3d66f3e48f0ec2efdea97149)
+ Signed-off-by: Naman Jain <[email protected]>
## arch/x86/kernel/cpu/mshyperv.c ##
@@ arch/x86/kernel/cpu/mshyperv.c: static void hv_machine_crash_shutdown(struct pt_regs *regs)
hyperv_cleanup();
}
- #endif /* CONFIG_CRASH_DUMP */
+ #endif /* CONFIG_KEXEC_CORE */
+
+static u64 hv_ref_counter_at_suspend;
+static void (*old_save_sched_clock_state)(void);
@@ drivers/clocksource/hyperv_timer.c
/*
* If false, we're using the old mechanism for stimer0 interrupts
@@ drivers/clocksource/hyperv_timer.c: static void resume_hv_clock_tsc(struct clocksource *arg)
- hv_set_msr(HV_MSR_REFERENCE_TSC, tsc_msr.as_uint64);
+ hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr.as_uint64);
}
+/*
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |