From: Michael Kelley <mikelley@microsoft.com>
To: Ani Sinha <ani@anisinha.ca>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: "anirban.sinha@nokia.com" <anirban.sinha@nokia.com>,
KY Srinivasan <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"x86@kernel.org" <x86@kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
"linux-hyperv@vger.kernel.org" <linux-hyperv@vger.kernel.org>
Subject: RE: [PATCH] Hyper-V: fix for unwanted manipulation of sched_clock when TSC marked unstable
Date: Tue, 13 Jul 2021 17:25:59 +0000 [thread overview]
Message-ID: <CY4PR21MB15866351E83212975EA02C34D7149@CY4PR21MB1586.namprd21.prod.outlook.com> (raw)
In-Reply-To: <20210713030522.1714803-1-ani@anisinha.ca>
From: Ani Sinha <ani@anisinha.ca> Sent: Monday, July 12, 2021 8:05 PM
>
> Marking TSC as unstable has a side effect of marking sched_clock as
> unstable when TSC is still being used as the sched_clock. This is not
> desirable. Hyper-V ultimately uses a paravirtualized clock source that
> provides a stable scheduler clock even on systems without TscInvariant
> CPU capability. Hence, mark_tsc_unstable() call should be called _after_
> scheduler clock has been changed to the paravirtualized clocksource. This
> will prevent any unwanted manipulation of the sched_clock. Only TSC will
> be correctly marked as unstable.
>
> Signed-off-by: Ani Sinha <ani@anisinha.ca>
> ---
> arch/x86/kernel/cpu/mshyperv.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
> index 22f13343b5da..715458b7729a 100644
> --- a/arch/x86/kernel/cpu/mshyperv.c
> +++ b/arch/x86/kernel/cpu/mshyperv.c
> @@ -370,8 +370,6 @@ static void __init ms_hyperv_init_platform(void)
> if (ms_hyperv.features & HV_ACCESS_TSC_INVARIANT) {
> wrmsrl(HV_X64_MSR_TSC_INVARIANT_CONTROL, 0x1);
> setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE);
> - } else {
> - mark_tsc_unstable("running on Hyper-V");
> }
>
> /*
> @@ -432,6 +430,12 @@ static void __init ms_hyperv_init_platform(void)
> /* Register Hyper-V specific clocksource */
> hv_init_clocksource();
> #endif
> + /* TSC should be marked as unstable only after Hyper-V
> + * clocksource has been initialized. This ensures that the
> + * stability of the sched_clock is not altered.
> + */
For multi-line comments like the above, the first comment line
should just be "/*". So:
/*
* TSC should be marked as unstable only after Hyper-V
* clocksource has been initialized. This ensures that the
* stability of the sched_clock is not altered.
*/
> + if (!(ms_hyperv.features & HV_ACCESS_TSC_INVARIANT))
> + mark_tsc_unstable("running on Hyper-V");
> }
>
> static bool __init ms_hyperv_x2apic_available(void)
> --
> 2.25.1
Modulo the comment format,
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Michael Kelley <mikelley@microsoft.com>
next prev parent reply other threads:[~2021-07-13 17:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-13 3:05 [PATCH] Hyper-V: fix for unwanted manipulation of sched_clock when TSC marked unstable Ani Sinha
2021-07-13 13:04 ` Wei Liu
2021-07-13 13:17 ` Peter Zijlstra
2021-07-13 15:31 ` Ani Sinha
2021-07-13 15:47 ` Wei Liu
2021-07-13 17:25 ` Michael Kelley [this message]
2021-07-13 17:32 ` Wei Liu
2021-07-13 17:48 ` Ani Sinha
2021-07-13 18:30 ` Michael Kelley
2021-07-14 3:16 ` Ani Sinha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CY4PR21MB15866351E83212975EA02C34D7149@CY4PR21MB1586.namprd21.prod.outlook.com \
--to=mikelley@microsoft.com \
--cc=ani@anisinha.ca \
--cc=anirban.sinha@nokia.com \
--cc=bp@alien8.de \
--cc=decui@microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=hpa@zytor.com \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=sthemmin@microsoft.com \
--cc=tglx@linutronix.de \
--cc=wei.liu@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).