clocksource/hyperv: Miscellaneous changes
Subsystems (3)
v2 cover clocksource/hyperv: Miscellaneous changes
Provide some refactoring and adjustments to the Hyper-V clocksources code.
Changes since v1 [1]:
- Rebased on Daniel's repo/branch
- Added Reviewed-by: tags
[1] https://lkml.kernel.org/r/[email protected]
Andrea Parri (2):
clocksource/hyperv: Untangle stimers and timesync from clocksources clocksource/hyperv: Set TSC clocksource as default w/ InvariantTSC
drivers/clocksource/hyperv_timer.c | 48 ++++++++++++++++++++---------- drivers/hv/hv_util.c | 8 ++--- include/clocksource/hyperv_timer.h | 2 +- 3 files changed, 38 insertions(+), 20 deletions(-)
Signature · 1 line
2.24.0
PATCH v2 1/2 clocksource/hyperv: Untangle stimers and timesync from clocksources
hyperv_timer.c exports hyperv_cs, which is used by stimers and the timesync mechanism. However, the clocksource dependency is not
needed: these mechanisms only depend on the partition reference counter (which can be read via a MSR or via the TSC Reference Page).
Introduce the (function) pointer hv_read_reference_counter, as an embodiment of the partition reference counter read, and export it in place of the hyperv_cs pointer. The latter can be removed.
This should clarify that there's no relationship between Hyper-V stimers & timesync and the Linux clocksource abstractions. No functional or semantic change.
--- drivers/clocksource/hyperv_timer.c | 36 +++++++++++++++++++----------- drivers/hv/hv_util.c | 8 +++---- include/clocksource/hyperv_timer.h | 2 +- 3 files changed, 28 insertions(+), 18 deletions(-)
drivers/clocksource/hyperv_timer.c +23 -13
@@ -56,7 +56,7 @@ static int hv_ce_set_next_event(unsigned long delta, {u64 current_tick; - current_tick = hyperv_cs->read (NULL ); + current_tick =hv_read_reference_counter (); current_tick += delta;hv_init_timer (0 , current_tick);return 0 ;
@@ -210,8 +210,8 @@ EXPORT_SYMBOL_GPL(hv_stimer_global_cleanup);* Hyper-V and 32-bit x86. The TSC reference page version is preferred. */ -struct clocksource *hyperv_cs; -EXPORT_SYMBOL_GPL (hyperv_cs); +u64 (*hv_read_reference_counter)(void); +EXPORT_SYMBOL_GPL (hv_read_reference_counter); static union { struct ms_hyperv_tsc_page page;
@@ -224,7 +224,7 @@ struct ms_hyperv_tsc_page *hv_get_tsc_page(void) }EXPORT_SYMBOL_GPL (hv_get_tsc_page); -static u64 notrace read_hv_clock_tsc(struct clocksource *arg) +static u64 notrace read_hv_clock_tsc(void) {u64 current_tick =hv_read_tsc_page (hv_get_tsc_page ());
@@ -234,9 +234,14 @@ static u64 notrace read_hv_clock_tsc(struct clocksource *arg)return current_tick; } +static u64 notrace read_hv_clock_tsc_cs(struct clocksource *arg) +{ +return read_hv_clock_tsc (); +} +static u64 read_hv_sched_clock_tsc (void ) { -return read_hv_clock_tsc (NULL ) - hv_sched_clock_offset; +return read_hv_clock_tsc () - hv_sched_clock_offset; }static void suspend_hv_clock_tsc (struct clocksource *arg)
@@ -265,14 +270,14 @@ static void resume_hv_clock_tsc(struct clocksource *arg)static struct clocksource hyperv_cs_tsc = { .name ="hyperv_clocksource_tsc_page" , .rating =400 , - .read = read_hv_clock_tsc, + .read = read_hv_clock_tsc_cs, .mask =CLOCKSOURCE_MASK (64 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS , .suspend= suspend_hv_clock_tsc, .resume = resume_hv_clock_tsc, }; -static u64 notrace read_hv_clock_msr(struct clocksource *arg) +static u64 notrace read_hv_clock_msr(void) {u64 current_tick;/*
@@ -284,15 +289,20 @@ static u64 notrace read_hv_clock_msr(struct clocksource *arg)return current_tick; } +static u64 notrace read_hv_clock_msr_cs(struct clocksource *arg) +{ +return read_hv_clock_msr (); +} +static u64 read_hv_sched_clock_msr (void ) { -return read_hv_clock_msr (NULL ) - hv_sched_clock_offset; +return read_hv_clock_msr () - hv_sched_clock_offset; }static struct clocksource hyperv_cs_msr = { .name ="hyperv_clocksource_msr" , .rating =400 , - .read = read_hv_clock_msr, + .read = read_hv_clock_msr_cs, .mask =CLOCKSOURCE_MASK (64 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS , };
@@ -305,7 +315,7 @@ static bool __init hv_init_tsc_clocksource(void)if (!(ms_hyperv.features &HV_MSR_REFERENCE_TSC_AVAILABLE ))return false; - hyperv_cs = &hyperv_cs_tsc; + hv_read_reference_counter = read_hv_clock_tsc; phys_addr =virt_to_phys (hv_get_tsc_page ());/*
@@ -323,7 +333,7 @@ static bool __init hv_init_tsc_clocksource(void)hv_set_clocksource_vdso (hyperv_cs_tsc);clocksource_register_hz (&hyperv_cs_tsc,NSEC_PER_SEC /100 ); - hv_sched_clock_offset = hyperv_cs->read (hyperv_cs); + hv_sched_clock_offset =hv_read_reference_counter ();hv_setup_sched_clock (read_hv_sched_clock_tsc);return true;
@@ -345,10 +355,10 @@ void __init hv_init_clocksource(void)if (!(ms_hyperv.features &HV_MSR_TIME_REF_COUNT_AVAILABLE ))return ; - hyperv_cs = &hyperv_cs_msr; + hv_read_reference_counter = read_hv_clock_msr;clocksource_register_hz (&hyperv_cs_msr,NSEC_PER_SEC /100 ); - hv_sched_clock_offset = hyperv_cs->read (hyperv_cs); + hv_sched_clock_offset =hv_read_reference_counter ();hv_setup_sched_clock (read_hv_sched_clock_msr); }EXPORT_SYMBOL_GPL (hv_init_clocksource);
drivers/hv/hv_util.c +4 -4
@@ -211,7 +211,7 @@ static struct timespec64 hv_get_adj_host_time(void)unsigned long flags;spin_lock_irqsave (&host_ts.lock, flags); - reftime = hyperv_cs->read (hyperv_cs); + reftime =hv_read_reference_counter (); newtime = host_ts.host_time + (reftime - host_ts.ref_time); ts =ns_to_timespec64 ((newtime -WLTIMEDELTA ) *100 );spin_unlock_irqrestore (&host_ts.lock, flags);
@@ -250,7 +250,7 @@ static inline void adj_guesttime(u64 hosttime, u64 reftime, u8 adj_flags)*/ spin_lock_irqsave (&host_ts.lock, flags); - cur_reftime = hyperv_cs->read (hyperv_cs); + cur_reftime =hv_read_reference_counter (); host_ts.host_time = hosttime; host_ts.ref_time = cur_reftime;
@@ -315,7 +315,7 @@ static void timesync_onchannelcallback(void *context)sizeof (struct vmbuspipe_hdr ) + sizeof(struct icmsg_hdr)];adj_guesttime (timedatap->parenttime, - hyperv_cs->read (hyperv_cs), +hv_read_reference_counter (), timedatap->flags); } }
@@ -523,7 +523,7 @@ static struct ptp_clock *hv_ptp_clock;static int hv_timesync_init (struct hv_util_service *srv) {/* TimeSync requires Hyper-V clocksource. */ -if (!hyperv_cs) +if (!hv_read_reference_counter)return -ENODEV ;spin_lock_init (&host_ts.lock);
include/clocksource/hyperv_timer.h +1 -1
@@ -29,7 +29,7 @@ extern void hv_stimer_global_cleanup(void);extern void hv_stimer0_isr (void );#ifdef CONFIG_HYPERV_TIMER -extern struct clocksource *hyperv_cs; +extern u64 (*hv_read_reference_counter)(void );extern void hv_init_clocksource (void );extern struct ms_hyperv_tsc_page *hv_get_tsc_page (void );
Signature · 1 line
2.24.0
[tip: timers/core] clocksource/drivers/hyper-v: Untangle stimers and timesync from clocksources
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 0af3e137c144377fbaf5025ba784ff5ba7ad40c9 Gitweb: https://git.kernel.org/tip/0af3e137c144377fbaf5025ba784ff5ba7ad40c9 Author: Andrea Parri <[email protected]> AuthorDate: Thu, 09 Jan 2020 17:06:49 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 16 Jan 2020 19:09:02 +01:00
clocksource/drivers/hyper-v: Untangle stimers and timesync from clocksources
hyperv_timer.c exports hyperv_cs, which is used by stimers and the timesync mechanism. However, the clocksource dependency is not
needed: these mechanisms only depend on the partition reference counter (which can be read via a MSR or via the TSC Reference Page).
Introduce the (function) pointer hv_read_reference_counter, as an embodiment of the partition reference counter read, and export it in place of the hyperv_cs pointer. The latter can be removed.
This should clarify that there's no relationship between Hyper-V stimers & timesync and the Linux clocksource abstractions. No functional or semantic change.
--- drivers/clocksource/hyperv_timer.c | 36 ++++++++++++++++++----------- drivers/hv/hv_util.c | 8 +++--- include/clocksource/hyperv_timer.h | 2 +- 3 files changed, 28 insertions(+), 18 deletions(-)
drivers/clocksource/hyperv_timer.c +23 -13
@@ -66,7 +66,7 @@ static int hv_ce_set_next_event(unsigned long delta, {u64 current_tick; - current_tick = hyperv_cs->read (NULL ); + current_tick =hv_read_reference_counter (); current_tick += delta;hv_init_timer (0 , current_tick);return 0 ;
@@ -304,8 +304,8 @@ EXPORT_SYMBOL_GPL(hv_stimer_global_cleanup);* Hyper-V and 32-bit x86. The TSC reference page version is preferred. */ -struct clocksource *hyperv_cs; -EXPORT_SYMBOL_GPL (hyperv_cs); +u64 (*hv_read_reference_counter)(void); +EXPORT_SYMBOL_GPL (hv_read_reference_counter); static union { struct ms_hyperv_tsc_page page;
@@ -318,7 +318,7 @@ struct ms_hyperv_tsc_page *hv_get_tsc_page(void) }EXPORT_SYMBOL_GPL (hv_get_tsc_page); -static u64 notrace read_hv_clock_tsc(struct clocksource *arg) +static u64 notrace read_hv_clock_tsc(void) {u64 current_tick =hv_read_tsc_page (hv_get_tsc_page ());
@@ -328,9 +328,14 @@ static u64 notrace read_hv_clock_tsc(struct clocksource *arg)return current_tick; } +static u64 notrace read_hv_clock_tsc_cs(struct clocksource *arg) +{ +return read_hv_clock_tsc (); +} +static u64 read_hv_sched_clock_tsc (void ) { -return read_hv_clock_tsc (NULL ) - hv_sched_clock_offset; +return read_hv_clock_tsc () - hv_sched_clock_offset; }static void suspend_hv_clock_tsc (struct clocksource *arg)
@@ -359,14 +364,14 @@ static void resume_hv_clock_tsc(struct clocksource *arg)static struct clocksource hyperv_cs_tsc = { .name ="hyperv_clocksource_tsc_page" , .rating =400 , - .read = read_hv_clock_tsc, + .read = read_hv_clock_tsc_cs, .mask =CLOCKSOURCE_MASK (64 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS , .suspend= suspend_hv_clock_tsc, .resume = resume_hv_clock_tsc, }; -static u64 notrace read_hv_clock_msr(struct clocksource *arg) +static u64 notrace read_hv_clock_msr(void) {u64 current_tick;/*
@@ -378,15 +383,20 @@ static u64 notrace read_hv_clock_msr(struct clocksource *arg)return current_tick; } +static u64 notrace read_hv_clock_msr_cs(struct clocksource *arg) +{ +return read_hv_clock_msr (); +} +static u64 read_hv_sched_clock_msr (void ) { -return read_hv_clock_msr (NULL ) - hv_sched_clock_offset; +return read_hv_clock_msr () - hv_sched_clock_offset; }static struct clocksource hyperv_cs_msr = { .name ="hyperv_clocksource_msr" , .rating =400 , - .read = read_hv_clock_msr, + .read = read_hv_clock_msr_cs, .mask =CLOCKSOURCE_MASK (64 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS , };
@@ -399,7 +409,7 @@ static bool __init hv_init_tsc_clocksource(void)if (!(ms_hyperv.features &HV_MSR_REFERENCE_TSC_AVAILABLE ))return false; - hyperv_cs = &hyperv_cs_tsc; + hv_read_reference_counter = read_hv_clock_tsc; phys_addr =virt_to_phys (hv_get_tsc_page ());/*
@@ -417,7 +427,7 @@ static bool __init hv_init_tsc_clocksource(void)hv_set_clocksource_vdso (hyperv_cs_tsc);clocksource_register_hz (&hyperv_cs_tsc,NSEC_PER_SEC /100 ); - hv_sched_clock_offset = hyperv_cs->read (hyperv_cs); + hv_sched_clock_offset =hv_read_reference_counter ();hv_setup_sched_clock (read_hv_sched_clock_tsc);return true;
@@ -439,10 +449,10 @@ void __init hv_init_clocksource(void)if (!(ms_hyperv.features &HV_MSR_TIME_REF_COUNT_AVAILABLE ))return ; - hyperv_cs = &hyperv_cs_msr; + hv_read_reference_counter = read_hv_clock_msr;clocksource_register_hz (&hyperv_cs_msr,NSEC_PER_SEC /100 ); - hv_sched_clock_offset = hyperv_cs->read (hyperv_cs); + hv_sched_clock_offset =hv_read_reference_counter ();hv_setup_sched_clock (read_hv_sched_clock_msr); }EXPORT_SYMBOL_GPL (hv_init_clocksource);
drivers/hv/hv_util.c +4 -4
@@ -211,7 +211,7 @@ static struct timespec64 hv_get_adj_host_time(void)unsigned long flags;spin_lock_irqsave (&host_ts.lock, flags); - reftime = hyperv_cs->read (hyperv_cs); + reftime =hv_read_reference_counter (); newtime = host_ts.host_time + (reftime - host_ts.ref_time); ts =ns_to_timespec64 ((newtime -WLTIMEDELTA ) *100 );spin_unlock_irqrestore (&host_ts.lock, flags);
@@ -250,7 +250,7 @@ static inline void adj_guesttime(u64 hosttime, u64 reftime, u8 adj_flags)*/ spin_lock_irqsave (&host_ts.lock, flags); - cur_reftime = hyperv_cs->read (hyperv_cs); + cur_reftime =hv_read_reference_counter (); host_ts.host_time = hosttime; host_ts.ref_time = cur_reftime;
@@ -315,7 +315,7 @@ static void timesync_onchannelcallback(void *context)sizeof (struct vmbuspipe_hdr ) + sizeof(struct icmsg_hdr)];adj_guesttime (timedatap->parenttime, - hyperv_cs->read (hyperv_cs), +hv_read_reference_counter (), timedatap->flags); } }
@@ -524,7 +524,7 @@ static struct ptp_clock *hv_ptp_clock;static int hv_timesync_init (struct hv_util_service *srv) {/* TimeSync requires Hyper-V clocksource. */ -if (!hyperv_cs) +if (!hv_read_reference_counter)return -ENODEV ;spin_lock_init (&host_ts.lock);
include/clocksource/hyperv_timer.h +1 -1
@@ -30,7 +30,7 @@ extern void hv_stimer_global_cleanup(void);extern void hv_stimer0_isr (void );#ifdef CONFIG_HYPERV_TIMER -extern struct clocksource *hyperv_cs; +extern u64 (*hv_read_reference_counter)(void );extern void hv_init_clocksource (void );extern struct ms_hyperv_tsc_page *hv_get_tsc_page (void );
PATCH v2 2/2 clocksource/hyperv: Set TSC clocksource as default w/ InvariantTSC
In reply to Andrea ParriChange the Hyper-V clocksource ratings to 250, below the TSC clocksource rating of 300. In configurations where Hyper-V offers an InvariantTSC, the TSC is not marked "unstable", so the TSC clocksource is available and preferred. With the higher rating, it will be the default. On older hardware and Hyper-V versions, the TSC is marked "unstable", so no TSC clocksource is created and the selected Hyper-V clocksource will be the default.
--- drivers/clocksource/hyperv_timer.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/clocksource/hyperv_timer.c +10 -2
@@ -208,6 +208,14 @@ EXPORT_SYMBOL_GPL(hv_stimer_global_cleanup);* the other that uses the TSC reference page feature as defined in the * TLFS. The MSR version is for compatibility with old versions of * Hyper-V and 32-bit x86. The TSC reference page version is preferred. +* +* The Hyper-V clocksource ratings of 250 are chosen to be below the +* TSC clocksource rating of 300. In configurations where Hyper-V offers +* an InvariantTSC, the TSC is not marked "unstable", so the TSC clocksource +* is available and preferred. With the higher rating, it will be the +* default. On older hardware and Hyper-V versions, the TSC is marked +* "unstable", so no TSC clocksource is created and the selected Hyper-V +* clocksource will be the default. */ u64 (*hv_read_reference_counter)(void);
@@ -269,7 +277,7 @@ static void resume_hv_clock_tsc(struct clocksource *arg)static struct clocksource hyperv_cs_tsc = { .name ="hyperv_clocksource_tsc_page" , - .rating =400 , + .rating =250 , .read = read_hv_clock_tsc_cs, .mask =CLOCKSOURCE_MASK (64 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS ,
@@ -301,7 +309,7 @@ static u64 read_hv_sched_clock_msr(void)static struct clocksource hyperv_cs_msr = { .name ="hyperv_clocksource_msr" , - .rating =400 , + .rating =250 , .read = read_hv_clock_msr_cs, .mask =CLOCKSOURCE_MASK (64 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS ,
Signature · 1 line
2.24.0
[tip: timers/core] clocksource/drivers/hyper-v: Set TSC clocksource as default w/ InvariantTSC
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 9e0333ae38eeb42249e10f95d209244a6e22ac9f Gitweb: https://git.kernel.org/tip/9e0333ae38eeb42249e10f95d209244a6e22ac9f Author: Andrea Parri <[email protected]> AuthorDate: Thu, 09 Jan 2020 17:06:50 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 16 Jan 2020 19:09:02 +01:00
clocksource/drivers/hyper-v: Set TSC clocksource as default w/ InvariantTSC
Change the Hyper-V clocksource ratings to 250, below the TSC clocksource rating of 300. In configurations where Hyper-V offers an InvariantTSC, the TSC is not marked "unstable", so the TSC clocksource is available and preferred. With the higher rating, it will be the default. On older hardware and Hyper-V versions, the TSC is marked "unstable", so no TSC clocksource is created and the selected Hyper-V clocksource will be the default.
--- drivers/clocksource/hyperv_timer.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/clocksource/hyperv_timer.c +10 -2
@@ -302,6 +302,14 @@ EXPORT_SYMBOL_GPL(hv_stimer_global_cleanup);* the other that uses the TSC reference page feature as defined in the * TLFS. The MSR version is for compatibility with old versions of * Hyper-V and 32-bit x86. The TSC reference page version is preferred. +* +* The Hyper-V clocksource ratings of 250 are chosen to be below the +* TSC clocksource rating of 300. In configurations where Hyper-V offers +* an InvariantTSC, the TSC is not marked "unstable", so the TSC clocksource +* is available and preferred. With the higher rating, it will be the +* default. On older hardware and Hyper-V versions, the TSC is marked +* "unstable", so no TSC clocksource is created and the selected Hyper-V +* clocksource will be the default. */ u64 (*hv_read_reference_counter)(void);
@@ -363,7 +371,7 @@ static void resume_hv_clock_tsc(struct clocksource *arg)static struct clocksource hyperv_cs_tsc = { .name ="hyperv_clocksource_tsc_page" , - .rating =400 , + .rating =250 , .read = read_hv_clock_tsc_cs, .mask =CLOCKSOURCE_MASK (64 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS ,
@@ -395,7 +403,7 @@ static u64 read_hv_sched_clock_msr(void)static struct clocksource hyperv_cs_msr = { .name ="hyperv_clocksource_msr" , - .rating =400 , + .rating =250 , .read = read_hv_clock_msr_cs, .mask =CLOCKSOURCE_MASK (64 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS ,
Daniel Lezcano
AppliedQuoted 9 lines · Andrea Parri
Provide some refactoring and adjustments to the Hyper-V clocksources code.
Changes since v1 [1]:
- Rebased on Daniel's repo/branch
- Added Reviewed-by: tags
Quoted 8 lines
Andrea Parri (2):
clocksource/hyperv: Untangle stimers and timesync from clocksources clocksource/hyperv: Set TSC clocksource as default w/ InvariantTSCdrivers/clocksource/hyperv_timer.c | 48 ++++++++++++++++++++---------- drivers/hv/hv_util.c | 8 ++--- include/clocksource/hyperv_timer.h | 2 +- 3 files changed, 38 insertions(+), 20 deletions(-)
Applied, thanks.
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog