From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
"Paul E. McKenney" <paulmck@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cleanups] x86/aperfmperf: Store aperf/mperf data for cpu frequency reads
Date: Wed, 27 Apr 2022 13:56:07 -0000 [thread overview]
Message-ID: <165106776778.4207.11312672097188195289.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20220415161206.817702355@linutronix.de>
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 3b1fc17f635164d74934f67d3bb46cdf877fb67f
Gitweb: https://git.kernel.org/tip/3b1fc17f635164d74934f67d3bb46cdf877fb67f
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Fri, 15 Apr 2022 21:20:01 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 27 Apr 2022 15:51:08 +02:00
x86/aperfmperf: Store aperf/mperf data for cpu frequency reads
Now that the MSR readout is unconditional, store the results in the per CPU
data structure along with a jiffies timestamp for the CPU frequency readout
code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@kernel.org>
Link: https://lore.kernel.org/r/20220415161206.817702355@linutronix.de
---
arch/x86/kernel/cpu/aperfmperf.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/aperfmperf.c b/arch/x86/kernel/cpu/aperfmperf.c
index df528a4..963c069 100644
--- a/arch/x86/kernel/cpu/aperfmperf.c
+++ b/arch/x86/kernel/cpu/aperfmperf.c
@@ -24,11 +24,17 @@
#include "cpu.h"
struct aperfmperf {
+ seqcount_t seq;
+ unsigned long last_update;
+ u64 acnt;
+ u64 mcnt;
u64 aperf;
u64 mperf;
};
-static DEFINE_PER_CPU_SHARED_ALIGNED(struct aperfmperf, cpu_samples);
+static DEFINE_PER_CPU_SHARED_ALIGNED(struct aperfmperf, cpu_samples) = {
+ .seq = SEQCNT_ZERO(cpu_samples.seq)
+};
struct aperfmperf_sample {
unsigned int khz;
@@ -515,6 +521,12 @@ void arch_scale_freq_tick(void)
s->aperf = aperf;
s->mperf = mperf;
+ raw_write_seqcount_begin(&s->seq);
+ s->last_update = jiffies;
+ s->acnt = acnt;
+ s->mcnt = mcnt;
+ raw_write_seqcount_end(&s->seq);
+
scale_freq_tick(acnt, mcnt);
}
next prev parent reply other threads:[~2022-04-27 13:56 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-15 19:19 [patch 00/10] x86/cpu: Consolidate APERF/MPERF code Thomas Gleixner
2022-04-15 19:19 ` [patch 01/10] x86/aperfmperf: Dont wake idle CPUs in arch_freq_get_on_cpu() Thomas Gleixner
2022-04-19 15:34 ` Rafael J. Wysocki
2022-04-27 13:56 ` [tip: x86/cleanups] " tip-bot2 for Thomas Gleixner
2022-04-15 19:19 ` [patch 02/10] x86/smp: Move APERF/MPERF code where it belongs Thomas Gleixner
2022-04-19 15:40 ` Rafael J. Wysocki
2022-04-27 13:56 ` [tip: x86/cleanups] " tip-bot2 for Thomas Gleixner
2022-04-15 19:19 ` [patch 03/10] x86/aperfmperf: Separate AP/BP frequency invariance init Thomas Gleixner
2022-04-19 16:04 ` Rafael J. Wysocki
2022-04-27 13:56 ` [tip: x86/cleanups] " tip-bot2 for Thomas Gleixner
2022-04-15 19:19 ` [patch 04/10] x86/aperfmperf: Untangle Intel and AMD " Thomas Gleixner
2022-04-19 16:12 ` Rafael J. Wysocki
2022-04-27 13:56 ` [tip: x86/cleanups] " tip-bot2 for Thomas Gleixner
2022-04-27 18:27 ` tip-bot2 for Thomas Gleixner
2022-04-15 19:19 ` [patch 05/10] x86/aperfmperf: Put frequency invariance aperf/mperf data into a struct Thomas Gleixner
2022-04-19 16:15 ` Rafael J. Wysocki
2022-04-27 13:56 ` [tip: x86/cleanups] " tip-bot2 for Thomas Gleixner
2022-04-27 18:27 ` tip-bot2 for Thomas Gleixner
2022-04-15 19:19 ` [patch 06/10] x86/aperfmperf: Restructure arch_scale_freq_tick() Thomas Gleixner
2022-04-19 16:20 ` Rafael J. Wysocki
2022-04-27 13:56 ` [tip: x86/cleanups] " tip-bot2 for Thomas Gleixner
2022-04-27 18:27 ` tip-bot2 for Thomas Gleixner
2022-04-15 19:19 ` [patch 07/10] x86/aperfmperf: Make parts of the frequency invariance code unconditional Thomas Gleixner
2022-04-19 16:27 ` Rafael J. Wysocki
2022-04-27 13:56 ` [tip: x86/cleanups] " tip-bot2 for Thomas Gleixner
2022-04-27 18:27 ` tip-bot2 for Thomas Gleixner
2022-04-15 19:20 ` [patch 08/10] x86/aperfmperf: Store aperf/mperf data for cpu frequency reads Thomas Gleixner
2022-04-19 16:30 ` Rafael J. Wysocki
2022-04-27 13:56 ` tip-bot2 for Thomas Gleixner [this message]
2022-04-27 18:27 ` [tip: x86/cleanups] " tip-bot2 for Thomas Gleixner
2022-04-15 19:20 ` [patch 09/10] x86/aperfmperf: Replace aperfmperf_get_khz() Thomas Gleixner
2022-04-19 16:35 ` Rafael J. Wysocki
2022-04-27 13:56 ` [tip: x86/cleanups] " tip-bot2 for Thomas Gleixner
2022-04-27 18:27 ` tip-bot2 for Thomas Gleixner
2022-04-15 19:20 ` [patch 10/10] x86/aperfmperf: Replace arch_freq_get_on_cpu() Thomas Gleixner
2022-04-19 16:37 ` Rafael J. Wysocki
2022-04-27 13:56 ` [tip: x86/cleanups] " tip-bot2 for Thomas Gleixner
2022-04-27 18:27 ` tip-bot2 for Thomas Gleixner
2022-04-19 15:51 ` [patch 00/10] x86/cpu: Consolidate APERF/MPERF code Eric Dumazet
2022-04-19 20:39 ` Thomas Gleixner
2022-04-19 21:20 ` Eric Dumazet
2022-04-19 16:41 ` Peter Zijlstra
2022-04-19 17:32 ` Doug Smythies
2022-04-19 18:49 ` Rafael J. Wysocki
2022-04-19 21:11 ` Thomas Gleixner
2022-04-20 22:08 ` Doug Smythies
2022-04-25 15:45 ` Thomas Gleixner
2022-04-25 23:20 ` Doug Smythies
2022-04-27 13:56 ` [tip: x86/cleanups] x86/aperfmperf: Integrate the fallback code from show_cpuinfo() tip-bot2 for Thomas Gleixner
2022-04-27 18:27 ` tip-bot2 for Thomas Gleixner
2022-04-19 21:56 ` [patch 00/10] x86/cpu: Consolidate APERF/MPERF code Paul E. McKenney
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=165106776778.4207.11312672097188195289.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=tglx@linutronix.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.