]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
x86: CPU: Fix up "cpu MHz" in /proc/cpuinfo
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 3 Nov 2017 15:35:49 +0000 (16:35 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Nov 2017 15:50:13 +0000 (08:50 -0700)
commit941f5f0f6ef5338814145cf2b813cf1f98873e2f
treeb5bfebf297b5213cb5ef96af994c5cc84b64e9bb
parent5cb0512c02ecd7e6214e912e4c150f4219ac78e0
x86: CPU: Fix up "cpu MHz" in /proc/cpuinfo

Commit 890da9cf0983 (Revert "x86: do not use cpufreq_quick_get() for
/proc/cpuinfo "cpu MHz"") is not sufficient to restore the previous
behavior of "cpu MHz" in /proc/cpuinfo on x86 due to some changes
made after the commit it has reverted.

To address this, make the code in question use arch_freq_get_on_cpu()
which also is used by cpufreq for reporting the current frequency of
CPUs and since that function doesn't really depend on cpufreq in any
way, drop the CONFIG_CPU_FREQ dependency for the object file
containing it.

Also refactor arch_freq_get_on_cpu() somewhat to avoid IPIs and
return cached values right away if it is called very often over a
short time (to prevent user space from triggering IPI storms through
it).

Fixes: 890da9cf0983 (Revert "x86: do not use cpufreq_quick_get() for /proc/cpuinfo "cpu MHz"")
Cc: stable@kernel.org # 4.13 - together with 890da9cf0983
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/kernel/cpu/Makefile
arch/x86/kernel/cpu/aperfmperf.c
arch/x86/kernel/cpu/proc.c