linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] cpufreq: x86: Disable interrupts during MSRs reading
@ 2017-08-08 21:12 Doug Smythies
  2017-08-10  5:05 ` Len Brown
  0 siblings, 1 reply; 2+ messages in thread
From: Doug Smythies @ 2017-08-08 21:12 UTC (permalink / raw)
  To: x86, linux-pm, len.brown; +Cc: dsmythies, rafael, linux-kernel

According to Intel 64 and IA-32 Architectures SDM, Volume 3,
Chapter 14.2, "Software needs to exercise care to avoid delays
between the two RDMSRs (for example interrupts)".

So, disable interrupts during reading MSRs IA32_APERF and IA32_MPERF.

See also:
commit 4ab60c3f32c721e46217e762bcd3e55a8f659c04
cpufreq: intel_pstate: Disable interrupts during MSRs reading

Signed-off-by: Doug Smythies <dsmythies@telus.net>
---
 arch/x86/kernel/cpu/aperfmperf.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/x86/kernel/cpu/aperfmperf.c b/arch/x86/kernel/cpu/aperfmperf.c
index 7cf7c70..0ee8332 100644
--- a/arch/x86/kernel/cpu/aperfmperf.c
+++ b/arch/x86/kernel/cpu/aperfmperf.c
@@ -40,13 +40,16 @@ static void aperfmperf_snapshot_khz(void *dummy)
 	struct aperfmperf_sample *s = this_cpu_ptr(&samples);
 	ktime_t now = ktime_get();
 	s64 time_delta = ktime_ms_delta(now, s->time);
+	unsigned long flags;
 
 	/* Don't bother re-computing within the cache threshold time. */
 	if (time_delta < APERFMPERF_CACHE_THRESHOLD_MS)
 		return;
 
+	local_irq_save(flags);
 	rdmsrl(MSR_IA32_APERF, aperf);
 	rdmsrl(MSR_IA32_MPERF, mperf);
+	local_irq_restore(flags);
 
 	aperf_delta = aperf - s->aperf;
 	mperf_delta = mperf - s->mperf;
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] cpufreq: x86: Disable interrupts during MSRs reading
  2017-08-08 21:12 [PATCH] cpufreq: x86: Disable interrupts during MSRs reading Doug Smythies
@ 2017-08-10  5:05 ` Len Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Len Brown @ 2017-08-10  5:05 UTC (permalink / raw)
  To: Doug Smythies
  Cc: X86 ML, Linux PM list, Brown, Len, Doug Smythies,
	Rafael J. Wysocki, linux-kernel

thanks, Doug!

Rafael,

Reviewed-by: Len Brown <len.brown@intel.com>


On Tue, Aug 8, 2017 at 5:12 PM, Doug Smythies <doug.smythies@gmail.com> wrote:
> According to Intel 64 and IA-32 Architectures SDM, Volume 3,
> Chapter 14.2, "Software needs to exercise care to avoid delays
> between the two RDMSRs (for example interrupts)".
>
> So, disable interrupts during reading MSRs IA32_APERF and IA32_MPERF.
>
> See also:
> commit 4ab60c3f32c721e46217e762bcd3e55a8f659c04
> cpufreq: intel_pstate: Disable interrupts during MSRs reading
>
> Signed-off-by: Doug Smythies <dsmythies@telus.net>
> ---
>  arch/x86/kernel/cpu/aperfmperf.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/arch/x86/kernel/cpu/aperfmperf.c b/arch/x86/kernel/cpu/aperfmperf.c
> index 7cf7c70..0ee8332 100644
> --- a/arch/x86/kernel/cpu/aperfmperf.c
> +++ b/arch/x86/kernel/cpu/aperfmperf.c
> @@ -40,13 +40,16 @@ static void aperfmperf_snapshot_khz(void *dummy)
>         struct aperfmperf_sample *s = this_cpu_ptr(&samples);
>         ktime_t now = ktime_get();
>         s64 time_delta = ktime_ms_delta(now, s->time);
> +       unsigned long flags;
>
>         /* Don't bother re-computing within the cache threshold time. */
>         if (time_delta < APERFMPERF_CACHE_THRESHOLD_MS)
>                 return;
>
> +       local_irq_save(flags);
>         rdmsrl(MSR_IA32_APERF, aperf);
>         rdmsrl(MSR_IA32_MPERF, mperf);
> +       local_irq_restore(flags);
>
>         aperf_delta = aperf - s->aperf;
>         mperf_delta = mperf - s->mperf;
> --
> 2.7.4
>



-- 
Len Brown, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-08-10  5:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-08 21:12 [PATCH] cpufreq: x86: Disable interrupts during MSRs reading Doug Smythies
2017-08-10  5:05 ` Len Brown

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).