On Fri, Mar 27, 2020 at 09:53:39AM +0100, Vitaly Kuznetsov wrote:
Tianyu Lan ltykernel@gmail.com writes:
From: Yubo Xie yuboxie@microsoft.com
sched clock callback should return time with nano second as unit but current hv callback returns time with 100ns. Fix it.
Cc: stable@vger.kernel.org Signed-off-by: Yubo Xie yuboxie@microsoft.com Signed-off-by: Tianyu Lan Tianyu.Lan@microsoft.com Fixes: bd00cd52d5be ("clocksource/drivers/hyperv: Add Hyper-V specific sched clock function")
Change since v1: Update fix commit number in change log.
drivers/clocksource/hyperv_timer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c index 9d808d595ca8..662ed978fa24 100644 --- a/drivers/clocksource/hyperv_timer.c +++ b/drivers/clocksource/hyperv_timer.c @@ -343,7 +343,8 @@ static u64 notrace read_hv_clock_tsc_cs(struct clocksource *arg) static u64 read_hv_sched_clock_tsc(void) {
- return read_hv_clock_tsc() - hv_sched_clock_offset;
- return (read_hv_clock_tsc() - hv_sched_clock_offset)
* (NSEC_PER_SEC / HV_CLOCK_HZ);} static void suspend_hv_clock_tsc(struct clocksource *arg) @@ -398,7 +399,8 @@ static u64 notrace read_hv_clock_msr_cs(struct clocksource *arg) static u64 read_hv_sched_clock_msr(void) {
- return read_hv_clock_msr() - hv_sched_clock_offset;
- return (read_hv_clock_msr() - hv_sched_clock_offset)
* (NSEC_PER_SEC / HV_CLOCK_HZ);} static struct clocksource hyperv_cs_msr = {
Reviewed-by: Vitaly Kuznetsov vkuznets@redhat.com
Queued for hyperv-fixes. Thank you both.
Wei.